From 8cfd2c3eeb6d34d3481aadf20d8eb5f5a5c793be Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 19 Nov 2022 07:17:12 +0000 Subject: [PATCH 01/45] Preliminary patches to get sqlite3.c building as-is in WASI environments. FossilOrigin-Name: 19c04d71bf0f2f44d5a03288cbea3f63cf4eae2fa018ac6be4ae49a321e2b2f3 --- manifest | 19 +++++++++++-------- manifest.uuid | 2 +- src/os_unix.c | 35 +++++++++++++++++++++++++++++++++++ src/shell.c.in | 4 ++-- src/sqlite.h.in | 6 ++++++ 5 files changed, 55 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index 3df90b2d8a..0d31c2ee29 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sbuild\sof\ssqlite3.mjs\s(ES6\smodule),\sadd\sa\stest\sapp\sfor\sit,\sand\sinclude\sit\sin\sthe\sdist\sbuild. -D 2022-11-19T05:26:45.763 +C Preliminary\spatches\sto\sget\ssqlite3.c\sbuilding\sas-is\sin\sWASI\senvironments. +D 2022-11-19T07:17:12.124 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -623,7 +623,7 @@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85 F src/os_kv.c 0e59600d25b72034c7666b8b7dcc527f039b5d9c16f24a7eca4c08c66f63c364 F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 -F src/os_unix.c 287aa5f5691a2b356780c63e83abaa33549add84227b8313395f04088486d79c +F src/os_unix.c fc309252d6c86d7ae32e25d6413249789428aab600ffa9db050532bbe3a92ce2 F src/os_win.c 295fe45f18bd86f2477f4cd79f3377c6f883ceb941b1f46808665c73747f2345 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c d3122cf67f327f1e2df12d06236a3473a8099542071e257067552f42917f172d @@ -640,8 +640,8 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c 9886d6669f5787471aab6ae52af76fad90b53edb1c218fc9ed9d953363bc5184 -F src/shell.c.in 16740a86346ba9823f92528ec588f2b74f68166dac965dabd19883ace230f11d -F src/sqlite.h.in 100fc660c2f19961b8ed8437b9d53d687de2f8eb2b96437ec6da216adcb643ca +F src/shell.c.in f5b696b44319a7c820b1b2922ce8d34fdf330337beaa6e87c0fd85c5c92bcd34 +F src/sqlite.h.in 1d18494193ea4772a4a372e05f48d3ef0a14534bc2e1c88b942b89dcd9b14e4b F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f F src/sqliteInt.h 1a2cec0f7682da69975eb203fef2058949051ff500445b997d8047cbd8813315 @@ -2057,8 +2057,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 10c723d96d61d2e552ec1102563d58f1eb11bc3d30e03606fd8e0279c5a9043a -R 222130501cabad70ae0d5e4c47519919 +P 2e783670e10b59e67c14b0db7f4803b41790cc7730de221d54fa2d4483cfba33 +R 15320a286fec35f9e29ba0e0afc5c3c6 +T *branch * wasi-patches +T *sym-wasi-patches * +T -sym-trunk * Cancelled\sby\sbranch. U stephan -Z bbe51f75fec2c52a531f67e9a6ac36f6 +Z 0b7069cc0349cc87f94f97d371c39591 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 78bd7a46af..285b57f1df 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2e783670e10b59e67c14b0db7f4803b41790cc7730de221d54fa2d4483cfba33 \ No newline at end of file +19c04d71bf0f2f44d5a03288cbea3f63cf4eae2fa018ac6be4ae49a321e2b2f3 \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index c390b51888..a32c68d661 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -183,6 +183,37 @@ */ #define SQLITE_MAX_SYMLINKS 100 +/* +** Remove and stub certain info for WASI (WebAssembly System +** Interface) builds. +*/ +#ifdef SQLITE_WASI +# undef HAVE_FCHMOD +# undef HAVE_FCHOWN +# ifndef SQLITE_DEFAULT_UNIX_VFS +# define SQLITE_DEFAULT_UNIX_VFS "unix-dotfile" + /* ^^^ should SQLITE_DEFAULT_UNIX_VFS be "unix-none"? */ +# endif +# ifndef F_RDLCK +# define F_RDLCK 0 +# define F_WRLCK 1 +# define F_UNLCK 2 +# if __LONG_MAX == 0x7fffffffL +# define F_GETLK 12 +# define F_SETLK 13 +# define F_SETLKW 14 +# else +# define F_GETLK 5 +# define F_SETLK 6 +# define F_SETLKW 7 +# endif +# endif +#else /* !SQLITE_WASI */ +# ifndef HAVE_FCHMOD +# define HAVE_FCHMOD +# endif +#endif /* SQLITE_WASI */ + /* Always cast the getpid() return type for compatibility with ** kernel modules in VxWorks. */ #define osGetpid(X) (pid_t)getpid() @@ -457,7 +488,11 @@ static struct unix_syscall { #define osPwrite64 ((ssize_t(*)(int,const void*,size_t,off64_t))\ aSyscall[13].pCurrent) +#if defined(HAVE_FCHMOD) { "fchmod", (sqlite3_syscall_ptr)fchmod, 0 }, +#else + { "fchmod", (sqlite3_syscall_ptr)0, 0 }, +#endif #define osFchmod ((int(*)(int,mode_t))aSyscall[14].pCurrent) #if defined(HAVE_POSIX_FALLOCATE) && HAVE_POSIX_FALLOCATE diff --git a/src/shell.c.in b/src/shell.c.in index db8d987660..36999ed44a 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -111,7 +111,7 @@ typedef unsigned char u8; #if !defined(_WIN32) && !defined(WIN32) # include -# if !defined(__RTP__) && !defined(_WRS_KERNEL) +# if !defined(__RTP__) && !defined(_WRS_KERNEL) && !defined(SQLITE_WASI) # include # endif #endif @@ -192,7 +192,7 @@ typedef unsigned char u8; /* Make sure isatty() has a prototype. */ extern int isatty(int); -# if !defined(__RTP__) && !defined(_WRS_KERNEL) +# if !defined(__RTP__) && !defined(_WRS_KERNEL) && !defined(SQLITE_WASI) /* popen and pclose are not C89 functions and so are ** sometimes omitted from the header */ extern FILE *popen(const char*,const char*); diff --git a/src/sqlite.h.in b/src/sqlite.h.in index c2fc4e5a6a..9ff5163b13 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -10472,6 +10472,12 @@ int sqlite3_deserialize( # undef double #endif +#if defined(__wasi__) || defined(WASM_WASI) +# ifndef SQLITE_WASI +# define SQLITE_WASI +# endif +#endif + #ifdef __cplusplus } /* End of the 'extern "C"' block */ #endif From 9a92d53cf5f3aa0452d7a9638c0b15f4c87d83ad Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 19 Nov 2022 07:39:31 +0000 Subject: [PATCH 02/45] Account for lack of mmap(), getpid(), and shared memory APIs in wasi. FossilOrigin-Name: 80ff026fb4b2203eea53d4930c1e9bb138db951fb408739c7d5c776fb397b665 --- manifest | 17 +++++++---------- manifest.uuid | 2 +- src/os_unix.c | 17 +++++++++++++---- src/sqlite.h.in | 7 ++++--- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/manifest b/manifest index 0d31c2ee29..4663a26d69 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Preliminary\spatches\sto\sget\ssqlite3.c\sbuilding\sas-is\sin\sWASI\senvironments. -D 2022-11-19T07:17:12.124 +C Account\sfor\slack\sof\smmap(),\sgetpid(),\sand\sshared\smemory\sAPIs\sin\swasi. +D 2022-11-19T07:39:31.318 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -623,7 +623,7 @@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85 F src/os_kv.c 0e59600d25b72034c7666b8b7dcc527f039b5d9c16f24a7eca4c08c66f63c364 F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 -F src/os_unix.c fc309252d6c86d7ae32e25d6413249789428aab600ffa9db050532bbe3a92ce2 +F src/os_unix.c 2d16b0e0186805306680cfad36f1efd2909683cdabd0812f0460833b24e0e66d F src/os_win.c 295fe45f18bd86f2477f4cd79f3377c6f883ceb941b1f46808665c73747f2345 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a F src/pager.c d3122cf67f327f1e2df12d06236a3473a8099542071e257067552f42917f172d @@ -641,7 +641,7 @@ F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c 9886d6669f5787471aab6ae52af76fad90b53edb1c218fc9ed9d953363bc5184 F src/shell.c.in f5b696b44319a7c820b1b2922ce8d34fdf330337beaa6e87c0fd85c5c92bcd34 -F src/sqlite.h.in 1d18494193ea4772a4a372e05f48d3ef0a14534bc2e1c88b942b89dcd9b14e4b +F src/sqlite.h.in 5c27883b53c95c7b44ac3e63378d11fe50f18ad0ec975ae570bf2b01322438b0 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f F src/sqliteInt.h 1a2cec0f7682da69975eb203fef2058949051ff500445b997d8047cbd8813315 @@ -2057,11 +2057,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 2e783670e10b59e67c14b0db7f4803b41790cc7730de221d54fa2d4483cfba33 -R 15320a286fec35f9e29ba0e0afc5c3c6 -T *branch * wasi-patches -T *sym-wasi-patches * -T -sym-trunk * Cancelled\sby\sbranch. +P 19c04d71bf0f2f44d5a03288cbea3f63cf4eae2fa018ac6be4ae49a321e2b2f3 +R ed76f6c019da486b38eceba46ef5c9a9 U stephan -Z 0b7069cc0349cc87f94f97d371c39591 +Z 8a0ad9bf871d09c041e33a1999bb3238 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 285b57f1df..bbfcae861c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -19c04d71bf0f2f44d5a03288cbea3f63cf4eae2fa018ac6be4ae49a321e2b2f3 \ No newline at end of file +80ff026fb4b2203eea53d4930c1e9bb138db951fb408739c7d5c776fb397b665 \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index a32c68d661..af22d3cf85 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -95,7 +95,8 @@ #include #include /* amalgamator: keep */ #include -#if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0 +#if (!defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0) \ + && !defined(SQLITE_WASI) # include #endif @@ -190,6 +191,8 @@ #ifdef SQLITE_WASI # undef HAVE_FCHMOD # undef HAVE_FCHOWN +# undef HAVE_MREMAP +# define HAVE_MREMAP 0 # ifndef SQLITE_DEFAULT_UNIX_VFS # define SQLITE_DEFAULT_UNIX_VFS "unix-dotfile" /* ^^^ should SQLITE_DEFAULT_UNIX_VFS be "unix-none"? */ @@ -214,9 +217,13 @@ # endif #endif /* SQLITE_WASI */ +#ifdef SQLITE_WASI +# define osGetpid(X) 1 +#else /* Always cast the getpid() return type for compatibility with ** kernel modules in VxWorks. */ -#define osGetpid(X) (pid_t)getpid() +# define osGetpid(X) (pid_t)getpid() +#endif /* ** Only set the lastErrno if the error code is a real error and not @@ -528,14 +535,16 @@ static struct unix_syscall { #endif #define osGeteuid ((uid_t(*)(void))aSyscall[21].pCurrent) -#if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0 +#if (!defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0) \ + && !defined(SQLITE_WASI) { "mmap", (sqlite3_syscall_ptr)mmap, 0 }, #else { "mmap", (sqlite3_syscall_ptr)0, 0 }, #endif #define osMmap ((void*(*)(void*,size_t,int,int,int,off_t))aSyscall[22].pCurrent) -#if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0 +#if (!defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0) \ + && !defined(SQLITE_WASI) { "munmap", (sqlite3_syscall_ptr)munmap, 0 }, #else { "munmap", (sqlite3_syscall_ptr)0, 0 }, diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 9ff5163b13..1a1ef3c143 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -10473,9 +10473,10 @@ int sqlite3_deserialize( #endif #if defined(__wasi__) || defined(WASM_WASI) -# ifndef SQLITE_WASI -# define SQLITE_WASI -# endif +# undef SQLITE_WASI +# define SQLITE_WASI 1 +# undef SQLITE_OMIT_WAL +# define SQLITE_OMIT_WAL 1/* because it requires shared memory APIs */ #endif #ifdef __cplusplus From 946c317ac6be8b839faede0e9a9fd5b076809f47 Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 19 Nov 2022 07:44:32 +0000 Subject: [PATCH 03/45] Default to SQLITE_THREADSAFE=0 and SQLITE_OMIT_LOAD_EXTENSION for wasi builds. FossilOrigin-Name: 382ba3b28409bbc54e6c5c3c9fe78980832e9f33261ee842e3b56e788300f669 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/sqlite.h.in | 6 ++++++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 4663a26d69..d1c0d7e692 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Account\sfor\slack\sof\smmap(),\sgetpid(),\sand\sshared\smemory\sAPIs\sin\swasi. -D 2022-11-19T07:39:31.318 +C Default\sto\sSQLITE_THREADSAFE=0\sand\sSQLITE_OMIT_LOAD_EXTENSION\sfor\swasi\sbuilds. +D 2022-11-19T07:44:32.626 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -641,7 +641,7 @@ F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c 9886d6669f5787471aab6ae52af76fad90b53edb1c218fc9ed9d953363bc5184 F src/shell.c.in f5b696b44319a7c820b1b2922ce8d34fdf330337beaa6e87c0fd85c5c92bcd34 -F src/sqlite.h.in 5c27883b53c95c7b44ac3e63378d11fe50f18ad0ec975ae570bf2b01322438b0 +F src/sqlite.h.in 843bf14e3dff296f0b2be440e59094530063bc6052347e23e97e6667ad59acad F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f F src/sqliteInt.h 1a2cec0f7682da69975eb203fef2058949051ff500445b997d8047cbd8813315 @@ -2057,8 +2057,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 19c04d71bf0f2f44d5a03288cbea3f63cf4eae2fa018ac6be4ae49a321e2b2f3 -R ed76f6c019da486b38eceba46ef5c9a9 +P 80ff026fb4b2203eea53d4930c1e9bb138db951fb408739c7d5c776fb397b665 +R beeafe07073ef1e2ccb7ee0293a95ef3 U stephan -Z 8a0ad9bf871d09c041e33a1999bb3238 +Z 10684edd410c3d649eb3bf1e4a06ed31 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index bbfcae861c..6b8332d051 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -80ff026fb4b2203eea53d4930c1e9bb138db951fb408739c7d5c776fb397b665 \ No newline at end of file +382ba3b28409bbc54e6c5c3c9fe78980832e9f33261ee842e3b56e788300f669 \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 1a1ef3c143..29ef14c0ff 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -10477,6 +10477,12 @@ int sqlite3_deserialize( # define SQLITE_WASI 1 # undef SQLITE_OMIT_WAL # define SQLITE_OMIT_WAL 1/* because it requires shared memory APIs */ +# ifndef SQLITE_OMIT_LOAD_EXTENSION +# define SQLITE_OMIT_LOAD_EXTENSION +# endif +# ifndef SQLITE_THREADSAFE +# define SQLITE_THREADSAFE 0 +# endif #endif #ifdef __cplusplus From cedc3eee7093e6f57fdcfbf7d41b11236155e74f Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 19 Nov 2022 15:03:25 +0000 Subject: [PATCH 04/45] Elide a wasi-incompatible shell.c block in SQLITE_WASI builds. FossilOrigin-Name: 9b8b15a779158ec7c39d936f6bfa6a35e12063a36933341ade051809993a5678 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/shell.c.in | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index d1c0d7e692..08b8556459 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Default\sto\sSQLITE_THREADSAFE=0\sand\sSQLITE_OMIT_LOAD_EXTENSION\sfor\swasi\sbuilds. -D 2022-11-19T07:44:32.626 +C Elide\sa\swasi-incompatible\sshell.c\sblock\sin\sSQLITE_WASI\sbuilds. +D 2022-11-19T15:03:25.773 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -640,7 +640,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c 9886d6669f5787471aab6ae52af76fad90b53edb1c218fc9ed9d953363bc5184 -F src/shell.c.in f5b696b44319a7c820b1b2922ce8d34fdf330337beaa6e87c0fd85c5c92bcd34 +F src/shell.c.in c04980beb7d8a6443bef463d3bac695d35c76e26a577076f2390efc871193cea F src/sqlite.h.in 843bf14e3dff296f0b2be440e59094530063bc6052347e23e97e6667ad59acad F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f @@ -2057,8 +2057,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 80ff026fb4b2203eea53d4930c1e9bb138db951fb408739c7d5c776fb397b665 -R beeafe07073ef1e2ccb7ee0293a95ef3 +P 382ba3b28409bbc54e6c5c3c9fe78980832e9f33261ee842e3b56e788300f669 +R fbc353ec2c303468e2c4f3839734e5b5 U stephan -Z 10684edd410c3d649eb3bf1e4a06ed31 +Z 832db4ba1df42c3e6c0af6e904f13656 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 6b8332d051..9858321ac0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -382ba3b28409bbc54e6c5c3c9fe78980832e9f33261ee842e3b56e788300f669 \ No newline at end of file +9b8b15a779158ec7c39d936f6bfa6a35e12063a36933341ade051809993a5678 \ No newline at end of file diff --git a/src/shell.c.in b/src/shell.c.in index 36999ed44a..e06d0ab09b 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -11196,7 +11196,7 @@ static char *find_home_dir(int clearFlag){ if( home_dir ) return home_dir; #if !defined(_WIN32) && !defined(WIN32) && !defined(_WIN32_WCE) \ - && !defined(__RTP__) && !defined(_WRS_KERNEL) + && !defined(__RTP__) && !defined(_WRS_KERNEL) && !defined(SQLITE_WASI) { struct passwd *pwent; uid_t uid = getuid(); From 5aa5463e759df21fe9763cdf96b831e6e14a76cf Mon Sep 17 00:00:00 2001 From: stephan Date: Sun, 20 Nov 2022 15:30:42 +0000 Subject: [PATCH 05/45] Remove check for WASM_WASI macro when detecting wasi compilation mode, as that macro is project-specific. Rely only on __wasi__ (exposed by clang) to detect wasi compilation mode. FossilOrigin-Name: d469ac0c448eced26a697751ce9be316e8bc3cd029fda2b50966523c7850854f --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/sqlite.h.in | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 08b8556459..113a79c680 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Elide\sa\swasi-incompatible\sshell.c\sblock\sin\sSQLITE_WASI\sbuilds. -D 2022-11-19T15:03:25.773 +C Remove\scheck\sfor\sWASM_WASI\smacro\swhen\sdetecting\swasi\scompilation\smode,\sas\sthat\smacro\sis\sproject-specific.\sRely\sonly\son\s__wasi__\s(exposed\sby\sclang)\sto\sdetect\swasi\scompilation\smode. +D 2022-11-20T15:30:42.968 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -641,7 +641,7 @@ F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c 9886d6669f5787471aab6ae52af76fad90b53edb1c218fc9ed9d953363bc5184 F src/shell.c.in c04980beb7d8a6443bef463d3bac695d35c76e26a577076f2390efc871193cea -F src/sqlite.h.in 843bf14e3dff296f0b2be440e59094530063bc6052347e23e97e6667ad59acad +F src/sqlite.h.in b14769848d4c1bcf51b3a968c656133302443aa4112de52fec8425a862fa99e9 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f F src/sqliteInt.h 1a2cec0f7682da69975eb203fef2058949051ff500445b997d8047cbd8813315 @@ -2057,8 +2057,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 382ba3b28409bbc54e6c5c3c9fe78980832e9f33261ee842e3b56e788300f669 -R fbc353ec2c303468e2c4f3839734e5b5 +P 9b8b15a779158ec7c39d936f6bfa6a35e12063a36933341ade051809993a5678 +R eab0332091536d080c020fa14b102cbe U stephan -Z 832db4ba1df42c3e6c0af6e904f13656 +Z 0c7f0b6e6cee222ce3be0bf4f50c95f1 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 9858321ac0..79a5820846 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9b8b15a779158ec7c39d936f6bfa6a35e12063a36933341ade051809993a5678 \ No newline at end of file +d469ac0c448eced26a697751ce9be316e8bc3cd029fda2b50966523c7850854f \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 29ef14c0ff..963e756956 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -10472,7 +10472,7 @@ int sqlite3_deserialize( # undef double #endif -#if defined(__wasi__) || defined(WASM_WASI) +#if defined(__wasi__) # undef SQLITE_WASI # define SQLITE_WASI 1 # undef SQLITE_OMIT_WAL From f0962c9f493ea86e5b36e8730890fbe5bb1910a1 Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 10 Dec 2022 05:52:02 +0000 Subject: [PATCH 06/45] Run configure.ac through autoupdate, as required by autoconf for rebuilding configure. These (many) changes were made entirely by the autotools, except that some whitespace-only changes were reverted by hand to reduce noise, and are a preliminary step to adding a new flag to configure.ac. FossilOrigin-Name: 2be2d5d428acd538e44d7b9345b64470131bef40f67ba3190f5cd42f9949f355 --- configure | 5218 +++++++++++++++++++++++++++---------------------- configure.ac | 70 +- manifest | 22 +- manifest.uuid | 2 +- 4 files changed, 2932 insertions(+), 2380 deletions(-) diff --git a/configure b/configure index 75ca8935ff..908bba9c5b 100755 --- a/configure +++ b/configure @@ -1,9 +1,10 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for sqlite 3.41.0. +# Generated by GNU Autoconf 2.71 for sqlite 3.41.0. # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -14,14 +15,16 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -31,46 +34,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -79,13 +82,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -94,8 +90,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -107,30 +107,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. @@ -152,20 +132,22 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else +else \$as_nop case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -185,42 +167,53 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; } as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : -else +else \$as_nop exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 +blah=\$(echo \$(echo blah)) +test x\"\$blah\" = xblah || exit 1 test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null; then : + if (eval "$as_required") 2>/dev/null +then : as_have_required=yes -else +else $as_nop as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : -else +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base + as_shell=$as_dir$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +then : break 2 fi fi @@ -228,14 +221,21 @@ fi esac as_found=false done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi +fi - if test "x$CONFIG_SHELL" != x; then : + if test "x$CONFIG_SHELL" != x +then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -253,18 +253,19 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." + if test x$as_have_required = xno +then : + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." + if test ${ZSH_VERSION+y} ; then + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, + printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system, $0: including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." @@ -291,6 +292,7 @@ as_fn_unset () } as_unset=as_fn_unset + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -308,6 +310,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -322,7 +332,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -331,7 +341,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -370,12 +380,13 @@ as_fn_executable_p () # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -387,18 +398,27 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -410,9 +430,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -439,7 +459,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -483,7 +503,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -497,6 +517,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits exit } + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -510,6 +534,13 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -733,40 +764,36 @@ PACKAGE_URL='' # Factoring default headers for most tests. ac_includes_default="\ -#include -#ifdef HAVE_SYS_TYPES_H -# include +#include +#ifdef HAVE_STDIO_H +# include #endif -#ifdef HAVE_SYS_STAT_H -# include -#endif -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif #endif #ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif # include #endif -#ifdef HAVE_STRINGS_H -# include -#endif #ifdef HAVE_INTTYPES_H # include #endif #ifdef HAVE_STDINT_H # include #endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif #ifdef HAVE_UNISTD_H # include #endif" +ac_header_c_list= ac_subst_vars='LTLIBOBJS LIBOBJS BUILD_CFLAGS @@ -808,7 +835,6 @@ TCLSH_CMD INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -CPP OTOOL64 OTOOL LIPO @@ -863,6 +889,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -926,7 +953,6 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP TCLLIBDIR' @@ -966,6 +992,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -995,8 +1022,6 @@ do *) ac_optarg=yes ;; esac - # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -1037,9 +1062,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1063,9 +1088,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1218,6 +1243,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1267,9 +1301,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1283,9 +1317,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1329,9 +1363,9 @@ Try \`$0 --help' for more information" *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1347,7 +1381,7 @@ if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1355,7 +1389,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1411,7 +1445,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | +printf "%s\n" X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1508,6 +1542,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1592,7 +1627,6 @@ Some influential environment variables: LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory - CPP C preprocessor TCLLIBDIR Where to install tcl plugin Use these variables to override the choices made by `configure' or to help @@ -1614,9 +1648,9 @@ if test "$ac_init_help" = "recursive"; then case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1644,7 +1678,8 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -1652,7 +1687,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1662,9 +1697,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF sqlite configure 3.41.0 -generated by GNU Autoconf 2.69 +generated by GNU Autoconf 2.71 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1681,14 +1716,14 @@ fi ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1696,14 +1731,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1719,14 +1755,14 @@ fi ac_fn_c_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext + rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1734,17 +1770,18 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1766,120 +1803,44 @@ fi ac_fn_c_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly ac_fn_c_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case declares $2. @@ -1887,16 +1848,9 @@ else #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif + which can conflict with char $2 (); below. */ +#include #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -1914,24 +1868,25 @@ choke me #endif int -main () +main (void) { return $2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func @@ -1943,17 +1898,18 @@ $as_echo "$ac_res" >&6; } ac_fn_c_check_type () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof ($2)) return 0; @@ -1961,12 +1917,13 @@ if (sizeof ($2)) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof (($2))) return 0; @@ -1974,116 +1931,50 @@ if (sizeof (($2))) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop eval "$3=yes" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type +ac_configure_args_raw= +for ac_arg +do + case $ac_arg in + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append ac_configure_args_raw " '$ac_arg'" +done -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_c_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; +case $ac_configure_args_raw in + *$as_nl*) + ac_safe_unquote= ;; + *) + ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. + ac_unsafe_a="$ac_unsafe_z#~" + ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" + ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -} # ac_fn_c_check_header_mongrel cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by sqlite $as_me 3.41.0, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was - $ $0 $@ + $ $0$ac_configure_args_raw _ACEOF exec 5>>config.log @@ -2116,8 +2007,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + printf "%s\n" "PATH: $as_dir" done IFS=$as_save_IFS @@ -2152,7 +2047,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -2187,11 +2082,13 @@ done # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - $as_echo "## ---------------- ## + printf "%s\n" "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -2202,8 +2099,8 @@ trap 'exit_status=$? case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -2227,7 +2124,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - $as_echo "## ----------------- ## + printf "%s\n" "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -2235,14 +2132,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + printf "%s\n" "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -2250,15 +2147,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - $as_echo "## ----------- ## + printf "%s\n" "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -2266,8 +2163,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -2281,63 +2178,48 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -$as_echo "/* confdefs.h */" > confdefs.h +printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_files="$CONFIG_SITE" elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + ac_site_files="$prefix/share/config.site $prefix/etc/config.site" else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" + +for ac_site_file in $ac_site_files do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + case $ac_site_file in #( + */*) : + ;; #( + *) : + ac_site_file=./$ac_site_file ;; +esac + if test -f "$ac_site_file" && test -r "$ac_site_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file See \`config.log' for more details" "$LINENO" 5; } fi @@ -2347,19 +2229,434 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +# Test code for whether the C compiler supports C89 (global declarations) +ac_c_conftest_c89_globals=' +/* Does the compiler advertise C89 conformance? + Do not test the value of __STDC__, because some compilers set it to 0 + while being otherwise adequately conformant. */ +#if !defined __STDC__ +# error "Compiler does not advertise C89 conformance" +#endif + +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ +struct buf { int x; }; +struct buf * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not \xHH hex character constants. + These do not provoke an error unfortunately, instead are silently treated + as an "x". The following induces an error, until -std is added to get + proper ANSI mode. Curiously \x00 != x always comes out true, for an + array size at least. It is necessary to write \x00 == 0 to get something + that is true only with -std. */ +int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) '\''x'\'' +int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), + int, int);' + +# Test code for whether the C compiler supports C89 (body of main). +ac_c_conftest_c89_main=' +ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); +' + +# Test code for whether the C compiler supports C99 (global declarations) +ac_c_conftest_c99_globals=' +// Does the compiler advertise C99 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L +# error "Compiler does not advertise C99 conformance" +#endif + +#include +extern int puts (const char *); +extern int printf (const char *, ...); +extern int dprintf (int, const char *, ...); +extern void *malloc (size_t); + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +// dprintf is used instead of fprintf to avoid needing to declare +// FILE and stderr. +#define debug(...) dprintf (2, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + #error "your preprocessor is broken" +#endif +#if BIG_OK +#else + #error "your preprocessor is broken" +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case '\''s'\'': // string + str = va_arg (args_copy, const char *); + break; + case '\''d'\'': // int + number = va_arg (args_copy, int); + break; + case '\''f'\'': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +} +' + +# Test code for whether the C compiler supports C99 (body of main). +ac_c_conftest_c99_main=' + // Check bool. + _Bool success = false; + success |= (argc != 0); + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[0] = argv[0][0]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' + || dynamic_array[ni.number - 1] != 543); +' + +# Test code for whether the C compiler supports C11 (global declarations) +ac_c_conftest_c11_globals=' +// Does the compiler advertise C11 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L +# error "Compiler does not advertise C11 conformance" +#endif + +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; +' + +# Test code for whether the C compiler supports C11 (body of main). +ac_c_conftest_c11_main=' + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + v1.i = 2; + v1.w.k = 5; + ok |= v1.i != 5; +' + +# Test code for whether the C compiler supports C11 (complete). +ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} +${ac_c_conftest_c11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + ${ac_c_conftest_c11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C99 (complete). +ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + return ok; +} +" + +# Test code for whether the C compiler supports C89 (complete). +ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + return ok; +} +" + +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" +as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" +as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" + +# Auxiliary files required by this configure script. +ac_aux_files="install-sh config.guess config.sub ltmain.sh" + +# Locations in which to look for auxiliary files. +ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.." + +# Search for a directory containing all of the required auxiliary files, +# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. +# If we don't find one directory that contains all the files we need, +# we report the set of missing files from the *first* directory in +# $ac_aux_dir_candidates and give up. +ac_missing_aux_files="" +ac_first_candidate=: +printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in $ac_aux_dir_candidates +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + + printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 + ac_aux_dir_found=yes + ac_install_sh= + for ac_aux in $ac_aux_files + do + # As a special case, if "install-sh" is required, that requirement + # can be satisfied by any of "install-sh", "install.sh", or "shtool", + # and $ac_install_sh is set appropriately for whichever one is found. + if test x"$ac_aux" = x"install-sh" + then + if test -f "${as_dir}install-sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 + ac_install_sh="${as_dir}install-sh -c" + elif test -f "${as_dir}install.sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 + ac_install_sh="${as_dir}install.sh -c" + elif test -f "${as_dir}shtool"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 + ac_install_sh="${as_dir}shtool install -c" + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} install-sh" + else + break + fi + fi + else + if test -f "${as_dir}${ac_aux}"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" + else + break + fi + fi + fi + done + if test "$ac_aux_dir_found" = yes; then + ac_aux_dir="$as_dir" + break + fi + ac_first_candidate=false + + as_found=false +done +IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 +fi + + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +if test -f "${ac_aux_dir}config.guess"; then + ac_config_guess="$SHELL ${ac_aux_dir}config.guess" +fi +if test -f "${ac_aux_dir}config.sub"; then + ac_config_sub="$SHELL ${ac_aux_dir}config.sub" +fi +if test -f "$ac_aux_dir/configure"; then + ac_configure="$SHELL ${ac_aux_dir}configure" +fi + # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -2370,12 +2667,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -2384,24 +2681,24 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -2411,11 +2708,12 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2442,8 +2740,8 @@ fi # case `pwd` in *\ * | *\ *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac @@ -2463,57 +2761,33 @@ macro_revision='1.3012' + + ltmain="$ac_aux_dir/ltmain.sh" -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + # Make sure we can run config.sub. +$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +printf %s "checking build system type... " >&6; } +if test ${ac_cv_build+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_build_alias=$build_alias test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 +ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +printf "%s\n" "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -2532,21 +2806,22 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +printf %s "checking host system type... " >&6; } +if test ${ac_cv_host+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +printf "%s\n" "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -2565,6 +2840,15 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + + + + + + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2573,11 +2857,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2585,11 +2870,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2600,11 +2889,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2613,11 +2902,12 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -2625,11 +2915,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2640,11 +2934,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2652,8 +2946,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2666,11 +2960,12 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2678,11 +2973,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2693,11 +2992,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2706,11 +3005,12 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2719,15 +3019,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2743,18 +3047,18 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2765,11 +3069,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2777,11 +3082,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2792,11 +3101,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2809,11 +3118,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -2821,11 +3131,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2836,11 +3150,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2852,8 +3166,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2861,25 +3175,129 @@ esac fi fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +fi + + +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do +for ac_option in --version -v -V -qversion -version; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2889,7 +3307,7 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -2897,7 +3315,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -2909,9 +3327,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +printf %s "checking whether the C compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -2932,11 +3350,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -2953,7 +3372,7 @@ do # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -2969,44 +3388,46 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else +else $as_nop ac_file='' fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +printf %s "checking for C compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -3020,15 +3441,15 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -3037,7 +3458,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -3049,8 +3470,8 @@ _ACEOF ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -3058,10 +3479,10 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -3069,39 +3490,40 @@ $as_echo "$ac_try_echo"; } >&5 *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details" "$LINENO" 5; } fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -3115,11 +3537,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -3128,31 +3551,32 @@ $as_echo "$ac_try_echo"; } >&5 break;; esac done -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -3162,29 +3586,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+set} +ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -3193,57 +3621,60 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes -else +else $as_nop CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -3258,94 +3689,144 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +$ac_c_conftest_c89_program _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC - fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 +fi fi ac_ext=c @@ -3354,11 +3835,12 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +printf %s "checking for a sed that does not truncate output... " >&6; } +if test ${ac_cv_path_SED+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" @@ -3372,10 +3854,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in sed gsed + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + ac_path_SED="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED @@ -3384,13 +3871,13 @@ case `"$ac_path_SED" --version 2>&1` in ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" + printf "%s\n" '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -3418,8 +3905,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +printf "%s\n" "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -3436,11 +3923,12 @@ Xsed="$SED -e 1s/^X//" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +printf %s "checking for grep that handles long lines and -e... " >&6; } +if test ${ac_cv_path_GREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$GREP"; then ac_path_GREP_found=false # Loop through the user's path and test for each of PROGNAME-LIST @@ -3448,10 +3936,15 @@ else for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in grep ggrep + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP @@ -3460,13 +3953,13 @@ case `"$ac_path_GREP" --version 2>&1` in ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" + printf "%s\n" 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -3494,16 +3987,17 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +printf "%s\n" "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +printf %s "checking for egrep... " >&6; } +if test ${ac_cv_path_EGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else @@ -3514,10 +4008,15 @@ else for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in egrep + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP @@ -3526,13 +4025,13 @@ case `"$ac_path_EGREP" --version 2>&1` in ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" + printf "%s\n" 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -3561,16 +4060,17 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +printf "%s\n" "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -$as_echo_n "checking for fgrep... " >&6; } -if ${ac_cv_path_FGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +printf %s "checking for fgrep... " >&6; } +if test ${ac_cv_path_FGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 then ac_cv_path_FGREP="$GREP -F" else @@ -3581,10 +4081,15 @@ else for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in fgrep + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP @@ -3593,13 +4098,13 @@ case `"$ac_path_FGREP" --version 2>&1` in ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'FGREP' >> "conftest.nl" + printf "%s\n" 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -3628,8 +4133,8 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -$as_echo "$ac_cv_path_FGREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +printf "%s\n" "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" @@ -3654,17 +4159,18 @@ test -z "$GREP" && GREP=grep # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : +if test ${with_gnu_ld+y} +then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else +else $as_nop with_gnu_ld=no fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +printf %s "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -3693,15 +4199,16 @@ $as_echo_n "checking for ld used by $CC... " >&6; } ;; esac elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +printf %s "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +printf %s "checking for non-GNU ld... " >&6; } fi -if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${lt_cv_path_LD+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$LD"; then lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do @@ -3730,18 +4237,19 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -$as_echo "$LD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +printf "%s\n" "$LD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +printf %s "checking if the linker ($LD) is GNU ld... " >&6; } +if test ${lt_cv_prog_gnu_ld+y} +then : + printf %s "(cached) " >&6 +else $as_nop # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -3764,11 +4272,12 @@ with_gnu_ld=$lt_cv_prog_gnu_ld -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 -$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if ${lt_cv_path_NM+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if test ${lt_cv_path_NM+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM="$NM" @@ -3813,8 +4322,8 @@ else : ${lt_cv_path_NM=no} fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 -$as_echo "$lt_cv_path_NM" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +printf "%s\n" "$lt_cv_path_NM" >&6; } if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else @@ -3824,11 +4333,12 @@ else do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DUMPBIN+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$DUMPBIN"; then ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. else @@ -3836,11 +4346,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3851,11 +4365,11 @@ fi fi DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 -$as_echo "$DUMPBIN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +printf "%s\n" "$DUMPBIN" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3868,11 +4382,12 @@ if test -z "$DUMPBIN"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DUMPBIN+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_DUMPBIN"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. else @@ -3880,11 +4395,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3895,11 +4414,11 @@ fi fi ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 -$as_echo "$ac_ct_DUMPBIN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +printf "%s\n" "$ac_ct_DUMPBIN" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3911,8 +4430,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DUMPBIN=$ac_ct_DUMPBIN @@ -3931,46 +4450,48 @@ test -z "$NM" && NM=nm -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 -$as_echo_n "checking the name lister ($NM) interface... " >&6; } -if ${lt_cv_nm_interface+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +printf %s "checking the name lister ($NM) interface... " >&6; } +if test ${lt_cv_nm_interface+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:3941: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4461: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:3944: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4464: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:3947: output\"" >&5) + (eval echo "\"\$as_me:4467: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" fi rm -f conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 -$as_echo "$lt_cv_nm_interface" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +printf "%s\n" "$lt_cv_nm_interface" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +printf %s "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +printf "%s\n" "no, using $LN_S" >&6; } fi # find the maximum length of command line arguments -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 -$as_echo_n "checking the maximum length of command line arguments... " >&6; } -if ${lt_cv_sys_max_cmd_len+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +printf %s "checking the maximum length of command line arguments... " >&6; } +if test ${lt_cv_sys_max_cmd_len+y} +then : + printf %s "(cached) " >&6 +else $as_nop i=0 teststring="ABCD" @@ -4086,11 +4607,11 @@ else fi if test -n $lt_cv_sys_max_cmd_len ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 -$as_echo "$lt_cv_sys_max_cmd_len" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 +printf "%s\n" "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -4103,8 +4624,8 @@ max_cmd_len=$lt_cv_sys_max_cmd_len : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 +printf %s "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -4113,18 +4634,18 @@ xsi_shell=no && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 +printf "%s\n" "$xsi_shell" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 +printf %s "checking whether the shell understands \"+=\"... " >&6; } lt_shell_append=no ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ >/dev/null 2>&1 \ && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 +printf "%s\n" "$lt_shell_append" >&6; } if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -4158,15 +4679,16 @@ esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 -$as_echo_n "checking for $LD option to reload object files... " >&6; } -if ${lt_cv_ld_reload_flag+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +printf %s "checking for $LD option to reload object files... " >&6; } +if test ${lt_cv_ld_reload_flag+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ld_reload_flag='-r' fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 -$as_echo "$lt_cv_ld_reload_flag" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +printf "%s\n" "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -4194,11 +4716,12 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OBJDUMP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else @@ -4206,11 +4729,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4221,11 +4748,11 @@ fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +printf "%s\n" "$OBJDUMP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4234,11 +4761,12 @@ if test -z "$ac_cv_prog_OBJDUMP"; then ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OBJDUMP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_OBJDUMP"; then ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. else @@ -4246,11 +4774,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4261,11 +4793,11 @@ fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +printf "%s\n" "$ac_ct_OBJDUMP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OBJDUMP" = x; then @@ -4273,8 +4805,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OBJDUMP=$ac_ct_OBJDUMP @@ -4293,11 +4825,12 @@ test -z "$OBJDUMP" && OBJDUMP=objdump -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 -$as_echo_n "checking how to recognize dependent libraries... " >&6; } -if ${lt_cv_deplibs_check_method+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +printf %s "checking how to recognize dependent libraries... " >&6; } +if test ${lt_cv_deplibs_check_method+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= lt_cv_deplibs_check_method='unknown' @@ -4489,8 +5022,8 @@ tpf*) esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 -$as_echo "$lt_cv_deplibs_check_method" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +printf "%s\n" "$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -4509,11 +5042,12 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AR+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else @@ -4521,11 +5055,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AR="${ac_tool_prefix}ar" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4536,11 +5074,11 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +printf "%s\n" "$AR" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4549,11 +5087,12 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_AR+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else @@ -4561,11 +5100,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="ar" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4576,11 +5119,11 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +printf "%s\n" "$ac_ct_AR" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_AR" = x; then @@ -4588,8 +5131,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR @@ -4614,11 +5157,12 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -4626,11 +5170,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4641,11 +5189,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4654,11 +5202,12 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -4666,11 +5215,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4681,11 +5234,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +printf "%s\n" "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -4693,8 +5246,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -4713,11 +5266,12 @@ test -z "$STRIP" && STRIP=: if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else @@ -4725,11 +5279,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4740,11 +5298,11 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +printf "%s\n" "$RANLIB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4753,11 +5311,12 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else @@ -4765,11 +5324,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4780,11 +5343,11 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +printf "%s\n" "$ac_ct_RANLIB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -4792,8 +5355,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -4870,11 +5433,12 @@ compiler=$CC # Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 -$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if ${lt_cv_sys_global_symbol_pipe+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +printf %s "checking command to parse $NM output from $compiler object... " >&6; } +if test ${lt_cv_sys_global_symbol_pipe+y} +then : + printf %s "(cached) " >&6 +else $as_nop # These are sane defaults that work on at least a few old systems. # [They come from Ultrix. What could be older than Ultrix?!! ;)] @@ -4991,14 +5555,14 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -5055,7 +5619,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -5090,11 +5654,11 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -$as_echo "failed" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +printf "%s\n" "failed" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +printf "%s\n" "ok" >&6; } fi @@ -5120,7 +5684,8 @@ fi # Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then : +if test ${enable_libtool_lock+y} +then : enableval=$enable_libtool_lock; fi @@ -5135,7 +5700,7 @@ ia64-*-hpux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) @@ -5150,11 +5715,11 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5153 "configure"' > conftest.$ac_ext + echo '#line 5718 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in @@ -5192,7 +5757,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *32-bit*) @@ -5242,11 +5807,12 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 -$as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if ${lt_cv_cc_needs_belf+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +printf %s "checking whether the C compiler needs -belf... " >&6; } +if test ${lt_cv_cc_needs_belf+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5257,19 +5823,20 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_cc_needs_belf=yes -else +else $as_nop lt_cv_cc_needs_belf=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -5278,8 +5845,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 -$as_echo "$lt_cv_cc_needs_belf" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +printf "%s\n" "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" @@ -5291,7 +5858,7 @@ sparc*-*solaris*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *64-bit*) @@ -5318,11 +5885,12 @@ need_locks="$enable_libtool_lock" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DSYMUTIL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$DSYMUTIL"; then ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. else @@ -5330,11 +5898,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5345,11 +5917,11 @@ fi fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +printf "%s\n" "$DSYMUTIL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5358,11 +5930,12 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DSYMUTIL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_DSYMUTIL"; then ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. else @@ -5370,11 +5943,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5385,11 +5962,11 @@ fi fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +printf "%s\n" "$ac_ct_DSYMUTIL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_DSYMUTIL" = x; then @@ -5397,8 +5974,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DSYMUTIL=$ac_ct_DSYMUTIL @@ -5410,11 +5987,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_NMEDIT+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$NMEDIT"; then ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. else @@ -5422,11 +6000,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5437,11 +6019,11 @@ fi fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -$as_echo "$NMEDIT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +printf "%s\n" "$NMEDIT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5450,11 +6032,12 @@ if test -z "$ac_cv_prog_NMEDIT"; then ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_NMEDIT+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_NMEDIT"; then ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. else @@ -5462,11 +6045,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5477,11 +6064,11 @@ fi fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 -$as_echo "$ac_ct_NMEDIT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +printf "%s\n" "$ac_ct_NMEDIT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_NMEDIT" = x; then @@ -5489,8 +6076,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac NMEDIT=$ac_ct_NMEDIT @@ -5502,11 +6089,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_LIPO+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$LIPO"; then ac_cv_prog_LIPO="$LIPO" # Let the user override the test. else @@ -5514,11 +6102,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5529,11 +6121,11 @@ fi fi LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -$as_echo "$LIPO" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +printf "%s\n" "$LIPO" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5542,11 +6134,12 @@ if test -z "$ac_cv_prog_LIPO"; then ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_LIPO+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_LIPO"; then ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. else @@ -5554,11 +6147,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5569,11 +6166,11 @@ fi fi ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 -$as_echo "$ac_ct_LIPO" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +printf "%s\n" "$ac_ct_LIPO" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_LIPO" = x; then @@ -5581,8 +6178,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac LIPO=$ac_ct_LIPO @@ -5594,11 +6191,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$OTOOL"; then ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. else @@ -5606,11 +6204,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5621,11 +6223,11 @@ fi fi OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -$as_echo "$OTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +printf "%s\n" "$OTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5634,11 +6236,12 @@ if test -z "$ac_cv_prog_OTOOL"; then ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_OTOOL"; then ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. else @@ -5646,11 +6249,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5661,11 +6268,11 @@ fi fi ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 -$as_echo "$ac_ct_OTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +printf "%s\n" "$ac_ct_OTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OTOOL" = x; then @@ -5673,8 +6280,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL=$ac_ct_OTOOL @@ -5686,11 +6293,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OTOOL64+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$OTOOL64"; then ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. else @@ -5698,11 +6306,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5713,11 +6325,11 @@ fi fi OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 -$as_echo "$OTOOL64" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +printf "%s\n" "$OTOOL64" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5726,11 +6338,12 @@ if test -z "$ac_cv_prog_OTOOL64"; then ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OTOOL64+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_OTOOL64"; then ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. else @@ -5738,11 +6351,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5753,11 +6370,11 @@ fi fi ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 -$as_echo "$ac_ct_OTOOL64" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +printf "%s\n" "$ac_ct_OTOOL64" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OTOOL64" = x; then @@ -5765,8 +6382,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL64=$ac_ct_OTOOL64 @@ -5801,11 +6418,12 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 -$as_echo_n "checking for -single_module linker flag... " >&6; } -if ${lt_cv_apple_cc_single_mod+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +printf %s "checking for -single_module linker flag... " >&6; } +if test ${lt_cv_apple_cc_single_mod+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_apple_cc_single_mod=no if test -z "${LT_MULTI_MODULE}"; then # By default we will add the -single_module flag. You can override @@ -5828,13 +6446,14 @@ else rm -f conftest.* fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -$as_echo "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 -$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if ${lt_cv_ld_exported_symbols_list+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +printf %s "checking for -exported_symbols_list linker flag... " >&6; } +if test ${lt_cv_ld_exported_symbols_list+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS echo "_main" > conftest.sym @@ -5843,25 +6462,26 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_ld_exported_symbols_list=yes -else +else $as_nop lt_cv_ld_exported_symbols_list=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -5897,286 +6517,43 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } ;; esac -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes +ac_header= ac_cache= +for ac_item in $ac_header_c_list do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - done - ac_cv_prog_CPP=$CPP + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +if test "x$ac_cv_header_dlfcn_h" = xyes +then : + printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h fi -done - - -for ac_header in dlfcn.h -do : - ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default -" -if test "x$ac_cv_header_dlfcn_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DLFCN_H 1 -_ACEOF - -fi - -done - # Set options @@ -6190,7 +6567,8 @@ done # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then : +if test ${enable_shared+y} +then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -6208,7 +6586,7 @@ if test "${enable_shared+set}" = set; then : IFS="$lt_save_ifs" ;; esac -else +else $as_nop enable_shared=yes fi @@ -6221,7 +6599,8 @@ fi # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : +if test ${enable_static+y} +then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -6239,7 +6618,7 @@ if test "${enable_static+set}" = set; then : IFS="$lt_save_ifs" ;; esac -else +else $as_nop enable_static=yes fi @@ -6253,9 +6632,10 @@ fi # Check whether --with-pic was given. -if test "${with_pic+set}" = set; then : +if test ${with_pic+y} +then : withval=$with_pic; pic_mode="$withval" -else +else $as_nop pic_mode=default fi @@ -6269,7 +6649,8 @@ test -z "$pic_mode" && pic_mode=default # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then : +if test ${enable_fast_install+y} +then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -6287,7 +6668,7 @@ if test "${enable_fast_install+set}" = set; then : IFS="$lt_save_ifs" ;; esac -else +else $as_nop enable_fast_install=yes fi @@ -6350,11 +6731,12 @@ if test -n "${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 -$as_echo_n "checking for objdir... " >&6; } -if ${lt_cv_objdir+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +printf %s "checking for objdir... " >&6; } +if test ${lt_cv_objdir+y} +then : + printf %s "(cached) " >&6 +else $as_nop rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null if test -d .libs; then @@ -6365,17 +6747,15 @@ else fi rmdir .libs 2>/dev/null fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -$as_echo "$lt_cv_objdir" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +printf "%s\n" "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir -cat >>confdefs.h <<_ACEOF -#define LT_OBJDIR "$lt_cv_objdir/" -_ACEOF +printf "%s\n" "#define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h @@ -6458,11 +6838,12 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 -$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +printf %s "checking for ${ac_tool_prefix}file... " >&6; } +if test ${lt_cv_path_MAGIC_CMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. @@ -6511,11 +6892,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +printf "%s\n" "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6524,11 +6905,12 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 -$as_echo_n "checking for file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +printf %s "checking for file... " >&6; } +if test ${lt_cv_path_MAGIC_CMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. @@ -6577,11 +6959,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +printf "%s\n" "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6657,11 +7039,12 @@ lt_prog_compiler_no_builtin_flag= if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if test ${lt_cv_prog_compiler_rtti_exceptions+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -6675,11 +7058,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6678: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7061: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6682: \$? = $ac_status" >&5 + echo "$as_me:7065: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6692,8 +7075,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -6712,8 +7095,8 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +printf %s "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -6984,8 +7367,8 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 -$as_echo "$lt_prog_compiler_pic" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 +printf "%s\n" "$lt_prog_compiler_pic" >&6; } @@ -6996,11 +7379,12 @@ $as_echo "$lt_prog_compiler_pic" >&6; } # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if ${lt_cv_prog_compiler_pic_works+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if test ${lt_cv_prog_compiler_pic_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -7014,11 +7398,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7017: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7401: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7021: \$? = $ac_status" >&5 + echo "$as_me:7405: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7031,8 +7415,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in @@ -7055,11 +7439,12 @@ fi # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if test ${lt_cv_prog_compiler_static_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" @@ -7083,8 +7468,8 @@ else LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 -$as_echo "$lt_cv_prog_compiler_static_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then : @@ -7098,11 +7483,12 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test ${lt_cv_prog_compiler_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest @@ -7119,11 +7505,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7122: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7508: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7126: \$? = $ac_status" >&5 + echo "$as_me:7512: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7145,19 +7531,20 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test ${lt_cv_prog_compiler_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest @@ -7174,11 +7561,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7177: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7564: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7181: \$? = $ac_status" >&5 + echo "$as_me:7568: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7200,8 +7587,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } @@ -7209,19 +7596,19 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +printf %s "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +printf "%s\n" "$hard_links" >&6; } if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +printf "%s\n" "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -7233,8 +7620,8 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= allow_undefined_flag= @@ -7679,14 +8066,15 @@ _LT_EOF /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -7701,7 +8089,7 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -7719,14 +8107,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -7741,7 +8130,7 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -7958,11 +8347,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi /* end confdefs.h. */ int foo(void) {} _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" else @@ -8219,8 +8609,8 @@ rm -f core conftest.err conftest.$ac_objext \ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 -$as_echo "$ld_shlibs" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +printf "%s\n" "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -8256,15 +8646,15 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +printf %s "checking whether -lc should be explicitly linked in... " >&6; } $RM conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest @@ -8282,7 +8672,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then archive_cmds_need_lc=no @@ -8294,8 +8684,8 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } cat conftest.err 1>&5 fi $RM conftest* - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 -$as_echo "$archive_cmds_need_lc" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 +printf "%s\n" "$archive_cmds_need_lc" >&6; } ;; esac fi @@ -8458,8 +8848,8 @@ esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +printf %s "checking dynamic linker characteristics... " >&6; } if test "$GCC" = yes; then case $host_os in @@ -8897,19 +9287,21 @@ linux* | k*bsd*-gnu) /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : +if ac_fn_c_try_link "$LINENO" +then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null +then : shlibpath_overrides_runpath=yes fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS libdir=$save_libdir @@ -9122,8 +9514,8 @@ uts4*) dynamic_linker=no ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +printf "%s\n" "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -9224,8 +9616,8 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +printf %s "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || @@ -9249,8 +9641,8 @@ else # directories. hardcode_action=unsupported fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 -$as_echo "$hardcode_action" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +printf "%s\n" "$hardcode_action" >&6; } if test "$hardcode_action" = relink || test "$inherit_rpath" = yes; then @@ -9294,11 +9686,12 @@ else darwin*) # if libdl is installed we need to link against it - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +printf %s "checking for dlopen in -ldl... " >&6; } +if test ${ac_cv_lib_dl_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9307,32 +9700,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlopen=yes -else +else $as_nop ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes +then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else +else $as_nop lt_cv_dlopen="dyld" lt_cv_dlopen_libs= @@ -9344,14 +9736,16 @@ fi *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = xyes; then : +if test "x$ac_cv_func_shl_load" = xyes +then : lt_cv_dlopen="shl_load" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 -$as_echo_n "checking for shl_load in -ldld... " >&6; } -if ${ac_cv_lib_dld_shl_load+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +printf %s "checking for shl_load in -ldld... " >&6; } +if test ${ac_cv_lib_dld_shl_load+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9360,41 +9754,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char shl_load (); int -main () +main (void) { return shl_load (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dld_shl_load=yes -else +else $as_nop ac_cv_lib_dld_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = xyes +then : lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -else +else $as_nop ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = xyes; then : +if test "x$ac_cv_func_dlopen" = xyes +then : lt_cv_dlopen="dlopen" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +printf %s "checking for dlopen in -ldl... " >&6; } +if test ${ac_cv_lib_dl_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9403,37 +9798,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlopen=yes -else +else $as_nop ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes +then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 -$as_echo_n "checking for dlopen in -lsvld... " >&6; } -if ${ac_cv_lib_svld_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +printf %s "checking for dlopen in -lsvld... " >&6; } +if test ${ac_cv_lib_svld_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9442,37 +9837,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_svld_dlopen=yes -else +else $as_nop ac_cv_lib_svld_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 -$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = xyes +then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 -$as_echo_n "checking for dld_link in -ldld... " >&6; } -if ${ac_cv_lib_dld_dld_link+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +printf %s "checking for dld_link in -ldld... " >&6; } +if test ${ac_cv_lib_dld_dld_link+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9481,30 +9876,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dld_link (); int -main () +main (void) { return dld_link (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dld_dld_link=yes -else +else $as_nop ac_cv_lib_dld_dld_link=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 -$as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = xyes +then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -9543,18 +9937,19 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 -$as_echo_n "checking whether a program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +printf %s "checking whether a program can dlopen itself... " >&6; } +if test ${lt_cv_dlopen_self+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "$cross_compiling" = yes; then : lt_cv_dlopen_self=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 9557 "configure" +#line 9952 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9616,7 +10011,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -9634,23 +10029,24 @@ rm -fr conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 -$as_echo "$lt_cv_dlopen_self" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +printf "%s\n" "$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 -$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self_static+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +printf %s "checking whether a statically linked program can dlopen itself... " >&6; } +if test ${lt_cv_dlopen_self_static+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "$cross_compiling" = yes; then : lt_cv_dlopen_self_static=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 9653 "configure" +#line 10049 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9712,7 +10108,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -9730,8 +10126,8 @@ rm -fr conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 -$as_echo "$lt_cv_dlopen_self_static" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +printf "%s\n" "$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS="$save_CPPFLAGS" @@ -9769,13 +10165,13 @@ fi striplib= old_striplib= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 -$as_echo_n "checking whether stripping libraries is possible... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +printf %s "checking whether stripping libraries is possible... " >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in @@ -9783,16 +10179,16 @@ else if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi ;; *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi @@ -9809,13 +10205,13 @@ fi # Report which library types will actually be built - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 -$as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +printf %s "checking if libtool supports shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +printf "%s\n" "$can_build_shared" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 -$as_echo_n "checking whether to build shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +printf %s "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -9835,15 +10231,15 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } fi ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +printf "%s\n" "$enable_shared" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 -$as_echo_n "checking whether to build static libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +printf %s "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +printf "%s\n" "$enable_static" >&6; } @@ -9877,7 +10273,8 @@ CC="$lt_save_CC" # Only expand once: -# Find a good install program. We prefer a C program (faster), + + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: # SysV /etc/install, /usr/sbin/install @@ -9891,20 +10288,25 @@ CC="$lt_save_CC" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +printf %s "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${ac_cv_path_install+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + # Account for fact that we put trailing slashes in our PATH walk. +case $as_dir in #(( + ./ | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; @@ -9914,13 +10316,13 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # program-specific install script used by HP pwplus--don't use. : else @@ -9928,12 +10330,12 @@ case $as_dir/ in #(( echo one > conftest.one echo two > conftest.two mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && test -s conftest.one && test -s conftest.two && test -s conftest.dir/conftest.one && test -s conftest.dir/conftest.two then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" break 3 fi fi @@ -9949,7 +10351,7 @@ IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir fi - if test "${ac_cv_path_install+set}" = set; then + if test ${ac_cv_path_install+y}; then INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. Don't cache a @@ -9959,8 +10361,8 @@ fi INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +printf "%s\n" "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -9975,17 +10377,19 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Enable large file support (if special flags are necessary) # # Check whether --enable-largefile was given. -if test "${enable_largefile+set}" = set; then : +if test ${enable_largefile+y} +then : enableval=$enable_largefile; fi if test "$enable_largefile" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 -$as_echo_n "checking for special C compiler options needed for large files... " >&6; } -if ${ac_cv_sys_largefile_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +printf %s "checking for special C compiler options needed for large files... " >&6; } +if test ${ac_cv_sys_largefile_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_sys_largefile_CC=no if test "$GCC" != yes; then ac_save_CC=$CC @@ -9999,44 +10403,47 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : break fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam CC="$CC -n32" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_largefile_CC=' -n32'; break fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam break done CC=$ac_save_CC rm -f conftest.$ac_ext fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 -$as_echo "$ac_cv_sys_largefile_CC" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; } if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if ${ac_cv_sys_file_offset_bits+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if test ${ac_cv_sys_file_offset_bits+y} +then : + printf %s "(cached) " >&6 +else $as_nop while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10045,22 +10452,23 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_file_offset_bits=no; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _FILE_OFFSET_BITS 64 @@ -10069,43 +10477,43 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_file_offset_bits=64; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_sys_file_offset_bits=unknown break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -$as_echo "$ac_cv_sys_file_offset_bits" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; } case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; *) -cat >>confdefs.h <<_ACEOF -#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits -_ACEOF +printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h ;; esac rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if ${ac_cv_sys_large_files+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +printf %s "checking for _LARGE_FILES value needed for large files... " >&6; } +if test ${ac_cv_sys_large_files+y} +then : + printf %s "(cached) " >&6 +else $as_nop while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10114,22 +10522,23 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_large_files=no; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _LARGE_FILES 1 @@ -10138,132 +10547,119 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_large_files=1; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_sys_large_files=unknown break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -$as_echo "$ac_cv_sys_large_files" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +printf "%s\n" "$ac_cv_sys_large_files" >&6; } case $ac_cv_sys_large_files in #( no | unknown) ;; *) -cat >>confdefs.h <<_ACEOF -#define _LARGE_FILES $ac_cv_sys_large_files -_ACEOF +printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h ;; esac rm -rf conftest* fi - - fi ######### # Check for needed/wanted data types ac_fn_c_check_type "$LINENO" "int8_t" "ac_cv_type_int8_t" "$ac_includes_default" -if test "x$ac_cv_type_int8_t" = xyes; then : +if test "x$ac_cv_type_int8_t" = xyes +then : -cat >>confdefs.h <<_ACEOF -#define HAVE_INT8_T 1 -_ACEOF +printf "%s\n" "#define HAVE_INT8_T 1" >>confdefs.h fi ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "$ac_includes_default" -if test "x$ac_cv_type_int16_t" = xyes; then : +if test "x$ac_cv_type_int16_t" = xyes +then : -cat >>confdefs.h <<_ACEOF -#define HAVE_INT16_T 1 -_ACEOF +printf "%s\n" "#define HAVE_INT16_T 1" >>confdefs.h fi ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default" -if test "x$ac_cv_type_int32_t" = xyes; then : +if test "x$ac_cv_type_int32_t" = xyes +then : -cat >>confdefs.h <<_ACEOF -#define HAVE_INT32_T 1 -_ACEOF +printf "%s\n" "#define HAVE_INT32_T 1" >>confdefs.h fi ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" "$ac_includes_default" -if test "x$ac_cv_type_int64_t" = xyes; then : +if test "x$ac_cv_type_int64_t" = xyes +then : -cat >>confdefs.h <<_ACEOF -#define HAVE_INT64_T 1 -_ACEOF +printf "%s\n" "#define HAVE_INT64_T 1" >>confdefs.h fi ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default" -if test "x$ac_cv_type_intptr_t" = xyes; then : +if test "x$ac_cv_type_intptr_t" = xyes +then : -cat >>confdefs.h <<_ACEOF -#define HAVE_INTPTR_T 1 -_ACEOF +printf "%s\n" "#define HAVE_INTPTR_T 1" >>confdefs.h fi ac_fn_c_check_type "$LINENO" "uint8_t" "ac_cv_type_uint8_t" "$ac_includes_default" -if test "x$ac_cv_type_uint8_t" = xyes; then : +if test "x$ac_cv_type_uint8_t" = xyes +then : -cat >>confdefs.h <<_ACEOF -#define HAVE_UINT8_T 1 -_ACEOF +printf "%s\n" "#define HAVE_UINT8_T 1" >>confdefs.h fi ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" "$ac_includes_default" -if test "x$ac_cv_type_uint16_t" = xyes; then : +if test "x$ac_cv_type_uint16_t" = xyes +then : -cat >>confdefs.h <<_ACEOF -#define HAVE_UINT16_T 1 -_ACEOF +printf "%s\n" "#define HAVE_UINT16_T 1" >>confdefs.h fi ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "$ac_includes_default" -if test "x$ac_cv_type_uint32_t" = xyes; then : +if test "x$ac_cv_type_uint32_t" = xyes +then : -cat >>confdefs.h <<_ACEOF -#define HAVE_UINT32_T 1 -_ACEOF +printf "%s\n" "#define HAVE_UINT32_T 1" >>confdefs.h fi ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "$ac_includes_default" -if test "x$ac_cv_type_uint64_t" = xyes; then : +if test "x$ac_cv_type_uint64_t" = xyes +then : -cat >>confdefs.h <<_ACEOF -#define HAVE_UINT64_T 1 -_ACEOF +printf "%s\n" "#define HAVE_UINT64_T 1" >>confdefs.h fi ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default" -if test "x$ac_cv_type_uintptr_t" = xyes; then : +if test "x$ac_cv_type_uintptr_t" = xyes +then : -cat >>confdefs.h <<_ACEOF -#define HAVE_UINTPTR_T 1 -_ACEOF +printf "%s\n" "#define HAVE_UINTPTR_T 1" >>confdefs.h fi @@ -10271,34 +10667,119 @@ fi ######### # Check for needed/wanted headers -for ac_header in sys/types.h stdlib.h stdint.h inttypes.h malloc.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_types_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_TYPES_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = xyes +then : + printf "%s\n" "#define HAVE_STDLIB_H 1" >>confdefs.h -done +fi +ac_fn_c_check_header_compile "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" +if test "x$ac_cv_header_stdint_h" = xyes +then : + printf "%s\n" "#define HAVE_STDINT_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default" +if test "x$ac_cv_header_inttypes_h" = xyes +then : + printf "%s\n" "#define HAVE_INTTYPES_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default" +if test "x$ac_cv_header_malloc_h" = xyes +then : + printf "%s\n" "#define HAVE_MALLOC_H 1" >>confdefs.h + +fi ######### # Figure out whether or not we have these functions # -for ac_func in fdatasync gmtime_r isnan localtime_r localtime_s malloc_usable_size strchrnul usleep utime pread pread64 pwrite pwrite64 -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +ac_fn_c_check_func "$LINENO" "fdatasync" "ac_cv_func_fdatasync" +if test "x$ac_cv_func_fdatasync" = xyes +then : + printf "%s\n" "#define HAVE_FDATASYNC 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "gmtime_r" "ac_cv_func_gmtime_r" +if test "x$ac_cv_func_gmtime_r" = xyes +then : + printf "%s\n" "#define HAVE_GMTIME_R 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "isnan" "ac_cv_func_isnan" +if test "x$ac_cv_func_isnan" = xyes +then : + printf "%s\n" "#define HAVE_ISNAN 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r" +if test "x$ac_cv_func_localtime_r" = xyes +then : + printf "%s\n" "#define HAVE_LOCALTIME_R 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "localtime_s" "ac_cv_func_localtime_s" +if test "x$ac_cv_func_localtime_s" = xyes +then : + printf "%s\n" "#define HAVE_LOCALTIME_S 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "malloc_usable_size" "ac_cv_func_malloc_usable_size" +if test "x$ac_cv_func_malloc_usable_size" = xyes +then : + printf "%s\n" "#define HAVE_MALLOC_USABLE_SIZE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strchrnul" "ac_cv_func_strchrnul" +if test "x$ac_cv_func_strchrnul" = xyes +then : + printf "%s\n" "#define HAVE_STRCHRNUL 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "usleep" "ac_cv_func_usleep" +if test "x$ac_cv_func_usleep" = xyes +then : + printf "%s\n" "#define HAVE_USLEEP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "utime" "ac_cv_func_utime" +if test "x$ac_cv_func_utime" = xyes +then : + printf "%s\n" "#define HAVE_UTIME 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "pread" "ac_cv_func_pread" +if test "x$ac_cv_func_pread" = xyes +then : + printf "%s\n" "#define HAVE_PREAD 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "pread64" "ac_cv_func_pread64" +if test "x$ac_cv_func_pread64" = xyes +then : + printf "%s\n" "#define HAVE_PREAD64 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "pwrite" "ac_cv_func_pwrite" +if test "x$ac_cv_func_pwrite" = xyes +then : + printf "%s\n" "#define HAVE_PWRITE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "pwrite64" "ac_cv_func_pwrite64" +if test "x$ac_cv_func_pwrite64" = xyes +then : + printf "%s\n" "#define HAVE_PWRITE64 1" >>confdefs.h fi -done ######### @@ -10315,11 +10796,12 @@ for ac_prog in tclsh8.7 tclsh8.6 tclsh8.5 tclsh do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_TCLSH_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_TCLSH_CMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$TCLSH_CMD"; then ac_cv_prog_TCLSH_CMD="$TCLSH_CMD" # Let the user override the test. else @@ -10327,11 +10809,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_TCLSH_CMD="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10342,11 +10828,11 @@ fi fi TCLSH_CMD=$ac_cv_prog_TCLSH_CMD if test -n "$TCLSH_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH_CMD" >&5 -$as_echo "$TCLSH_CMD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TCLSH_CMD" >&5 +printf "%s\n" "$TCLSH_CMD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -10385,12 +10871,12 @@ fi VERSION=`cat $srcdir/VERSION | sed 's/^\([0-9]*\.*[0-9]*\).*/\1/'` -{ $as_echo "$as_me:${as_lineno-$LINENO}: Version set to $VERSION" >&5 -$as_echo "$as_me: Version set to $VERSION" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Version set to $VERSION" >&5 +printf "%s\n" "$as_me: Version set to $VERSION" >&6;} RELEASE=`cat $srcdir/VERSION` -{ $as_echo "$as_me:${as_lineno-$LINENO}: Release set to $RELEASE" >&5 -$as_echo "$as_me: Release set to $RELEASE" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Release set to $RELEASE" >&5 +printf "%s\n" "$as_me: Release set to $RELEASE" >&6;} ######### @@ -10406,11 +10892,12 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_BUILD_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_BUILD_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$BUILD_CC"; then ac_cv_prog_BUILD_CC="$BUILD_CC" # Let the user override the test. else @@ -10418,11 +10905,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_BUILD_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10433,11 +10924,11 @@ fi fi BUILD_CC=$ac_cv_prog_BUILD_CC if test -n "$BUILD_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5 -$as_echo "$BUILD_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5 +printf "%s\n" "$BUILD_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -10455,29 +10946,31 @@ fi # Do we want to support multithreaded use of sqlite # # Check whether --enable-threadsafe was given. -if test "${enable_threadsafe+set}" = set; then : +if test ${enable_threadsafe+y} +then : enableval=$enable_threadsafe; fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support threadsafe operation" >&5 -$as_echo_n "checking whether to support threadsafe operation... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support threadsafe operation" >&5 +printf %s "checking whether to support threadsafe operation... " >&6; } if test "$enable_threadsafe" = "no"; then SQLITE_THREADSAFE=0 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else SQLITE_THREADSAFE=1 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi if test "$SQLITE_THREADSAFE" = "1"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5 -$as_echo_n "checking for library containing pthread_create... " >&6; } -if ${ac_cv_search_pthread_create+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5 +printf %s "checking for library containing pthread_create... " >&6; } +if test ${ac_cv_search_pthread_create+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10485,55 +10978,58 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char pthread_create (); int -main () +main (void) { return pthread_create (); ; return 0; } _ACEOF -for ac_lib in '' pthread; do +for ac_lib in '' pthread +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_pthread_create=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_pthread_create+:} false; then : + if test ${ac_cv_search_pthread_create+y} +then : break fi done -if ${ac_cv_search_pthread_create+:} false; then : +if test ${ac_cv_search_pthread_create+y} +then : -else +else $as_nop ac_cv_search_pthread_create=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_create" >&5 -$as_echo "$ac_cv_search_pthread_create" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_create" >&5 +printf "%s\n" "$ac_cv_search_pthread_create" >&6; } ac_res=$ac_cv_search_pthread_create -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_mutexattr_init" >&5 -$as_echo_n "checking for library containing pthread_mutexattr_init... " >&6; } -if ${ac_cv_search_pthread_mutexattr_init+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_mutexattr_init" >&5 +printf %s "checking for library containing pthread_mutexattr_init... " >&6; } +if test ${ac_cv_search_pthread_mutexattr_init+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10541,46 +11037,48 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char pthread_mutexattr_init (); int -main () +main (void) { return pthread_mutexattr_init (); ; return 0; } _ACEOF -for ac_lib in '' pthread; do +for ac_lib in '' pthread +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_pthread_mutexattr_init=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_pthread_mutexattr_init+:} false; then : + if test ${ac_cv_search_pthread_mutexattr_init+y} +then : break fi done -if ${ac_cv_search_pthread_mutexattr_init+:} false; then : +if test ${ac_cv_search_pthread_mutexattr_init+y} +then : -else +else $as_nop ac_cv_search_pthread_mutexattr_init=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_mutexattr_init" >&5 -$as_echo "$ac_cv_search_pthread_mutexattr_init" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_mutexattr_init" >&5 +printf "%s\n" "$ac_cv_search_pthread_mutexattr_init" >&6; } ac_res=$ac_cv_search_pthread_mutexattr_init -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -10591,22 +11089,23 @@ fi # Do we want to support release # # Check whether --enable-releasemode was given. -if test "${enable_releasemode+set}" = set; then : +if test ${enable_releasemode+y} +then : enableval=$enable_releasemode; -else +else $as_nop enable_releasemode=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support shared library linked as release mode or not" >&5 -$as_echo_n "checking whether to support shared library linked as release mode or not... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support shared library linked as release mode or not" >&5 +printf %s "checking whether to support shared library linked as release mode or not... " >&6; } if test "$enable_releasemode" = "no"; then ALLOWRELEASE="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else ALLOWRELEASE="-release `cat $srcdir/VERSION`" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -10614,39 +11113,40 @@ fi # Do we want temporary databases in memory # # Check whether --enable-tempstore was given. -if test "${enable_tempstore+set}" = set; then : +if test ${enable_tempstore+y} +then : enableval=$enable_tempstore; -else +else $as_nop enable_tempstore=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use an in-ram database for temporary tables" >&5 -$as_echo_n "checking whether to use an in-ram database for temporary tables... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use an in-ram database for temporary tables" >&5 +printf %s "checking whether to use an in-ram database for temporary tables... " >&6; } case "$enable_tempstore" in never ) TEMP_STORE=0 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: never" >&5 -$as_echo "never" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: never" >&5 +printf "%s\n" "never" >&6; } ;; no ) TEMP_STORE=1 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; yes ) TEMP_STORE=2 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } ;; always ) TEMP_STORE=3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: always" >&5 -$as_echo "always" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: always" >&5 +printf "%s\n" "always" >&6; } ;; * ) TEMP_STORE=1 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac @@ -10657,15 +11157,15 @@ esac # the CYGWIN environment. So check for that special case and handle # things accordingly. # -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if executables have the .exe suffix" >&5 -$as_echo_n "checking if executables have the .exe suffix... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if executables have the .exe suffix" >&5 +printf %s "checking if executables have the .exe suffix... " >&6; } if test "$config_BUILD_EXEEXT" = ".exe"; then CYGWIN=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5 -$as_echo "unknown" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unknown" >&5 +printf "%s\n" "unknown" >&6; } fi if test "$CYGWIN" != "yes"; then @@ -10709,24 +11209,27 @@ fi # minor changes to accomodate systems that do not have TCL installed. # # Check whether --enable-tcl was given. -if test "${enable_tcl+set}" = set; then : +if test ${enable_tcl+y} +then : enableval=$enable_tcl; use_tcl=$enableval -else +else $as_nop use_tcl=yes fi if test "${use_tcl}" = "yes" ; then # Check whether --with-tcl was given. -if test "${with_tcl+set}" = set; then : +if test ${with_tcl+y} +then : withval=$with_tcl; with_tclconfig=${withval} fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl configuration" >&5 -$as_echo_n "checking for Tcl configuration... " >&6; } - if ${ac_cv_c_tclconfig+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Tcl configuration" >&5 +printf %s "checking for Tcl configuration... " >&6; } + if test ${ac_cv_c_tclconfig+y} +then : + printf %s "(cached) " >&6 +else $as_nop # First check to see if --with-tcl was specified. if test x"${with_tclconfig}" != x ; then @@ -10836,26 +11339,26 @@ fi if test x"${ac_cv_c_tclconfig}" = x ; then use_tcl=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find Tcl configuration definitions" >&5 -$as_echo "$as_me: WARNING: Can't find Tcl configuration definitions" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Without Tcl the regression tests cannot be executed ***" >&5 -$as_echo "$as_me: WARNING: *** Without Tcl the regression tests cannot be executed ***" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Consider using --with-tcl=... to define location of Tcl ***" >&5 -$as_echo "$as_me: WARNING: *** Consider using --with-tcl=... to define location of Tcl ***" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Can't find Tcl configuration definitions" >&5 +printf "%s\n" "$as_me: WARNING: Can't find Tcl configuration definitions" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** Without Tcl the regression tests cannot be executed ***" >&5 +printf "%s\n" "$as_me: WARNING: *** Without Tcl the regression tests cannot be executed ***" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** Consider using --with-tcl=... to define location of Tcl ***" >&5 +printf "%s\n" "$as_me: WARNING: *** Consider using --with-tcl=... to define location of Tcl ***" >&2;} else TCL_BIN_DIR=${ac_cv_c_tclconfig} - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $TCL_BIN_DIR/tclConfig.sh" >&5 -$as_echo "found $TCL_BIN_DIR/tclConfig.sh" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found $TCL_BIN_DIR/tclConfig.sh" >&5 +printf "%s\n" "found $TCL_BIN_DIR/tclConfig.sh" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 -$as_echo_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 +printf %s "checking for existence of $TCL_BIN_DIR/tclConfig.sh... " >&6; } if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 -$as_echo "loading" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: loading" >&5 +printf "%s\n" "loading" >&6; } . $TCL_BIN_DIR/tclConfig.sh else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 -$as_echo "file not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 +printf "%s\n" "file not found" >&6; } fi # @@ -10916,16 +11419,18 @@ TARGET_READLINE_INC="" TARGET_HAVE_READLINE=0 TARGET_HAVE_EDITLINE=0 # Check whether --enable-editline was given. -if test "${enable_editline+set}" = set; then : +if test ${enable_editline+y} +then : enableval=$enable_editline; with_editline=$enableval -else +else $as_nop with_editline=auto fi # Check whether --enable-readline was given. -if test "${enable_readline+set}" = set; then : +if test ${enable_readline+y} +then : enableval=$enable_readline; with_readline=$enableval -else +else $as_nop with_readline=auto fi @@ -10934,11 +11439,12 @@ if test x"$with_editline" != xno; then sLIBS=$LIBS LIBS="" TARGET_HAVE_EDITLINE=1 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing readline" >&5 -$as_echo_n "checking for library containing readline... " >&6; } -if ${ac_cv_search_readline+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing readline" >&5 +printf %s "checking for library containing readline... " >&6; } +if test ${ac_cv_search_readline+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10946,49 +11452,51 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char readline (); int -main () +main (void) { return readline (); ; return 0; } _ACEOF -for ac_lib in '' edit; do +for ac_lib in '' edit +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_readline=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_readline+:} false; then : + if test ${ac_cv_search_readline+y} +then : break fi done -if ${ac_cv_search_readline+:} false; then : +if test ${ac_cv_search_readline+y} +then : -else +else $as_nop ac_cv_search_readline=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_readline" >&5 -$as_echo "$ac_cv_search_readline" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_readline" >&5 +printf "%s\n" "$ac_cv_search_readline" >&6; } ac_res=$ac_cv_search_readline -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" with_readline=no -else +else $as_nop TARGET_HAVE_EDITLINE=0 fi @@ -11000,20 +11508,22 @@ if test x"$with_readline" != xno; then # Check whether --with-readline-lib was given. -if test "${with_readline_lib+set}" = set; then : +if test ${with_readline_lib+y} +then : withval=$with_readline_lib; with_readline_lib=$withval -else +else $as_nop with_readline_lib="auto" fi if test "x$with_readline_lib" = xauto; then save_LIBS="$LIBS" LIBS="" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5 -$as_echo_n "checking for library containing tgetent... " >&6; } -if ${ac_cv_search_tgetent+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5 +printf %s "checking for library containing tgetent... " >&6; } +if test ${ac_cv_search_tgetent+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11021,57 +11531,60 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char tgetent (); int -main () +main (void) { return tgetent (); ; return 0; } _ACEOF -for ac_lib in '' readline ncurses curses termcap; do +for ac_lib in '' readline ncurses curses termcap +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_tgetent=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_tgetent+:} false; then : + if test ${ac_cv_search_tgetent+y} +then : break fi done -if ${ac_cv_search_tgetent+:} false; then : +if test ${ac_cv_search_tgetent+y} +then : -else +else $as_nop ac_cv_search_tgetent=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_tgetent" >&5 -$as_echo "$ac_cv_search_tgetent" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_tgetent" >&5 +printf "%s\n" "$ac_cv_search_tgetent" >&6; } ac_res=$ac_cv_search_tgetent -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" term_LIBS="$LIBS" -else +else $as_nop term_LIBS="" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 -$as_echo_n "checking for readline in -lreadline... " >&6; } -if ${ac_cv_lib_readline_readline+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 +printf %s "checking for readline in -lreadline... " >&6; } +if test ${ac_cv_lib_readline_readline+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lreadline $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11080,32 +11593,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char readline (); int -main () +main (void) { return readline (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_readline_readline=yes -else +else $as_nop ac_cv_lib_readline_readline=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5 -$as_echo "$ac_cv_lib_readline_readline" >&6; } -if test "x$ac_cv_lib_readline_readline" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5 +printf "%s\n" "$ac_cv_lib_readline_readline" >&6; } +if test "x$ac_cv_lib_readline_readline" = xyes +then : TARGET_READLINE_LIBS="-lreadline" -else +else $as_nop found="no" fi @@ -11117,28 +11629,31 @@ fi # Check whether --with-readline-inc was given. -if test "${with_readline_inc+set}" = set; then : +if test ${with_readline_inc+y} +then : withval=$with_readline_inc; with_readline_inc=$withval -else +else $as_nop with_readline_inc="auto" fi if test "x$with_readline_inc" = xauto; then - ac_fn_c_check_header_mongrel "$LINENO" "readline.h" "ac_cv_header_readline_h" "$ac_includes_default" -if test "x$ac_cv_header_readline_h" = xyes; then : + ac_fn_c_check_header_compile "$LINENO" "readline.h" "ac_cv_header_readline_h" "$ac_includes_default" +if test "x$ac_cv_header_readline_h" = xyes +then : found="yes" -else +else $as_nop found="no" if test "$cross_compiling" != yes; then for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do for subdir in include include/readline; do - as_ac_File=`$as_echo "ac_cv_file_$dir/$subdir/readline.h" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dir/$subdir/readline.h" >&5 -$as_echo_n "checking for $dir/$subdir/readline.h... " >&6; } -if eval \${$as_ac_File+:} false; then : - $as_echo_n "(cached) " >&6 -else + as_ac_File=`printf "%s\n" "ac_cv_file_$dir/$subdir/readline.h" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $dir/$subdir/readline.h" >&5 +printf %s "checking for $dir/$subdir/readline.h... " >&6; } +if eval test \${$as_ac_File+y} +then : + printf %s "(cached) " >&6 +else $as_nop test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "$dir/$subdir/readline.h"; then @@ -11148,9 +11663,10 @@ else fi fi eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_File"\" = x"yes"; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_File"\" = x"yes" +then : found=yes fi @@ -11165,7 +11681,6 @@ fi fi - else TARGET_READLINE_INC="$with_readline_inc" fi @@ -11188,11 +11703,12 @@ fi # Figure out what C libraries are required to compile programs # that use "fdatasync()" function. # -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fdatasync" >&5 -$as_echo_n "checking for library containing fdatasync... " >&6; } -if ${ac_cv_search_fdatasync+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing fdatasync" >&5 +printf %s "checking for library containing fdatasync... " >&6; } +if test ${ac_cv_search_fdatasync+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11200,46 +11716,48 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char fdatasync (); int -main () +main (void) { return fdatasync (); ; return 0; } _ACEOF -for ac_lib in '' rt; do +for ac_lib in '' rt +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_fdatasync=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_fdatasync+:} false; then : + if test ${ac_cv_search_fdatasync+y} +then : break fi done -if ${ac_cv_search_fdatasync+:} false; then : +if test ${ac_cv_search_fdatasync+y} +then : -else +else $as_nop ac_cv_search_fdatasync=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fdatasync" >&5 -$as_echo "$ac_cv_search_fdatasync" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fdatasync" >&5 +printf "%s\n" "$ac_cv_search_fdatasync" >&6; } ac_res=$ac_cv_search_fdatasync -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -11248,27 +11766,30 @@ fi ######### # check for debug enabled # Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then : +if test ${enable_debug+y} +then : enableval=$enable_debug; fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build type" >&5 -$as_echo_n "checking build type... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build type" >&5 +printf %s "checking build type... " >&6; } if test "${enable_debug}" = "yes" ; then TARGET_DEBUG="-DSQLITE_DEBUG=1 -DSQLITE_ENABLE_SELECTTRACE -DSQLITE_ENABLE_WHERETRACE -O0" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: debug" >&5 -$as_echo "debug" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: debug" >&5 +printf "%s\n" "debug" >&6; } else TARGET_DEBUG="-DNDEBUG" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: release" >&5 -$as_echo "release" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: release" >&5 +printf "%s\n" "release" >&6; } fi ######### # See whether we should use the amalgamation to build + # Check whether --enable-amalgamation was given. -if test "${enable_amalgamation+set}" = set; then : +if test ${enable_amalgamation+y} +then : enableval=$enable_amalgamation; fi @@ -11279,23 +11800,19 @@ fi ######### # Look for zlib. Only needed by extensions and by the sqlite3.exe shell -for ac_header in zlib.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" -if test "x$ac_cv_header_zlib_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_ZLIB_H 1 -_ACEOF +ac_fn_c_check_header_compile "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" +if test "x$ac_cv_header_zlib_h" = xyes +then : + printf "%s\n" "#define HAVE_ZLIB_H 1" >>confdefs.h fi -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing deflate" >&5 -$as_echo_n "checking for library containing deflate... " >&6; } -if ${ac_cv_search_deflate+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing deflate" >&5 +printf %s "checking for library containing deflate... " >&6; } +if test ${ac_cv_search_deflate+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11303,49 +11820,51 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char deflate (); int -main () +main (void) { return deflate (); ; return 0; } _ACEOF -for ac_lib in '' z; do +for ac_lib in '' z +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_deflate=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_deflate+:} false; then : + if test ${ac_cv_search_deflate+y} +then : break fi done -if ${ac_cv_search_deflate+:} false; then : +if test ${ac_cv_search_deflate+y} +then : -else +else $as_nop ac_cv_search_deflate=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_deflate" >&5 -$as_echo "$ac_cv_search_deflate" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_deflate" >&5 +printf "%s\n" "$ac_cv_search_deflate" >&6; } ac_res=$ac_cv_search_deflate -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" HAVE_ZLIB="-DSQLITE_HAVE_ZLIB=1" -else +else $as_nop HAVE_ZLIB="" fi @@ -11354,19 +11873,21 @@ fi ######### # See whether we should allow loadable extensions # Check whether --enable-load-extension was given. -if test "${enable_load_extension+set}" = set; then : +if test ${enable_load_extension+y} +then : enableval=$enable_load_extension; -else +else $as_nop enable_load_extension=yes fi if test "${enable_load_extension}" = "yes" ; then OPT_FEATURE_FLAGS="" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 -$as_echo_n "checking for library containing dlopen... " >&6; } -if ${ac_cv_search_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 +printf %s "checking for library containing dlopen... " >&6; } +if test ${ac_cv_search_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11374,46 +11895,48 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -for ac_lib in '' dl; do +for ac_lib in '' dl +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_dlopen=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_dlopen+:} false; then : + if test ${ac_cv_search_dlopen+y} +then : break fi done -if ${ac_cv_search_dlopen+:} false; then : +if test ${ac_cv_search_dlopen+y} +then : -else +else $as_nop ac_cv_search_dlopen=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5 -$as_echo "$ac_cv_search_dlopen" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5 +printf "%s\n" "$ac_cv_search_dlopen" >&6; } ac_res=$ac_cv_search_dlopen -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -11426,24 +11949,26 @@ fi # Do we want to support math functions # # Check whether --enable-math was given. -if test "${enable_math+set}" = set; then : +if test ${enable_math+y} +then : enableval=$enable_math; 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; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support math functions" >&5 +printf %s "checking whether to support math functions... " >&6; } if test "$enable_math" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MATH_FUNCTIONS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ceil" >&5 -$as_echo_n "checking for library containing ceil... " >&6; } -if ${ac_cv_search_ceil+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing ceil" >&5 +printf %s "checking for library containing ceil... " >&6; } +if test ${ac_cv_search_ceil+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11451,46 +11976,48 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char ceil (); int -main () +main (void) { return ceil (); ; return 0; } _ACEOF -for ac_lib in '' m; do +for ac_lib in '' m +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_ceil=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_ceil+:} false; then : + if test ${ac_cv_search_ceil+y} +then : break fi done -if ${ac_cv_search_ceil+:} false; then : +if test ${ac_cv_search_ceil+y} +then : -else +else $as_nop ac_cv_search_ceil=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ceil" >&5 -$as_echo "$ac_cv_search_ceil" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ceil" >&5 +printf "%s\n" "$ac_cv_search_ceil" >&6; } ac_res=$ac_cv_search_ceil -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -11501,26 +12028,28 @@ fi # Do we want to support JSON functions # # Check whether --enable-json was given. -if test "${enable_json+set}" = set; then : +if test ${enable_json+y} +then : enableval=$enable_json; fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support JSON functions" >&5 -$as_echo_n "checking whether to support JSON functions... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support JSON functions" >&5 +printf %s "checking whether to support JSON functions... " >&6; } if test "$enable_json" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_OMIT_JSON" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&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 : +if test ${enable_all+y} +then : enableval=$enable_all; fi @@ -11529,69 +12058,74 @@ fi # Do we want to support memsys3 and/or memsys5 # # Check whether --enable-memsys5 was given. -if test "${enable_memsys5+set}" = set; then : +if test ${enable_memsys5+y} +then : enableval=$enable_memsys5; fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS5" >&5 -$as_echo_n "checking whether to support MEMSYS5... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS5" >&5 +printf %s "checking whether to support MEMSYS5... " >&6; } if test "${enable_memsys5}" = "yes"; then OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MEMSYS5" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Check whether --enable-memsys3 was given. -if test "${enable_memsys3+set}" = set; then : +if test ${enable_memsys3+y} +then : enableval=$enable_memsys3; fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS3" >&5 -$as_echo_n "checking whether to support MEMSYS3... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS3" >&5 +printf %s "checking whether to support MEMSYS3... " >&6; } if test "${enable_memsys3}" = "yes" -a "${enable_memsys5}" = "no"; then OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MEMSYS3" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi ######### # See whether we should enable Full Text Search extensions # Check whether --enable-fts3 was given. -if test "${enable_fts3+set}" = set; then : +if test ${enable_fts3+y} +then : enableval=$enable_fts3; fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support FTS3" >&5 -$as_echo_n "checking whether to support FTS3... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support FTS3" >&5 +printf %s "checking whether to support FTS3... " >&6; } if test "${enable_fts3}" = "yes" ; then OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS3" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Check whether --enable-fts4 was given. -if test "${enable_fts4+set}" = set; then : +if test ${enable_fts4+y} +then : enableval=$enable_fts4; fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support FTS4" >&5 -$as_echo_n "checking whether to support FTS4... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support FTS4" >&5 +printf %s "checking whether to support FTS4... " >&6; } if test "${enable_fts4}" = "yes" -o "${enable_all}" = "yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS4" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing log" >&5 -$as_echo_n "checking for library containing log... " >&6; } -if ${ac_cv_search_log+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing log" >&5 +printf %s "checking for library containing log... " >&6; } +if test ${ac_cv_search_log+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11599,70 +12133,74 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char log (); int -main () +main (void) { return log (); ; return 0; } _ACEOF -for ac_lib in '' m; do +for ac_lib in '' m +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_log=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_log+:} false; then : + if test ${ac_cv_search_log+y} +then : break fi done -if ${ac_cv_search_log+:} false; then : +if test ${ac_cv_search_log+y} +then : -else +else $as_nop ac_cv_search_log=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_log" >&5 -$as_echo "$ac_cv_search_log" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_log" >&5 +printf "%s\n" "$ac_cv_search_log" >&6; } ac_res=$ac_cv_search_log -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Check whether --enable-fts5 was given. -if test "${enable_fts5+set}" = set; then : +if test ${enable_fts5+y} +then : enableval=$enable_fts5; fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support FTS5" >&5 -$as_echo_n "checking whether to support FTS5... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support FTS5" >&5 +printf %s "checking whether to support FTS5... " >&6; } if test "${enable_fts5}" = "yes" -o "${enable_all}" = "yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS5" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing log" >&5 -$as_echo_n "checking for library containing log... " >&6; } -if ${ac_cv_search_log+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing log" >&5 +printf %s "checking for library containing log... " >&6; } +if test ${ac_cv_search_log+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11670,130 +12208,136 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char log (); int -main () +main (void) { return log (); ; return 0; } _ACEOF -for ac_lib in '' m; do +for ac_lib in '' m +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_log=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_log+:} false; then : + if test ${ac_cv_search_log+y} +then : break fi done -if ${ac_cv_search_log+:} false; then : +if test ${ac_cv_search_log+y} +then : -else +else $as_nop ac_cv_search_log=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_log" >&5 -$as_echo "$ac_cv_search_log" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_log" >&5 +printf "%s\n" "$ac_cv_search_log" >&6; } ac_res=$ac_cv_search_log -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi ######### # See whether we should enable the LIMIT clause on UPDATE and DELETE # statements. # Check whether --enable-update-limit was given. -if test "${enable_update_limit+set}" = set; then : +if test ${enable_update_limit+y} +then : enableval=$enable_update_limit; fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support LIMIT on UPDATE and DELETE statements" >&5 -$as_echo_n "checking whether to support LIMIT on UPDATE and DELETE statements... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support LIMIT on UPDATE and DELETE statements" >&5 +printf %s "checking whether to support LIMIT on UPDATE and DELETE statements... " >&6; } if test "${enable_update_limit}" = "yes" ; then OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi ######### # See whether we should enable GEOPOLY # Check whether --enable-geopoly was given. -if test "${enable_geopoly+set}" = set; then : +if test ${enable_geopoly+y} +then : enableval=$enable_geopoly; enable_geopoly=yes -else +else $as_nop enable_geopoly=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support GEOPOLY" >&5 -$as_echo_n "checking whether to support GEOPOLY... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support GEOPOLY" >&5 +printf %s "checking whether to support GEOPOLY... " >&6; } if test "${enable_geopoly}" = "yes" -o "${enable_all}" = "yes" ; then OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_GEOPOLY" enable_rtree=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi ######### # See whether we should enable RTREE # Check whether --enable-rtree was given. -if test "${enable_rtree+set}" = set; then : +if test ${enable_rtree+y} +then : enableval=$enable_rtree; fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support RTREE" >&5 -$as_echo_n "checking whether to support RTREE... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support RTREE" >&5 +printf %s "checking whether to support RTREE... " >&6; } if test "${enable_rtree}" = "yes" ; then OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_RTREE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi ######### # See whether we should enable the SESSION extension # Check whether --enable-session was given. -if test "${enable_session+set}" = set; then : +if test ${enable_session+y} +then : enableval=$enable_session; fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support SESSION" >&5 -$as_echo_n "checking whether to support SESSION... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support SESSION" >&5 +printf %s "checking whether to support SESSION... " >&6; } if test "${enable_session}" = "yes" -o "${enable_all}" = "yes" ; then OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_SESSION" OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_PREUPDATE_HOOK" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi ######### @@ -11850,7 +12394,8 @@ BUILD_CFLAGS=$ac_temp_BUILD_CFLAGS ######### # See whether we should use GCOV # Check whether --enable-gcov was given. -if test "${enable_gcov+set}" = set; then : +if test ${enable_gcov+y} +then : enableval=$enable_gcov; fi @@ -11911,8 +12456,8 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -11942,15 +12487,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -11964,8 +12509,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;} fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -11982,7 +12527,7 @@ U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -11998,8 +12543,8 @@ LTLIBOBJS=$ac_ltlibobjs ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -12022,14 +12567,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -12039,46 +12586,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -12087,13 +12634,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -12102,8 +12642,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -12115,30 +12659,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -12151,13 +12675,14 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -12184,18 +12709,20 @@ as_fn_unset () { eval $1=; unset $1;} } as_unset=as_fn_unset + # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -12207,12 +12734,13 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` @@ -12243,7 +12771,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -12265,6 +12793,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -12278,6 +12810,12 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -12319,7 +12857,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -12328,7 +12866,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -12391,7 +12929,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by sqlite $as_me 3.41.0, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -12453,14 +12991,16 @@ $config_commands Report bugs to the package provider." _ACEOF +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ sqlite config.status 3.41.0 -configured by $0, generated by GNU Autoconf 2.69, +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -12498,15 +13038,15 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; + printf "%s\n" "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; + printf "%s\n" "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -12514,7 +13054,7 @@ do --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; @@ -12523,7 +13063,7 @@ do as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; + printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -12551,7 +13091,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -12565,7 +13105,7 @@ exec 5>>config.log sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - $as_echo "$ac_log" + printf "%s\n" "$ac_log" } >&5 _ACEOF @@ -12852,9 +13392,9 @@ done # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands + test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files + test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers + test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands fi # Have a temporary directory for convenience. Make it in the build tree @@ -13190,7 +13730,7 @@ do esac || as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -13198,17 +13738,17 @@ do # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | + ac_sed_conf_input=`printf "%s\n" "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -13225,7 +13765,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | +printf "%s\n" X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -13249,9 +13789,9 @@ $as_echo X"$ac_file" | case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -13308,8 +13848,8 @@ ac_sed_dataroot=' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -13352,9 +13892,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -13370,27 +13910,27 @@ which seems to be undefined. Please make sure it is defined" >&2;} # if test x"$ac_file" != x-; then { - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi ;; - :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -$as_echo "$as_me: executing $ac_file commands" >&6;} + :C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +printf "%s\n" "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -13814,6 +14354,7 @@ _LT_EOF esac + ltmain="$ac_aux_dir/ltmain.sh" @@ -14065,7 +14606,8 @@ if test "$no_create" != yes; then $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + diff --git a/configure.ac b/configure.ac index 5f905db40c..9eaf6bcadb 100644 --- a/configure.ac +++ b/configure.ac @@ -70,11 +70,11 @@ # target platform. "" for Unix and ".exe" for windows. # # This configure.in file is easy to reuse on other projects. Just -# change the argument to AC_INIT(). And disable any features that +# change the argument to AC_INIT. And disable any features that # you don't need (for example BLT) by erasing or commenting out # the corresponding code. # -AC_INIT(sqlite, m4_esyscmd([cat VERSION | tr -d '\n'])) +AC_INIT([sqlite],[m4_esyscmd(cat VERSION | tr -d '\n')]) dnl Make sure the local VERSION file matches this configure script sqlite_version_sanity_check=`cat $srcdir/VERSION | tr -d '\n'` @@ -88,7 +88,7 @@ fi ######### # Programs needed # -AC_PROG_LIBTOOL +LT_INIT AC_PROG_INSTALL ######### @@ -179,7 +179,7 @@ AC_SUBST(BUILD_CC) # Do we want to support multithreaded use of sqlite # AC_ARG_ENABLE(threadsafe, -AC_HELP_STRING([--disable-threadsafe],[Disable mutexing])) +AS_HELP_STRING([--disable-threadsafe],[Disable mutexing])) AC_MSG_CHECKING([whether to support threadsafe operation]) if test "$enable_threadsafe" = "no"; then SQLITE_THREADSAFE=0 @@ -199,7 +199,7 @@ fi # Do we want to support release # AC_ARG_ENABLE(releasemode, -AC_HELP_STRING([--enable-releasemode],[Support libtool link to release mode]),,enable_releasemode=no) +AS_HELP_STRING([--enable-releasemode],[Support libtool link to release mode]),,enable_releasemode=no) AC_MSG_CHECKING([whether to support shared library linked as release mode or not]) if test "$enable_releasemode" = "no"; then ALLOWRELEASE="" @@ -214,7 +214,7 @@ AC_SUBST(ALLOWRELEASE) # Do we want temporary databases in memory # AC_ARG_ENABLE(tempstore, -AC_HELP_STRING([--enable-tempstore],[Use an in-ram database for temporary tables (never,no,yes,always)]),,enable_tempstore=no) +AS_HELP_STRING([--enable-tempstore],[Use an in-ram database for temporary tables (never,no,yes,always)]),,enable_tempstore=no) AC_MSG_CHECKING([whether to use an in-ram database for temporary tables]) case "$enable_tempstore" in never ) @@ -254,7 +254,15 @@ else AC_MSG_RESULT(unknown) fi if test "$CYGWIN" != "yes"; then - AC_CYGWIN + m4_warn([obsolete], +[AC_CYGWIN is obsolete: use AC_CANONICAL_HOST and check if $host_os +matches *cygwin*])dnl +AC_CANONICAL_HOST +case $host_os in + *cygwin* ) CYGWIN=yes;; + * ) CYGWIN=no;; +esac + fi if test "$CYGWIN" = "yes"; then BUILD_EXEEXT=.exe @@ -289,10 +297,10 @@ AC_SUBST(TARGET_EXEEXT) # Those macros could not be used directly since we have to make some # minor changes to accomodate systems that do not have TCL installed. # -AC_ARG_ENABLE(tcl, AC_HELP_STRING([--disable-tcl],[do not build TCL extension]), +AC_ARG_ENABLE(tcl, AS_HELP_STRING([--disable-tcl],[do not build TCL extension]), [use_tcl=$enableval],[use_tcl=yes]) if test "${use_tcl}" = "yes" ; then - AC_ARG_WITH(tcl, AC_HELP_STRING([--with-tcl=DIR],[directory containing tcl configuration (tclConfig.sh)]), with_tclconfig=${withval}) + AC_ARG_WITH(tcl, AS_HELP_STRING([--with-tcl=DIR],[directory containing tcl configuration (tclConfig.sh)]), with_tclconfig=${withval}) AC_MSG_CHECKING([for Tcl configuration]) AC_CACHE_VAL(ac_cv_c_tclconfig,[ # First check to see if --with-tcl was specified. @@ -474,11 +482,11 @@ TARGET_READLINE_INC="" TARGET_HAVE_READLINE=0 TARGET_HAVE_EDITLINE=0 AC_ARG_ENABLE([editline], - [AC_HELP_STRING([--enable-editline],[enable BSD editline support])], + [AS_HELP_STRING([--enable-editline],[enable BSD editline support])], [with_editline=$enableval], [with_editline=auto]) AC_ARG_ENABLE([readline], - [AC_HELP_STRING([--disable-readline],[disable readline support])], + [AS_HELP_STRING([--disable-readline],[disable readline support])], [with_readline=$enableval], [with_readline=auto]) @@ -494,7 +502,7 @@ if test x"$with_readline" != xno; then found="yes" AC_ARG_WITH([readline-lib], - [AC_HELP_STRING([--with-readline-lib],[specify readline library])], + [AS_HELP_STRING([--with-readline-lib],[specify readline library])], [with_readline_lib=$withval], [with_readline_lib="auto"]) if test "x$with_readline_lib" = xauto; then @@ -509,7 +517,7 @@ if test x"$with_readline" != xno; then fi AC_ARG_WITH([readline-inc], - [AC_HELP_STRING([--with-readline-inc],[specify readline include paths])], + [AS_HELP_STRING([--with-readline-inc],[specify readline include paths])], [with_readline_inc=$withval], [with_readline_inc="auto"]) if test "x$with_readline_inc" = xauto; then @@ -554,7 +562,7 @@ AC_SEARCH_LIBS(fdatasync, [rt]) ######### # check for debug enabled -AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],[enable debugging & verbose explain])) +AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],[enable debugging & verbose explain])) AC_MSG_CHECKING([build type]) if test "${enable_debug}" = "yes" ; then TARGET_DEBUG="-DSQLITE_DEBUG=1 -DSQLITE_ENABLE_SELECTTRACE -DSQLITE_ENABLE_WHERETRACE -O0" @@ -567,7 +575,8 @@ AC_SUBST(TARGET_DEBUG) ######### # See whether we should use the amalgamation to build -AC_ARG_ENABLE(amalgamation, AC_HELP_STRING([--disable-amalgamation], + +AC_ARG_ENABLE(amalgamation, AS_HELP_STRING([--disable-amalgamation], [Disable the amalgamation and instead build all files separately])) if test "${enable_amalgamation}" = "no" ; then USE_AMALGAMATION=0 @@ -582,7 +591,7 @@ AC_SUBST(HAVE_ZLIB) ######### # See whether we should allow loadable extensions -AC_ARG_ENABLE(load-extension, AC_HELP_STRING([--disable-load-extension], +AC_ARG_ENABLE(load-extension, AS_HELP_STRING([--disable-load-extension], [Disable loading of external extensions]),,[enable_load_extension=yes]) if test "${enable_load_extension}" = "yes" ; then OPT_FEATURE_FLAGS="" @@ -595,7 +604,7 @@ fi # Do we want to support math functions # AC_ARG_ENABLE(math, -AC_HELP_STRING([--disable-math],[Disable math functions])) +AS_HELP_STRING([--disable-math],[Disable math functions])) AC_MSG_CHECKING([whether to support math functions]) if test "$enable_math" = "no"; then AC_MSG_RESULT([no]) @@ -609,7 +618,7 @@ fi # Do we want to support JSON functions # AC_ARG_ENABLE(json, -AC_HELP_STRING([--disable-json],[Disable JSON functions])) +AS_HELP_STRING([--disable-json],[Disable JSON functions])) AC_MSG_CHECKING([whether to support JSON functions]) if test "$enable_json" = "no"; then AC_MSG_RESULT([no]) @@ -621,14 +630,14 @@ fi ######## # The --enable-all argument is short-hand to enable # multiple extensions. -AC_ARG_ENABLE(all, AC_HELP_STRING([--enable-all], +AC_ARG_ENABLE(all, AS_HELP_STRING([--enable-all], [Enable FTS4, FTS5, Geopoly, RTree, Sessions])) ########## # Do we want to support memsys3 and/or memsys5 # AC_ARG_ENABLE(memsys5, - AC_HELP_STRING([--enable-memsys5],[Enable MEMSYS5])) + AS_HELP_STRING([--enable-memsys5],[Enable MEMSYS5])) AC_MSG_CHECKING([whether to support MEMSYS5]) if test "${enable_memsys5}" = "yes"; then OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MEMSYS5" @@ -637,7 +646,7 @@ else AC_MSG_RESULT([no]) fi AC_ARG_ENABLE(memsys3, - AC_HELP_STRING([--enable-memsys3],[Enable MEMSYS3])) + AS_HELP_STRING([--enable-memsys3],[Enable MEMSYS3])) AC_MSG_CHECKING([whether to support MEMSYS3]) if test "${enable_memsys3}" = "yes" -a "${enable_memsys5}" = "no"; then OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MEMSYS3" @@ -648,7 +657,7 @@ fi ######### # See whether we should enable Full Text Search extensions -AC_ARG_ENABLE(fts3, AC_HELP_STRING([--enable-fts3], +AC_ARG_ENABLE(fts3, AS_HELP_STRING([--enable-fts3], [Enable the FTS3 extension])) AC_MSG_CHECKING([whether to support FTS3]) if test "${enable_fts3}" = "yes" ; then @@ -657,7 +666,7 @@ if test "${enable_fts3}" = "yes" ; then else AC_MSG_RESULT([no]) fi -AC_ARG_ENABLE(fts4, AC_HELP_STRING([--enable-fts4], +AC_ARG_ENABLE(fts4, AS_HELP_STRING([--enable-fts4], [Enable the FTS4 extension])) AC_MSG_CHECKING([whether to support FTS4]) if test "${enable_fts4}" = "yes" -o "${enable_all}" = "yes" ; then @@ -667,7 +676,7 @@ if test "${enable_fts4}" = "yes" -o "${enable_all}" = "yes" ; then else AC_MSG_RESULT([no]) fi -AC_ARG_ENABLE(fts5, AC_HELP_STRING([--enable-fts5], +AC_ARG_ENABLE(fts5, AS_HELP_STRING([--enable-fts5], [Enable the FTS5 extension])) AC_MSG_CHECKING([whether to support FTS5]) if test "${enable_fts5}" = "yes" -o "${enable_all}" = "yes" ; then @@ -681,7 +690,7 @@ fi ######### # See whether we should enable the LIMIT clause on UPDATE and DELETE # statements. -AC_ARG_ENABLE(update-limit, AC_HELP_STRING([--enable-update-limit], +AC_ARG_ENABLE(update-limit, AS_HELP_STRING([--enable-update-limit], [Enable the UPDATE/DELETE LIMIT clause])) AC_MSG_CHECKING([whether to support LIMIT on UPDATE and DELETE statements]) if test "${enable_update_limit}" = "yes" ; then @@ -693,7 +702,7 @@ fi ######### # See whether we should enable GEOPOLY -AC_ARG_ENABLE(geopoly, AC_HELP_STRING([--enable-geopoly], +AC_ARG_ENABLE(geopoly, AS_HELP_STRING([--enable-geopoly], [Enable the GEOPOLY extension]), [enable_geopoly=yes],[enable_geopoly=no]) AC_MSG_CHECKING([whether to support GEOPOLY]) @@ -707,7 +716,7 @@ fi ######### # See whether we should enable RTREE -AC_ARG_ENABLE(rtree, AC_HELP_STRING([--enable-rtree], +AC_ARG_ENABLE(rtree, AS_HELP_STRING([--enable-rtree], [Enable the RTREE extension])) AC_MSG_CHECKING([whether to support RTREE]) if test "${enable_rtree}" = "yes" ; then @@ -719,7 +728,7 @@ fi ######### # See whether we should enable the SESSION extension -AC_ARG_ENABLE(session, AC_HELP_STRING([--enable-session], +AC_ARG_ENABLE(session, AS_HELP_STRING([--enable-session], [Enable the SESSION extension])) AC_MSG_CHECKING([whether to support SESSION]) if test "${enable_session}" = "yes" -o "${enable_all}" = "yes" ; then @@ -783,7 +792,7 @@ BUILD_CFLAGS=$ac_temp_BUILD_CFLAGS ######### # See whether we should use GCOV -AC_ARG_ENABLE(gcov, AC_HELP_STRING([--enable-gcov], +AC_ARG_ENABLE(gcov, AS_HELP_STRING([--enable-gcov], [Enable coverage testing using gcov])) if test "${use_gcov}" = "yes" ; then USE_GCOV=1 @@ -812,7 +821,8 @@ AC_CONFIG_HEADERS(sqlite_cfg.h) # Generate the output files. # AC_SUBST(BUILD_CFLAGS) -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile sqlite3.pc ]) +AC_OUTPUT diff --git a/manifest b/manifest index 65515b97e4..e4c7685cf0 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Merge\strunk\sinto\swasi-patches\sbranch. -D 2022-12-10T05:00:16.044 +C Run\sconfigure.ac\sthrough\sautoupdate,\sas\srequired\sby\sautoconf\sfor\srebuilding\sconfigure.\sThese\s(many)\schanges\swere\smade\sentirely\sby\sthe\sautotools,\sexcept\sthat\ssome\swhitespace-only\schanges\swere\sreverted\sby\shand\sto\sreduce\snoise,\sand\sare\sa\spreliminary\sstep\sto\sadding\sa\snew\sflag\sto\sconfigure.ac. +D 2022-12-10T05:52:02.526 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -33,8 +33,8 @@ F autoconf/tea/win/nmakehlp.c b01f822eabbe1ed2b64e70882d97d48402b42d2689a1ea0034 F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63 F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6 F config.sub c2d0260f17f3e4bc0b6808fccf1b291cb5e9126c14fc5890efc77b9fd0175559 -F configure 9cbf6a15a4b5f2b3551a466420e5f51ce04c40aaed7f90c886402bf0b66ec110 x -F configure.ac 48dc6bfee293eef05910faf085760f2fd79b680aa47b50e8e6a22ca40bb026bb +F configure e24b3bc7cd06e0462d90aba856c3cdddbac3a0d85a86f0c3402866d579798f4c x +F configure.ac c36bbc3f2604fc9b64a1e39e8c1897e395307ee624e95d4def8d7dcc8ef82918 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f @@ -497,11 +497,11 @@ F ext/wasm/README.md ef39861aa21632fdbca0bdd469f78f0096f6449a720f3f39642594af503 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 4825910f48cc31b326c1c148e0c569dd4969deb81c69a48fab5d3e14728aa5e7 F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287 F ext/wasm/api/README.md 17fb1e10335cc87e366dec496c5b17b061f3f75cdf216e825258de34d97a3e53 -F ext/wasm/api/extern-post-js.c-pp.js 8923f76c3d2213159e12d641dc750523ead5c848185dc4996fae5cc12397f88d w ext/wasm/api/extern-post-js.js +F ext/wasm/api/extern-post-js.c-pp.js 8923f76c3d2213159e12d641dc750523ead5c848185dc4996fae5cc12397f88d F ext/wasm/api/extern-pre-js.js cc61c09c7a24a07dbecb4c352453c3985170cec12b4e7e7e7a4d11d43c5c8f41 F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08902f15c34720ee4a1 F ext/wasm/api/post-js-header.js 47b6b281f39ad59fa6e8b658308cd98ea292c286a68407b35ff3ed9cfd281a62 -F ext/wasm/api/pre-js.c-pp.js b88499dc303c21fc3f55f2c364a0f814f587b60a95784303881169f9e91c1d5f w ext/wasm/api/pre-js.js +F ext/wasm/api/pre-js.c-pp.js b88499dc303c21fc3f55f2c364a0f814f587b60a95784303881169f9e91c1d5f F ext/wasm/api/sqlite3-api-cleanup.js 680d5ccfff54459db136a49b2199d9f879c8405d9c99af1dda0cc5e7c29056f4 F ext/wasm/api/sqlite3-api-glue.js 88e62a380b39a924728d9ed4f74f5424f0ea36e8d124df7da9268cc01ad0b191 F ext/wasm/api/sqlite3-api-oo1.js 6d10849609231ccd46fa11b1d3fbbe0f45d9fe84c66a0b054601036540844300 @@ -509,8 +509,8 @@ F ext/wasm/api/sqlite3-api-prologue.js 2582c5a983e6213687153125a12e7f7496a1cd474 F ext/wasm/api/sqlite3-api-worker1.js e94ba98e44afccfa482874cd9acb325883ade50ed1f9f9526beb9de1711f182f F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3 F ext/wasm/api/sqlite3-opfs-async-proxy.js 7795b84b66a7a8dedc791340709b310bb497c3c72a80bef364fa2a58e2ddae3f -F ext/wasm/api/sqlite3-v-helper.js 64bb3559446eb441ce87afe942f6f924ee135a9f069a82705ffefdcd55fc6481 w ext/wasm/api/sqlite3-vfs-helper.js -F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 66daf6fb6843bea615fe193109e1542efbeca24f560ee9da63375a910bb48115 w ext/wasm/api/sqlite3-vfs-opfs.js +F ext/wasm/api/sqlite3-v-helper.js 64bb3559446eb441ce87afe942f6f924ee135a9f069a82705ffefdcd55fc6481 +F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 66daf6fb6843bea615fe193109e1542efbeca24f560ee9da63375a910bb48115 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9 F ext/wasm/api/sqlite3-wasm.c daad00c6822facb6ceb506dadc2201c734e9128c457c93f9304df01542084216 F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52aff253afbf3350431f5773faf0e4b @@ -2067,8 +2067,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 64cf34a85505814b4c93e82855c25559c8096bb3ce38cdc5e0fb9218c6bcce32 4600a7bbdc4cbe14591d48ea19fe5f7de3a0c10a14cdd97fd51e263a13163d10 -R e3b70765e88ec1ad3cf06ec9b25dc445 +P 13dade955d46020ab408734123261e9fadb8bccbaf67003b111112af4789d8c0 +R fc46c79a94547ce08fe3cd195462d6fd U stephan -Z 12a8b4ca5bc116a93035c1402600a66b +Z 3477295956a0e931748d4f484704cfa0 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index cbb2d80283..05bb16dbd7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -13dade955d46020ab408734123261e9fadb8bccbaf67003b111112af4789d8c0 \ No newline at end of file +2be2d5d428acd538e44d7b9345b64470131bef40f67ba3190f5cd42f9949f355 \ No newline at end of file From 146961889e742d3d62034711fb68d7e64a860d27 Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 10 Dec 2022 06:44:48 +0000 Subject: [PATCH 07/45] Add --with-wasi-sdk=DIR flag to configure.ac. This mode compiles but fails to link the DLL because libtool is apparently hard-coded to gcc for the DLL. FossilOrigin-Name: 39c9f441519d3b3c365c52293a73cdf4af86de639e0009170c27725aad6653f6 --- Makefile.in | 9 +++++- configure | 88 +++++++++++++++++++++++++++++++++++++++++++-------- configure.ac | 44 ++++++++++++++++++++++++++ manifest | 16 +++++----- manifest.uuid | 2 +- 5 files changed, 135 insertions(+), 24 deletions(-) diff --git a/Makefile.in b/Makefile.in index f808312c69..c146461e85 100644 --- a/Makefile.in +++ b/Makefile.in @@ -649,10 +649,17 @@ FUZZCHECK_SRC += $(TOP)/test/vt02.c DBFUZZ_OPT = ST_OPT = -DSQLITE_OS_KV_OPTIONAL + +# In wasi-sdk builds, disable the CLI shell build in the "all" target. +SQLITE3_SHELL_TARGET_ = sqlite3$(TEXE) +SQLITE3_SHELL_TARGET_1 = +SQLITE3_SHELL_TARGET = $(SQLITE3_SHELL_TARGET_@HAVE_WASI_SDK@) + # This is the default Makefile target. The objects listed here # are what get build when you type just "make" with no arguments. # -all: sqlite3.h libsqlite3.la sqlite3$(TEXE) $(HAVE_TCL:1=libtclsqlite3.la) +all: sqlite3.h libsqlite3.la $(SQLITE3_SHELL_TARGET) \ + $(HAVE_TCL:1=libtclsqlite3.la) Makefile: $(TOP)/Makefile.in ./config.status diff --git a/configure b/configure index 908bba9c5b..5cd4a2bd14 100755 --- a/configure +++ b/configure @@ -827,6 +827,7 @@ TEMP_STORE ALLOWRELEASE SQLITE_THREADSAFE BUILD_CC +HAVE_WASI_SDK RELEASE VERSION program_prefix @@ -919,6 +920,7 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_largefile +with_wasi_sdk enable_threadsafe enable_releasemode enable_tempstore @@ -1614,6 +1616,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-wasi-sdk=DIR directory containing the WASI SDK. Triggers + cross-compile to WASM. --with-tcl=DIR directory containing tcl configuration (tclConfig.sh) --with-readline-lib specify readline library @@ -4458,13 +4462,13 @@ then : else $as_nop lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4461: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4465: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4464: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4468: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4467: output\"" >&5) + (eval echo "\"\$as_me:4471: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5715,7 +5719,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5718 "configure"' > conftest.$ac_ext + echo '#line 5722 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7058,11 +7062,11 @@ else $as_nop -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7061: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7065: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7065: \$? = $ac_status" >&5 + echo "$as_me:7069: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7398,11 +7402,11 @@ else $as_nop -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7401: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7405: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7405: \$? = $ac_status" >&5 + echo "$as_me:7409: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7505,11 +7509,11 @@ else $as_nop -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7508: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7512: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7512: \$? = $ac_status" >&5 + echo "$as_me:7516: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7561,11 +7565,11 @@ else $as_nop -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7564: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7568: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7568: \$? = $ac_status" >&5 + echo "$as_me:7572: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9949,7 +9953,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 9952 "configure" +#line 9956 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10046,7 +10050,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10049 "configure" +#line 10053 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10879,6 +10883,62 @@ RELEASE=`cat $srcdir/VERSION` printf "%s\n" "$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+y} +then : + withval=$with_wasi_sdk; with_wasisdk=${withval} +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for WASI SDK directory" >&5 +printf %s "checking for WASI SDK directory... " >&6; } +if test ${ac_cv_c_wasi_sdk+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + # 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 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${with_wasi_sdk}: using wasi-sdk clang, disabling tcl, disabling sqlite3 CLI app" >&5 +printf "%s\n" "${with_wasi_sdk}: using wasi-sdk clang, disabling tcl, disabling sqlite3 CLI app" >&6; } + use_wasi_sdk=yes + else + use_wasi_sdk=no + fi + +fi + +if test "${use_wasi_sdk}" = "no" ; then + HAVE_WASI_SDK="" +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" + cross_compiling=yes + enable_threadsafe=no + use_tcl=no + enable_tcl=no +fi + + + ######### # Locate a compiler for the build machine. This compiler should # generate command-line programs that run on the build machine. diff --git a/configure.ac b/configure.ac index 9eaf6bcadb..9cd68dd63c 100644 --- a/configure.ac +++ b/configure.ac @@ -158,6 +158,50 @@ 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, disabling sqlite3 CLI app]) + use_wasi_sdk=yes + else + use_wasi_sdk=no + fi +]) +if test "${use_wasi_sdk}" = "no" ; then + HAVE_WASI_SDK="" +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" + cross_compiling=yes + enable_threadsafe=no + use_tcl=no + enable_tcl=no +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 --git a/manifest b/manifest index e4c7685cf0..73290a5f26 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Run\sconfigure.ac\sthrough\sautoupdate,\sas\srequired\sby\sautoconf\sfor\srebuilding\sconfigure.\sThese\s(many)\schanges\swere\smade\sentirely\sby\sthe\sautotools,\sexcept\sthat\ssome\swhitespace-only\schanges\swere\sreverted\sby\shand\sto\sreduce\snoise,\sand\sare\sa\spreliminary\sstep\sto\sadding\sa\snew\sflag\sto\sconfigure.ac. -D 2022-12-10T05:52:02.526 +C Add\s--with-wasi-sdk=DIR\sflag\sto\sconfigure.ac.\sThis\smode\scompiles\sbut\sfails\sto\slink\sthe\sDLL\sbecause\slibtool\sis\sapparently\shard-coded\sto\sgcc\sfor\sthe\sDLL. +D 2022-12-10T06:44:48.363 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 -F Makefile.in c223963d7b0828f26cb62ea3e0f583d26839b7d3ef0d1cca87f35c4b222ff01b +F Makefile.in 05d97a13bf8e50162f5aff3f1ca22b2af6af7f9bba49525db0906c807422fd15 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241 F Makefile.msc e86ec21328921721dd6f777da435c62a5469cda1a654f5ecefacf87ddb3dfeb3 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e @@ -33,8 +33,8 @@ F autoconf/tea/win/nmakehlp.c b01f822eabbe1ed2b64e70882d97d48402b42d2689a1ea0034 F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63 F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6 F config.sub c2d0260f17f3e4bc0b6808fccf1b291cb5e9126c14fc5890efc77b9fd0175559 -F configure e24b3bc7cd06e0462d90aba856c3cdddbac3a0d85a86f0c3402866d579798f4c x -F configure.ac c36bbc3f2604fc9b64a1e39e8c1897e395307ee624e95d4def8d7dcc8ef82918 +F configure a4d3f20148c5cefd1d569a3c83368909a6250f107687c69e41161f418cf0632b x +F configure.ac b7785dcc6e5c15c45ca1ffc7dc72db61f67cbdce7b7564d097a1cb79d4cefd53 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f @@ -2067,8 +2067,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 13dade955d46020ab408734123261e9fadb8bccbaf67003b111112af4789d8c0 -R fc46c79a94547ce08fe3cd195462d6fd +P 2be2d5d428acd538e44d7b9345b64470131bef40f67ba3190f5cd42f9949f355 +R 764c0bd85411c14594ad3a6f3ef07d68 U stephan -Z 3477295956a0e931748d4f484704cfa0 +Z 6513e2f83a7c258ce48894809c0f7313 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 05bb16dbd7..bfa81c9f46 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2be2d5d428acd538e44d7b9345b64470131bef40f67ba3190f5cd42f9949f355 \ No newline at end of file +39c9f441519d3b3c365c52293a73cdf4af86de639e0009170c27725aad6653f6 \ No newline at end of file From 3bcb5ce472d7b1d7fa47eed9cb6bebec7390fc6a Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 10 Dec 2022 07:02:46 +0000 Subject: [PATCH 08/45] Imply configure flag --disable-shared when --with-wasi-sdk is active because libtool is running gcc for linking the shared lib, which cannot work in a wasi build. FossilOrigin-Name: 9253ba43c0c7657ecf4c3d32df4084577e7188e6151b883a5fa92a43aa4c3e30 --- configure | 7 +++++-- configure.ac | 5 ++++- manifest | 14 +++++++------- manifest.uuid | 2 +- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 5cd4a2bd14..0614411113 100755 --- a/configure +++ b/configure @@ -10907,8 +10907,8 @@ else $as_nop if ! test -d "${with_wasi_sdk}" ; then as_fn_error $? "${with_wasi_sdk} directory doesn't exist" "$LINENO" 5 fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${with_wasi_sdk}: using wasi-sdk clang, disabling tcl, disabling sqlite3 CLI app" >&5 -printf "%s\n" "${with_wasi_sdk}: using wasi-sdk clang, disabling tcl, disabling sqlite3 CLI app" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${with_wasi_sdk}: using wasi-sdk clang, disabling: tcl, CLI shell, DLL" >&5 +printf "%s\n" "${with_wasi_sdk}: using wasi-sdk clang, disabling: tcl, CLI shell, DLL" >&6; } use_wasi_sdk=yes else use_wasi_sdk=no @@ -10935,6 +10935,9 @@ else 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 fi diff --git a/configure.ac b/configure.ac index 9cd68dd63c..5b4e573f28 100644 --- a/configure.ac +++ b/configure.ac @@ -173,7 +173,7 @@ AC_CACHE_VAL(ac_cv_c_wasi_sdk,[ 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, disabling sqlite3 CLI app]) + AC_MSG_RESULT([${with_wasi_sdk}: using wasi-sdk clang, disabling: tcl, CLI shell, DLL]) use_wasi_sdk=yes else use_wasi_sdk=no @@ -198,6 +198,9 @@ else 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 fi AC_SUBST(HAVE_WASI_SDK) diff --git a/manifest b/manifest index 73290a5f26..166680d89f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\s--with-wasi-sdk=DIR\sflag\sto\sconfigure.ac.\sThis\smode\scompiles\sbut\sfails\sto\slink\sthe\sDLL\sbecause\slibtool\sis\sapparently\shard-coded\sto\sgcc\sfor\sthe\sDLL. -D 2022-12-10T06:44:48.363 +C Imply\sconfigure\sflag\s--disable-shared\swhen\s--with-wasi-sdk\sis\sactive\sbecause\slibtool\sis\srunning\sgcc\sfor\slinking\sthe\sshared\slib,\swhich\scannot\swork\sin\sa\swasi\sbuild. +D 2022-12-10T07:02:46.438 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -33,8 +33,8 @@ F autoconf/tea/win/nmakehlp.c b01f822eabbe1ed2b64e70882d97d48402b42d2689a1ea0034 F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63 F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6 F config.sub c2d0260f17f3e4bc0b6808fccf1b291cb5e9126c14fc5890efc77b9fd0175559 -F configure a4d3f20148c5cefd1d569a3c83368909a6250f107687c69e41161f418cf0632b x -F configure.ac b7785dcc6e5c15c45ca1ffc7dc72db61f67cbdce7b7564d097a1cb79d4cefd53 +F configure bf4eb4211407d4583eec9d66c44712b781838fe64dc44ce361680522bf08555c x +F configure.ac e184f2215aa933c691a41140d286baf28f0c9be24e1d53a97a40851ca26724b2 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f @@ -2067,8 +2067,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 2be2d5d428acd538e44d7b9345b64470131bef40f67ba3190f5cd42f9949f355 -R 764c0bd85411c14594ad3a6f3ef07d68 +P 39c9f441519d3b3c365c52293a73cdf4af86de639e0009170c27725aad6653f6 +R 8e096ab9ce7a7de4c50eadef054f9ac5 U stephan -Z 6513e2f83a7c258ce48894809c0f7313 +Z c27f23eb0fdf959a8de40976e5f5fb98 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index bfa81c9f46..081767ab2e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -39c9f441519d3b3c365c52293a73cdf4af86de639e0009170c27725aad6653f6 \ No newline at end of file +9253ba43c0c7657ecf4c3d32df4084577e7188e6151b883a5fa92a43aa4c3e30 \ No newline at end of file From 22166f83b4fff60052eef877d36656d0e676e8e1 Mon Sep 17 00:00:00 2001 From: drh <> Date: Sat, 10 Dec 2022 12:06:31 +0000 Subject: [PATCH 09/45] Rerun autoconf using version 2.69 to minimize configure script differences with trunk. FossilOrigin-Name: b63342839427917ae48e13b959457baa5c2e0e1be8a444b0e1a4e0446ace9178 --- configure | 5237 ++++++++++++++++++++++--------------------------- manifest | 14 +- manifest.uuid | 2 +- 3 files changed, 2355 insertions(+), 2898 deletions(-) diff --git a/configure b/configure index 0614411113..31c0fa919a 100755 --- a/configure +++ b/configure @@ -1,10 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for sqlite 3.41.0. +# Generated by GNU Autoconf 2.69 for sqlite 3.41.0. # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, -# Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -15,16 +14,14 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: -if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop +else case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -34,46 +31,46 @@ esac fi - -# Reset variables that may have inherited troublesome values from -# the environment. - -# IFS needs to be set, to space, tab, and newline, in precisely that order. -# (If _AS_PATH_WALK were called with IFS unset, it would have the -# side effect of setting IFS to empty, thus disabling word splitting.) -# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -IFS=" "" $as_nl" - -PS1='$ ' -PS2='> ' -PS4='+ ' - -# Ensure predictable behavior from utilities with locale-dependent output. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# We cannot yet rely on "unset" to work, but we need these variables -# to be unset--not just set to an empty or harmless value--now, to -# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct -# also avoids known problems related to "unset" and subshell syntax -# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). -for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH -do eval test \${$as_var+y} \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done - -# Ensure that fds 0, 1, and 2 are open. -if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi -if (exec 3>&2) ; then :; else exec 2>/dev/null; fi +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi # The user is always right. -if ${PATH_SEPARATOR+false} :; then +if test "${PATH_SEPARATOR+set}" != set; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -82,6 +79,13 @@ if ${PATH_SEPARATOR+false} :; then fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -90,12 +94,8 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - test -r "$as_dir$0" && as_myself=$as_dir$0 && break + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break done IFS=$as_save_IFS @@ -107,10 +107,30 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. @@ -132,22 +152,20 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="as_nop=: -if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else \$as_nop +else case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -167,53 +185,42 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; } as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ) -then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : -else \$as_nop +else exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 -blah=\$(echo \$(echo blah)) -test x\"\$blah\" = xblah || exit 1 test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null -then : + if (eval "$as_required") 2>/dev/null; then : as_have_required=yes -else $as_nop +else as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null -then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -else $as_nop +else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir$as_base + as_shell=$as_dir/$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null -then : + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : CONFIG_SHELL=$as_shell as_have_required=yes - if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null -then : + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : break 2 fi fi @@ -221,21 +228,14 @@ fi esac as_found=false done -IFS=$as_save_IFS -if $as_found -then : - -else $as_nop - if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null -then : +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : CONFIG_SHELL=$SHELL as_have_required=yes -fi -fi +fi; } +IFS=$as_save_IFS - if test "x$CONFIG_SHELL" != x -then : + if test "x$CONFIG_SHELL" != x; then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -253,19 +253,18 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - if test x$as_have_required = xno -then : - printf "%s\n" "$0: This script requires a shell more modern than all" - printf "%s\n" "$0: the shells that I found on your system." - if test ${ZSH_VERSION+y} ; then - printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" - printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system, + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, $0: including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." @@ -292,7 +291,6 @@ as_fn_unset () } as_unset=as_fn_unset - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -310,14 +308,6 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -332,7 +322,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -341,7 +331,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -380,13 +370,12 @@ as_fn_executable_p () # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null -then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : eval 'as_fn_append () { eval $1+=\$2 }' -else $as_nop +else as_fn_append () { eval $1=\$$1\$2 @@ -398,27 +387,18 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null -then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else $as_nop +else as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` } fi # as_fn_arith -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -430,9 +410,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - printf "%s\n" "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -459,7 +439,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -503,7 +483,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -517,10 +497,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits exit } - -# Determine whether it's possible to make 'echo' print without a newline. -# These variables are no longer used directly by Autoconf, but are AC_SUBSTed -# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -534,13 +510,6 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac -# For backward compatibility with old third-party macros, we provide -# the shell variables $as_echo and $as_echo_n. New code should use -# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. -as_echo='printf %s\n' -as_echo_n='printf %s' - - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -764,36 +733,40 @@ PACKAGE_URL='' # Factoring default headers for most tests. ac_includes_default="\ -#include -#ifdef HAVE_STDIO_H -# include +#include +#ifdef HAVE_SYS_TYPES_H +# include #endif -#ifdef HAVE_STDLIB_H +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef STDC_HEADERS # include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif #endif #ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include +# endif # include #endif +#ifdef HAVE_STRINGS_H +# include +#endif #ifdef HAVE_INTTYPES_H # include #endif #ifdef HAVE_STDINT_H # include #endif -#ifdef HAVE_STRINGS_H -# include -#endif -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include -#endif #ifdef HAVE_UNISTD_H # include #endif" -ac_header_c_list= ac_subst_vars='LTLIBOBJS LIBOBJS BUILD_CFLAGS @@ -836,6 +809,7 @@ TCLSH_CMD INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM +CPP OTOOL64 OTOOL LIPO @@ -890,7 +864,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -955,6 +928,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS +CPP TCLLIBDIR' @@ -994,7 +968,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1024,6 +997,8 @@ do *) ac_optarg=yes ;; esac + # Accept the important Cygnus configure options, so we can diagnose typos. + case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -1064,9 +1039,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1090,9 +1065,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1245,15 +1220,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1303,9 +1269,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1319,9 +1285,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1365,9 +1331,9 @@ Try \`$0 --help' for more information" *) # FIXME: should be removed in autoconf 3.0. - printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1383,7 +1349,7 @@ if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1391,7 +1357,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1447,7 +1413,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_myself" | +$as_echo X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1544,7 +1510,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1631,6 +1596,7 @@ Some influential environment variables: LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory + CPP C preprocessor TCLLIBDIR Where to install tcl plugin Use these variables to override the choices made by `configure' or to help @@ -1652,9 +1618,9 @@ if test "$ac_init_help" = "recursive"; then case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1682,8 +1648,7 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for configure.gnu first; this name is used for a wrapper for - # Metaconfig's "Configure" on case-insensitive file systems. + # Check for guested configure. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -1691,7 +1656,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1701,9 +1666,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF sqlite configure 3.41.0 -generated by GNU Autoconf 2.71 +generated by GNU Autoconf 2.69 -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1720,14 +1685,14 @@ fi ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam + rm -f conftest.$ac_objext if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1735,15 +1700,14 @@ printf "%s\n" "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext -then : + } && test -s conftest.$ac_objext; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1759,14 +1723,14 @@ fi ac_fn_c_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext + rm -f conftest.$ac_objext conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1774,18 +1738,17 @@ printf "%s\n" "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - } -then : + }; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1807,44 +1770,120 @@ fi ac_fn_c_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$3=yes" -else $as_nop +else eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly ac_fn_c_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case declares $2. @@ -1852,9 +1891,16 @@ else $as_nop #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. */ + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif -#include #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -1872,25 +1918,24 @@ choke me #endif int -main (void) +main () { return $2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$3=yes" -else $as_nop +else eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func @@ -1902,18 +1947,17 @@ printf "%s\n" "$ac_res" >&6; } ac_fn_c_check_type () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main (void) +main () { if (sizeof ($2)) return 0; @@ -1921,13 +1965,12 @@ if (sizeof ($2)) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main (void) +main () { if (sizeof (($2))) return 0; @@ -1935,50 +1978,116 @@ if (sizeof (($2))) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : -else $as_nop +else eval "$3=yes" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type -ac_configure_args_raw= -for ac_arg -do - case $ac_arg in - *\'*) - ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - as_fn_append ac_configure_args_raw " '$ac_arg'" -done -case $ac_configure_args_raw in - *$as_nl*) - ac_safe_unquote= ;; - *) - ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. - ac_unsafe_a="$ac_unsafe_z#~" - ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" - ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +} # ac_fn_c_check_header_mongrel cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by sqlite $as_me 3.41.0, which was -generated by GNU Autoconf 2.71. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was - $ $0$ac_configure_args_raw + $ $0 $@ _ACEOF exec 5>>config.log @@ -2011,12 +2120,8 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - printf "%s\n" "PATH: $as_dir" + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" done IFS=$as_save_IFS @@ -2051,7 +2156,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -2086,13 +2191,11 @@ done # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? - # Sanitize IFS. - IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - printf "%s\n" "## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -2103,8 +2206,8 @@ trap 'exit_status=$? case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -2128,7 +2231,7 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ) echo - printf "%s\n" "## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -2136,14 +2239,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - printf "%s\n" "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - printf "%s\n" "## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -2151,15 +2254,15 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - printf "%s\n" "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - printf "%s\n" "## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -2167,8 +2270,8 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} echo fi test "$ac_signal" != 0 && - printf "%s\n" "$as_me: caught signal $ac_signal" - printf "%s\n" "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -2182,48 +2285,63 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -printf "%s\n" "/* confdefs.h */" > confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF -printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF -printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF -printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF -printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF -printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_files="$CONFIG_SITE" + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then - ac_site_files="$prefix/share/config.site $prefix/etc/config.site" + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi - -for ac_site_file in $ac_site_files +for ac_site_file in "$ac_site_file1" "$ac_site_file2" do - case $ac_site_file in #( - */*) : - ;; #( - *) : - ac_site_file=./$ac_site_file ;; -esac - if test -f "$ac_site_file" && test -r "$ac_site_file"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file See \`config.log' for more details" "$LINENO" 5; } fi @@ -2233,434 +2351,19 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -printf "%s\n" "$as_me: loading cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -printf "%s\n" "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -# Test code for whether the C compiler supports C89 (global declarations) -ac_c_conftest_c89_globals=' -/* Does the compiler advertise C89 conformance? - Do not test the value of __STDC__, because some compilers set it to 0 - while being otherwise adequately conformant. */ -#if !defined __STDC__ -# error "Compiler does not advertise C89 conformance" -#endif - -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ -struct buf { int x; }; -struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not \xHH hex character constants. - These do not provoke an error unfortunately, instead are silently treated - as an "x". The following induces an error, until -std is added to get - proper ANSI mode. Curiously \x00 != x always comes out true, for an - array size at least. It is necessary to write \x00 == 0 to get something - that is true only with -std. */ -int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) '\''x'\'' -int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), - int, int);' - -# Test code for whether the C compiler supports C89 (body of main). -ac_c_conftest_c89_main=' -ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); -' - -# Test code for whether the C compiler supports C99 (global declarations) -ac_c_conftest_c99_globals=' -// Does the compiler advertise C99 conformance? -#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L -# error "Compiler does not advertise C99 conformance" -#endif - -#include -extern int puts (const char *); -extern int printf (const char *, ...); -extern int dprintf (int, const char *, ...); -extern void *malloc (size_t); - -// Check varargs macros. These examples are taken from C99 6.10.3.5. -// dprintf is used instead of fprintf to avoid needing to declare -// FILE and stderr. -#define debug(...) dprintf (2, __VA_ARGS__) -#define showlist(...) puts (#__VA_ARGS__) -#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -static void -test_varargs_macros (void) -{ - int x = 1234; - int y = 5678; - debug ("Flag"); - debug ("X = %d\n", x); - showlist (The first, second, and third items.); - report (x>y, "x is %d but y is %d", x, y); -} - -// Check long long types. -#define BIG64 18446744073709551615ull -#define BIG32 4294967295ul -#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -#if !BIG_OK - #error "your preprocessor is broken" -#endif -#if BIG_OK -#else - #error "your preprocessor is broken" -#endif -static long long int bignum = -9223372036854775807LL; -static unsigned long long int ubignum = BIG64; - -struct incomplete_array -{ - int datasize; - double data[]; -}; - -struct named_init { - int number; - const wchar_t *name; - double average; -}; - -typedef const char *ccp; - -static inline int -test_restrict (ccp restrict text) -{ - // See if C++-style comments work. - // Iterate through items via the restricted pointer. - // Also check for declarations in for loops. - for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) - continue; - return 0; -} - -// Check varargs and va_copy. -static bool -test_varargs (const char *format, ...) -{ - va_list args; - va_start (args, format); - va_list args_copy; - va_copy (args_copy, args); - - const char *str = ""; - int number = 0; - float fnumber = 0; - - while (*format) - { - switch (*format++) - { - case '\''s'\'': // string - str = va_arg (args_copy, const char *); - break; - case '\''d'\'': // int - number = va_arg (args_copy, int); - break; - case '\''f'\'': // float - fnumber = va_arg (args_copy, double); - break; - default: - break; - } - } - va_end (args_copy); - va_end (args); - - return *str && number && fnumber; -} -' - -# Test code for whether the C compiler supports C99 (body of main). -ac_c_conftest_c99_main=' - // Check bool. - _Bool success = false; - success |= (argc != 0); - - // Check restrict. - if (test_restrict ("String literal") == 0) - success = true; - char *restrict newvar = "Another string"; - - // Check varargs. - success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); - test_varargs_macros (); - - // Check flexible array members. - struct incomplete_array *ia = - malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); - ia->datasize = 10; - for (int i = 0; i < ia->datasize; ++i) - ia->data[i] = i * 1.234; - - // Check named initializers. - struct named_init ni = { - .number = 34, - .name = L"Test wide string", - .average = 543.34343, - }; - - ni.number = 58; - - int dynamic_array[ni.number]; - dynamic_array[0] = argv[0][0]; - dynamic_array[ni.number - 1] = 543; - - // work around unused variable warnings - ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' - || dynamic_array[ni.number - 1] != 543); -' - -# Test code for whether the C compiler supports C11 (global declarations) -ac_c_conftest_c11_globals=' -// Does the compiler advertise C11 conformance? -#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L -# error "Compiler does not advertise C11 conformance" -#endif - -// Check _Alignas. -char _Alignas (double) aligned_as_double; -char _Alignas (0) no_special_alignment; -extern char aligned_as_int; -char _Alignas (0) _Alignas (int) aligned_as_int; - -// Check _Alignof. -enum -{ - int_alignment = _Alignof (int), - int_array_alignment = _Alignof (int[100]), - char_alignment = _Alignof (char) -}; -_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); - -// Check _Noreturn. -int _Noreturn does_not_return (void) { for (;;) continue; } - -// Check _Static_assert. -struct test_static_assert -{ - int x; - _Static_assert (sizeof (int) <= sizeof (long int), - "_Static_assert does not work in struct"); - long int y; -}; - -// Check UTF-8 literals. -#define u8 syntax error! -char const utf8_literal[] = u8"happens to be ASCII" "another string"; - -// Check duplicate typedefs. -typedef long *long_ptr; -typedef long int *long_ptr; -typedef long_ptr long_ptr; - -// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. -struct anonymous -{ - union { - struct { int i; int j; }; - struct { int k; long int l; } w; - }; - int m; -} v1; -' - -# Test code for whether the C compiler supports C11 (body of main). -ac_c_conftest_c11_main=' - _Static_assert ((offsetof (struct anonymous, i) - == offsetof (struct anonymous, w.k)), - "Anonymous union alignment botch"); - v1.i = 2; - v1.w.k = 5; - ok |= v1.i != 5; -' - -# Test code for whether the C compiler supports C11 (complete). -ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} -${ac_c_conftest_c99_globals} -${ac_c_conftest_c11_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - ${ac_c_conftest_c99_main} - ${ac_c_conftest_c11_main} - return ok; -} -" - -# Test code for whether the C compiler supports C99 (complete). -ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} -${ac_c_conftest_c99_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - ${ac_c_conftest_c99_main} - return ok; -} -" - -# Test code for whether the C compiler supports C89 (complete). -ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - return ok; -} -" - -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" -as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" -as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" -as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" -as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" -as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" -as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" -as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" -as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" - -# Auxiliary files required by this configure script. -ac_aux_files="install-sh config.guess config.sub ltmain.sh" - -# Locations in which to look for auxiliary files. -ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.." - -# Search for a directory containing all of the required auxiliary files, -# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. -# If we don't find one directory that contains all the files we need, -# we report the set of missing files from the *first* directory in -# $ac_aux_dir_candidates and give up. -ac_missing_aux_files="" -ac_first_candidate=: -printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_found=false -for as_dir in $ac_aux_dir_candidates -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - as_found=: - - printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 - ac_aux_dir_found=yes - ac_install_sh= - for ac_aux in $ac_aux_files - do - # As a special case, if "install-sh" is required, that requirement - # can be satisfied by any of "install-sh", "install.sh", or "shtool", - # and $ac_install_sh is set appropriately for whichever one is found. - if test x"$ac_aux" = x"install-sh" - then - if test -f "${as_dir}install-sh"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 - ac_install_sh="${as_dir}install-sh -c" - elif test -f "${as_dir}install.sh"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 - ac_install_sh="${as_dir}install.sh -c" - elif test -f "${as_dir}shtool"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 - ac_install_sh="${as_dir}shtool install -c" - else - ac_aux_dir_found=no - if $ac_first_candidate; then - ac_missing_aux_files="${ac_missing_aux_files} install-sh" - else - break - fi - fi - else - if test -f "${as_dir}${ac_aux}"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 - else - ac_aux_dir_found=no - if $ac_first_candidate; then - ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" - else - break - fi - fi - fi - done - if test "$ac_aux_dir_found" = yes; then - ac_aux_dir="$as_dir" - break - fi - ac_first_candidate=false - - as_found=false -done -IFS=$as_save_IFS -if $as_found -then : - -else $as_nop - as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 -fi - - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -if test -f "${ac_aux_dir}config.guess"; then - ac_config_guess="$SHELL ${ac_aux_dir}config.guess" -fi -if test -f "${ac_aux_dir}config.sub"; then - ac_config_sub="$SHELL ${ac_aux_dir}config.sub" -fi -if test -f "$ac_aux_dir/configure"; then - ac_configure="$SHELL ${ac_aux_dir}configure" -fi - # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -2671,12 +2374,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -2685,24 +2388,24 @@ printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -2712,12 +2415,11 @@ printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' - and start over" "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2744,8 +2446,8 @@ fi # case `pwd` in *\ * | *\ *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac @@ -2765,33 +2467,57 @@ macro_revision='1.3012' - - ltmain="$ac_aux_dir/ltmain.sh" +ac_aux_dir= +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - # Make sure we can run config.sub. -$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -printf %s "checking build system type... " >&6; } -if test ${ac_cv_build+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_build_alias=$build_alias test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -printf "%s\n" "$ac_cv_build" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -2810,22 +2536,21 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -printf %s "checking host system type... " >&6; } -if test ${ac_cv_host+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 +else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else - ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || - as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -printf "%s\n" "$ac_cv_host" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -2844,15 +2569,6 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - - - - - - - - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2861,12 +2577,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2874,15 +2589,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2893,11 +2604,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2906,12 +2617,11 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -2919,15 +2629,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2938,11 +2644,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2950,8 +2656,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2964,12 +2670,11 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2977,15 +2682,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2996,11 +2697,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3009,12 +2710,11 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -3023,19 +2723,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3051,18 +2747,18 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3073,12 +2769,11 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -3086,15 +2781,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3105,11 +2796,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3122,12 +2813,11 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -3135,15 +2825,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3154,11 +2840,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3170,8 +2856,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -3179,129 +2865,25 @@ esac fi fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. -set dummy ${ac_tool_prefix}clang; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}clang" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "clang", so it can be a program name with args. -set dummy clang; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="clang" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -fi - - -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion -version; do +for ac_option in --version -v -V -qversion; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -3311,7 +2893,7 @@ printf "%s\n" "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -3319,7 +2901,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; @@ -3331,9 +2913,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -printf %s "checking whether the C compiler works... " >&6; } -ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -3354,12 +2936,11 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -3376,7 +2957,7 @@ do # certainly right. break;; *.* ) - if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -3392,46 +2973,44 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else $as_nop +else ac_file='' fi -if test -z "$ac_file" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -printf "%s\n" "$as_me: failed program was:" >&5 +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -printf %s "checking for C compiler default output file name... " >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -printf "%s\n" "$ac_file" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -printf %s "checking for suffix of executables... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -3445,15 +3024,15 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -printf "%s\n" "$ac_cv_exeext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -3462,7 +3041,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -3474,8 +3053,8 @@ _ACEOF ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -printf %s "checking whether we are cross compiling... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -3483,10 +3062,10 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -3494,40 +3073,39 @@ printf "%s\n" "$ac_try_echo"; } >&5 *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot run C compiled programs. + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details" "$LINENO" 5; } fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -printf "%s\n" "$cross_compiling" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -printf %s "checking for suffix of object files... " >&6; } -if test ${ac_cv_objext+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; @@ -3541,12 +3119,11 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -3555,32 +3132,31 @@ then : break;; esac done -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -printf "%s\n" "$ac_cv_objext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 -printf %s "checking whether the compiler supports GNU C... " >&6; } -if test ${ac_cv_c_compiler_gnu+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { #ifndef __GNUC__ choke me @@ -3590,33 +3166,29 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes -else $as_nop +else ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } -ac_compiler_gnu=$ac_cv_c_compiler_gnu - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+y} +ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -printf %s "checking whether $CC accepts -g... " >&6; } -if test ${ac_cv_prog_cc_g+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -3625,60 +3197,57 @@ else $as_nop /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else $as_nop +else CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : -else $as_nop +else ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -printf "%s\n" "$ac_cv_prog_cc_g" >&6; } -if test $ac_test_CFLAGS; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -3693,144 +3262,94 @@ else CFLAGS= fi fi -ac_prog_cc_stdc=no -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 -printf %s "checking for $CC option to enable C11 features... " >&6; } -if test ${ac_cv_prog_cc_c11+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c11=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_c_conftest_c11_program -_ACEOF -for ac_arg in '' -std=gnu11 -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c11=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c11" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -fi - -if test "x$ac_cv_prog_cc_c11" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c11" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 -printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 -fi -fi -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 -printf %s "checking for $CC option to enable C99 features... " >&6; } -if test ${ac_cv_prog_cc_c99+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c99=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_c_conftest_c99_program -_ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c99=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c99" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -fi - -if test "x$ac_cv_prog_cc_c99" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c99" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 -printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 -fi -fi -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 -printf %s "checking for $CC option to enable C89 features... " >&6; } -if test ${ac_cv_prog_cc_c89+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_c_conftest_c89_program +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext conftest.beam +rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC -fi -if test "x$ac_cv_prog_cc_c89" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c89" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + fi ac_ext=c @@ -3839,12 +3358,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -printf %s "checking for a sed that does not truncate output... " >&6; } -if test ${ac_cv_path_SED+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" @@ -3858,15 +3376,10 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in sed gsed - do + test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir$ac_prog$ac_exec_ext" + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED @@ -3875,13 +3388,13 @@ case `"$ac_path_SED" --version 2>&1` in ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; *) ac_count=0 - printf %s 0123456789 >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf "%s\n" '' >> "conftest.nl" + $as_echo '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -3909,8 +3422,8 @@ else fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -printf "%s\n" "$ac_cv_path_SED" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -3927,12 +3440,11 @@ Xsed="$SED -e 1s/^X//" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -printf %s "checking for grep that handles long lines and -e... " >&6; } -if test ${ac_cv_path_GREP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -z "$GREP"; then ac_path_GREP_found=false # Loop through the user's path and test for each of PROGNAME-LIST @@ -3940,15 +3452,10 @@ else $as_nop for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in grep ggrep - do + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP @@ -3957,13 +3464,13 @@ case `"$ac_path_GREP" --version 2>&1` in ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - printf %s 0123456789 >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf "%s\n" 'GREP' >> "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -3991,17 +3498,16 @@ else fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -printf "%s\n" "$ac_cv_path_GREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -printf %s "checking for egrep... " >&6; } -if test ${ac_cv_path_EGREP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else @@ -4012,15 +3518,10 @@ else $as_nop for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in egrep - do + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP @@ -4029,13 +3530,13 @@ case `"$ac_path_EGREP" --version 2>&1` in ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - printf %s 0123456789 >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf "%s\n" 'EGREP' >> "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -4064,17 +3565,16 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -printf "%s\n" "$ac_cv_path_EGREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -printf %s "checking for fgrep... " >&6; } -if test ${ac_cv_path_FGREP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +$as_echo_n "checking for fgrep... " >&6; } +if ${ac_cv_path_FGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 then ac_cv_path_FGREP="$GREP -F" else @@ -4085,15 +3585,10 @@ else $as_nop for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in fgrep - do + test -z "$as_dir" && as_dir=. + for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext" + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP @@ -4102,13 +3597,13 @@ case `"$ac_path_FGREP" --version 2>&1` in ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; *) ac_count=0 - printf %s 0123456789 >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - printf "%s\n" 'FGREP' >> "conftest.nl" + $as_echo 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -4137,8 +3632,8 @@ fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -printf "%s\n" "$ac_cv_path_FGREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +$as_echo "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" @@ -4163,18 +3658,17 @@ test -z "$GREP" && GREP=grep # Check whether --with-gnu-ld was given. -if test ${with_gnu_ld+y} -then : +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else $as_nop +else with_gnu_ld=no fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -printf %s "checking for ld used by $CC... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -4203,16 +3697,15 @@ printf %s "checking for ld used by $CC... " >&6; } ;; esac elif test "$with_gnu_ld" = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -printf %s "checking for GNU ld... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -printf %s "checking for non-GNU ld... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } fi -if test ${lt_cv_path_LD+y} -then : - printf %s "(cached) " >&6 -else $as_nop +if ${lt_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -z "$LD"; then lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do @@ -4241,19 +3734,18 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -printf "%s\n" "$LD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -printf %s "checking if the linker ($LD) is GNU ld... " >&6; } -if test ${lt_cv_prog_gnu_ld+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if ${lt_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 +else # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &1 &5 -printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -4276,12 +3768,11 @@ with_gnu_ld=$lt_cv_prog_gnu_ld -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 -printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if test ${lt_cv_path_NM+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if ${lt_cv_path_NM+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM="$NM" @@ -4326,8 +3817,8 @@ else : ${lt_cv_path_NM=no} fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 -printf "%s\n" "$lt_cv_path_NM" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +$as_echo "$lt_cv_path_NM" >&6; } if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else @@ -4337,12 +3828,11 @@ else do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_DUMPBIN+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$DUMPBIN"; then ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. else @@ -4350,15 +3840,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4369,11 +3855,11 @@ fi fi DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 -printf "%s\n" "$DUMPBIN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +$as_echo "$DUMPBIN" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4386,12 +3872,11 @@ if test -z "$DUMPBIN"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_DUMPBIN+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_DUMPBIN"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. else @@ -4399,15 +3884,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4418,11 +3899,11 @@ fi fi ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 -printf "%s\n" "$ac_ct_DUMPBIN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +$as_echo "$ac_ct_DUMPBIN" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4434,8 +3915,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DUMPBIN=$ac_ct_DUMPBIN @@ -4454,48 +3935,46 @@ test -z "$NM" && NM=nm -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 -printf %s "checking the name lister ($NM) interface... " >&6; } -if test ${lt_cv_nm_interface+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +$as_echo_n "checking the name lister ($NM) interface... " >&6; } +if ${lt_cv_nm_interface+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4465: $ac_compile\"" >&5) + (eval echo "\"\$as_me:3945: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4468: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:3948: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4471: output\"" >&5) + (eval echo "\"\$as_me:3951: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" fi rm -f conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 -printf "%s\n" "$lt_cv_nm_interface" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +$as_echo "$lt_cv_nm_interface" >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -printf %s "checking whether ln -s works... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -printf "%s\n" "no, using $LN_S" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } fi # find the maximum length of command line arguments -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 -printf %s "checking the maximum length of command line arguments... " >&6; } -if test ${lt_cv_sys_max_cmd_len+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +$as_echo_n "checking the maximum length of command line arguments... " >&6; } +if ${lt_cv_sys_max_cmd_len+:} false; then : + $as_echo_n "(cached) " >&6 +else i=0 teststring="ABCD" @@ -4611,11 +4090,11 @@ else $as_nop fi if test -n $lt_cv_sys_max_cmd_len ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 -printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 -printf "%s\n" "none" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -4628,8 +4107,8 @@ max_cmd_len=$lt_cv_sys_max_cmd_len : ${MV="mv -f"} : ${RM="rm -f"} -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -printf %s "checking whether the shell understands some XSI constructs... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 +$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -4638,18 +4117,18 @@ xsi_shell=no && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -printf "%s\n" "$xsi_shell" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 +$as_echo "$xsi_shell" >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -printf %s "checking whether the shell understands \"+=\"... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 +$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } lt_shell_append=no ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ >/dev/null 2>&1 \ && lt_shell_append=yes -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -printf "%s\n" "$lt_shell_append" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 +$as_echo "$lt_shell_append" >&6; } if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -4683,16 +4162,15 @@ esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 -printf %s "checking for $LD option to reload object files... " >&6; } -if test ${lt_cv_ld_reload_flag+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } +if ${lt_cv_ld_reload_flag+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_ld_reload_flag='-r' fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 -printf "%s\n" "$lt_cv_ld_reload_flag" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +$as_echo "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -4720,12 +4198,11 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_OBJDUMP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else @@ -4733,15 +4210,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4752,11 +4225,11 @@ fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -printf "%s\n" "$OBJDUMP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4765,12 +4238,11 @@ if test -z "$ac_cv_prog_OBJDUMP"; then ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_OBJDUMP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_OBJDUMP"; then ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. else @@ -4778,15 +4250,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4797,11 +4265,11 @@ fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -printf "%s\n" "$ac_ct_OBJDUMP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_OBJDUMP" = x; then @@ -4809,8 +4277,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OBJDUMP=$ac_ct_OBJDUMP @@ -4829,12 +4297,11 @@ test -z "$OBJDUMP" && OBJDUMP=objdump -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 -printf %s "checking how to recognize dependent libraries... " >&6; } -if test ${lt_cv_deplibs_check_method+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +$as_echo_n "checking how to recognize dependent libraries... " >&6; } +if ${lt_cv_deplibs_check_method+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= lt_cv_deplibs_check_method='unknown' @@ -5026,8 +4493,8 @@ tpf*) esac fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 -printf "%s\n" "$lt_cv_deplibs_check_method" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -5046,12 +4513,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_AR+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else @@ -5059,15 +4525,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="${ac_tool_prefix}ar" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5078,11 +4540,11 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -printf "%s\n" "$AR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5091,12 +4553,11 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_AR+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else @@ -5104,15 +4565,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="ar" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5123,11 +4580,11 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -printf "%s\n" "$ac_ct_AR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_AR" = x; then @@ -5135,8 +4592,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR @@ -5161,12 +4618,11 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_STRIP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -5174,15 +4630,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5193,11 +4645,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -printf "%s\n" "$STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5206,12 +4658,11 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_STRIP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -5219,15 +4670,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5238,11 +4685,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -printf "%s\n" "$ac_ct_STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -5250,8 +4697,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -5270,12 +4717,11 @@ test -z "$STRIP" && STRIP=: if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_RANLIB+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else @@ -5283,15 +4729,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5302,11 +4744,11 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -printf "%s\n" "$RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5315,12 +4757,11 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_RANLIB+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else @@ -5328,15 +4769,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5347,11 +4784,11 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -printf "%s\n" "$ac_ct_RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -5359,8 +4796,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -5437,12 +4874,11 @@ compiler=$CC # Check for command to grab the raw symbol name followed by C symbol from nm. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 -printf %s "checking command to parse $NM output from $compiler object... " >&6; } -if test ${lt_cv_sys_global_symbol_pipe+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +if ${lt_cv_sys_global_symbol_pipe+:} false; then : + $as_echo_n "(cached) " >&6 +else # These are sane defaults that work on at least a few old systems. # [They come from Ultrix. What could be older than Ultrix?!! ;)] @@ -5559,14 +4995,14 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -5623,7 +5059,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -5658,11 +5094,11 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -printf "%s\n" "failed" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +$as_echo "failed" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -printf "%s\n" "ok" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } fi @@ -5688,8 +5124,7 @@ fi # Check whether --enable-libtool-lock was given. -if test ${enable_libtool_lock+y} -then : +if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi @@ -5704,7 +5139,7 @@ ia64-*-hpux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) @@ -5719,11 +5154,11 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5722 "configure"' > conftest.$ac_ext + echo '#line 5157 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in @@ -5761,7 +5196,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *32-bit*) @@ -5811,12 +5246,11 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 -printf %s "checking whether the C compiler needs -belf... " >&6; } -if test ${lt_cv_cc_needs_belf+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } +if ${lt_cv_cc_needs_belf+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5827,20 +5261,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : lt_cv_cc_needs_belf=yes -else $as_nop +else lt_cv_cc_needs_belf=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -5849,8 +5282,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 -printf "%s\n" "$lt_cv_cc_needs_belf" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +$as_echo "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" @@ -5862,7 +5295,7 @@ sparc*-*solaris*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *64-bit*) @@ -5889,12 +5322,11 @@ need_locks="$enable_libtool_lock" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_DSYMUTIL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$DSYMUTIL"; then ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. else @@ -5902,15 +5334,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5921,11 +5349,11 @@ fi fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -printf "%s\n" "$DSYMUTIL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5934,12 +5362,11 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_DSYMUTIL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_DSYMUTIL"; then ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. else @@ -5947,15 +5374,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5966,11 +5389,11 @@ fi fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -printf "%s\n" "$ac_ct_DSYMUTIL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_DSYMUTIL" = x; then @@ -5978,8 +5401,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DSYMUTIL=$ac_ct_DSYMUTIL @@ -5991,12 +5414,11 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_NMEDIT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$NMEDIT"; then ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. else @@ -6004,15 +5426,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6023,11 +5441,11 @@ fi fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -printf "%s\n" "$NMEDIT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6036,12 +5454,11 @@ if test -z "$ac_cv_prog_NMEDIT"; then ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_NMEDIT+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_NMEDIT"; then ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. else @@ -6049,15 +5466,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6068,11 +5481,11 @@ fi fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 -printf "%s\n" "$ac_ct_NMEDIT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +$as_echo "$ac_ct_NMEDIT" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_NMEDIT" = x; then @@ -6080,8 +5493,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac NMEDIT=$ac_ct_NMEDIT @@ -6093,12 +5506,11 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_LIPO+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$LIPO"; then ac_cv_prog_LIPO="$LIPO" # Let the user override the test. else @@ -6106,15 +5518,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6125,11 +5533,11 @@ fi fi LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -printf "%s\n" "$LIPO" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +$as_echo "$LIPO" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6138,12 +5546,11 @@ if test -z "$ac_cv_prog_LIPO"; then ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_LIPO+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_LIPO"; then ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. else @@ -6151,15 +5558,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6170,11 +5573,11 @@ fi fi ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 -printf "%s\n" "$ac_ct_LIPO" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +$as_echo "$ac_ct_LIPO" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_LIPO" = x; then @@ -6182,8 +5585,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac LIPO=$ac_ct_LIPO @@ -6195,12 +5598,11 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_OTOOL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$OTOOL"; then ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. else @@ -6208,15 +5610,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6227,11 +5625,11 @@ fi fi OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -printf "%s\n" "$OTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +$as_echo "$OTOOL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6240,12 +5638,11 @@ if test -z "$ac_cv_prog_OTOOL"; then ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_OTOOL+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_OTOOL"; then ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. else @@ -6253,15 +5650,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6272,11 +5665,11 @@ fi fi ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 -printf "%s\n" "$ac_ct_OTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +$as_echo "$ac_ct_OTOOL" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_OTOOL" = x; then @@ -6284,8 +5677,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL=$ac_ct_OTOOL @@ -6297,12 +5690,11 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_OTOOL64+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$OTOOL64"; then ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. else @@ -6310,15 +5702,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6329,11 +5717,11 @@ fi fi OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 -printf "%s\n" "$OTOOL64" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +$as_echo "$OTOOL64" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6342,12 +5730,11 @@ if test -z "$ac_cv_prog_OTOOL64"; then ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_OTOOL64+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_OTOOL64"; then ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. else @@ -6355,15 +5742,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6374,11 +5757,11 @@ fi fi ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 -printf "%s\n" "$ac_ct_OTOOL64" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +$as_echo "$ac_ct_OTOOL64" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_OTOOL64" = x; then @@ -6386,8 +5769,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL64=$ac_ct_OTOOL64 @@ -6422,12 +5805,11 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 -printf %s "checking for -single_module linker flag... " >&6; } -if test ${lt_cv_apple_cc_single_mod+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +$as_echo_n "checking for -single_module linker flag... " >&6; } +if ${lt_cv_apple_cc_single_mod+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_apple_cc_single_mod=no if test -z "${LT_MULTI_MODULE}"; then # By default we will add the -single_module flag. You can override @@ -6450,14 +5832,13 @@ else $as_nop rm -f conftest.* fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 -printf %s "checking for -exported_symbols_list linker flag... " >&6; } -if test ${lt_cv_ld_exported_symbols_list+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +if ${lt_cv_ld_exported_symbols_list+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS echo "_main" > conftest.sym @@ -6466,26 +5847,25 @@ else $as_nop /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : lt_cv_ld_exported_symbols_list=yes -else $as_nop +else lt_cv_ld_exported_symbols_list=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -6521,43 +5901,286 @@ printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; } ;; esac -ac_header= ac_cache= -for ac_item in $ac_header_c_list +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + done - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " -if test "x$ac_cv_header_dlfcn_h" = xyes -then : - printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h +if test "x$ac_cv_header_dlfcn_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF fi +done + # Set options @@ -6571,8 +6194,7 @@ fi # Check whether --enable-shared was given. -if test ${enable_shared+y} -then : +if test "${enable_shared+set}" = set; then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -6590,7 +6212,7 @@ then : IFS="$lt_save_ifs" ;; esac -else $as_nop +else enable_shared=yes fi @@ -6603,8 +6225,7 @@ fi # Check whether --enable-static was given. -if test ${enable_static+y} -then : +if test "${enable_static+set}" = set; then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -6622,7 +6243,7 @@ then : IFS="$lt_save_ifs" ;; esac -else $as_nop +else enable_static=yes fi @@ -6636,10 +6257,9 @@ fi # Check whether --with-pic was given. -if test ${with_pic+y} -then : +if test "${with_pic+set}" = set; then : withval=$with_pic; pic_mode="$withval" -else $as_nop +else pic_mode=default fi @@ -6653,8 +6273,7 @@ test -z "$pic_mode" && pic_mode=default # Check whether --enable-fast-install was given. -if test ${enable_fast_install+y} -then : +if test "${enable_fast_install+set}" = set; then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -6672,7 +6291,7 @@ then : IFS="$lt_save_ifs" ;; esac -else $as_nop +else enable_fast_install=yes fi @@ -6735,12 +6354,11 @@ if test -n "${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 -printf %s "checking for objdir... " >&6; } -if test ${lt_cv_objdir+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +$as_echo_n "checking for objdir... " >&6; } +if ${lt_cv_objdir+:} false; then : + $as_echo_n "(cached) " >&6 +else rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null if test -d .libs; then @@ -6751,15 +6369,17 @@ else fi rmdir .libs 2>/dev/null fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -printf "%s\n" "$lt_cv_objdir" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +$as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir -printf "%s\n" "#define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define LT_OBJDIR "$lt_cv_objdir/" +_ACEOF @@ -6842,12 +6462,11 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 -printf %s "checking for ${ac_tool_prefix}file... " >&6; } -if test ${lt_cv_path_MAGIC_CMD+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. @@ -6896,11 +6515,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -printf "%s\n" "$MAGIC_CMD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6909,12 +6528,11 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5 -printf %s "checking for file... " >&6; } -if test ${lt_cv_path_MAGIC_CMD+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +$as_echo_n "checking for file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. @@ -6963,11 +6581,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -printf "%s\n" "$MAGIC_CMD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7043,12 +6661,11 @@ lt_prog_compiler_no_builtin_flag= if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if test ${lt_cv_prog_compiler_rtti_exceptions+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -7062,11 +6679,11 @@ else $as_nop -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7065: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6682: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7069: \$? = $ac_status" >&5 + echo "$as_me:6686: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7079,8 +6696,8 @@ else $as_nop $RM conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -7099,8 +6716,8 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -printf %s "checking for $compiler option to produce PIC... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -7371,8 +6988,8 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 -printf "%s\n" "$lt_prog_compiler_pic" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 +$as_echo "$lt_prog_compiler_pic" >&6; } @@ -7383,12 +7000,11 @@ printf "%s\n" "$lt_prog_compiler_pic" >&6; } # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if test ${lt_cv_prog_compiler_pic_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if ${lt_cv_prog_compiler_pic_works+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -7402,11 +7018,11 @@ else $as_nop -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7405: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7021: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7409: \$? = $ac_status" >&5 + echo "$as_me:7025: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7419,8 +7035,8 @@ else $as_nop $RM conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 -printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in @@ -7443,12 +7059,11 @@ fi # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test ${lt_cv_prog_compiler_static_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if ${lt_cv_prog_compiler_static_works+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" @@ -7472,8 +7087,8 @@ else $as_nop LDFLAGS="$save_LDFLAGS" fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 -printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then : @@ -7487,12 +7102,11 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test ${lt_cv_prog_compiler_c_o+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest @@ -7509,11 +7123,11 @@ else $as_nop -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7512: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7126: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7516: \$? = $ac_status" >&5 + echo "$as_me:7130: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7535,20 +7149,19 @@ else $as_nop $RM conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test ${lt_cv_prog_compiler_c_o+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest @@ -7565,11 +7178,11 @@ else $as_nop -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7568: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7181: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7572: \$? = $ac_status" >&5 + echo "$as_me:7185: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7591,8 +7204,8 @@ else $as_nop $RM conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } @@ -7600,19 +7213,19 @@ printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -printf %s "checking if we can lock with hard links... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -printf "%s\n" "$hard_links" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -printf "%s\n" "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -7624,8 +7237,8 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= allow_undefined_flag= @@ -8070,15 +7683,14 @@ _LT_EOF /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -8093,7 +7705,7 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -8111,15 +7723,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -8134,7 +7745,7 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -8351,12 +7962,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi /* end confdefs.h. */ int foo(void) {} _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" else @@ -8613,8 +8223,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 -printf "%s\n" "$ld_shlibs" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +$as_echo "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -8650,15 +8260,15 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -printf %s "checking whether -lc should be explicitly linked in... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } $RM conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest @@ -8676,7 +8286,7 @@ printf %s "checking whether -lc should be explicitly linked in... " >&6; } if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then archive_cmds_need_lc=no @@ -8688,8 +8298,8 @@ printf %s "checking whether -lc should be explicitly linked in... " >&6; } cat conftest.err 1>&5 fi $RM conftest* - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 -printf "%s\n" "$archive_cmds_need_lc" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 +$as_echo "$archive_cmds_need_lc" >&6; } ;; esac fi @@ -8852,8 +8462,8 @@ esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -printf %s "checking dynamic linker characteristics... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } if test "$GCC" = yes; then case $host_os in @@ -9291,21 +8901,19 @@ linux* | k*bsd*-gnu) /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null -then : +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : shlibpath_overrides_runpath=yes fi fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS libdir=$save_libdir @@ -9518,8 +9126,8 @@ uts4*) dynamic_linker=no ;; esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -printf "%s\n" "$dynamic_linker" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -9620,8 +9228,8 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -printf %s "checking how to hardcode library paths into programs... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || @@ -9645,8 +9253,8 @@ else # directories. hardcode_action=unsupported fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 -printf "%s\n" "$hardcode_action" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +$as_echo "$hardcode_action" >&6; } if test "$hardcode_action" = relink || test "$inherit_rpath" = yes; then @@ -9690,12 +9298,11 @@ else darwin*) # if libdl is installed we need to link against it - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -printf %s "checking for dlopen in -ldl... " >&6; } -if test ${ac_cv_lib_dl_dlopen+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9704,31 +9311,32 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char dlopen (); int -main (void) +main () { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes -else $as_nop +else ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else $as_nop +else lt_cv_dlopen="dyld" lt_cv_dlopen_libs= @@ -9740,16 +9348,14 @@ fi *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = xyes -then : +if test "x$ac_cv_func_shl_load" = xyes; then : lt_cv_dlopen="shl_load" -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 -printf %s "checking for shl_load in -ldld... " >&6; } -if test ${ac_cv_lib_dld_shl_load+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +$as_echo_n "checking for shl_load in -ldld... " >&6; } +if ${ac_cv_lib_dld_shl_load+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9758,42 +9364,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char shl_load (); int -main (void) +main () { return shl_load (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dld_shl_load=yes -else $as_nop +else ac_cv_lib_dld_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -else $as_nop +else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = xyes -then : +if test "x$ac_cv_func_dlopen" = xyes; then : lt_cv_dlopen="dlopen" -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -printf %s "checking for dlopen in -ldl... " >&6; } -if test ${ac_cv_lib_dl_dlopen+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9802,37 +9407,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char dlopen (); int -main (void) +main () { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes -else $as_nop +else ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 -printf %s "checking for dlopen in -lsvld... " >&6; } -if test ${ac_cv_lib_svld_dlopen+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +$as_echo_n "checking for dlopen in -lsvld... " >&6; } +if ${ac_cv_lib_svld_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9841,37 +9446,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char dlopen (); int -main (void) +main () { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_svld_dlopen=yes -else $as_nop +else ac_cv_lib_svld_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 -printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 -printf %s "checking for dld_link in -ldld... " >&6; } -if test ${ac_cv_lib_dld_dld_link+y} -then : - printf %s "(cached) " >&6 -else $as_nop +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +$as_echo_n "checking for dld_link in -ldld... " >&6; } +if ${ac_cv_lib_dld_dld_link+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9880,29 +9485,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char dld_link (); int -main (void) +main () { return dld_link (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dld_dld_link=yes -else $as_nop +else ac_cv_lib_dld_dld_link=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 -printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -9941,19 +9547,18 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 -printf %s "checking whether a program can dlopen itself... " >&6; } -if test ${lt_cv_dlopen_self+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +$as_echo_n "checking whether a program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self+:} false; then : + $as_echo_n "(cached) " >&6 +else if test "$cross_compiling" = yes; then : lt_cv_dlopen_self=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 9956 "configure" +#line 9561 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10015,7 +9620,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -10033,24 +9638,23 @@ rm -fr conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 -printf "%s\n" "$lt_cv_dlopen_self" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +$as_echo "$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 -printf %s "checking whether a statically linked program can dlopen itself... " >&6; } -if test ${lt_cv_dlopen_self_static+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self_static+:} false; then : + $as_echo_n "(cached) " >&6 +else if test "$cross_compiling" = yes; then : lt_cv_dlopen_self_static=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10053 "configure" +#line 9657 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10112,7 +9716,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -10130,8 +9734,8 @@ rm -fr conftest* fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 -printf "%s\n" "$lt_cv_dlopen_self_static" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS="$save_CPPFLAGS" @@ -10169,13 +9773,13 @@ fi striplib= old_striplib= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 -printf %s "checking whether stripping libraries is possible... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in @@ -10183,16 +9787,16 @@ else if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi ;; *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ;; esac fi @@ -10209,13 +9813,13 @@ fi # Report which library types will actually be built - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 -printf %s "checking if libtool supports shared libraries... " >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -printf "%s\n" "$can_build_shared" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 -printf %s "checking whether to build shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -10235,15 +9839,15 @@ printf %s "checking whether to build shared libraries... " >&6; } fi ;; esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -printf "%s\n" "$enable_shared" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 -printf %s "checking whether to build static libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -printf "%s\n" "$enable_static" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } @@ -10277,8 +9881,7 @@ CC="$lt_save_CC" # Only expand once: - - # Find a good install program. We prefer a C program (faster), +# Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: # SysV /etc/install, /usr/sbin/install @@ -10292,25 +9895,20 @@ CC="$lt_save_CC" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -printf %s "checking for a BSD-compatible install... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test ${ac_cv_path_install+y} -then : - printf %s "(cached) " >&6 -else $as_nop +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - # Account for fact that we put trailing slashes in our PATH walk. -case $as_dir in #(( - ./ | /[cC]/* | \ + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; @@ -10320,13 +9918,13 @@ case $as_dir in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && - grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : elif test $ac_prog = install && - grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # program-specific install script used by HP pwplus--don't use. : else @@ -10334,12 +9932,12 @@ case $as_dir in #(( echo one > conftest.one echo two > conftest.two mkdir conftest.dir - if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && test -s conftest.one && test -s conftest.two && test -s conftest.dir/conftest.one && test -s conftest.dir/conftest.two then - ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" break 3 fi fi @@ -10355,7 +9953,7 @@ IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir fi - if test ${ac_cv_path_install+y}; then + if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. Don't cache a @@ -10365,8 +9963,8 @@ fi INSTALL=$ac_install_sh fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -printf "%s\n" "$INSTALL" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -10381,19 +9979,17 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Enable large file support (if special flags are necessary) # # Check whether --enable-largefile was given. -if test ${enable_largefile+y} -then : +if test "${enable_largefile+set}" = set; then : enableval=$enable_largefile; fi if test "$enable_largefile" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 -printf %s "checking for special C compiler options needed for large files... " >&6; } -if test ${ac_cv_sys_largefile_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +$as_echo_n "checking for special C compiler options needed for large files... " >&6; } +if ${ac_cv_sys_largefile_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_cv_sys_largefile_CC=no if test "$GCC" != yes; then ac_save_CC=$CC @@ -10407,47 +10003,44 @@ else $as_nop We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main (void) +main () { ; return 0; } _ACEOF - if ac_fn_c_try_compile "$LINENO" -then : + if ac_fn_c_try_compile "$LINENO"; then : break fi -rm -f core conftest.err conftest.$ac_objext conftest.beam +rm -f core conftest.err conftest.$ac_objext CC="$CC -n32" - if ac_fn_c_try_compile "$LINENO" -then : + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_largefile_CC=' -n32'; break fi -rm -f core conftest.err conftest.$ac_objext conftest.beam +rm -f core conftest.err conftest.$ac_objext break done CC=$ac_save_CC rm -f conftest.$ac_ext fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 -printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +$as_echo "$ac_cv_sys_largefile_CC" >&6; } if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if test ${ac_cv_sys_file_offset_bits+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if ${ac_cv_sys_file_offset_bits+:} false; then : + $as_echo_n "(cached) " >&6 +else while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10456,23 +10049,22 @@ else $as_nop We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_file_offset_bits=no; break fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _FILE_OFFSET_BITS 64 @@ -10481,43 +10073,43 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_file_offset_bits=64; break fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_sys_file_offset_bits=unknown break done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +$as_echo "$ac_cv_sys_file_offset_bits" >&6; } case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; *) -printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits +_ACEOF ;; esac rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -printf %s "checking for _LARGE_FILES value needed for large files... " >&6; } -if test ${ac_cv_sys_large_files+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } +if ${ac_cv_sys_large_files+:} false; then : + $as_echo_n "(cached) " >&6 +else while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10526,23 +10118,22 @@ else $as_nop We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_large_files=no; break fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _LARGE_FILES 1 @@ -10551,119 +10142,132 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_sys_large_files=1; break fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_sys_large_files=unknown break done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -printf "%s\n" "$ac_cv_sys_large_files" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +$as_echo "$ac_cv_sys_large_files" >&6; } case $ac_cv_sys_large_files in #( no | unknown) ;; *) -printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define _LARGE_FILES $ac_cv_sys_large_files +_ACEOF ;; esac rm -rf conftest* fi + + fi ######### # Check for needed/wanted data types ac_fn_c_check_type "$LINENO" "int8_t" "ac_cv_type_int8_t" "$ac_includes_default" -if test "x$ac_cv_type_int8_t" = xyes -then : +if test "x$ac_cv_type_int8_t" = xyes; then : -printf "%s\n" "#define HAVE_INT8_T 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_INT8_T 1 +_ACEOF fi ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "$ac_includes_default" -if test "x$ac_cv_type_int16_t" = xyes -then : +if test "x$ac_cv_type_int16_t" = xyes; then : -printf "%s\n" "#define HAVE_INT16_T 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_INT16_T 1 +_ACEOF fi ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default" -if test "x$ac_cv_type_int32_t" = xyes -then : +if test "x$ac_cv_type_int32_t" = xyes; then : -printf "%s\n" "#define HAVE_INT32_T 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_INT32_T 1 +_ACEOF fi ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" "$ac_includes_default" -if test "x$ac_cv_type_int64_t" = xyes -then : +if test "x$ac_cv_type_int64_t" = xyes; then : -printf "%s\n" "#define HAVE_INT64_T 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_INT64_T 1 +_ACEOF fi ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default" -if test "x$ac_cv_type_intptr_t" = xyes -then : +if test "x$ac_cv_type_intptr_t" = xyes; then : -printf "%s\n" "#define HAVE_INTPTR_T 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_INTPTR_T 1 +_ACEOF fi ac_fn_c_check_type "$LINENO" "uint8_t" "ac_cv_type_uint8_t" "$ac_includes_default" -if test "x$ac_cv_type_uint8_t" = xyes -then : +if test "x$ac_cv_type_uint8_t" = xyes; then : -printf "%s\n" "#define HAVE_UINT8_T 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_UINT8_T 1 +_ACEOF fi ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" "$ac_includes_default" -if test "x$ac_cv_type_uint16_t" = xyes -then : +if test "x$ac_cv_type_uint16_t" = xyes; then : -printf "%s\n" "#define HAVE_UINT16_T 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_UINT16_T 1 +_ACEOF fi ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "$ac_includes_default" -if test "x$ac_cv_type_uint32_t" = xyes -then : +if test "x$ac_cv_type_uint32_t" = xyes; then : -printf "%s\n" "#define HAVE_UINT32_T 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_UINT32_T 1 +_ACEOF fi ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "$ac_includes_default" -if test "x$ac_cv_type_uint64_t" = xyes -then : +if test "x$ac_cv_type_uint64_t" = xyes; then : -printf "%s\n" "#define HAVE_UINT64_T 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_UINT64_T 1 +_ACEOF fi ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default" -if test "x$ac_cv_type_uintptr_t" = xyes -then : +if test "x$ac_cv_type_uintptr_t" = xyes; then : -printf "%s\n" "#define HAVE_UINTPTR_T 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_UINTPTR_T 1 +_ACEOF fi @@ -10671,119 +10275,34 @@ fi ######### # Check for needed/wanted headers -ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_types_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_TYPES_H 1" >>confdefs.h +for ac_header in sys/types.h stdlib.h stdint.h inttypes.h malloc.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi -ac_fn_c_check_header_compile "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -if test "x$ac_cv_header_stdlib_h" = xyes -then : - printf "%s\n" "#define HAVE_STDLIB_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" -if test "x$ac_cv_header_stdint_h" = xyes -then : - printf "%s\n" "#define HAVE_STDINT_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default" -if test "x$ac_cv_header_inttypes_h" = xyes -then : - printf "%s\n" "#define HAVE_INTTYPES_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default" -if test "x$ac_cv_header_malloc_h" = xyes -then : - printf "%s\n" "#define HAVE_MALLOC_H 1" >>confdefs.h - -fi +done ######### # Figure out whether or not we have these functions # -ac_fn_c_check_func "$LINENO" "fdatasync" "ac_cv_func_fdatasync" -if test "x$ac_cv_func_fdatasync" = xyes -then : - printf "%s\n" "#define HAVE_FDATASYNC 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "gmtime_r" "ac_cv_func_gmtime_r" -if test "x$ac_cv_func_gmtime_r" = xyes -then : - printf "%s\n" "#define HAVE_GMTIME_R 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "isnan" "ac_cv_func_isnan" -if test "x$ac_cv_func_isnan" = xyes -then : - printf "%s\n" "#define HAVE_ISNAN 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r" -if test "x$ac_cv_func_localtime_r" = xyes -then : - printf "%s\n" "#define HAVE_LOCALTIME_R 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "localtime_s" "ac_cv_func_localtime_s" -if test "x$ac_cv_func_localtime_s" = xyes -then : - printf "%s\n" "#define HAVE_LOCALTIME_S 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "malloc_usable_size" "ac_cv_func_malloc_usable_size" -if test "x$ac_cv_func_malloc_usable_size" = xyes -then : - printf "%s\n" "#define HAVE_MALLOC_USABLE_SIZE 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "strchrnul" "ac_cv_func_strchrnul" -if test "x$ac_cv_func_strchrnul" = xyes -then : - printf "%s\n" "#define HAVE_STRCHRNUL 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "usleep" "ac_cv_func_usleep" -if test "x$ac_cv_func_usleep" = xyes -then : - printf "%s\n" "#define HAVE_USLEEP 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "utime" "ac_cv_func_utime" -if test "x$ac_cv_func_utime" = xyes -then : - printf "%s\n" "#define HAVE_UTIME 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "pread" "ac_cv_func_pread" -if test "x$ac_cv_func_pread" = xyes -then : - printf "%s\n" "#define HAVE_PREAD 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "pread64" "ac_cv_func_pread64" -if test "x$ac_cv_func_pread64" = xyes -then : - printf "%s\n" "#define HAVE_PREAD64 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "pwrite" "ac_cv_func_pwrite" -if test "x$ac_cv_func_pwrite" = xyes -then : - printf "%s\n" "#define HAVE_PWRITE 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "pwrite64" "ac_cv_func_pwrite64" -if test "x$ac_cv_func_pwrite64" = xyes -then : - printf "%s\n" "#define HAVE_PWRITE64 1" >>confdefs.h +for ac_func in fdatasync gmtime_r isnan localtime_r localtime_s malloc_usable_size strchrnul usleep utime pread pread64 pwrite pwrite64 +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF fi +done ######### @@ -10800,12 +10319,11 @@ for ac_prog in tclsh8.7 tclsh8.6 tclsh8.5 tclsh do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_TCLSH_CMD+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_TCLSH_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$TCLSH_CMD"; then ac_cv_prog_TCLSH_CMD="$TCLSH_CMD" # Let the user override the test. else @@ -10813,15 +10331,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_TCLSH_CMD="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10832,11 +10346,11 @@ fi fi TCLSH_CMD=$ac_cv_prog_TCLSH_CMD if test -n "$TCLSH_CMD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TCLSH_CMD" >&5 -printf "%s\n" "$TCLSH_CMD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH_CMD" >&5 +$as_echo "$TCLSH_CMD" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -10875,12 +10389,12 @@ fi VERSION=`cat $srcdir/VERSION | sed 's/^\([0-9]*\.*[0-9]*\).*/\1/'` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Version set to $VERSION" >&5 -printf "%s\n" "$as_me: Version set to $VERSION" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Version set to $VERSION" >&5 +$as_echo "$as_me: Version set to $VERSION" >&6;} RELEASE=`cat $srcdir/VERSION` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Release set to $RELEASE" >&5 -printf "%s\n" "$as_me: Release set to $RELEASE" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Release set to $RELEASE" >&5 +$as_echo "$as_me: Release set to $RELEASE" >&6;} ########## @@ -10890,25 +10404,23 @@ printf "%s\n" "$as_me: Release set to $RELEASE" >&6;} # # Check whether --with-wasi-sdk was given. -if test ${with_wasi_sdk+y} -then : +if test "${with_wasi_sdk+set}" = set; then : withval=$with_wasi_sdk; with_wasisdk=${withval} fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for WASI SDK directory" >&5 -printf %s "checking for WASI SDK directory... " >&6; } -if test ${ac_cv_c_wasi_sdk+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${with_wasi_sdk}: using wasi-sdk clang, disabling: tcl, CLI shell, DLL" >&5 -printf "%s\n" "${with_wasi_sdk}: using wasi-sdk clang, disabling: tcl, CLI shell, DLL" >&6; } + { $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 @@ -10955,12 +10467,11 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_BUILD_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_BUILD_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$BUILD_CC"; then ac_cv_prog_BUILD_CC="$BUILD_CC" # Let the user override the test. else @@ -10968,15 +10479,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_BUILD_CC="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10987,11 +10494,11 @@ fi fi BUILD_CC=$ac_cv_prog_BUILD_CC if test -n "$BUILD_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5 -printf "%s\n" "$BUILD_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5 +$as_echo "$BUILD_CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -11009,31 +10516,29 @@ fi # Do we want to support multithreaded use of sqlite # # Check whether --enable-threadsafe was given. -if test ${enable_threadsafe+y} -then : +if test "${enable_threadsafe+set}" = set; then : enableval=$enable_threadsafe; fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support threadsafe operation" >&5 -printf %s "checking whether to support threadsafe operation... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support threadsafe operation" >&5 +$as_echo_n "checking whether to support threadsafe operation... " >&6; } if test "$enable_threadsafe" = "no"; then SQLITE_THREADSAFE=0 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else SQLITE_THREADSAFE=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi if test "$SQLITE_THREADSAFE" = "1"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5 -printf %s "checking for library containing pthread_create... " >&6; } -if test ${ac_cv_search_pthread_create+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5 +$as_echo_n "checking for library containing pthread_create... " >&6; } +if ${ac_cv_search_pthread_create+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11041,58 +10546,55 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char pthread_create (); int -main (void) +main () { return pthread_create (); ; return 0; } _ACEOF -for ac_lib in '' pthread -do +for ac_lib in '' pthread; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_pthread_create=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_pthread_create+y} -then : + if ${ac_cv_search_pthread_create+:} false; then : break fi done -if test ${ac_cv_search_pthread_create+y} -then : +if ${ac_cv_search_pthread_create+:} false; then : -else $as_nop +else ac_cv_search_pthread_create=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_create" >&5 -printf "%s\n" "$ac_cv_search_pthread_create" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_create" >&5 +$as_echo "$ac_cv_search_pthread_create" >&6; } ac_res=$ac_cv_search_pthread_create -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_mutexattr_init" >&5 -printf %s "checking for library containing pthread_mutexattr_init... " >&6; } -if test ${ac_cv_search_pthread_mutexattr_init+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_mutexattr_init" >&5 +$as_echo_n "checking for library containing pthread_mutexattr_init... " >&6; } +if ${ac_cv_search_pthread_mutexattr_init+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11100,48 +10602,46 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char pthread_mutexattr_init (); int -main (void) +main () { return pthread_mutexattr_init (); ; return 0; } _ACEOF -for ac_lib in '' pthread -do +for ac_lib in '' pthread; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_pthread_mutexattr_init=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_pthread_mutexattr_init+y} -then : + if ${ac_cv_search_pthread_mutexattr_init+:} false; then : break fi done -if test ${ac_cv_search_pthread_mutexattr_init+y} -then : +if ${ac_cv_search_pthread_mutexattr_init+:} false; then : -else $as_nop +else ac_cv_search_pthread_mutexattr_init=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_mutexattr_init" >&5 -printf "%s\n" "$ac_cv_search_pthread_mutexattr_init" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_mutexattr_init" >&5 +$as_echo "$ac_cv_search_pthread_mutexattr_init" >&6; } ac_res=$ac_cv_search_pthread_mutexattr_init -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -11152,23 +10652,22 @@ fi # Do we want to support release # # Check whether --enable-releasemode was given. -if test ${enable_releasemode+y} -then : +if test "${enable_releasemode+set}" = set; then : enableval=$enable_releasemode; -else $as_nop +else enable_releasemode=no fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support shared library linked as release mode or not" >&5 -printf %s "checking whether to support shared library linked as release mode or not... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support shared library linked as release mode or not" >&5 +$as_echo_n "checking whether to support shared library linked as release mode or not... " >&6; } if test "$enable_releasemode" = "no"; then ALLOWRELEASE="" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else ALLOWRELEASE="-release `cat $srcdir/VERSION`" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi @@ -11176,40 +10675,39 @@ fi # Do we want temporary databases in memory # # Check whether --enable-tempstore was given. -if test ${enable_tempstore+y} -then : +if test "${enable_tempstore+set}" = set; then : enableval=$enable_tempstore; -else $as_nop +else enable_tempstore=no fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use an in-ram database for temporary tables" >&5 -printf %s "checking whether to use an in-ram database for temporary tables... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use an in-ram database for temporary tables" >&5 +$as_echo_n "checking whether to use an in-ram database for temporary tables... " >&6; } case "$enable_tempstore" in never ) TEMP_STORE=0 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: never" >&5 -printf "%s\n" "never" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: never" >&5 +$as_echo "never" >&6; } ;; no ) TEMP_STORE=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ;; yes ) TEMP_STORE=2 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ;; always ) TEMP_STORE=3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: always" >&5 -printf "%s\n" "always" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: always" >&5 +$as_echo "always" >&6; } ;; * ) TEMP_STORE=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ;; esac @@ -11220,15 +10718,15 @@ esac # the CYGWIN environment. So check for that special case and handle # things accordingly. # -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if executables have the .exe suffix" >&5 -printf %s "checking if executables have the .exe suffix... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if executables have the .exe suffix" >&5 +$as_echo_n "checking if executables have the .exe suffix... " >&6; } if test "$config_BUILD_EXEEXT" = ".exe"; then CYGWIN=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unknown" >&5 -printf "%s\n" "unknown" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5 +$as_echo "unknown" >&6; } fi if test "$CYGWIN" != "yes"; then @@ -11272,27 +10770,24 @@ fi # minor changes to accomodate systems that do not have TCL installed. # # Check whether --enable-tcl was given. -if test ${enable_tcl+y} -then : +if test "${enable_tcl+set}" = set; then : enableval=$enable_tcl; use_tcl=$enableval -else $as_nop +else use_tcl=yes fi if test "${use_tcl}" = "yes" ; then # Check whether --with-tcl was given. -if test ${with_tcl+y} -then : +if test "${with_tcl+set}" = set; then : withval=$with_tcl; with_tclconfig=${withval} fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Tcl configuration" >&5 -printf %s "checking for Tcl configuration... " >&6; } - if test ${ac_cv_c_tclconfig+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl configuration" >&5 +$as_echo_n "checking for Tcl configuration... " >&6; } + if ${ac_cv_c_tclconfig+:} false; then : + $as_echo_n "(cached) " >&6 +else # First check to see if --with-tcl was specified. if test x"${with_tclconfig}" != x ; then @@ -11402,26 +10897,26 @@ fi if test x"${ac_cv_c_tclconfig}" = x ; then use_tcl=no - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Can't find Tcl configuration definitions" >&5 -printf "%s\n" "$as_me: WARNING: Can't find Tcl configuration definitions" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** Without Tcl the regression tests cannot be executed ***" >&5 -printf "%s\n" "$as_me: WARNING: *** Without Tcl the regression tests cannot be executed ***" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** Consider using --with-tcl=... to define location of Tcl ***" >&5 -printf "%s\n" "$as_me: WARNING: *** Consider using --with-tcl=... to define location of Tcl ***" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find Tcl configuration definitions" >&5 +$as_echo "$as_me: WARNING: Can't find Tcl configuration definitions" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Without Tcl the regression tests cannot be executed ***" >&5 +$as_echo "$as_me: WARNING: *** Without Tcl the regression tests cannot be executed ***" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Consider using --with-tcl=... to define location of Tcl ***" >&5 +$as_echo "$as_me: WARNING: *** Consider using --with-tcl=... to define location of Tcl ***" >&2;} else TCL_BIN_DIR=${ac_cv_c_tclconfig} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found $TCL_BIN_DIR/tclConfig.sh" >&5 -printf "%s\n" "found $TCL_BIN_DIR/tclConfig.sh" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $TCL_BIN_DIR/tclConfig.sh" >&5 +$as_echo "found $TCL_BIN_DIR/tclConfig.sh" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 -printf %s "checking for existence of $TCL_BIN_DIR/tclConfig.sh... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 +$as_echo_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh... " >&6; } if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: loading" >&5 -printf "%s\n" "loading" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 +$as_echo "loading" >&6; } . $TCL_BIN_DIR/tclConfig.sh else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 -printf "%s\n" "file not found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 +$as_echo "file not found" >&6; } fi # @@ -11482,18 +10977,16 @@ TARGET_READLINE_INC="" TARGET_HAVE_READLINE=0 TARGET_HAVE_EDITLINE=0 # Check whether --enable-editline was given. -if test ${enable_editline+y} -then : +if test "${enable_editline+set}" = set; then : enableval=$enable_editline; with_editline=$enableval -else $as_nop +else with_editline=auto fi # Check whether --enable-readline was given. -if test ${enable_readline+y} -then : +if test "${enable_readline+set}" = set; then : enableval=$enable_readline; with_readline=$enableval -else $as_nop +else with_readline=auto fi @@ -11502,12 +10995,11 @@ if test x"$with_editline" != xno; then sLIBS=$LIBS LIBS="" TARGET_HAVE_EDITLINE=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing readline" >&5 -printf %s "checking for library containing readline... " >&6; } -if test ${ac_cv_search_readline+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing readline" >&5 +$as_echo_n "checking for library containing readline... " >&6; } +if ${ac_cv_search_readline+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11515,51 +11007,49 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char readline (); int -main (void) +main () { return readline (); ; return 0; } _ACEOF -for ac_lib in '' edit -do +for ac_lib in '' edit; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_readline=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_readline+y} -then : + if ${ac_cv_search_readline+:} false; then : break fi done -if test ${ac_cv_search_readline+y} -then : +if ${ac_cv_search_readline+:} false; then : -else $as_nop +else ac_cv_search_readline=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_readline" >&5 -printf "%s\n" "$ac_cv_search_readline" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_readline" >&5 +$as_echo "$ac_cv_search_readline" >&6; } ac_res=$ac_cv_search_readline -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" with_readline=no -else $as_nop +else TARGET_HAVE_EDITLINE=0 fi @@ -11571,22 +11061,20 @@ if test x"$with_readline" != xno; then # Check whether --with-readline-lib was given. -if test ${with_readline_lib+y} -then : +if test "${with_readline_lib+set}" = set; then : withval=$with_readline_lib; with_readline_lib=$withval -else $as_nop +else with_readline_lib="auto" fi if test "x$with_readline_lib" = xauto; then save_LIBS="$LIBS" LIBS="" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5 -printf %s "checking for library containing tgetent... " >&6; } -if test ${ac_cv_search_tgetent+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5 +$as_echo_n "checking for library containing tgetent... " >&6; } +if ${ac_cv_search_tgetent+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11594,60 +11082,57 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char tgetent (); int -main (void) +main () { return tgetent (); ; return 0; } _ACEOF -for ac_lib in '' readline ncurses curses termcap -do +for ac_lib in '' readline ncurses curses termcap; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_tgetent=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_tgetent+y} -then : + if ${ac_cv_search_tgetent+:} false; then : break fi done -if test ${ac_cv_search_tgetent+y} -then : +if ${ac_cv_search_tgetent+:} false; then : -else $as_nop +else ac_cv_search_tgetent=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_tgetent" >&5 -printf "%s\n" "$ac_cv_search_tgetent" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_tgetent" >&5 +$as_echo "$ac_cv_search_tgetent" >&6; } ac_res=$ac_cv_search_tgetent -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" term_LIBS="$LIBS" -else $as_nop +else term_LIBS="" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 -printf %s "checking for readline in -lreadline... " >&6; } -if test ${ac_cv_lib_readline_readline+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 +$as_echo_n "checking for readline in -lreadline... " >&6; } +if ${ac_cv_lib_readline_readline+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_check_lib_save_LIBS=$LIBS LIBS="-lreadline $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11656,31 +11141,32 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char readline (); int -main (void) +main () { return readline (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_readline_readline=yes -else $as_nop +else ac_cv_lib_readline_readline=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5 -printf "%s\n" "$ac_cv_lib_readline_readline" >&6; } -if test "x$ac_cv_lib_readline_readline" = xyes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5 +$as_echo "$ac_cv_lib_readline_readline" >&6; } +if test "x$ac_cv_lib_readline_readline" = xyes; then : TARGET_READLINE_LIBS="-lreadline" -else $as_nop +else found="no" fi @@ -11692,31 +11178,28 @@ fi # Check whether --with-readline-inc was given. -if test ${with_readline_inc+y} -then : +if test "${with_readline_inc+set}" = set; then : withval=$with_readline_inc; with_readline_inc=$withval -else $as_nop +else with_readline_inc="auto" fi if test "x$with_readline_inc" = xauto; then - ac_fn_c_check_header_compile "$LINENO" "readline.h" "ac_cv_header_readline_h" "$ac_includes_default" -if test "x$ac_cv_header_readline_h" = xyes -then : + ac_fn_c_check_header_mongrel "$LINENO" "readline.h" "ac_cv_header_readline_h" "$ac_includes_default" +if test "x$ac_cv_header_readline_h" = xyes; then : found="yes" -else $as_nop +else found="no" if test "$cross_compiling" != yes; then for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do for subdir in include include/readline; do - as_ac_File=`printf "%s\n" "ac_cv_file_$dir/$subdir/readline.h" | $as_tr_sh` -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $dir/$subdir/readline.h" >&5 -printf %s "checking for $dir/$subdir/readline.h... " >&6; } -if eval test \${$as_ac_File+y} -then : - printf %s "(cached) " >&6 -else $as_nop + as_ac_File=`$as_echo "ac_cv_file_$dir/$subdir/readline.h" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dir/$subdir/readline.h" >&5 +$as_echo_n "checking for $dir/$subdir/readline.h... " >&6; } +if eval \${$as_ac_File+:} false; then : + $as_echo_n "(cached) " >&6 +else test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "$dir/$subdir/readline.h"; then @@ -11726,10 +11209,9 @@ else fi fi eval ac_res=\$$as_ac_File - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } -if eval test \"x\$"$as_ac_File"\" = x"yes" -then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_File"\" = x"yes"; then : found=yes fi @@ -11744,6 +11226,7 @@ fi fi + else TARGET_READLINE_INC="$with_readline_inc" fi @@ -11766,12 +11249,11 @@ fi # Figure out what C libraries are required to compile programs # that use "fdatasync()" function. # -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing fdatasync" >&5 -printf %s "checking for library containing fdatasync... " >&6; } -if test ${ac_cv_search_fdatasync+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fdatasync" >&5 +$as_echo_n "checking for library containing fdatasync... " >&6; } +if ${ac_cv_search_fdatasync+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11779,48 +11261,46 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char fdatasync (); int -main (void) +main () { return fdatasync (); ; return 0; } _ACEOF -for ac_lib in '' rt -do +for ac_lib in '' rt; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_fdatasync=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_fdatasync+y} -then : + if ${ac_cv_search_fdatasync+:} false; then : break fi done -if test ${ac_cv_search_fdatasync+y} -then : +if ${ac_cv_search_fdatasync+:} false; then : -else $as_nop +else ac_cv_search_fdatasync=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fdatasync" >&5 -printf "%s\n" "$ac_cv_search_fdatasync" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fdatasync" >&5 +$as_echo "$ac_cv_search_fdatasync" >&6; } ac_res=$ac_cv_search_fdatasync -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -11829,21 +11309,20 @@ fi ######### # check for debug enabled # Check whether --enable-debug was given. -if test ${enable_debug+y} -then : +if test "${enable_debug+set}" = set; then : enableval=$enable_debug; fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build type" >&5 -printf %s "checking build type... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build type" >&5 +$as_echo_n "checking build type... " >&6; } if test "${enable_debug}" = "yes" ; then TARGET_DEBUG="-DSQLITE_DEBUG=1 -DSQLITE_ENABLE_SELECTTRACE -DSQLITE_ENABLE_WHERETRACE -O0" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: debug" >&5 -printf "%s\n" "debug" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: debug" >&5 +$as_echo "debug" >&6; } else TARGET_DEBUG="-DNDEBUG" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: release" >&5 -printf "%s\n" "release" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: release" >&5 +$as_echo "release" >&6; } fi @@ -11851,8 +11330,7 @@ fi # See whether we should use the amalgamation to build # Check whether --enable-amalgamation was given. -if test ${enable_amalgamation+y} -then : +if test "${enable_amalgamation+set}" = set; then : enableval=$enable_amalgamation; fi @@ -11863,19 +11341,23 @@ fi ######### # Look for zlib. Only needed by extensions and by the sqlite3.exe shell -ac_fn_c_check_header_compile "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" -if test "x$ac_cv_header_zlib_h" = xyes -then : - printf "%s\n" "#define HAVE_ZLIB_H 1" >>confdefs.h +for ac_header in zlib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" +if test "x$ac_cv_header_zlib_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ZLIB_H 1 +_ACEOF fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing deflate" >&5 -printf %s "checking for library containing deflate... " >&6; } -if test ${ac_cv_search_deflate+y} -then : - printf %s "(cached) " >&6 -else $as_nop +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing deflate" >&5 +$as_echo_n "checking for library containing deflate... " >&6; } +if ${ac_cv_search_deflate+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11883,51 +11365,49 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char deflate (); int -main (void) +main () { return deflate (); ; return 0; } _ACEOF -for ac_lib in '' z -do +for ac_lib in '' z; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_deflate=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_deflate+y} -then : + if ${ac_cv_search_deflate+:} false; then : break fi done -if test ${ac_cv_search_deflate+y} -then : +if ${ac_cv_search_deflate+:} false; then : -else $as_nop +else ac_cv_search_deflate=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_deflate" >&5 -printf "%s\n" "$ac_cv_search_deflate" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_deflate" >&5 +$as_echo "$ac_cv_search_deflate" >&6; } ac_res=$ac_cv_search_deflate -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" HAVE_ZLIB="-DSQLITE_HAVE_ZLIB=1" -else $as_nop +else HAVE_ZLIB="" fi @@ -11936,21 +11416,19 @@ fi ######### # See whether we should allow loadable extensions # Check whether --enable-load-extension was given. -if test ${enable_load_extension+y} -then : +if test "${enable_load_extension+set}" = set; then : enableval=$enable_load_extension; -else $as_nop +else enable_load_extension=yes fi if test "${enable_load_extension}" = "yes" ; then OPT_FEATURE_FLAGS="" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 -printf %s "checking for library containing dlopen... " >&6; } -if test ${ac_cv_search_dlopen+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 +$as_echo_n "checking for library containing dlopen... " >&6; } +if ${ac_cv_search_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11958,48 +11436,46 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char dlopen (); int -main (void) +main () { return dlopen (); ; return 0; } _ACEOF -for ac_lib in '' dl -do +for ac_lib in '' dl; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_dlopen=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_dlopen+y} -then : + if ${ac_cv_search_dlopen+:} false; then : break fi done -if test ${ac_cv_search_dlopen+y} -then : +if ${ac_cv_search_dlopen+:} false; then : -else $as_nop +else ac_cv_search_dlopen=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5 -printf "%s\n" "$ac_cv_search_dlopen" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5 +$as_echo "$ac_cv_search_dlopen" >&6; } ac_res=$ac_cv_search_dlopen -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -12012,26 +11488,24 @@ fi # Do we want to support math functions # # Check whether --enable-math was given. -if test ${enable_math+y} -then : +if test "${enable_math+set}" = set; then : enableval=$enable_math; fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support math functions" >&5 -printf %s "checking whether to support math functions... " >&6; } +{ $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_math" = "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MATH_FUNCTIONS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing ceil" >&5 -printf %s "checking for library containing ceil... " >&6; } -if test ${ac_cv_search_ceil+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ceil" >&5 +$as_echo_n "checking for library containing ceil... " >&6; } +if ${ac_cv_search_ceil+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12039,48 +11513,46 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char ceil (); int -main (void) +main () { return ceil (); ; return 0; } _ACEOF -for ac_lib in '' m -do +for ac_lib in '' m; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_ceil=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_ceil+y} -then : + if ${ac_cv_search_ceil+:} false; then : break fi done -if test ${ac_cv_search_ceil+y} -then : +if ${ac_cv_search_ceil+:} false; then : -else $as_nop +else ac_cv_search_ceil=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ceil" >&5 -printf "%s\n" "$ac_cv_search_ceil" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ceil" >&5 +$as_echo "$ac_cv_search_ceil" >&6; } ac_res=$ac_cv_search_ceil -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -12091,28 +11563,26 @@ fi # Do we want to support JSON functions # # Check whether --enable-json was given. -if test ${enable_json+y} -then : +if test "${enable_json+set}" = set; then : enableval=$enable_json; fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support JSON functions" >&5 -printf %s "checking whether to support JSON functions... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support JSON functions" >&5 +$as_echo_n "checking whether to support JSON functions... " >&6; } if test "$enable_json" = "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_OMIT_JSON" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi ######## # The --enable-all argument is short-hand to enable # multiple extensions. # Check whether --enable-all was given. -if test ${enable_all+y} -then : +if test "${enable_all+set}" = set; then : enableval=$enable_all; fi @@ -12121,74 +11591,69 @@ fi # Do we want to support memsys3 and/or memsys5 # # Check whether --enable-memsys5 was given. -if test ${enable_memsys5+y} -then : +if test "${enable_memsys5+set}" = set; then : enableval=$enable_memsys5; fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS5" >&5 -printf %s "checking whether to support MEMSYS5... " >&6; } +{ $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 OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MEMSYS5" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Check whether --enable-memsys3 was given. -if test ${enable_memsys3+y} -then : +if test "${enable_memsys3+set}" = set; then : enableval=$enable_memsys3; fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS3" >&5 -printf %s "checking whether to support MEMSYS3... " >&6; } +{ $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" -a "${enable_memsys5}" = "no"; then OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MEMSYS3" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi ######### # See whether we should enable Full Text Search extensions # Check whether --enable-fts3 was given. -if test ${enable_fts3+y} -then : +if test "${enable_fts3+set}" = set; then : enableval=$enable_fts3; fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support FTS3" >&5 -printf %s "checking whether to support FTS3... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support FTS3" >&5 +$as_echo_n "checking whether to support FTS3... " >&6; } if test "${enable_fts3}" = "yes" ; then OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS3" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Check whether --enable-fts4 was given. -if test ${enable_fts4+y} -then : +if test "${enable_fts4+set}" = set; then : enableval=$enable_fts4; fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support FTS4" >&5 -printf %s "checking whether to support FTS4... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support FTS4" >&5 +$as_echo_n "checking whether to support FTS4... " >&6; } if test "${enable_fts4}" = "yes" -o "${enable_all}" = "yes" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS4" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing log" >&5 -printf %s "checking for library containing log... " >&6; } -if test ${ac_cv_search_log+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing log" >&5 +$as_echo_n "checking for library containing log... " >&6; } +if ${ac_cv_search_log+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12196,74 +11661,70 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char log (); int -main (void) +main () { return log (); ; return 0; } _ACEOF -for ac_lib in '' m -do +for ac_lib in '' m; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_log=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_log+y} -then : + if ${ac_cv_search_log+:} false; then : break fi done -if test ${ac_cv_search_log+y} -then : +if ${ac_cv_search_log+:} false; then : -else $as_nop +else ac_cv_search_log=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_log" >&5 -printf "%s\n" "$ac_cv_search_log" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_log" >&5 +$as_echo "$ac_cv_search_log" >&6; } ac_res=$ac_cv_search_log -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Check whether --enable-fts5 was given. -if test ${enable_fts5+y} -then : +if test "${enable_fts5+set}" = set; then : enableval=$enable_fts5; fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support FTS5" >&5 -printf %s "checking whether to support FTS5... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support FTS5" >&5 +$as_echo_n "checking whether to support FTS5... " >&6; } if test "${enable_fts5}" = "yes" -o "${enable_all}" = "yes" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS5" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing log" >&5 -printf %s "checking for library containing log... " >&6; } -if test ${ac_cv_search_log+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing log" >&5 +$as_echo_n "checking for library containing log... " >&6; } +if ${ac_cv_search_log+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12271,136 +11732,130 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif char log (); int -main (void) +main () { return log (); ; return 0; } _ACEOF -for ac_lib in '' m -do +for ac_lib in '' m; do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO" -then : + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_log=$ac_res fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test ${ac_cv_search_log+y} -then : + if ${ac_cv_search_log+:} false; then : break fi done -if test ${ac_cv_search_log+y} -then : +if ${ac_cv_search_log+:} false; then : -else $as_nop +else ac_cv_search_log=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_log" >&5 -printf "%s\n" "$ac_cv_search_log" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_log" >&5 +$as_echo "$ac_cv_search_log" >&6; } ac_res=$ac_cv_search_log -if test "$ac_res" != no -then : +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi ######### # See whether we should enable the LIMIT clause on UPDATE and DELETE # statements. # Check whether --enable-update-limit was given. -if test ${enable_update_limit+y} -then : +if test "${enable_update_limit+set}" = set; then : enableval=$enable_update_limit; fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support LIMIT on UPDATE and DELETE statements" >&5 -printf %s "checking whether to support LIMIT on UPDATE and DELETE statements... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support LIMIT on UPDATE and DELETE statements" >&5 +$as_echo_n "checking whether to support LIMIT on UPDATE and DELETE statements... " >&6; } if test "${enable_update_limit}" = "yes" ; then OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi ######### # See whether we should enable GEOPOLY # Check whether --enable-geopoly was given. -if test ${enable_geopoly+y} -then : +if test "${enable_geopoly+set}" = set; then : enableval=$enable_geopoly; enable_geopoly=yes -else $as_nop +else enable_geopoly=no fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support GEOPOLY" >&5 -printf %s "checking whether to support GEOPOLY... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support GEOPOLY" >&5 +$as_echo_n "checking whether to support GEOPOLY... " >&6; } if test "${enable_geopoly}" = "yes" -o "${enable_all}" = "yes" ; then OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_GEOPOLY" enable_rtree=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi ######### # See whether we should enable RTREE # Check whether --enable-rtree was given. -if test ${enable_rtree+y} -then : +if test "${enable_rtree+set}" = set; then : enableval=$enable_rtree; fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support RTREE" >&5 -printf %s "checking whether to support RTREE... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support RTREE" >&5 +$as_echo_n "checking whether to support RTREE... " >&6; } if test "${enable_rtree}" = "yes" ; then OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_RTREE" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi ######### # See whether we should enable the SESSION extension # Check whether --enable-session was given. -if test ${enable_session+y} -then : +if test "${enable_session+set}" = set; then : enableval=$enable_session; fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support SESSION" >&5 -printf %s "checking whether to support SESSION... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support SESSION" >&5 +$as_echo_n "checking whether to support SESSION... " >&6; } if test "${enable_session}" = "yes" -o "${enable_all}" = "yes" ; then OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_SESSION" OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_PREUPDATE_HOOK" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi ######### @@ -12457,8 +11912,7 @@ BUILD_CFLAGS=$ac_temp_BUILD_CFLAGS ######### # See whether we should use GCOV # Check whether --enable-gcov was given. -if test ${enable_gcov+y} -then : +if test "${enable_gcov+set}" = set; then : enableval=$enable_gcov; fi @@ -12519,8 +11973,8 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -12550,15 +12004,15 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -printf "%s\n" "$as_me: updating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -12572,8 +12026,8 @@ printf "%s\n" "$as_me: updating cache $cache_file" >&6;} fi fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -12590,7 +12044,7 @@ U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -12606,8 +12060,8 @@ LTLIBOBJS=$ac_ltlibobjs ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -12630,16 +12084,14 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: -if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop +else case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -12649,46 +12101,46 @@ esac fi - -# Reset variables that may have inherited troublesome values from -# the environment. - -# IFS needs to be set, to space, tab, and newline, in precisely that order. -# (If _AS_PATH_WALK were called with IFS unset, it would have the -# side effect of setting IFS to empty, thus disabling word splitting.) -# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -IFS=" "" $as_nl" - -PS1='$ ' -PS2='> ' -PS4='+ ' - -# Ensure predictable behavior from utilities with locale-dependent output. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# We cannot yet rely on "unset" to work, but we need these variables -# to be unset--not just set to an empty or harmless value--now, to -# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct -# also avoids known problems related to "unset" and subshell syntax -# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). -for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH -do eval test \${$as_var+y} \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done - -# Ensure that fds 0, 1, and 2 are open. -if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi -if (exec 3>&2) ; then :; else exec 2>/dev/null; fi +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi # The user is always right. -if ${PATH_SEPARATOR+false} :; then +if test "${PATH_SEPARATOR+set}" != set; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -12697,6 +12149,13 @@ if ${PATH_SEPARATOR+false} :; then fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -12705,12 +12164,8 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - test -r "$as_dir$0" && as_myself=$as_dir$0 && break + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break done IFS=$as_save_IFS @@ -12722,10 +12177,30 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -12738,14 +12213,13 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - printf "%s\n" "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -12772,20 +12246,18 @@ as_fn_unset () { eval $1=; unset $1;} } as_unset=as_fn_unset - # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null -then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : eval 'as_fn_append () { eval $1+=\$2 }' -else $as_nop +else as_fn_append () { eval $1=\$$1\$2 @@ -12797,13 +12269,12 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null -then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else $as_nop +else as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` @@ -12834,7 +12305,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -12856,10 +12327,6 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits - -# Determine whether it's possible to make 'echo' print without a newline. -# These variables are no longer used directly by Autoconf, but are AC_SUBSTed -# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -12873,12 +12340,6 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac -# For backward compatibility with old third-party macros, we provide -# the shell variables $as_echo and $as_echo_n. New code should use -# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. -as_echo='printf %s\n' -as_echo_n='printf %s' - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -12920,7 +12381,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -12929,7 +12390,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -12992,7 +12453,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by sqlite $as_me 3.41.0, which was -generated by GNU Autoconf 2.71. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -13054,16 +12515,14 @@ $config_commands Report bugs to the package provider." _ACEOF -ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` -ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config='$ac_cs_config_escaped' +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ sqlite config.status 3.41.0 -configured by $0, generated by GNU Autoconf 2.71, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -13101,15 +12560,15 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - printf "%s\n" "$ac_cs_version"; exit ;; + $as_echo "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - printf "%s\n" "$ac_cs_config"; exit ;; + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -13117,7 +12576,7 @@ do --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; @@ -13126,7 +12585,7 @@ do as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) - printf "%s\n" "$ac_cs_usage"; exit ;; + $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -13154,7 +12613,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -13168,7 +12627,7 @@ exec 5>>config.log sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - printf "%s\n" "$ac_log" + $as_echo "$ac_log" } >&5 _ACEOF @@ -13455,9 +12914,9 @@ done # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files - test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers - test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi # Have a temporary directory for convenience. Make it in the build tree @@ -13793,7 +13252,7 @@ do esac || as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -13801,17 +13260,17 @@ do # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -printf "%s\n" "$as_me: creating $ac_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`printf "%s\n" "$configure_input" | + ac_sed_conf_input=`$as_echo "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -13828,7 +13287,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$ac_file" | +$as_echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -13852,9 +13311,9 @@ printf "%s\n" X"$ac_file" | case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -13911,8 +13370,8 @@ ac_sed_dataroot=' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -13955,9 +13414,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -13973,27 +13432,27 @@ which seems to be undefined. Please make sure it is defined" >&2;} # if test x"$ac_file" != x-; then { - printf "%s\n" "/* $configure_input */" >&1 \ + $as_echo "/* $configure_input */" \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - printf "%s\n" "/* $configure_input */" >&1 \ + $as_echo "/* $configure_input */" \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi ;; - :C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -printf "%s\n" "$as_me: executing $ac_file commands" >&6;} + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -14417,7 +13876,6 @@ _LT_EOF esac - ltmain="$ac_aux_dir/ltmain.sh" @@ -14669,8 +14127,7 @@ if test "$no_create" != yes; then $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi - diff --git a/manifest b/manifest index 166680d89f..f05e46897f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Imply\sconfigure\sflag\s--disable-shared\swhen\s--with-wasi-sdk\sis\sactive\sbecause\slibtool\sis\srunning\sgcc\sfor\slinking\sthe\sshared\slib,\swhich\scannot\swork\sin\sa\swasi\sbuild. -D 2022-12-10T07:02:46.438 +C Rerun\sautoconf\susing\sversion\s2.69\sto\sminimize\sconfigure\sscript\sdifferences\nwith\strunk. +D 2022-12-10T12:06:31.110 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -33,7 +33,7 @@ F autoconf/tea/win/nmakehlp.c b01f822eabbe1ed2b64e70882d97d48402b42d2689a1ea0034 F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63 F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6 F config.sub c2d0260f17f3e4bc0b6808fccf1b291cb5e9126c14fc5890efc77b9fd0175559 -F configure bf4eb4211407d4583eec9d66c44712b781838fe64dc44ce361680522bf08555c x +F configure 8a95051058f6b314fe3becdd8a3735cba2e0b5ebd0b8ab1a7c2be741cdd1589d x F configure.ac e184f2215aa933c691a41140d286baf28f0c9be24e1d53a97a40851ca26724b2 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd @@ -2067,8 +2067,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 39c9f441519d3b3c365c52293a73cdf4af86de639e0009170c27725aad6653f6 -R 8e096ab9ce7a7de4c50eadef054f9ac5 -U stephan -Z c27f23eb0fdf959a8de40976e5f5fb98 +P 9253ba43c0c7657ecf4c3d32df4084577e7188e6151b883a5fa92a43aa4c3e30 +R 58a80b6621eaa4dac8225acd0777cb7b +U drh +Z 8ff784f967134425b21915359f92c074 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 081767ab2e..cf18170d61 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9253ba43c0c7657ecf4c3d32df4084577e7188e6151b883a5fa92a43aa4c3e30 \ No newline at end of file +b63342839427917ae48e13b959457baa5c2e0e1be8a444b0e1a4e0446ace9178 \ No newline at end of file From 60a1a0f7df99e03bba7abc45f526e372c20d2fdc Mon Sep 17 00:00:00 2001 From: stephan Date: Sat, 24 Dec 2022 15:34:16 +0000 Subject: [PATCH 10/45] Incorporate wasi-sdk RANLIB configure script patch from the VMware OCTO team. FossilOrigin-Name: 478fe96ee7f3ffd5732231b75e6f04e898a59368b3c91f79e6af9496dfcef6d3 --- configure | 1 + configure.ac | 1 + manifest | 14 +++++++------- manifest.uuid | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 31c0fa919a..7b1a6d4d6b 100755 --- a/configure +++ b/configure @@ -10443,6 +10443,7 @@ else # 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 diff --git a/configure.ac b/configure.ac index 5b4e573f28..5391f08020 100644 --- a/configure.ac +++ b/configure.ac @@ -194,6 +194,7 @@ else # 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 diff --git a/manifest b/manifest index 954a87e320..7c99ab4883 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Merge\strunk\sinto\swasi-patches\sbranch. -D 2022-12-24T15:31:56.293 +C Incorporate\swasi-sdk\sRANLIB\sconfigure\sscript\spatch\sfrom\sthe\sVMware\sOCTO\steam. +D 2022-12-24T15:34:16.082 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -33,8 +33,8 @@ F autoconf/tea/win/nmakehlp.c b01f822eabbe1ed2b64e70882d97d48402b42d2689a1ea0034 F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63 F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6 F config.sub c2d0260f17f3e4bc0b6808fccf1b291cb5e9126c14fc5890efc77b9fd0175559 -F configure 8a95051058f6b314fe3becdd8a3735cba2e0b5ebd0b8ab1a7c2be741cdd1589d x -F configure.ac e184f2215aa933c691a41140d286baf28f0c9be24e1d53a97a40851ca26724b2 +F configure 7932e767cf730e8161b65bca56dee4d3bba56acd90808ac262e8c6345d1ca006 x +F configure.ac b5f9355c46b73222ea1a9a16be868e016adda9b9b6349bfc3f72ae267f38331c F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f @@ -2067,8 +2067,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P b63342839427917ae48e13b959457baa5c2e0e1be8a444b0e1a4e0446ace9178 ffe2999a91a7dec129a38afb675fe9e539d7c347886bfea85cba55f6367d54d1 -R c1c0aec63849e1bcd3645431f9857a14 +P 52f40ab12e437c59af2b91c7ac105ab7784db57fc8d9ab7a1356f17092681f43 +R 93cdd50555e4edfd8abc358599b58d5a U stephan -Z 62054beb051c57456f6977543b0cb0d2 +Z 748c24f9d507d828fe21c349ea9e2c67 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 945dd77bb1..433404363d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -52f40ab12e437c59af2b91c7ac105ab7784db57fc8d9ab7a1356f17092681f43 \ No newline at end of file +478fe96ee7f3ffd5732231b75e6f04e898a59368b3c91f79e6af9496dfcef6d3 \ No newline at end of file From 8057fe9baa02bb44f0e8623e7e4c1d9a42c64a3b Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 6 Feb 2023 19:00:54 +0000 Subject: [PATCH 11/45] Fix RBU test scripts to avoid attempting to copy or delete a locked file. FossilOrigin-Name: f25eb898fce44120136f8ee5557305f43541e8a75323cfc3becf103f3fa795aa --- ext/rbu/rbufault4.test | 3 +++ ext/rbu/rburesume.test | 6 +++--- manifest | 17 ++++++++--------- manifest.uuid | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/ext/rbu/rbufault4.test b/ext/rbu/rbufault4.test index d8a884101d..b95612449f 100644 --- a/ext/rbu/rbufault4.test +++ b/ext/rbu/rbufault4.test @@ -24,6 +24,7 @@ for {set tn 1} {1} {incr tn} { INSERT INTO t1 VALUES(1, 2, 3); INSERT INTO t1 VALUES(4, 5, 6); } + db close forcedelete test.db2 sqlite3rbu_vacuum rbu test.db test.db2 @@ -53,8 +54,10 @@ for {set tn 1} {1} {incr tn} { set trc [rbu close] if {$trc!="SQLITE_DONE"} { error "Got $trc instead of SQLITE_DONE!" } + sqlite3 db test.db set rc [db one {PRAGMA integrity_check}] if {$rc!="ok"} { error "Got $rc instead of ok!" } + db close } } diff --git a/ext/rbu/rburesume.test b/ext/rbu/rburesume.test index a9c7ee866a..cdd8908435 100644 --- a/ext/rbu/rburesume.test +++ b/ext/rbu/rburesume.test @@ -100,7 +100,7 @@ for {set n 1} {$n < 5000} {incr n} { break } - foreach f {test.db test.db-oal test.db-wal test.db-shm test.db-vacuum} { + foreach f {test.db test.db-oal test.db-wal test.db-vacuum} { set f2 [string map [list test.db test.db2] $f] if {[file exists $f]} { forcecopy $f $f2 @@ -159,7 +159,7 @@ for {set n 1} {$n < 5000} {incr n} { break } - foreach f {test.db test.db-oal test.db-wal test.db-shm test.db-vacuum} { + foreach f {test.db test.db-oal test.db-wal test.db-vacuum} { set f2 [string map [list test.db test.db2] $f] if {[file exists $f]} { forcecopy $f $f2 @@ -226,7 +226,7 @@ for {set n 1} {$n < 5000} {incr n} { break } - foreach f {test.db test.db-oal test.db-wal test.db-shm test.db-vacuum} { + foreach f {test.db test.db-oal test.db-wal test.db-vacuum} { set f2 [string map [list test.db test.db2] $f] if {[file exists $f]} { forcecopy $f $f2 diff --git a/manifest b/manifest index a219c6f158..01139f0fbc 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Omit\sthe\sobsolete\sclient/server\stest\scases. -D 2023-02-06T16:23:52.256 +C Fix\sRBU\stest\sscripts\sto\savoid\sattempting\sto\scopy\sor\sdelete\sa\slocked\sfile. +D 2023-02-06T19:00:54.237 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -346,7 +346,7 @@ F ext/rbu/rbuexpr.test 2c91617509c88b6e9030f7bf6ff720df26032fcd801adc25533feae72 F ext/rbu/rbufault.test c51de14067cfe867849530d3d1718ffeb28522f28d52937f95dd7bc2116eb42e F ext/rbu/rbufault2.test 8cc8f6298d2d7d20080b2c77e65b607af8b89839f9d87c0972b27e6442edc258 F ext/rbu/rbufault3.test d14ff46e050816ce43c4ed320a0927712636ac11bf48bfc5f74601f183af5445 -F ext/rbu/rbufault4.test fa2f9d10b213eaa3cfbf0711ba9255761febe372c9546fa22ef4006f53ed8acc +F ext/rbu/rbufault4.test 39fbf093b7e16aae85dc309262ec570d217a1578538c1c74dd621e5451c083d6 F ext/rbu/rbufts.test df754d2f96c22d1da8b5d685b4a4a49863971920856d17620cef724e3a9b6edd F ext/rbu/rbumisc.test 6641749e42c83062824c86b3d03a47f8ec35760f341bc023f53e612655b0a8af F ext/rbu/rbumulti.test 6f6cdd9b3775108aada5216762cbbd7b5d5caa7cb620b3e6e1b8ace81286a2e0 @@ -354,7 +354,7 @@ F ext/rbu/rbupartial.test 4ed7789f47128c8aa7ff58445face8a070cef852993afe03c86391 F ext/rbu/rbupass.test 2ee86581a441f3b4b449b99a2dc203d5d6a08750dd2ee9ab6a02743e238d3c8a F ext/rbu/rbuprogress.test db8bb26a8123d35f52acfc3984b56caa31c8fcd1fa3589991b9c8e8a68e64b59 F ext/rbu/rburename.test 8d8a6a6ba896338d0610658e1f60e8055a181d5913e1e21c41b866a8f15bb7cd -F ext/rbu/rburesume.test ed122426a0411fb16efca49f19a5f2ba18956a765d5d9031b9d01931cbe7f282 +F ext/rbu/rburesume.test 1403752d152b55efb7fc25749c0fccc790061371ec9ffe428cc04f8a69bb834c F ext/rbu/rbusave.test 588b618dad9d65c4b13d03a79931de82213503fedc26bdf5789c996ecf427fba F ext/rbu/rbusplit.test a6dedd23cf37bcf2e8646d9d7139846e96d60d92f9bc6d6ba6ca8c24c0bd1f72 F ext/rbu/rbutemplimit.test 4980df2d4b74f4dd982add8f78809106154ef5a3c4bdce747422ab0b0481e029 @@ -2045,9 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P e761d4b9c8dcacccc927d23f20fdf779a0ae5304281b5bd6aa998bade56f0a37 aea3b6f6515bc3b7e7205b7d17d99cb1fc68030eb929d8adbe25f065668c9c95 -R caa6ecd94fb7ea02fd878b743e510f50 -T +closed aea3b6f6515bc3b7e7205b7d17d99cb1fc68030eb929d8adbe25f065668c9c95 -U drh -Z 1340b10b2dc7f9a742e2f9cc54c452b7 +P 5dde07a91dcf99b9c9a418b4e2178f66eef4cffd4799538a419674314a7530f9 +R 249137c726d5884204a2faf3e938a076 +U dan +Z fb37ea41986419483c8b019665bddd2c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 1b25b3ce71..804cc3ebc4 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5dde07a91dcf99b9c9a418b4e2178f66eef4cffd4799538a419674314a7530f9 \ No newline at end of file +f25eb898fce44120136f8ee5557305f43541e8a75323cfc3becf103f3fa795aa \ No newline at end of file From 9f29998d2a8890d58b52d13605324193703525c3 Mon Sep 17 00:00:00 2001 From: stephan Date: Mon, 6 Feb 2023 21:20:59 +0000 Subject: [PATCH 12/45] Roll back part of [c54f29d8] which attempted to use symbols which that worker does not have access to. FossilOrigin-Name: 90b12211376eb445df7221b3d3593394ff651ef93f4218492c6208bc74b8fc63 --- ext/wasm/api/sqlite3-opfs-async-proxy.js | 12 ++++++------ manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ext/wasm/api/sqlite3-opfs-async-proxy.js b/ext/wasm/api/sqlite3-opfs-async-proxy.js index b1ad9152e7..1456ae08d2 100644 --- a/ext/wasm/api/sqlite3-opfs-async-proxy.js +++ b/ext/wasm/api/sqlite3-opfs-async-proxy.js @@ -74,9 +74,9 @@ const installAsyncProxy = function(self){ state.verbose = 1; const loggers = { - 0:sqlite3.config.error.bind(console), - 1:sqlite3.config.warn.bind(console), - 2:sqlite3.config.log.bind(console) + 0:console.error.bind(console), + 1:console.warn.bind(console), + 2:console.log.bind(console) }; const logImpl = (level,...args)=>{ if(state.verbose>level) loggers[level]("OPFS asyncer:",...args); @@ -106,12 +106,12 @@ const installAsyncProxy = function(self){ w += m.wait; m.avgTime = (m.count && m.time) ? (m.time / m.count) : 0; } - sqlite3.config.log(self.location.href, + console.log(self.location.href, "metrics for",self.location.href,":\n", metrics, "\nTotal of",n,"op(s) for",t,"ms", "approx",w,"ms spent waiting on OPFS APIs."); - sqlite3.config.log("Serialization metrics:",metrics.s11n); + console.log("Serialization metrics:",metrics.s11n); }; /** @@ -272,7 +272,7 @@ const installAsyncProxy = function(self){ || (e.cause.name==='DOMException' && 0===e.cause.message.indexOf('Access Handles cannot'))) ) ? ( - /*sqlite3.config.warn("SQLITE_BUSY",e),*/ + /*console.warn("SQLITE_BUSY",e),*/ state.sq3Codes.SQLITE_BUSY ) : rc; }else{ diff --git a/manifest b/manifest index 01139f0fbc..eb2ec3c06e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sRBU\stest\sscripts\sto\savoid\sattempting\sto\scopy\sor\sdelete\sa\slocked\sfile. -D 2023-02-06T19:00:54.237 +C Roll\sback\spart\sof\s[c54f29d8]\swhich\sattempted\sto\suse\ssymbols\swhich\sthat\sworker\sdoes\snot\shave\saccess\sto. +D 2023-02-06T21:20:59.248 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -484,7 +484,7 @@ F ext/wasm/api/sqlite3-api-oo1.js 9b50c188513c70438a497914089cfeac79b6ac2d735017 F ext/wasm/api/sqlite3-api-prologue.js 5cc817b67a774bfa3c47d4c2fa484b10b24b5529a66094b35546f3ebba1ef646 F ext/wasm/api/sqlite3-api-worker1.js 9551f04cdfcde354e5a6ccb48951e007d618abb4e95758297b7fd44ccffdf89f F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3 -F ext/wasm/api/sqlite3-opfs-async-proxy.js 2bc6b2b68198467ff467cea9657df7a9b06dcd50adb78efc8c7d893394eb3010 +F ext/wasm/api/sqlite3-opfs-async-proxy.js 7795b84b66a7a8dedc791340709b310bb497c3c72a80bef364fa2a58e2ddae3f F ext/wasm/api/sqlite3-v-helper.js 6f6c3e390a72e08b0a5b16a0d567d7af3c04d172831853a29d72a6f1dd40ff24 F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js ca291837840b3eae3a60810721a7970c98f7c7cd3ee1c879acb7e91f1e3fe65a F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9 @@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 5dde07a91dcf99b9c9a418b4e2178f66eef4cffd4799538a419674314a7530f9 -R 249137c726d5884204a2faf3e938a076 -U dan -Z fb37ea41986419483c8b019665bddd2c +P f25eb898fce44120136f8ee5557305f43541e8a75323cfc3becf103f3fa795aa +R 45dc2b723628d86b418bb80a3f156c5c +U stephan +Z 38ec374e47328d1caa5423d767743727 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 804cc3ebc4..496c3c7b00 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f25eb898fce44120136f8ee5557305f43541e8a75323cfc3becf103f3fa795aa \ No newline at end of file +90b12211376eb445df7221b3d3593394ff651ef93f4218492c6208bc74b8fc63 \ No newline at end of file From 9d6725c651f2787ae6b211b8b422edb5239cd9d2 Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 7 Feb 2023 16:58:58 +0000 Subject: [PATCH 13/45] Fix a typo in example documentation code for sqlite3_vtab_in_next(). FossilOrigin-Name: a95dbfae6133cc7aac950c3e7ba55a29d80b1625c39479a7d1d10b0868ee2be4 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/sqlite.h.in | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index eb2ec3c06e..db824ad00b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Roll\sback\spart\sof\s[c54f29d8]\swhich\sattempted\sto\suse\ssymbols\swhich\sthat\sworker\sdoes\snot\shave\saccess\sto. -D 2023-02-06T21:20:59.248 +C Fix\sa\stypo\sin\sexample\sdocumentation\scode\sfor\ssqlite3_vtab_in_next(). +D 2023-02-07T16:58:58.113 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -623,7 +623,7 @@ F src/resolve.c d62c5665279cc7485f9d45b5e20911cc7b19c203f268321a90d05d74f4725750 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c c3ce1b49cca2c66c8c88fe7d9e1f3db23590deb4dd631619ad90e1e5d21bcf1f F src/shell.c.in 250817509dbf12e258e334fdcd87901e35a6b63dc285885fec5f577ebb67b498 -F src/sqlite.h.in d2a5fc1f6740bd02b571d33d2eb308fa7d1b0fac5b86f6f1fe8310cd49bca97d +F src/sqlite.h.in e26116b4dba94903c78db0f3281493435cf70ee049e2e8270b1013fad740fdb1 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4 F src/sqliteInt.h 43eeee1ea80543a0e40444bf53643ca259a2b1158ccfe859a6a6435b7358ecdd @@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P f25eb898fce44120136f8ee5557305f43541e8a75323cfc3becf103f3fa795aa -R 45dc2b723628d86b418bb80a3f156c5c -U stephan -Z 38ec374e47328d1caa5423d767743727 +P 90b12211376eb445df7221b3d3593394ff651ef93f4218492c6208bc74b8fc63 +R 671a4295326d41710345877fa9cb95d1 +U drh +Z c1cf8d70fac085412ee8e4c80e6bf788 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 496c3c7b00..e82d37885c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -90b12211376eb445df7221b3d3593394ff651ef93f4218492c6208bc74b8fc63 \ No newline at end of file +a95dbfae6133cc7aac950c3e7ba55a29d80b1625c39479a7d1d10b0868ee2be4 \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 0ae65aa75d..c297da0b6f 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -9819,7 +9819,7 @@ int sqlite3_vtab_in(sqlite3_index_info*, int iCons, int bHandle); ** ** 
 **    for(rc=sqlite3_vtab_in_first(pList, &pVal);
-**        rc==SQLITE_OK && pVal
+**        rc==SQLITE_OK && pVal;
 **        rc=sqlite3_vtab_in_next(pList, &pVal)
 **    ){
 **      // do something with pVal

From c3ea539dc21f193c277851ab44109aef8de8a15d Mon Sep 17 00:00:00 2001
From: dan 
Date: Tue, 7 Feb 2023 18:41:23 +0000
Subject: [PATCH 14/45] Fix a test script problem causing "make test" to fail
 for non-RBU builds.

FossilOrigin-Name: 2abc3f9de0d2b66342598ab9015e62568ed20c7da4744a0f0a76b1db72c7e941
---
 ext/rbu/rbu_common.tcl |  5 +++--
 manifest               | 14 +++++++-------
 manifest.uuid          |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ext/rbu/rbu_common.tcl b/ext/rbu/rbu_common.tcl
index cb4f63820b..57db5a561f 100644
--- a/ext/rbu/rbu_common.tcl
+++ b/ext/rbu/rbu_common.tcl
@@ -20,8 +20,9 @@ proc if_no_rbu_support {tcl} {
   ifcapable !rbu { set bOk 0 }
   if {[permutation]=="journaltest"} { set bOk 0 }
   if {$bOk==0} {
-    uplevel $tcl
-  }
+    set c [catch {uplevel 1 $tcl} r]
+    return -code $c $r
+  } 
 }
 
 proc check_prestep_state {target state} {
diff --git a/manifest b/manifest
index db824ad00b..b1319ebcd5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stypo\sin\sexample\sdocumentation\scode\sfor\ssqlite3_vtab_in_next().
-D 2023-02-07T16:58:58.113
+C Fix\sa\stest\sscript\sproblem\scausing\s"make\stest"\sto\sfail\sfor\snon-RBU\sbuilds.
+D 2023-02-07T18:41:23.632
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -334,7 +334,7 @@ F ext/rbu/rbu9.test 4b66f0705442711a44b54ef2cc3c59952f1ea15f12e34442681bdb1a6eb3
 F ext/rbu/rbuA.test 3f8fdd4ae7b9a0571af7361cd88359254f63e445ac4acfe395173e31d7e3fc31
 F ext/rbu/rbuB.test c639803bbc1dc9358afe6abe046dc4d3e9965238b75239b04e3a8e33e3e90f85
 F ext/rbu/rbuC.test 5326ea3954754c68fd518beb70d3e6b6690af53e1a5fa102d650e4110b26b4c5
-F ext/rbu/rbu_common.tcl 815cc97be0e67e96f3ccaff74d951eef89cefc34cec7d93d64f01d9402121545
+F ext/rbu/rbu_common.tcl 15d063397a89aeaf26b4cbdf6f29911b4154a902ba61a40c4f180ab452454a63
 F ext/rbu/rbubusy.test 88298187ad35aac9084436d85ca66b3722f96eaa704a09cfe5f931d452ab7237
 F ext/rbu/rbucollate.test 9852ec5e5ba7f3b04ce849a24ef7298e03ae0f16e58e6031d0f845234559feec
 F ext/rbu/rbucrash.test d2b5d619d9281c89cad74401b73b46172daa89906940b1d739c813ddc0cd2cf5
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 90b12211376eb445df7221b3d3593394ff651ef93f4218492c6208bc74b8fc63
-R 671a4295326d41710345877fa9cb95d1
-U drh
-Z c1cf8d70fac085412ee8e4c80e6bf788
+P a95dbfae6133cc7aac950c3e7ba55a29d80b1625c39479a7d1d10b0868ee2be4
+R eadbc6d63430234ac2cb17610c353b99
+U dan
+Z b7b3585268bb0984169cdf414e4a24fd
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e82d37885c..40eb42fb45 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a95dbfae6133cc7aac950c3e7ba55a29d80b1625c39479a7d1d10b0868ee2be4
\ No newline at end of file
+2abc3f9de0d2b66342598ab9015e62568ed20c7da4744a0f0a76b1db72c7e941
\ No newline at end of file

From d4af882a1bebbefa02cb40ba85b78c82d1deebd9 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 7 Feb 2023 21:55:14 +0000
Subject: [PATCH 15/45] Add support for the 'txn' argument to date/time
 functions that works like 'now' but keeps the same time for the entire
 transaction.

FossilOrigin-Name: 5e4f45af96247e29910403a63ac148cb313b005f9c014b37a9a49d98f5fef9a6
---
 manifest        | 23 +++++++++++++----------
 manifest.uuid   |  2 +-
 src/date.c      | 29 +++++++++++++++++++++++++----
 src/sqliteInt.h |  2 ++
 src/vdbeapi.c   | 23 +++++++++++++++++++++++
 src/vdbeaux.c   |  1 +
 6 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/manifest b/manifest
index b1319ebcd5..d91cd340c4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stest\sscript\sproblem\scausing\s"make\stest"\sto\sfail\sfor\snon-RBU\sbuilds.
-D 2023-02-07T18:41:23.632
+C Add\ssupport\sfor\sthe\s'txn'\sargument\sto\sdate/time\sfunctions\sthat\sworks\slike\n'now'\sbut\skeeps\sthe\ssame\stime\sfor\sthe\sentire\stransaction.
+D 2023-02-07T21:55:14.119
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -567,7 +567,7 @@ F src/build.c c55ab6d1b089ceef57160e840f05f692955ac90944c3d04fcf01d97fd7bfd08d
 F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 20507cc0b0a6c19cd882fcd0eaeda32ae6a4229fb4b024cfdf3183043d9b703d
-F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
+F src/date.c ff2d10db98269759315c2048d3cc16cc135f7b39f394fa7442e37f9f9161892f
 F src/dbpage.c d47549716549311f79dc39fe5c8fb19390a6eb2c960f8e37c89a9c4de0c1052e
 F src/dbstat.c ec92074baa61d883de58c945162d9e666c13cd7cf3a23bc38b4d1c4d0b2c2bef
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
@@ -626,7 +626,7 @@ F src/shell.c.in 250817509dbf12e258e334fdcd87901e35a6b63dc285885fec5f577ebb67b49
 F src/sqlite.h.in e26116b4dba94903c78db0f3281493435cf70ee049e2e8270b1013fad740fdb1
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
-F src/sqliteInt.h 43eeee1ea80543a0e40444bf53643ca259a2b1158ccfe859a6a6435b7358ecdd
+F src/sqliteInt.h 459e7dc3936c3f3321d588f9e74c1298526c29dced7e3b9c0b63de5a5e5ecdcc
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -694,8 +694,8 @@ F src/vacuum.c 84ce7f01f8a7a08748e107a441db83bcec13970190ddcb0c9ff522adbc1c23fd
 F src/vdbe.c 47d3b78e75e239e1909933f0d77612b4111ebe760f01fdd0085e4e30b59b4cc6
 F src/vdbe.h 73b904a6b3bb27f308c6cc287a5751ebc7f1f89456be0ed068a12b92844c6e8c
 F src/vdbeInt.h a4147a4ddf613cb1bcb555ace9e9e74a9c099d65facd88155f191b1fb4d74cfb
-F src/vdbeapi.c 40c47b1528d308a322203de21d2e0d711753257ed9771771b6129214b1d65932
-F src/vdbeaux.c 3f9e3b6585e7434aa11300169dd66ddf0fc963a0c6f7940bdc058335dadeb353
+F src/vdbeapi.c 0760fbeea76491a4c5b79ff0ec212915e7fe27c60ba319ef232ec25403ef4493
+F src/vdbeaux.c 9f2a2ec80ff90266ab603065c32dd3c8b0a53023ab7210a03fccf324ad6ddbce
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
 F src/vdbemem.c 87d3811aabb68eb9210c14c9a8b5e8ec3acb7ba787beb80a4323af54fb6013f7
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
@@ -2045,8 +2045,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P a95dbfae6133cc7aac950c3e7ba55a29d80b1625c39479a7d1d10b0868ee2be4
-R eadbc6d63430234ac2cb17610c353b99
-U dan
-Z b7b3585268bb0984169cdf414e4a24fd
+P 2abc3f9de0d2b66342598ab9015e62568ed20c7da4744a0f0a76b1db72c7e941
+R c0a88244db992b40f65ce347d314e978
+T *branch * txn-date
+T *sym-txn-date *
+T -sym-trunk *
+U drh
+Z 947981482da05fefcea564acb307123a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 40eb42fb45..3cfde09ef5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2abc3f9de0d2b66342598ab9015e62568ed20c7da4744a0f0a76b1db72c7e941
\ No newline at end of file
+5e4f45af96247e29910403a63ac148cb313b005f9c014b37a9a49d98f5fef9a6
\ No newline at end of file
diff --git a/src/date.c b/src/date.c
index a3e58bc4e3..21077df93f 100644
--- a/src/date.c
+++ b/src/date.c
@@ -331,11 +331,13 @@ static int parseYyyyMmDd(const char *zDate, DateTime *p){
 }
 
 /*
-** Set the time to the current time reported by the VFS.
+** Set the time to the current time reported for the prepared statement
+** that is currently executing.  The same time is reported for all
+** invocations of this routine from within the same call to sqlite3_step().
 **
 ** Return the number of errors.
 */
-static int setDateTimeToCurrent(sqlite3_context *context, DateTime *p){
+static int setCurrentStmtTime(sqlite3_context *context, DateTime *p){
   p->iJD = sqlite3StmtCurrentTime(context);
   if( p->iJD>0 ){
     p->validJD = 1;
@@ -345,6 +347,23 @@ static int setDateTimeToCurrent(sqlite3_context *context, DateTime *p){
   }
 }
 
+/*
+** Set the time to the current time reported for the current transaction.
+** The same time is set for all calls to this routine within the same
+** transaction.
+**
+** Return the number of errors.
+*/
+static int setCurrentTxnTime(sqlite3_context *context, DateTime *p){
+  p->iJD = sqlite3TxnCurrentTime(context);
+  if( p->iJD>0 ){
+    p->validJD = 1;
+    return 0;
+  }else{
+    return 1;
+  }
+}
+
 /*
 ** Input "r" is a numeric quantity which might be a julian day number,
 ** or the number of seconds since 1970.  If the value if r is within
@@ -387,7 +406,9 @@ static int parseDateOrTime(
   }else if( parseHhMmSs(zDate, p)==0 ){
     return 0;
   }else if( sqlite3StrICmp(zDate,"now")==0 && sqlite3NotPureFunc(context) ){
-    return setDateTimeToCurrent(context, p);
+    return setCurrentStmtTime(context, p);
+  }else if( sqlite3StrICmp(zDate,"txn")==0 && sqlite3NotPureFunc(context) ){
+    return setCurrentTxnTime(context, p);
   }else if( sqlite3AtoF(zDate, &r, sqlite3Strlen30(zDate), SQLITE_UTF8)>0 ){
     setRawDateNumber(p, r);
     return 0;
@@ -946,7 +967,7 @@ static int isDate(
   memset(p, 0, sizeof(*p));
   if( argc==0 ){
     if( !sqlite3NotPureFunc(context) ) return 1;
-    return setDateTimeToCurrent(context, p);
+    return setCurrentStmtTime(context, p);
   }
   if( (eType = sqlite3_value_type(argv[0]))==SQLITE_FLOAT
                    || eType==SQLITE_INTEGER ){
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 3da5f13d5b..638260c5dc 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1621,6 +1621,7 @@ struct sqlite3 {
   u8 nSqlExec;                  /* Number of pending OP_SqlExec opcodes */
   u8 eOpenState;                /* Current condition of the connection */
   int nextPagesize;             /* Pagesize after VACUUM if >0 */
+  i64 txnTime;                  /* Timestamp for current transaction */
   i64 nChange;                  /* Value returned by sqlite3_changes() */
   i64 nTotalChange;             /* Value returned by sqlite3_total_changes() */
   int aLimit[SQLITE_N_LIMIT];   /* Limits */
@@ -5341,6 +5342,7 @@ FuncDef *sqlite3VtabOverloadFunction(sqlite3 *,FuncDef*, int nArg, Expr*);
   void sqlite3VtabUsesAllSchemas(sqlite3_index_info*);
 #endif
 sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context*);
+sqlite3_int64 sqlite3TxnCurrentTime(sqlite3_context*);
 int sqlite3VdbeParameterIndex(Vdbe*, const char*, int);
 int sqlite3TransferBindings(sqlite3_stmt *, sqlite3_stmt *);
 void sqlite3ParseObjectInit(Parse*,sqlite3*);
diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 476b6a2adf..432c1fa225 100644
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -987,6 +987,29 @@ sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context *p){
   return *piTime;
 }
 
+/*
+** Return the current time for a transaction.  If the current time
+** is requested more than once within the same transaction
+** the same time is returned for each invocation regardless
+** of the amount of time that elapses between invocations.  In other words,
+** the time returned is always the time of the first call.
+*/
+sqlite3_int64 sqlite3TxnCurrentTime(sqlite3_context *p){
+  int rc;
+#ifndef SQLITE_ENABLE_STAT4
+  sqlite3_int64 *piTime = &p->pVdbe->db->txnTime;
+  assert( p->pVdbe!=0 );
+#else
+  sqlite3_int64 iTime = 0;
+  sqlite3_int64 *piTime = p->pVdbe!=0 ? &p->pVdbe->db->txnTime : &iTime;
+#endif
+  if( *piTime==0 ){
+    rc = sqlite3OsCurrentTimeInt64(p->pOut->db->pVfs, piTime);
+    if( rc ) *piTime = 0;
+  }
+  return *piTime;
+}
+
 /*
 ** Create a new aggregate context for p and return a pointer to
 ** its pMem->z element.
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index d04d8f1e17..82dc607154 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -3394,6 +3394,7 @@ int sqlite3VdbeHalt(Vdbe *p){
   */
   if( db->autoCommit ){
     sqlite3ConnectionUnlocked(db);
+    db->txnTime = 0;
   }
 
   assert( db->nVdbeActive>0 || db->autoCommit==0 || db->nStatement==0 );

From 3393ee7ff613780888ce67934571e274c5ebb302 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Tue, 7 Feb 2023 23:55:59 +0000
Subject: [PATCH 16/45] Simplify the code and add test cases.

FossilOrigin-Name: d3bed4caff561e71c396cc869c5b4d9bf216ba203485e738c12ec62741f1aba5
---
 manifest        | 21 +++++++---------
 manifest.uuid   |  2 +-
 src/date.c      | 27 +++++---------------
 src/sqliteInt.h |  3 +--
 src/vdbeapi.c   | 40 ++++++++++--------------------
 test/date.test  | 66 ++++++++++++++++++++++++++++++++++++++++---------
 6 files changed, 85 insertions(+), 74 deletions(-)

diff --git a/manifest b/manifest
index d91cd340c4..1be3d9ae98 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssupport\sfor\sthe\s'txn'\sargument\sto\sdate/time\sfunctions\sthat\sworks\slike\n'now'\sbut\skeeps\sthe\ssame\stime\sfor\sthe\sentire\stransaction.
-D 2023-02-07T21:55:14.119
+C Simplify\sthe\scode\sand\sadd\stest\scases.
+D 2023-02-07T23:55:59.881
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -567,7 +567,7 @@ F src/build.c c55ab6d1b089ceef57160e840f05f692955ac90944c3d04fcf01d97fd7bfd08d
 F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 20507cc0b0a6c19cd882fcd0eaeda32ae6a4229fb4b024cfdf3183043d9b703d
-F src/date.c ff2d10db98269759315c2048d3cc16cc135f7b39f394fa7442e37f9f9161892f
+F src/date.c 0c5db79ea1d5951ed917fa43046e9cc146dfbef5ff46106abe76b69e2523a9f5
 F src/dbpage.c d47549716549311f79dc39fe5c8fb19390a6eb2c960f8e37c89a9c4de0c1052e
 F src/dbstat.c ec92074baa61d883de58c945162d9e666c13cd7cf3a23bc38b4d1c4d0b2c2bef
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
@@ -626,7 +626,7 @@ F src/shell.c.in 250817509dbf12e258e334fdcd87901e35a6b63dc285885fec5f577ebb67b49
 F src/sqlite.h.in e26116b4dba94903c78db0f3281493435cf70ee049e2e8270b1013fad740fdb1
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
-F src/sqliteInt.h 459e7dc3936c3f3321d588f9e74c1298526c29dced7e3b9c0b63de5a5e5ecdcc
+F src/sqliteInt.h 859e193140c393a9a50dd81345b95130b208a312dd064867065c5e637232ed58
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -694,7 +694,7 @@ F src/vacuum.c 84ce7f01f8a7a08748e107a441db83bcec13970190ddcb0c9ff522adbc1c23fd
 F src/vdbe.c 47d3b78e75e239e1909933f0d77612b4111ebe760f01fdd0085e4e30b59b4cc6
 F src/vdbe.h 73b904a6b3bb27f308c6cc287a5751ebc7f1f89456be0ed068a12b92844c6e8c
 F src/vdbeInt.h a4147a4ddf613cb1bcb555ace9e9e74a9c099d65facd88155f191b1fb4d74cfb
-F src/vdbeapi.c 0760fbeea76491a4c5b79ff0ec212915e7fe27c60ba319ef232ec25403ef4493
+F src/vdbeapi.c be64df0e21a43056b62f46777749347b7d51f6e5e6c419c4bf42ce9bf98d6064
 F src/vdbeaux.c 9f2a2ec80ff90266ab603065c32dd3c8b0a53023ab7210a03fccf324ad6ddbce
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
 F src/vdbemem.c 87d3811aabb68eb9210c14c9a8b5e8ec3acb7ba787beb80a4323af54fb6013f7
@@ -910,7 +910,7 @@ F test/ctime.test 340f362f41f92972bbd71f44e10569a5cc694062b692231bd08aa6fe6c1c47
 F test/cursorhint.test 0175e4404181ace3ceca8b114eb0a98eae600d565aa4e2705abbe6614c7fe201
 F test/cursorhint2.test 6f3aa9cb19e7418967a10ec6905209bcbb5968054da855fc36c8beee9ae9c42f
 F test/dataversion1.test 6e5e86ac681f0782e766ebcb56c019ae001522d114e0e111e5ebf68ccf2a7bb8
-F test/date.test 118e04db8c8b4efeb885542b4918c7b869a34c460a6bebbfe927dfd75706b80d
+F test/date.test 0890bbd03f722169ae34f6d6f7822061d5fda8742355438562638ebed07e227c
 F test/date2.test 7e12ec14aaf4d5e6294b4ba140445b0eca06ea50062a9c3a69c4ee13d0b6f8b1
 F test/date3.test a1b77abf05c6772fe5ca2337cac1398892f2a41e62bce7e6be0f4a08a0e64ae5
 F test/dbdata.test 042f49acff3438f940eeba5868d3af080ae64ddf26ae78f80c92bec3ca7d8603
@@ -2045,11 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2abc3f9de0d2b66342598ab9015e62568ed20c7da4744a0f0a76b1db72c7e941
-R c0a88244db992b40f65ce347d314e978
-T *branch * txn-date
-T *sym-txn-date *
-T -sym-trunk *
+P 5e4f45af96247e29910403a63ac148cb313b005f9c014b37a9a49d98f5fef9a6
+R c20bc84a84eb9b7dcb5243c1d98778fa
 U drh
-Z 947981482da05fefcea564acb307123a
+Z 4b08eb982cff98771c7da608dde8a084
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3cfde09ef5..b7c2e2f8f5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5e4f45af96247e29910403a63ac148cb313b005f9c014b37a9a49d98f5fef9a6
\ No newline at end of file
+d3bed4caff561e71c396cc869c5b4d9bf216ba203485e738c12ec62741f1aba5
\ No newline at end of file
diff --git a/src/date.c b/src/date.c
index 21077df93f..6c48d45e33 100644
--- a/src/date.c
+++ b/src/date.c
@@ -335,27 +335,12 @@ static int parseYyyyMmDd(const char *zDate, DateTime *p){
 ** that is currently executing.  The same time is reported for all
 ** invocations of this routine from within the same call to sqlite3_step().
 **
-** Return the number of errors.
-*/
-static int setCurrentStmtTime(sqlite3_context *context, DateTime *p){
-  p->iJD = sqlite3StmtCurrentTime(context);
-  if( p->iJD>0 ){
-    p->validJD = 1;
-    return 0;
-  }else{
-    return 1;
-  }
-}
-
-/*
-** Set the time to the current time reported for the current transaction.
-** The same time is set for all calls to this routine within the same
-** transaction.
+** Or if bTxn is true, use the transaction time.
 **
 ** Return the number of errors.
 */
-static int setCurrentTxnTime(sqlite3_context *context, DateTime *p){
-  p->iJD = sqlite3TxnCurrentTime(context);
+static int setCurrentStmtTime(sqlite3_context *context, DateTime *p, int bTxn){
+  p->iJD = sqlite3StmtCurrentTime(context, bTxn);
   if( p->iJD>0 ){
     p->validJD = 1;
     return 0;
@@ -406,9 +391,9 @@ static int parseDateOrTime(
   }else if( parseHhMmSs(zDate, p)==0 ){
     return 0;
   }else if( sqlite3StrICmp(zDate,"now")==0 && sqlite3NotPureFunc(context) ){
-    return setCurrentStmtTime(context, p);
+    return setCurrentStmtTime(context, p, 0);
   }else if( sqlite3StrICmp(zDate,"txn")==0 && sqlite3NotPureFunc(context) ){
-    return setCurrentTxnTime(context, p);
+    return setCurrentStmtTime(context, p, 1);
   }else if( sqlite3AtoF(zDate, &r, sqlite3Strlen30(zDate), SQLITE_UTF8)>0 ){
     setRawDateNumber(p, r);
     return 0;
@@ -967,7 +952,7 @@ static int isDate(
   memset(p, 0, sizeof(*p));
   if( argc==0 ){
     if( !sqlite3NotPureFunc(context) ) return 1;
-    return setCurrentStmtTime(context, p);
+    return setCurrentStmtTime(context, p, 0);
   }
   if( (eType = sqlite3_value_type(argv[0]))==SQLITE_FLOAT
                    || eType==SQLITE_INTEGER ){
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 638260c5dc..73378dbf61 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -5341,8 +5341,7 @@ FuncDef *sqlite3VtabOverloadFunction(sqlite3 *,FuncDef*, int nArg, Expr*);
     && !defined(SQLITE_OMIT_VIRTUALTABLE)
   void sqlite3VtabUsesAllSchemas(sqlite3_index_info*);
 #endif
-sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context*);
-sqlite3_int64 sqlite3TxnCurrentTime(sqlite3_context*);
+sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context*, int);
 int sqlite3VdbeParameterIndex(Vdbe*, const char*, int);
 int sqlite3TransferBindings(sqlite3_stmt *, sqlite3_stmt *);
 void sqlite3ParseObjectInit(Parse*,sqlite3*);
diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 432c1fa225..722d1215f1 100644
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -970,41 +970,27 @@ int sqlite3_vtab_in_next(sqlite3_value *pVal, sqlite3_value **ppOut){
 ** statement, the exact same time is returned for each invocation regardless
 ** of the amount of time that elapses between invocations.  In other words,
 ** the time returned is always the time of the first call.
+**
+** Or, if bTxn, return the transaction time.  The transaction time is the
+** same for all calls within the same transaction.
+**
+** bTxn is 0 for SQL like datetime('now') and is 1 for datetime('txn').
 */
-sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context *p){
+sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context *p, int bTxn){
   int rc;
 #ifndef SQLITE_ENABLE_STAT4
-  sqlite3_int64 *piTime = &p->pVdbe->iCurrentTime;
+  sqlite3_int64 *piTime;
+  sqlite3 *db = p->pOut->db;
   assert( p->pVdbe!=0 );
+  piTime = bTxn ? &db->txnTime : &p->pVdbe->iCurrentTime;
 #else
   sqlite3_int64 iTime = 0;
-  sqlite3_int64 *piTime = p->pVdbe!=0 ? &p->pVdbe->iCurrentTime : &iTime;
+  sqlite3_int64 *piTime;
+  sqlite3 *db = p->pOut->db;
+  piTime = bTxn ? &db->txnTime : p->pVdbe!=0 ? &p->pVdbe->iCurrentTime : &iTime;
 #endif
   if( *piTime==0 ){
-    rc = sqlite3OsCurrentTimeInt64(p->pOut->db->pVfs, piTime);
-    if( rc ) *piTime = 0;
-  }
-  return *piTime;
-}
-
-/*
-** Return the current time for a transaction.  If the current time
-** is requested more than once within the same transaction
-** the same time is returned for each invocation regardless
-** of the amount of time that elapses between invocations.  In other words,
-** the time returned is always the time of the first call.
-*/
-sqlite3_int64 sqlite3TxnCurrentTime(sqlite3_context *p){
-  int rc;
-#ifndef SQLITE_ENABLE_STAT4
-  sqlite3_int64 *piTime = &p->pVdbe->db->txnTime;
-  assert( p->pVdbe!=0 );
-#else
-  sqlite3_int64 iTime = 0;
-  sqlite3_int64 *piTime = p->pVdbe!=0 ? &p->pVdbe->db->txnTime : &iTime;
-#endif
-  if( *piTime==0 ){
-    rc = sqlite3OsCurrentTimeInt64(p->pOut->db->pVfs, piTime);
+    rc = sqlite3OsCurrentTimeInt64(db->pVfs, piTime);
     if( rc ) *piTime = 0;
   }
   return *piTime;
diff --git a/test/date.test b/test/date.test
index 62233ad8f6..8ade3e43c8 100644
--- a/test/date.test
+++ b/test/date.test
@@ -309,9 +309,9 @@ sqlite3_test_control SQLITE_TESTCTRL_LOCALTIME_FAULT 0
 #
 datetest 7.1 {datetime(null)} NULL
 datetest 7.2 {datetime('now',null)} NULL
-datetest 7.3 {datetime('now','localtime',null)} NULL
+datetest 7.3 {datetime('txn','localtime',null)} NULL
 datetest 7.4 {time(null)} NULL
-datetest 7.5 {time('now',null)} NULL
+datetest 7.5 {time('txn',null)} NULL
 datetest 7.6 {time('now','localtime',null)} NULL
 datetest 7.7 {date(null)} NULL
 datetest 7.8 {date('now',null)} NULL
@@ -322,28 +322,28 @@ datetest 7.12 {julianday('now','localtime',null)} NULL
 datetest 7.13 {strftime(null,'now')} NULL
 datetest 7.14 {strftime('%s',null)} NULL
 datetest 7.15 {strftime('%s','now',null)} NULL
-datetest 7.16 {strftime('%s','now','localtime',null)} NULL
+datetest 7.16 {strftime('%s','txn','localtime',null)} NULL
 
 # Test modifiers when the date begins as a julian day number - to
 # make sure the HH:MM:SS is preserved.  Ticket #551.
 #
 set sqlite_current_time [db eval {SELECT strftime('%s','2003-10-22 12:34:00')}]
 datetest 8.1 {datetime('now','weekday 0')} {2003-10-26 12:34:00}
-datetest 8.2 {datetime('now','weekday 1')} {2003-10-27 12:34:00}
+datetest 8.2 {datetime('txn','weekday 1')} {2003-10-27 12:34:00}
 datetest 8.3 {datetime('now','weekday 2')} {2003-10-28 12:34:00}
-datetest 8.4 {datetime('now','weekday 3')} {2003-10-22 12:34:00}
+datetest 8.4 {datetime('txn','weekday 3')} {2003-10-22 12:34:00}
 datetest 8.5 {datetime('now','start of month')} {2003-10-01 00:00:00}
-datetest 8.6 {datetime('now','start of year')} {2003-01-01 00:00:00}
+datetest 8.6 {datetime('txn','start of year')} {2003-01-01 00:00:00}
 datetest 8.7 {datetime('now','start of day')} {2003-10-22 00:00:00}
-datetest 8.8 {datetime('now','1 day')} {2003-10-23 12:34:00}
+datetest 8.8 {datetime('txn','1 day')} {2003-10-23 12:34:00}
 datetest 8.9 {datetime('now','+1 day')} {2003-10-23 12:34:00}
-datetest 8.10 {datetime('now','+1.25 day')} {2003-10-23 18:34:00}
+datetest 8.10 {datetime('txn','+1.25 day')} {2003-10-23 18:34:00}
 datetest 8.11 {datetime('now','-1.0 day')} {2003-10-21 12:34:00}
-datetest 8.12 {datetime('now','1 month')} {2003-11-22 12:34:00}
+datetest 8.12 {datetime('txn','1 month')} {2003-11-22 12:34:00}
 datetest 8.13 {datetime('now','11 month')} {2004-09-22 12:34:00}
-datetest 8.14 {datetime('now','-13 month')} {2002-09-22 12:34:00}
+datetest 8.14 {datetime('txn','-13 month')} {2002-09-22 12:34:00}
 datetest 8.15 {datetime('now','1.5 months')} {2003-12-07 12:34:00}
-datetest 8.16 {datetime('now','-5 years')} {1998-10-22 12:34:00}
+datetest 8.16 {datetime('txn','-5 years')} {1998-10-22 12:34:00}
 datetest 8.17 {datetime('now','+10.5 minutes')} {2003-10-22 12:44:30}
 datetest 8.18 {datetime('now','-1.25 hours')} {2003-10-22 11:19:00}
 datetest 8.19 {datetime('now','11.25 seconds')} {2003-10-22 12:34:11}
@@ -486,11 +486,55 @@ do_test date-15.1 {
   }
 } {0.0}
 do_test date-15.2 {
+  db func sleeper sleeper
+  db eval {
+     SELECT c - a FROM (SELECT julianday('txn') AS a,
+                               sleeper(), julianday('txn') AS c);
+  }
+} {0.0}
+do_test date-15.3 {
   db eval {
      SELECT a==b FROM (SELECT current_timestamp AS a,
                                sleeper(), current_timestamp AS b);
   }
 } {1}
+do_test date-15.4 {
+  db eval {
+     SELECT a==b FROM (SELECT julianday('txn') AS a,
+                               sleeper(), julianday('txn') AS b);
+  }
+} {0}
+
+do_execsql_test date-15.5 {
+  CREATE TEMP TABLE t15(a,b);
+  BEGIN;
+  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
+  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
+  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
+  COMMIT;
+  SELECT count(a), count(DISTINCT a) FROM t15;
+} {3 1}
+do_execsql_test date-15.6 {
+  DELETE FROM t15;
+  BEGIN;
+  INSERT INTO t15(a,b) VALUES(julianday('now'),sleeper());
+  INSERT INTO t15(a,b) VALUES(julianday('now'),sleeper());
+  INSERT INTO t15(a,b) VALUES(julianday('now'),sleeper());
+  COMMIT;
+  SELECT count(a), count(DISTINCT a) FROM t15;
+} {3 3}
+do_execsql_test date-15.7 {
+  DELETE FROM t15;
+  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
+  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
+  BEGIN;
+  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
+  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
+  COMMIT;
+  SELECT count(a), count(DISTINCT a) FROM t15;
+} {4 3}
+
+
 
 # Tests of extreme values in date/time functions.  Run with UBSan or the
 # equivalent to verify no signed interger overflow warnings.

From c1dab9ded2c16c66e6781984bac804e3218aa5c9 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 8 Feb 2023 11:34:05 +0000
Subject: [PATCH 17/45] Change the behavior of date-time functions without any
 arguments (and thus the CURRENT_TIME, CURRENT_DATE, and CURRENT_TIMESTAMP
 variables) so that they work like 'txn' instead of like 'now'.  This is an
 incompatibility with legacy, but brings SQLite into conformance with all
 other SQL systems.

FossilOrigin-Name: 1ac78be54502779236645eac35b962797f2fb98307d059d2aa19658c4fa74cb7
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/date.c    |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 1be3d9ae98..e5694c8f1a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simplify\sthe\scode\sand\sadd\stest\scases.
-D 2023-02-07T23:55:59.881
+C Change\sthe\sbehavior\sof\sdate-time\sfunctions\swithout\sany\sarguments\s(and\sthus\nthe\sCURRENT_TIME,\sCURRENT_DATE,\sand\sCURRENT_TIMESTAMP\svariables)\sso\sthat\sthey\nwork\slike\s'txn'\sinstead\sof\slike\s'now'.\s\sThis\sis\san\sincompatibility\swith\slegacy,\nbut\sbrings\sSQLite\sinto\sconformance\swith\sall\sother\sSQL\ssystems.
+D 2023-02-08T11:34:05.173
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -567,7 +567,7 @@ F src/build.c c55ab6d1b089ceef57160e840f05f692955ac90944c3d04fcf01d97fd7bfd08d
 F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 20507cc0b0a6c19cd882fcd0eaeda32ae6a4229fb4b024cfdf3183043d9b703d
-F src/date.c 0c5db79ea1d5951ed917fa43046e9cc146dfbef5ff46106abe76b69e2523a9f5
+F src/date.c 7bbe94be3ceb349faaf922ed6fb2429c1745bf0c4440c77bfc9ce5b93fcc9fde
 F src/dbpage.c d47549716549311f79dc39fe5c8fb19390a6eb2c960f8e37c89a9c4de0c1052e
 F src/dbstat.c ec92074baa61d883de58c945162d9e666c13cd7cf3a23bc38b4d1c4d0b2c2bef
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 5e4f45af96247e29910403a63ac148cb313b005f9c014b37a9a49d98f5fef9a6
-R c20bc84a84eb9b7dcb5243c1d98778fa
+P d3bed4caff561e71c396cc869c5b4d9bf216ba203485e738c12ec62741f1aba5
+R 306a6107a9a25e9636c592ddc5563a3a
 U drh
-Z 4b08eb982cff98771c7da608dde8a084
+Z 577c1f61a5429561225ed1087c13c668
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b7c2e2f8f5..e3acf22720 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d3bed4caff561e71c396cc869c5b4d9bf216ba203485e738c12ec62741f1aba5
\ No newline at end of file
+1ac78be54502779236645eac35b962797f2fb98307d059d2aa19658c4fa74cb7
\ No newline at end of file
diff --git a/src/date.c b/src/date.c
index 6c48d45e33..43334f15c1 100644
--- a/src/date.c
+++ b/src/date.c
@@ -952,7 +952,7 @@ static int isDate(
   memset(p, 0, sizeof(*p));
   if( argc==0 ){
     if( !sqlite3NotPureFunc(context) ) return 1;
-    return setCurrentStmtTime(context, p, 0);
+    return setCurrentStmtTime(context, p, 1);
   }
   if( (eType = sqlite3_value_type(argv[0]))==SQLITE_FLOAT
                    || eType==SQLITE_INTEGER ){
@@ -1318,7 +1318,7 @@ static void currentTimeFunc(
   UNUSED_PARAMETER(argc);
   UNUSED_PARAMETER(argv);
 
-  iT = sqlite3StmtCurrentTime(context);
+  iT = sqlite3StmtCurrentTime(context, 1);
   if( iT<=0 ) return;
   t = iT/1000 - 10000*(sqlite3_int64)21086676;
 #if HAVE_GMTIME_R

From ed092fc3684dbc2b2d8642cd05241391e279fe8e Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 8 Feb 2023 12:01:48 +0000
Subject: [PATCH 18/45] Revert the behavior of date/time functions with no
 arguments so that they once again work like 'now', even while
 CURRENT_TIMESTAMP and similar work like 'txn'.

FossilOrigin-Name: 06180caff0f5d8aba83b9f7be682ccdd6cb2ffc228b557ee6c1fd00fe5c23e92
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/date.c    | 17 ++++++++++-------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/manifest b/manifest
index e5694c8f1a..b98697019e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sbehavior\sof\sdate-time\sfunctions\swithout\sany\sarguments\s(and\sthus\nthe\sCURRENT_TIME,\sCURRENT_DATE,\sand\sCURRENT_TIMESTAMP\svariables)\sso\sthat\sthey\nwork\slike\s'txn'\sinstead\sof\slike\s'now'.\s\sThis\sis\san\sincompatibility\swith\slegacy,\nbut\sbrings\sSQLite\sinto\sconformance\swith\sall\sother\sSQL\ssystems.
-D 2023-02-08T11:34:05.173
+C Revert\sthe\sbehavior\sof\sdate/time\sfunctions\swith\sno\sarguments\sso\sthat\sthey\nonce\sagain\swork\slike\s'now',\seven\swhile\sCURRENT_TIMESTAMP\sand\ssimilar\swork\nlike\s'txn'.
+D 2023-02-08T12:01:48.294
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -567,7 +567,7 @@ F src/build.c c55ab6d1b089ceef57160e840f05f692955ac90944c3d04fcf01d97fd7bfd08d
 F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 20507cc0b0a6c19cd882fcd0eaeda32ae6a4229fb4b024cfdf3183043d9b703d
-F src/date.c 7bbe94be3ceb349faaf922ed6fb2429c1745bf0c4440c77bfc9ce5b93fcc9fde
+F src/date.c 37ca5e3cb34d666fae892156c9317d8bf756ae8a281504040dd3a02813ce5e9e
 F src/dbpage.c d47549716549311f79dc39fe5c8fb19390a6eb2c960f8e37c89a9c4de0c1052e
 F src/dbstat.c ec92074baa61d883de58c945162d9e666c13cd7cf3a23bc38b4d1c4d0b2c2bef
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d3bed4caff561e71c396cc869c5b4d9bf216ba203485e738c12ec62741f1aba5
-R 306a6107a9a25e9636c592ddc5563a3a
+P 1ac78be54502779236645eac35b962797f2fb98307d059d2aa19658c4fa74cb7
+R 21bc10e166e48f106bd855a3f05d7452
 U drh
-Z 577c1f61a5429561225ed1087c13c668
+Z 81861e88fff679ab1e007b3943020398
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e3acf22720..0086c81715 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1ac78be54502779236645eac35b962797f2fb98307d059d2aa19658c4fa74cb7
\ No newline at end of file
+06180caff0f5d8aba83b9f7be682ccdd6cb2ffc228b557ee6c1fd00fe5c23e92
\ No newline at end of file
diff --git a/src/date.c b/src/date.c
index 43334f15c1..8546b5dc89 100644
--- a/src/date.c
+++ b/src/date.c
@@ -937,8 +937,11 @@ static int parseModifier(
 ** the resulting time into the DateTime structure p.  Return 0
 ** on success and 1 if there are any errors.
 **
-** If there are zero parameters (if even argv[0] is undefined)
-** then assume a default value of "now" for argv[0].
+** If there are zero parameters (if argc<=0) then assume a default
+** value of "now" for argv[0] if argc==0 and "txn" if argc<0.  SQL
+** functions will always have argc>=0, but the special implementations
+** of CURRENT_TIME, CURRENT_DATE, and CURRENT_TIMESTAMP set argc to -1
+** in order to force the use of 'txn' semantics.
 */
 static int isDate(
   sqlite3_context *context, 
@@ -950,9 +953,9 @@ static int isDate(
   const unsigned char *z;
   int eType;
   memset(p, 0, sizeof(*p));
-  if( argc==0 ){
+  if( argc<=0 ){
     if( !sqlite3NotPureFunc(context) ) return 1;
-    return setCurrentStmtTime(context, p, 1);
+    return setCurrentStmtTime(context, p, argc<0);
   }
   if( (eType = sqlite3_value_type(argv[0]))==SQLITE_FLOAT
                    || eType==SQLITE_INTEGER ){
@@ -1259,7 +1262,7 @@ static void ctimeFunc(
   sqlite3_value **NotUsed2
 ){
   UNUSED_PARAMETER2(NotUsed, NotUsed2);
-  timeFunc(context, 0, 0);
+  timeFunc(context, -1, 0);
 }
 
 /*
@@ -1273,7 +1276,7 @@ static void cdateFunc(
   sqlite3_value **NotUsed2
 ){
   UNUSED_PARAMETER2(NotUsed, NotUsed2);
-  dateFunc(context, 0, 0);
+  dateFunc(context, -1, 0);
 }
 
 /*
@@ -1287,7 +1290,7 @@ static void ctimestampFunc(
   sqlite3_value **NotUsed2
 ){
   UNUSED_PARAMETER2(NotUsed, NotUsed2);
-  datetimeFunc(context, 0, 0);
+  datetimeFunc(context, -1, 0);
 }
 #endif /* !defined(SQLITE_OMIT_DATETIME_FUNCS) */
 

From 159cbfe1cbb9a725cb206479181870adfcb8b6fa Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 8 Feb 2023 12:31:47 +0000
Subject: [PATCH 19/45] Test cases to show that CURRENT_TIMESTAMP and similar
 hold the same value across a transaction.

FossilOrigin-Name: 7b2fa20e31b8a0314b9ccb97bb556898d552505dbc5943f248df3f86c0f4e008
---
 manifest       | 12 ++++++------
 manifest.uuid  |  2 +-
 test/date.test | 25 +++++++++++++++++++++++--
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index b98697019e..1e6875435e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Revert\sthe\sbehavior\sof\sdate/time\sfunctions\swith\sno\sarguments\sso\sthat\sthey\nonce\sagain\swork\slike\s'now',\seven\swhile\sCURRENT_TIMESTAMP\sand\ssimilar\swork\nlike\s'txn'.
-D 2023-02-08T12:01:48.294
+C Test\scases\sto\sshow\sthat\sCURRENT_TIMESTAMP\sand\ssimilar\shold\sthe\ssame\svalue\nacross\sa\stransaction.
+D 2023-02-08T12:31:47.043
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -910,7 +910,7 @@ F test/ctime.test 340f362f41f92972bbd71f44e10569a5cc694062b692231bd08aa6fe6c1c47
 F test/cursorhint.test 0175e4404181ace3ceca8b114eb0a98eae600d565aa4e2705abbe6614c7fe201
 F test/cursorhint2.test 6f3aa9cb19e7418967a10ec6905209bcbb5968054da855fc36c8beee9ae9c42f
 F test/dataversion1.test 6e5e86ac681f0782e766ebcb56c019ae001522d114e0e111e5ebf68ccf2a7bb8
-F test/date.test 0890bbd03f722169ae34f6d6f7822061d5fda8742355438562638ebed07e227c
+F test/date.test 8e9ae588d832c54fa2512b0f9789bea48442ada0736dabee54b377dc1b8d4a87
 F test/date2.test 7e12ec14aaf4d5e6294b4ba140445b0eca06ea50062a9c3a69c4ee13d0b6f8b1
 F test/date3.test a1b77abf05c6772fe5ca2337cac1398892f2a41e62bce7e6be0f4a08a0e64ae5
 F test/dbdata.test 042f49acff3438f940eeba5868d3af080ae64ddf26ae78f80c92bec3ca7d8603
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1ac78be54502779236645eac35b962797f2fb98307d059d2aa19658c4fa74cb7
-R 21bc10e166e48f106bd855a3f05d7452
+P 06180caff0f5d8aba83b9f7be682ccdd6cb2ffc228b557ee6c1fd00fe5c23e92
+R 191c2a25e4d73ba45ecc912c47f9a8ca
 U drh
-Z 81861e88fff679ab1e007b3943020398
+Z bc216ff029b87470207499db9cc62288
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0086c81715..604bf7c5e3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-06180caff0f5d8aba83b9f7be682ccdd6cb2ffc228b557ee6c1fd00fe5c23e92
\ No newline at end of file
+7b2fa20e31b8a0314b9ccb97bb556898d552505dbc5943f248df3f86c0f4e008
\ No newline at end of file
diff --git a/test/date.test b/test/date.test
index 8ade3e43c8..479635753a 100644
--- a/test/date.test
+++ b/test/date.test
@@ -501,7 +501,7 @@ do_test date-15.3 {
 do_test date-15.4 {
   db eval {
      SELECT a==b FROM (SELECT julianday('txn') AS a,
-                               sleeper(), julianday('txn') AS b);
+                               sleeper(), julianday('now') AS b);
   }
 } {0}
 
@@ -534,7 +534,28 @@ do_execsql_test date-15.7 {
   SELECT count(a), count(DISTINCT a) FROM t15;
 } {4 3}
 
-
+do_test date-15.10 {
+  unset -nocomplain x
+  db eval {BEGIN;}
+  db eval {
+    SELECT
+       current_time AS ct1,
+       current_date AS cd1,
+       current_timestamp AS cs1,
+       time() AS ct2,
+       datetime() AS cs2;
+    } x {continue}
+  after 1000
+  db eval {
+    SELECT
+      current_time=$x(ct1),
+      current_date=$x(cd1),
+      current_timestamp=$x(cs1),
+      time()=$x(ct2),
+      datetime()=$x(cs2);
+  }
+} {1 1 1 0 0}
+db eval {COMMIT}
 
 # Tests of extreme values in date/time functions.  Run with UBSan or the
 # equivalent to verify no signed interger overflow warnings.

From 0873d88423ccd7acca443b7018263dd2e4fd1e09 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 8 Feb 2023 14:17:34 +0000
Subject: [PATCH 20/45] Fix an incorrect assert() in STAT4 logic added just a
 few days ago on [2023-02-01|/info/55a26c67ed4a3a93].

FossilOrigin-Name: 168fa2fb22b8c1ad80c7001a429d3a80b48acfbfebb5414a0caa76964ea647c3
---
 manifest      | 13 ++++++-------
 manifest.uuid |  2 +-
 src/vdbemem.c |  4 +++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 1c38152cce..90c4c1403f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s'txn'\sdate/time\sformat.\s\sChange\sCURRENT_TIMESTAMP\sand\ssimilar\sto\suse\n'tnx'-style\ssemantics\sinstead\sof\s'now'-style.
-D 2023-02-08T12:47:37.844
+C Fix\san\sincorrect\sassert()\sin\sSTAT4\slogic\sadded\sjust\sa\sfew\sdays\sago\son\n[2023-02-01|/info/55a26c67ed4a3a93].
+D 2023-02-08T14:17:34.024
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -697,7 +697,7 @@ F src/vdbeInt.h a4147a4ddf613cb1bcb555ace9e9e74a9c099d65facd88155f191b1fb4d74cfb
 F src/vdbeapi.c be64df0e21a43056b62f46777749347b7d51f6e5e6c419c4bf42ce9bf98d6064
 F src/vdbeaux.c 9f2a2ec80ff90266ab603065c32dd3c8b0a53023ab7210a03fccf324ad6ddbce
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
-F src/vdbemem.c 87d3811aabb68eb9210c14c9a8b5e8ec3acb7ba787beb80a4323af54fb6013f7
+F src/vdbemem.c 86908c0ab1624df678458feb53319bf9720992e761cbccf77a36d671ce11693d
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
 F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
 F src/vdbevtab.c aae4bd769410eb7e1d02c42613eec961d514459b1c3c1c63cfc84e92a137daac
@@ -2045,9 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 9902e66a37d59c1909593bbc296091df3fa3bfa12ec7062bd84e458030f77c8d 7b2fa20e31b8a0314b9ccb97bb556898d552505dbc5943f248df3f86c0f4e008
-R 645bf11b6f82132024c9558d18e0aef7
-T +closed 7b2fa20e31b8a0314b9ccb97bb556898d552505dbc5943f248df3f86c0f4e008
+P 61cc8ed8d3541eddf23a9d542179c3f0223c5b8519b54d3be79988a376e25a89
+R b30ddae4c32511676ec9f35ba0a9073d
 U drh
-Z 2be6e595f8a3c82105db9bee2081e8f8
+Z f13262bcc096124d3a09821c781e66c8
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 12478fb900..7aa8813f24 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-61cc8ed8d3541eddf23a9d542179c3f0223c5b8519b54d3be79988a376e25a89
\ No newline at end of file
+168fa2fb22b8c1ad80c7001a429d3a80b48acfbfebb5414a0caa76964ea647c3
\ No newline at end of file
diff --git a/src/vdbemem.c b/src/vdbemem.c
index d415f9f72c..31264f797f 100644
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -1519,7 +1519,9 @@ static int valueFromFunction(
   }else{
     sqlite3ValueApplyAffinity(pVal, aff, SQLITE_UTF8);
     assert( rc==SQLITE_OK );
-    assert( enc==pVal->enc || db->mallocFailed );
+    assert( enc==pVal->enc
+         || (pVal->flags & MEM_Str)==0
+         || db->mallocFailed  );
 #if 0  /* Not reachable except after a prior failure */
     rc = sqlite3VdbeChangeEncoding(pVal, enc);
     if( rc==SQLITE_OK && sqlite3VdbeMemTooBig(pVal) ){

From 8ae1d29b1316063ee14c13641604ca1d04327b60 Mon Sep 17 00:00:00 2001
From: dan 
Date: Wed, 8 Feb 2023 14:25:00 +0000
Subject: [PATCH 21/45] Update an assert() in the stat4 code that is only true
 for a well-formed database.

FossilOrigin-Name: 04439f3b23b22a3c187637f286764568ee922227e3e34b2e63075876b4d1f2ac
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/where.c   |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 90c4c1403f..251febb9b5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sincorrect\sassert()\sin\sSTAT4\slogic\sadded\sjust\sa\sfew\sdays\sago\son\n[2023-02-01|/info/55a26c67ed4a3a93].
-D 2023-02-08T14:17:34.024
+C Update\san\sassert()\sin\sthe\sstat4\scode\sthat\sis\sonly\strue\sfor\sa\swell-formed\sdatabase.
+D 2023-02-08T14:25:00.629
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -706,7 +706,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c 3bbca705410258969d6d2e0c54b468de9674445d41b67714bb4fc3f1edef41d2
+F src/where.c 5b20d08699c9a55c0556661ff6f937dd1c8e27567b7553e48d477d3fad22ec4c
 F src/whereInt.h e25203e5bfee149f5f1225ae0166cfb4f1e65490c998a024249e98bb0647377c
 F src/wherecode.c 76bca3379219880d2527493b71a3be49e696f75396d3481e4de5d4ceec7886b2
 F src/whereexpr.c 7c5671a04b00c876bec5e99fd4e6f688065feb4773160fbf76fd7900d2901777
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 61cc8ed8d3541eddf23a9d542179c3f0223c5b8519b54d3be79988a376e25a89
-R b30ddae4c32511676ec9f35ba0a9073d
-U drh
-Z f13262bcc096124d3a09821c781e66c8
+P 168fa2fb22b8c1ad80c7001a429d3a80b48acfbfebb5414a0caa76964ea647c3
+R 81e82019be06f2b1f77bebf5a224afea
+U dan
+Z ee5c3f940801bd68e725142a7015cdad
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7aa8813f24..486243a63b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-168fa2fb22b8c1ad80c7001a429d3a80b48acfbfebb5414a0caa76964ea647c3
\ No newline at end of file
+04439f3b23b22a3c187637f286764568ee922227e3e34b2e63075876b4d1f2ac
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index df2a13b665..67ce10eece 100644
--- a/src/where.c
+++ b/src/where.c
@@ -1621,12 +1621,12 @@ static int whereKeyStats(
       if( iCol>0 ){
         pRec->nField = iCol;
         assert( sqlite3VdbeRecordCompare(aSample[i].n, aSample[i].p, pRec)<=0
-             || pParse->db->mallocFailed );
+             || pParse->db->mallocFailed || CORRUPT_DB );
       }
       if( i>0 ){
         pRec->nField = nField;
         assert( sqlite3VdbeRecordCompare(aSample[i-1].n, aSample[i-1].p, pRec)<0
-             || pParse->db->mallocFailed );
+             || pParse->db->mallocFailed || CORRUPT_DB );
       }
     }
   }

From 72ce57e675105bee8cf3900beb3d6f57909d0ecb Mon Sep 17 00:00:00 2001
From: larrybr 
Date: Wed, 8 Feb 2023 14:49:52 +0000
Subject: [PATCH 22/45] Cause gcc warning suppression in shell.c to be nice in
 other project(s).

FossilOrigin-Name: 6b41ba2e996ab7b9c3943ab93a19748db5cf37792f5d59d20eec301085282355
---
 manifest       | 14 +++++++-------
 manifest.uuid  |  2 +-
 src/shell.c.in |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 251febb9b5..7d29f291ae 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\san\sassert()\sin\sthe\sstat4\scode\sthat\sis\sonly\strue\sfor\sa\swell-formed\sdatabase.
-D 2023-02-08T14:25:00.629
+C Cause\sgcc\swarning\ssuppression\sin\sshell.c\sto\sbe\snice\sin\sother\sproject(s).
+D 2023-02-08T14:49:52.179
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -622,7 +622,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d62c5665279cc7485f9d45b5e20911cc7b19c203f268321a90d05d74f4725750
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c c3ce1b49cca2c66c8c88fe7d9e1f3db23590deb4dd631619ad90e1e5d21bcf1f
-F src/shell.c.in 623d793be69c1d9592447fa6e1dbabfce46758821f2b63d6cde2c8cd1d472641
+F src/shell.c.in 839d2b9f04f2b24e7032edb9ef756c34fbd60be91e24bc1ac8f1dae3a13c7742
 F src/sqlite.h.in c060f9e6f646fd817abf273c068666e079fc6e8467ea1d3e8b20f355f82722e9
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 168fa2fb22b8c1ad80c7001a429d3a80b48acfbfebb5414a0caa76964ea647c3
-R 81e82019be06f2b1f77bebf5a224afea
-U dan
-Z ee5c3f940801bd68e725142a7015cdad
+P 04439f3b23b22a3c187637f286764568ee922227e3e34b2e63075876b4d1f2ac
+R 5a4282edd5d64747c316d95e6189a5da
+U larrybr
+Z 5a1072aa059100fdccf9abcb84e30eb9
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 486243a63b..0e294db11a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-04439f3b23b22a3c187637f286764568ee922227e3e34b2e63075876b4d1f2ac
\ No newline at end of file
+6b41ba2e996ab7b9c3943ab93a19748db5cf37792f5d59d20eec301085282355
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index f5a354a2ee..6c15ad285f 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -168,7 +168,7 @@ typedef unsigned char u8;
 
 #ifndef deliberate_fall_through
 /* Quiet some compilers about some of our intentional code. */
-# if GCC_VERSION>=7000000
+# if defined(GCC_VERSION) && GCC_VERSION>=7000000
 #  define deliberate_fall_through __attribute__((fallthrough));
 # else
 #  define deliberate_fall_through

From 0d12a79310a75c726c8898068c0ca325f6e3ebdb Mon Sep 17 00:00:00 2001
From: dan 
Date: Wed, 8 Feb 2023 17:28:08 +0000
Subject: [PATCH 23/45] Better fix the problem where optimizing an fts5 table
 too often causes it to become unreadable (first attempt was [35bed981]).

FossilOrigin-Name: 459d986d38fc0ccbfd66801e0f22900cfed831268cf59ac8d1cd1e556f0d1441
---
 ext/fts5/fts5_index.c            |  4 ++--
 ext/fts5/test/fts5optimize2.test | 10 ++++++----
 manifest                         | 16 ++++++++--------
 manifest.uuid                    |  2 +-
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c
index 2ce75c1967..694cc16e45 100644
--- a/ext/fts5/fts5_index.c
+++ b/ext/fts5/fts5_index.c
@@ -4770,10 +4770,10 @@ static Fts5Structure *fts5IndexOptimizeStruct(
   if( pNew ){
     Fts5StructureLevel *pLvl;
     nByte = nSeg * sizeof(Fts5StructureSegment);
-    pNew->nLevel = pStruct->nLevel+1;
+    pNew->nLevel = MIN(pStruct->nLevel+1, FTS5_MAX_LEVEL);
     pNew->nRef = 1;
     pNew->nWriteCounter = pStruct->nWriteCounter;
-    pLvl = &pNew->aLevel[MIN(pStruct->nLevel, FTS5_MAX_LEVEL-1)];
+    pLvl = &pNew->aLevel[pNew->nLevel-1];
     pLvl->aSeg = (Fts5StructureSegment*)sqlite3Fts5MallocZero(&p->rc, nByte);
     if( pLvl->aSeg ){
       int iLvl, iSeg;
diff --git a/ext/fts5/test/fts5optimize2.test b/ext/fts5/test/fts5optimize2.test
index 78373e5e4d..a0782ee790 100644
--- a/ext/fts5/test/fts5optimize2.test
+++ b/ext/fts5/test/fts5optimize2.test
@@ -21,13 +21,15 @@ ifcapable !fts5 {
   return
 }
 
+set nLoop 2500
+
 do_execsql_test 1.0 {
   CREATE VIRTUAL TABLE t1 USING fts5(x);
   INSERT INTO t1(t1, rank) VALUES('pgsz', 32);
 }
 
 do_test 1.1 {
-  for {set ii 0} {$ii < 1500} {incr ii} {
+  for {set ii 0} {$ii < $nLoop} {incr ii} {
     execsql {
       INSERT INTO t1 VALUES('abc def ghi');
       INSERT INTO t1 VALUES('jkl mno pqr');
@@ -38,7 +40,7 @@ do_test 1.1 {
 
 do_execsql_test 1.2 {
   SELECT count(*) FROM t1('mno')
-} {1500}
+} $nLoop
 
 do_execsql_test 2.0 {
   CREATE VIRTUAL TABLE t2 USING fts5(x);
@@ -46,7 +48,7 @@ do_execsql_test 2.0 {
 }
 
 do_test 2.1 {
-  for {set ii 0} {$ii < 1500} {incr ii} {
+  for {set ii 0} {$ii < $nLoop} {incr ii} {
     execsql {
       INSERT INTO t2 VALUES('abc def ghi');
       INSERT INTO t2 VALUES('jkl mno pqr');
@@ -57,6 +59,6 @@ do_test 2.1 {
 
 do_execsql_test 2.2 {
   SELECT count(*) FROM t2('mno')
-} {1500}
+} $nLoop
 
 finish_test
diff --git a/manifest b/manifest
index 7d29f291ae..dd9f20b490 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Cause\sgcc\swarning\ssuppression\sin\sshell.c\sto\sbe\snice\sin\sother\sproject(s).
-D 2023-02-08T14:49:52.179
+C Better\sfix\sthe\sproblem\swhere\soptimizing\san\sfts5\stable\stoo\soften\scauses\sit\sto\sbecome\sunreadable\s(first\sattempt\swas\s[35bed981]).
+D 2023-02-08T17:28:08.724
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -92,7 +92,7 @@ F ext/fts5/fts5_buffer.c 3001fbabb585d6de52947b44b455235072b741038391f830d6b7292
 F ext/fts5/fts5_config.c 501e7d3566bc92766b0e11c0109a7c5a6146bc41144195459af5422f6c2078aa
 F ext/fts5/fts5_expr.c 40174a64829d30cc86e8266306ad24980f6911edd5ca0b8c1ce7821ea1341b88
 F ext/fts5/fts5_hash.c d4fb70940359f2120ccd1de7ffe64cc3efe65de9e8995b822cd536ff64c96982
-F ext/fts5/fts5_index.c 8a78d6c57a1ac1b4652e88ca994ac024a8652335431e12443f241fa61c6c6049
+F ext/fts5/fts5_index.c df5b29576a409f673e54b470723d817df9d5167cff208c48ab9a3773cba6fa89
 F ext/fts5/fts5_main.c fe67b6fb2ef134d9dbfa3941c63f777d755b075449be1863cb913a7f8754cb69
 F ext/fts5/fts5_storage.c 76c6085239eb44424004c022e9da17a5ecd5aaec859fba90ad47d3b08f4c8082
 F ext/fts5/fts5_tcl.c b1445cbe69908c411df8084a10b2485500ac70a9c747cdc8cda175a3da59d8ae
@@ -174,7 +174,7 @@ F ext/fts5/test/fts5multiclient.test 5ff811c028d6108045ffef737f1e9f05028af2458e4
 F ext/fts5/test/fts5near.test 211477940142d733ac04fad97cb24095513ab2507073a99c2765c3ddd2ef58bd
 F ext/fts5/test/fts5onepass.test f9b7d9b2c334900c6542a869760290e2ab5382af8fbd618834bf1fcc3e7b84da
 F ext/fts5/test/fts5optimize.test 36a752d24c818792032e4ff502936fc9cc5ef938721696396fdc79214b2717f1
-F ext/fts5/test/fts5optimize2.test 8ec4fccee2b33f3a7dbd431064b2e79f11e636345e3c997683eb158d6975999c
+F ext/fts5/test/fts5optimize2.test c7c97693abe8a2cb572acfb1f252d78f03d3984094cfc5eb2285a76d8a702a92
 F ext/fts5/test/fts5phrase.test 13e5d8e9083077b3d9c74315b3c92ec723cc6eb37c8155e0bfe1bba00559f07b
 F ext/fts5/test/fts5plan.test b65cfcca9ddd6fdaa118c61e17aeec8e8433bc5b6bb307abd116514f79c49c5a
 F ext/fts5/test/fts5porter.test 8d08010c28527db66bc3feebd2b8767504aaeb9b101a986342fa7833d49d0d15
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 04439f3b23b22a3c187637f286764568ee922227e3e34b2e63075876b4d1f2ac
-R 5a4282edd5d64747c316d95e6189a5da
-U larrybr
-Z 5a1072aa059100fdccf9abcb84e30eb9
+P 6b41ba2e996ab7b9c3943ab93a19748db5cf37792f5d59d20eec301085282355
+R da19a0cff193106684ce35fd290917f2
+U dan
+Z 46a321111c67d64fb04a92b485f79f0e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0e294db11a..1c788ff602 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6b41ba2e996ab7b9c3943ab93a19748db5cf37792f5d59d20eec301085282355
\ No newline at end of file
+459d986d38fc0ccbfd66801e0f22900cfed831268cf59ac8d1cd1e556f0d1441
\ No newline at end of file

From 03b30b7abe0167ee5f80a9fba4a7e605caf787b4 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 8 Feb 2023 17:28:42 +0000
Subject: [PATCH 24/45] Always use 64-bit integers for stats associated with
 STAT1 and STAT4.

FossilOrigin-Name: 6647d1cb8b53102c8114b1f3e34173d907504d78aa3140eab53f88027a36660b
---
 manifest          | 16 ++++++++--------
 manifest.uuid     |  2 +-
 src/sqliteInt.h   | 10 ++--------
 tool/mkctimec.tcl |  1 -
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/manifest b/manifest
index dd9f20b490..69073840ef 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Better\sfix\sthe\sproblem\swhere\soptimizing\san\sfts5\stable\stoo\soften\scauses\sit\sto\sbecome\sunreadable\s(first\sattempt\swas\s[35bed981]).
-D 2023-02-08T17:28:08.724
+C Always\suse\s64-bit\sintegers\sfor\sstats\sassociated\swith\sSTAT1\sand\sSTAT4.
+D 2023-02-08T17:28:42.250
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -626,7 +626,7 @@ F src/shell.c.in 839d2b9f04f2b24e7032edb9ef756c34fbd60be91e24bc1ac8f1dae3a13c774
 F src/sqlite.h.in c060f9e6f646fd817abf273c068666e079fc6e8467ea1d3e8b20f355f82722e9
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
-F src/sqliteInt.h 859e193140c393a9a50dd81345b95130b208a312dd064867065c5e637232ed58
+F src/sqliteInt.h 79cc3484763e2a4d4b2a7ea17d50c376671cc438b2610f2c1cd1a503d4e714de
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -1970,7 +1970,7 @@ F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
 F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176
 F tool/mkautoconfamal.sh f62353eb6c06ab264da027fd4507d09914433dbdcab9cb011cdc18016f1ab3b8
 F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x
-F tool/mkctimec.tcl c185cf1bdcd3d9bd3c06f77a2fd2df8a4a0d07266f992ecda75286965ba3574c x
+F tool/mkctimec.tcl 38e3db33210a200aae791635125052a643a27aa0619a0debf19aa9c55e1b2dde x
 F tool/mkkeywordhash.c 35bfc41adacc4aa6ef6fca7fd0c63e0ec0534b78daf4d0cfdebe398216bbffc3
 F tool/mkmsvcmin.tcl 6ecab9fe22c2c8de4d82d4c46797bda3d2deac8e763885f5a38d0c44a895ab33
 F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 6b41ba2e996ab7b9c3943ab93a19748db5cf37792f5d59d20eec301085282355
-R da19a0cff193106684ce35fd290917f2
-U dan
-Z 46a321111c67d64fb04a92b485f79f0e
+P 459d986d38fc0ccbfd66801e0f22900cfed831268cf59ac8d1cd1e556f0d1441
+R 7d765c5331bdc4fd6218383f0460f3b4
+U drh
+Z d38d730b036fdc5d765ac843fc1e375f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1c788ff602..cec0c36a0c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-459d986d38fc0ccbfd66801e0f22900cfed831268cf59ac8d1cd1e556f0d1441
\ No newline at end of file
+6647d1cb8b53102c8114b1f3e34173d907504d78aa3140eab53f88027a36660b
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 73378dbf61..5aaa45d08e 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -819,15 +819,9 @@ typedef INT8_TYPE i8;              /* 1-byte signed integer */
 
 /*
 ** The datatype used to store estimates of the number of rows in a
-** table or index.  This is an unsigned integer type.  For 99.9% of
-** the world, a 32-bit integer is sufficient.  But a 64-bit integer
-** can be used at compile-time if desired.
+** table or index.
 */
-#ifdef SQLITE_64BIT_STATS
- typedef u64 tRowcnt;    /* 64-bit only if requested at compile-time */
-#else
- typedef u32 tRowcnt;    /* 32-bit is the default */
-#endif
+typedef u64 tRowcnt;
 
 /*
 ** Estimated quantities used for query planning are stored as 16-bit
diff --git a/tool/mkctimec.tcl b/tool/mkctimec.tcl
index 0438b11b35..bcb1a54bb8 100755
--- a/tool/mkctimec.tcl
+++ b/tool/mkctimec.tcl
@@ -98,7 +98,6 @@ set boolean_defnnz_options {
 set boolean_defnil_options {
   SQLITE_32BIT_ROWID
   SQLITE_4_BYTE_ALIGNED_MALLOC
-  SQLITE_64BIT_STATS
   SQLITE_ALLOW_URI_AUTHORITY
   SQLITE_BUG_COMPATIBLE_20160819
   SQLITE_CASE_SENSITIVE_LIKE

From 601e4d4a0f0a62ab148d9aa77dfff2862626508f Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 8 Feb 2023 20:29:48 +0000
Subject: [PATCH 25/45] Back out the 'txn' enhancement to date/time functions. 
 The duration of a "transaction" is confused and needs to be straightened out
 prior to moving forward with this change.

FossilOrigin-Name: 4a145f07322d768a07619bed27e0390d50f3a01d07787b9296234a5ceb6f1218
---
 manifest        | 21 ++++++------
 manifest.uuid   |  2 +-
 src/date.c      | 33 +++++++------------
 src/sqliteInt.h |  3 +-
 src/vdbeapi.c   | 17 +++-------
 src/vdbeaux.c   |  1 -
 test/date.test  | 87 +++++++------------------------------------------
 7 files changed, 40 insertions(+), 124 deletions(-)

diff --git a/manifest b/manifest
index 69073840ef..421b371067 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Always\suse\s64-bit\sintegers\sfor\sstats\sassociated\swith\sSTAT1\sand\sSTAT4.
-D 2023-02-08T17:28:42.250
+C Back\sout\sthe\s'txn'\senhancement\sto\sdate/time\sfunctions.\s\sThe\sduration\sof\sa\n"transaction"\sis\sconfused\sand\sneeds\sto\sbe\sstraightened\sout\sprior\sto\smoving\nforward\swith\sthis\schange.
+D 2023-02-08T20:29:48.017
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -567,7 +567,7 @@ F src/build.c c55ab6d1b089ceef57160e840f05f692955ac90944c3d04fcf01d97fd7bfd08d
 F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 20507cc0b0a6c19cd882fcd0eaeda32ae6a4229fb4b024cfdf3183043d9b703d
-F src/date.c 37ca5e3cb34d666fae892156c9317d8bf756ae8a281504040dd3a02813ce5e9e
+F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
 F src/dbpage.c d47549716549311f79dc39fe5c8fb19390a6eb2c960f8e37c89a9c4de0c1052e
 F src/dbstat.c ec92074baa61d883de58c945162d9e666c13cd7cf3a23bc38b4d1c4d0b2c2bef
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
@@ -626,7 +626,7 @@ F src/shell.c.in 839d2b9f04f2b24e7032edb9ef756c34fbd60be91e24bc1ac8f1dae3a13c774
 F src/sqlite.h.in c060f9e6f646fd817abf273c068666e079fc6e8467ea1d3e8b20f355f82722e9
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
-F src/sqliteInt.h 79cc3484763e2a4d4b2a7ea17d50c376671cc438b2610f2c1cd1a503d4e714de
+F src/sqliteInt.h 4dcc36b21dd0c77efeb0bb38b0d31916bc63fb429c8a89d186c945eba0816447
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -694,8 +694,8 @@ F src/vacuum.c 84ce7f01f8a7a08748e107a441db83bcec13970190ddcb0c9ff522adbc1c23fd
 F src/vdbe.c 47d3b78e75e239e1909933f0d77612b4111ebe760f01fdd0085e4e30b59b4cc6
 F src/vdbe.h 73b904a6b3bb27f308c6cc287a5751ebc7f1f89456be0ed068a12b92844c6e8c
 F src/vdbeInt.h a4147a4ddf613cb1bcb555ace9e9e74a9c099d65facd88155f191b1fb4d74cfb
-F src/vdbeapi.c be64df0e21a43056b62f46777749347b7d51f6e5e6c419c4bf42ce9bf98d6064
-F src/vdbeaux.c 9f2a2ec80ff90266ab603065c32dd3c8b0a53023ab7210a03fccf324ad6ddbce
+F src/vdbeapi.c 40c47b1528d308a322203de21d2e0d711753257ed9771771b6129214b1d65932
+F src/vdbeaux.c 3f9e3b6585e7434aa11300169dd66ddf0fc963a0c6f7940bdc058335dadeb353
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
 F src/vdbemem.c 86908c0ab1624df678458feb53319bf9720992e761cbccf77a36d671ce11693d
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
@@ -910,7 +910,7 @@ F test/ctime.test 340f362f41f92972bbd71f44e10569a5cc694062b692231bd08aa6fe6c1c47
 F test/cursorhint.test 0175e4404181ace3ceca8b114eb0a98eae600d565aa4e2705abbe6614c7fe201
 F test/cursorhint2.test 6f3aa9cb19e7418967a10ec6905209bcbb5968054da855fc36c8beee9ae9c42f
 F test/dataversion1.test 6e5e86ac681f0782e766ebcb56c019ae001522d114e0e111e5ebf68ccf2a7bb8
-F test/date.test 8e9ae588d832c54fa2512b0f9789bea48442ada0736dabee54b377dc1b8d4a87
+F test/date.test 118e04db8c8b4efeb885542b4918c7b869a34c460a6bebbfe927dfd75706b80d
 F test/date2.test 7e12ec14aaf4d5e6294b4ba140445b0eca06ea50062a9c3a69c4ee13d0b6f8b1
 F test/date3.test a1b77abf05c6772fe5ca2337cac1398892f2a41e62bce7e6be0f4a08a0e64ae5
 F test/dbdata.test 042f49acff3438f940eeba5868d3af080ae64ddf26ae78f80c92bec3ca7d8603
@@ -2045,8 +2045,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 459d986d38fc0ccbfd66801e0f22900cfed831268cf59ac8d1cd1e556f0d1441
-R 7d765c5331bdc4fd6218383f0460f3b4
+P 6647d1cb8b53102c8114b1f3e34173d907504d78aa3140eab53f88027a36660b
+Q -61cc8ed8d3541eddf23a9d542179c3f0223c5b8519b54d3be79988a376e25a89
+R a860bd4c312a3654d874052ef844c582
 U drh
-Z d38d730b036fdc5d765ac843fc1e375f
+Z aa31102f6fd0899de50076b8543233cf
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index cec0c36a0c..d930a4a188 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6647d1cb8b53102c8114b1f3e34173d907504d78aa3140eab53f88027a36660b
\ No newline at end of file
+4a145f07322d768a07619bed27e0390d50f3a01d07787b9296234a5ceb6f1218
\ No newline at end of file
diff --git a/src/date.c b/src/date.c
index 8546b5dc89..a3e58bc4e3 100644
--- a/src/date.c
+++ b/src/date.c
@@ -331,16 +331,12 @@ static int parseYyyyMmDd(const char *zDate, DateTime *p){
 }
 
 /*
-** Set the time to the current time reported for the prepared statement
-** that is currently executing.  The same time is reported for all
-** invocations of this routine from within the same call to sqlite3_step().
-**
-** Or if bTxn is true, use the transaction time.
+** Set the time to the current time reported by the VFS.
 **
 ** Return the number of errors.
 */
-static int setCurrentStmtTime(sqlite3_context *context, DateTime *p, int bTxn){
-  p->iJD = sqlite3StmtCurrentTime(context, bTxn);
+static int setDateTimeToCurrent(sqlite3_context *context, DateTime *p){
+  p->iJD = sqlite3StmtCurrentTime(context);
   if( p->iJD>0 ){
     p->validJD = 1;
     return 0;
@@ -391,9 +387,7 @@ static int parseDateOrTime(
   }else if( parseHhMmSs(zDate, p)==0 ){
     return 0;
   }else if( sqlite3StrICmp(zDate,"now")==0 && sqlite3NotPureFunc(context) ){
-    return setCurrentStmtTime(context, p, 0);
-  }else if( sqlite3StrICmp(zDate,"txn")==0 && sqlite3NotPureFunc(context) ){
-    return setCurrentStmtTime(context, p, 1);
+    return setDateTimeToCurrent(context, p);
   }else if( sqlite3AtoF(zDate, &r, sqlite3Strlen30(zDate), SQLITE_UTF8)>0 ){
     setRawDateNumber(p, r);
     return 0;
@@ -937,11 +931,8 @@ static int parseModifier(
 ** the resulting time into the DateTime structure p.  Return 0
 ** on success and 1 if there are any errors.
 **
-** If there are zero parameters (if argc<=0) then assume a default
-** value of "now" for argv[0] if argc==0 and "txn" if argc<0.  SQL
-** functions will always have argc>=0, but the special implementations
-** of CURRENT_TIME, CURRENT_DATE, and CURRENT_TIMESTAMP set argc to -1
-** in order to force the use of 'txn' semantics.
+** If there are zero parameters (if even argv[0] is undefined)
+** then assume a default value of "now" for argv[0].
 */
 static int isDate(
   sqlite3_context *context, 
@@ -953,9 +944,9 @@ static int isDate(
   const unsigned char *z;
   int eType;
   memset(p, 0, sizeof(*p));
-  if( argc<=0 ){
+  if( argc==0 ){
     if( !sqlite3NotPureFunc(context) ) return 1;
-    return setCurrentStmtTime(context, p, argc<0);
+    return setDateTimeToCurrent(context, p);
   }
   if( (eType = sqlite3_value_type(argv[0]))==SQLITE_FLOAT
                    || eType==SQLITE_INTEGER ){
@@ -1262,7 +1253,7 @@ static void ctimeFunc(
   sqlite3_value **NotUsed2
 ){
   UNUSED_PARAMETER2(NotUsed, NotUsed2);
-  timeFunc(context, -1, 0);
+  timeFunc(context, 0, 0);
 }
 
 /*
@@ -1276,7 +1267,7 @@ static void cdateFunc(
   sqlite3_value **NotUsed2
 ){
   UNUSED_PARAMETER2(NotUsed, NotUsed2);
-  dateFunc(context, -1, 0);
+  dateFunc(context, 0, 0);
 }
 
 /*
@@ -1290,7 +1281,7 @@ static void ctimestampFunc(
   sqlite3_value **NotUsed2
 ){
   UNUSED_PARAMETER2(NotUsed, NotUsed2);
-  datetimeFunc(context, -1, 0);
+  datetimeFunc(context, 0, 0);
 }
 #endif /* !defined(SQLITE_OMIT_DATETIME_FUNCS) */
 
@@ -1321,7 +1312,7 @@ static void currentTimeFunc(
   UNUSED_PARAMETER(argc);
   UNUSED_PARAMETER(argv);
 
-  iT = sqlite3StmtCurrentTime(context, 1);
+  iT = sqlite3StmtCurrentTime(context);
   if( iT<=0 ) return;
   t = iT/1000 - 10000*(sqlite3_int64)21086676;
 #if HAVE_GMTIME_R
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 5aaa45d08e..9af38e8df4 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1615,7 +1615,6 @@ struct sqlite3 {
   u8 nSqlExec;                  /* Number of pending OP_SqlExec opcodes */
   u8 eOpenState;                /* Current condition of the connection */
   int nextPagesize;             /* Pagesize after VACUUM if >0 */
-  i64 txnTime;                  /* Timestamp for current transaction */
   i64 nChange;                  /* Value returned by sqlite3_changes() */
   i64 nTotalChange;             /* Value returned by sqlite3_total_changes() */
   int aLimit[SQLITE_N_LIMIT];   /* Limits */
@@ -5335,7 +5334,7 @@ FuncDef *sqlite3VtabOverloadFunction(sqlite3 *,FuncDef*, int nArg, Expr*);
     && !defined(SQLITE_OMIT_VIRTUALTABLE)
   void sqlite3VtabUsesAllSchemas(sqlite3_index_info*);
 #endif
-sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context*, int);
+sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context*);
 int sqlite3VdbeParameterIndex(Vdbe*, const char*, int);
 int sqlite3TransferBindings(sqlite3_stmt *, sqlite3_stmt *);
 void sqlite3ParseObjectInit(Parse*,sqlite3*);
diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 722d1215f1..476b6a2adf 100644
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -970,27 +970,18 @@ int sqlite3_vtab_in_next(sqlite3_value *pVal, sqlite3_value **ppOut){
 ** statement, the exact same time is returned for each invocation regardless
 ** of the amount of time that elapses between invocations.  In other words,
 ** the time returned is always the time of the first call.
-**
-** Or, if bTxn, return the transaction time.  The transaction time is the
-** same for all calls within the same transaction.
-**
-** bTxn is 0 for SQL like datetime('now') and is 1 for datetime('txn').
 */
-sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context *p, int bTxn){
+sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context *p){
   int rc;
 #ifndef SQLITE_ENABLE_STAT4
-  sqlite3_int64 *piTime;
-  sqlite3 *db = p->pOut->db;
+  sqlite3_int64 *piTime = &p->pVdbe->iCurrentTime;
   assert( p->pVdbe!=0 );
-  piTime = bTxn ? &db->txnTime : &p->pVdbe->iCurrentTime;
 #else
   sqlite3_int64 iTime = 0;
-  sqlite3_int64 *piTime;
-  sqlite3 *db = p->pOut->db;
-  piTime = bTxn ? &db->txnTime : p->pVdbe!=0 ? &p->pVdbe->iCurrentTime : &iTime;
+  sqlite3_int64 *piTime = p->pVdbe!=0 ? &p->pVdbe->iCurrentTime : &iTime;
 #endif
   if( *piTime==0 ){
-    rc = sqlite3OsCurrentTimeInt64(db->pVfs, piTime);
+    rc = sqlite3OsCurrentTimeInt64(p->pOut->db->pVfs, piTime);
     if( rc ) *piTime = 0;
   }
   return *piTime;
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 82dc607154..d04d8f1e17 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -3394,7 +3394,6 @@ int sqlite3VdbeHalt(Vdbe *p){
   */
   if( db->autoCommit ){
     sqlite3ConnectionUnlocked(db);
-    db->txnTime = 0;
   }
 
   assert( db->nVdbeActive>0 || db->autoCommit==0 || db->nStatement==0 );
diff --git a/test/date.test b/test/date.test
index 479635753a..62233ad8f6 100644
--- a/test/date.test
+++ b/test/date.test
@@ -309,9 +309,9 @@ sqlite3_test_control SQLITE_TESTCTRL_LOCALTIME_FAULT 0
 #
 datetest 7.1 {datetime(null)} NULL
 datetest 7.2 {datetime('now',null)} NULL
-datetest 7.3 {datetime('txn','localtime',null)} NULL
+datetest 7.3 {datetime('now','localtime',null)} NULL
 datetest 7.4 {time(null)} NULL
-datetest 7.5 {time('txn',null)} NULL
+datetest 7.5 {time('now',null)} NULL
 datetest 7.6 {time('now','localtime',null)} NULL
 datetest 7.7 {date(null)} NULL
 datetest 7.8 {date('now',null)} NULL
@@ -322,28 +322,28 @@ datetest 7.12 {julianday('now','localtime',null)} NULL
 datetest 7.13 {strftime(null,'now')} NULL
 datetest 7.14 {strftime('%s',null)} NULL
 datetest 7.15 {strftime('%s','now',null)} NULL
-datetest 7.16 {strftime('%s','txn','localtime',null)} NULL
+datetest 7.16 {strftime('%s','now','localtime',null)} NULL
 
 # Test modifiers when the date begins as a julian day number - to
 # make sure the HH:MM:SS is preserved.  Ticket #551.
 #
 set sqlite_current_time [db eval {SELECT strftime('%s','2003-10-22 12:34:00')}]
 datetest 8.1 {datetime('now','weekday 0')} {2003-10-26 12:34:00}
-datetest 8.2 {datetime('txn','weekday 1')} {2003-10-27 12:34:00}
+datetest 8.2 {datetime('now','weekday 1')} {2003-10-27 12:34:00}
 datetest 8.3 {datetime('now','weekday 2')} {2003-10-28 12:34:00}
-datetest 8.4 {datetime('txn','weekday 3')} {2003-10-22 12:34:00}
+datetest 8.4 {datetime('now','weekday 3')} {2003-10-22 12:34:00}
 datetest 8.5 {datetime('now','start of month')} {2003-10-01 00:00:00}
-datetest 8.6 {datetime('txn','start of year')} {2003-01-01 00:00:00}
+datetest 8.6 {datetime('now','start of year')} {2003-01-01 00:00:00}
 datetest 8.7 {datetime('now','start of day')} {2003-10-22 00:00:00}
-datetest 8.8 {datetime('txn','1 day')} {2003-10-23 12:34:00}
+datetest 8.8 {datetime('now','1 day')} {2003-10-23 12:34:00}
 datetest 8.9 {datetime('now','+1 day')} {2003-10-23 12:34:00}
-datetest 8.10 {datetime('txn','+1.25 day')} {2003-10-23 18:34:00}
+datetest 8.10 {datetime('now','+1.25 day')} {2003-10-23 18:34:00}
 datetest 8.11 {datetime('now','-1.0 day')} {2003-10-21 12:34:00}
-datetest 8.12 {datetime('txn','1 month')} {2003-11-22 12:34:00}
+datetest 8.12 {datetime('now','1 month')} {2003-11-22 12:34:00}
 datetest 8.13 {datetime('now','11 month')} {2004-09-22 12:34:00}
-datetest 8.14 {datetime('txn','-13 month')} {2002-09-22 12:34:00}
+datetest 8.14 {datetime('now','-13 month')} {2002-09-22 12:34:00}
 datetest 8.15 {datetime('now','1.5 months')} {2003-12-07 12:34:00}
-datetest 8.16 {datetime('txn','-5 years')} {1998-10-22 12:34:00}
+datetest 8.16 {datetime('now','-5 years')} {1998-10-22 12:34:00}
 datetest 8.17 {datetime('now','+10.5 minutes')} {2003-10-22 12:44:30}
 datetest 8.18 {datetime('now','-1.25 hours')} {2003-10-22 11:19:00}
 datetest 8.19 {datetime('now','11.25 seconds')} {2003-10-22 12:34:11}
@@ -486,76 +486,11 @@ do_test date-15.1 {
   }
 } {0.0}
 do_test date-15.2 {
-  db func sleeper sleeper
-  db eval {
-     SELECT c - a FROM (SELECT julianday('txn') AS a,
-                               sleeper(), julianday('txn') AS c);
-  }
-} {0.0}
-do_test date-15.3 {
   db eval {
      SELECT a==b FROM (SELECT current_timestamp AS a,
                                sleeper(), current_timestamp AS b);
   }
 } {1}
-do_test date-15.4 {
-  db eval {
-     SELECT a==b FROM (SELECT julianday('txn') AS a,
-                               sleeper(), julianday('now') AS b);
-  }
-} {0}
-
-do_execsql_test date-15.5 {
-  CREATE TEMP TABLE t15(a,b);
-  BEGIN;
-  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
-  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
-  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
-  COMMIT;
-  SELECT count(a), count(DISTINCT a) FROM t15;
-} {3 1}
-do_execsql_test date-15.6 {
-  DELETE FROM t15;
-  BEGIN;
-  INSERT INTO t15(a,b) VALUES(julianday('now'),sleeper());
-  INSERT INTO t15(a,b) VALUES(julianday('now'),sleeper());
-  INSERT INTO t15(a,b) VALUES(julianday('now'),sleeper());
-  COMMIT;
-  SELECT count(a), count(DISTINCT a) FROM t15;
-} {3 3}
-do_execsql_test date-15.7 {
-  DELETE FROM t15;
-  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
-  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
-  BEGIN;
-  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
-  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
-  COMMIT;
-  SELECT count(a), count(DISTINCT a) FROM t15;
-} {4 3}
-
-do_test date-15.10 {
-  unset -nocomplain x
-  db eval {BEGIN;}
-  db eval {
-    SELECT
-       current_time AS ct1,
-       current_date AS cd1,
-       current_timestamp AS cs1,
-       time() AS ct2,
-       datetime() AS cs2;
-    } x {continue}
-  after 1000
-  db eval {
-    SELECT
-      current_time=$x(ct1),
-      current_date=$x(cd1),
-      current_timestamp=$x(cs1),
-      time()=$x(ct2),
-      datetime()=$x(cs2);
-  }
-} {1 1 1 0 0}
-db eval {COMMIT}
 
 # Tests of extreme values in date/time functions.  Run with UBSan or the
 # equivalent to verify no signed interger overflow warnings.

From a0c8ec9ee5a479bce71a3c9f78fbe6dfc93ef547 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 9 Feb 2023 11:51:40 +0000
Subject: [PATCH 26/45] The "flexnum" affinity that was added by
 [44135d6ea84f7ba6] needs to also be added to the output of the affinity()
 built-in function. dbsqlfuzz d309eaa5fe492c9606a8be876c2bc7dedb29d3d8

FossilOrigin-Name: f4ec68ceefa3a607f37d6355aac89fd1ae1704da4061bad7f271db1f17c1dd3a
---
 manifest      | 13 ++++++-------
 manifest.uuid |  2 +-
 src/expr.c    |  7 +++++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 421b371067..2c9dd512ce 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Back\sout\sthe\s'txn'\senhancement\sto\sdate/time\sfunctions.\s\sThe\sduration\sof\sa\n"transaction"\sis\sconfused\sand\sneeds\sto\sbe\sstraightened\sout\sprior\sto\smoving\nforward\swith\sthis\schange.
-D 2023-02-08T20:29:48.017
+C The\s"flexnum"\saffinity\sthat\swas\sadded\sby\s[44135d6ea84f7ba6]\sneeds\sto\salso\nbe\sadded\sto\sthe\soutput\sof\sthe\saffinity()\sbuilt-in\sfunction.\ndbsqlfuzz\sd309eaa5fe492c9606a8be876c2bc7dedb29d3d8
+D 2023-02-09T11:51:40.007
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -571,7 +571,7 @@ F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
 F src/dbpage.c d47549716549311f79dc39fe5c8fb19390a6eb2c960f8e37c89a9c4de0c1052e
 F src/dbstat.c ec92074baa61d883de58c945162d9e666c13cd7cf3a23bc38b4d1c4d0b2c2bef
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
-F src/expr.c 204af6a83c191f5ac19ec4af6ecc546f188cc2dd1c76fc5280982f710ec4b9c4
+F src/expr.c 2e5e67e800c9416996df52409746a2f3c7dadf5d38b5a367ce379b239e3f40c8
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
 F src/func.c 0bf5b82df41ffa1afe2bc67c3d0d361761c56c9e1785c999e24a15ba04c28d2b
@@ -2045,9 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 6647d1cb8b53102c8114b1f3e34173d907504d78aa3140eab53f88027a36660b
-Q -61cc8ed8d3541eddf23a9d542179c3f0223c5b8519b54d3be79988a376e25a89
-R a860bd4c312a3654d874052ef844c582
+P 4a145f07322d768a07619bed27e0390d50f3a01d07787b9296234a5ceb6f1218
+R 0e0a47ab991199699eb3ec89de3dd5bd
 U drh
-Z aa31102f6fd0899de50076b8543233cf
+Z c922ed95eb155a993ae91de5a4e97292
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d930a4a188..ef08859215 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4a145f07322d768a07619bed27e0390d50f3a01d07787b9296234a5ceb6f1218
\ No newline at end of file
+f4ec68ceefa3a607f37d6355aac89fd1ae1704da4061bad7f271db1f17c1dd3a
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 271d9dea80..ea3c901671 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -4103,11 +4103,14 @@ static int exprCodeInlineFunction(
       ** the type affinity of the argument.  This is used for testing of
       ** the SQLite type logic.
       */
-      const char *azAff[] = { "blob", "text", "numeric", "integer", "real" };
+      const char *azAff[] = { "blob", "text", "numeric", "integer",
+                              "real", "flexnum" };
       char aff;
       assert( nFarg==1 );
       aff = sqlite3ExprAffinity(pFarg->a[0].pExpr);
-      sqlite3VdbeLoadString(v, target, 
+      assert( aff<=SQLITE_AFF_NONE
+           || (aff>=SQLITE_AFF_BLOB && aff<=SQLITE_AFF_FLEXNUM) );
+      sqlite3VdbeLoadString(v, target,
               (aff<=SQLITE_AFF_NONE) ? "none" : azAff[aff-SQLITE_AFF_BLOB]);
       break;
     }

From 9a8330b5503628e033efca3348fc6148416c4e95 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 9 Feb 2023 12:47:15 +0000
Subject: [PATCH 27/45] New test cases added to fuzzdata8.db.

FossilOrigin-Name: be67bafccd79ba835ed7e287e09852ce83805da0797b164d0c8e44be05d9d28a
---
 manifest          |  12 ++++++------
 manifest.uuid     |   2 +-
 test/fuzzdata8.db | Bin 4118528 -> 4235264 bytes
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index 2c9dd512ce..55cdd9fc22 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\s"flexnum"\saffinity\sthat\swas\sadded\sby\s[44135d6ea84f7ba6]\sneeds\sto\salso\nbe\sadded\sto\sthe\soutput\sof\sthe\saffinity()\sbuilt-in\sfunction.\ndbsqlfuzz\sd309eaa5fe492c9606a8be876c2bc7dedb29d3d8
-D 2023-02-09T11:51:40.007
+C New\stest\scases\sadded\sto\sfuzzdata8.db.
+D 2023-02-09T12:47:15.432
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1146,7 +1146,7 @@ F test/fuzzdata4.db b502c7d5498261715812dd8b3c2005bad08b3a26e6489414bd13926cd3e4
 F test/fuzzdata5.db e35f64af17ec48926481cfaf3b3855e436bd40d1cfe2d59a9474cb4b748a52a5
 F test/fuzzdata6.db 92a80e4afc172c24f662a10a612d188fb272de4a9bd19e017927c95f737de6d7
 F test/fuzzdata7.db 0166b56fd7a6b9636a1d60ef0a060f86ddaecf99400a666bb6e5bbd7199ad1f2
-F test/fuzzdata8.db d07d68dcebbc4d537eb9fe066ed858239f901f48032c8e627b52e0f39058ac7a
+F test/fuzzdata8.db f6c2f2af4deaaae0ddb3310d509c2659990794aa653dc501b80a0534c3493f80
 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8
 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14
 F test/fuzzerfault.test f64c4aef4c9e9edf1d6dc0d3f1e65dcc81e67c996403c88d14f09b74807a42bc
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 4a145f07322d768a07619bed27e0390d50f3a01d07787b9296234a5ceb6f1218
-R 0e0a47ab991199699eb3ec89de3dd5bd
+P f4ec68ceefa3a607f37d6355aac89fd1ae1704da4061bad7f271db1f17c1dd3a
+R 2ecfe56d715e0c05010edfc93912b400
 U drh
-Z c922ed95eb155a993ae91de5a4e97292
+Z 0e31dffba5097c501205fab7ba01a193
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ef08859215..1f0074e652 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f4ec68ceefa3a607f37d6355aac89fd1ae1704da4061bad7f271db1f17c1dd3a
\ No newline at end of file
+be67bafccd79ba835ed7e287e09852ce83805da0797b164d0c8e44be05d9d28a
\ No newline at end of file
diff --git a/test/fuzzdata8.db b/test/fuzzdata8.db
index 4e5b957e0a0f053f18d62bf84e067c3fe9266d37..a4969047aa677cdad6e9786fd825d28a6630661b 100644
GIT binary patch
delta 91245
zcmeFZcU)A*7dX0e%iepp(Rk)^~&=91~8
zj1-eGWCR&Z`jJf1gQSs;B#uOrFcSC}5q^O+N2TJ6tXT{2Hr$$tFyGn-VP9)6gng_%
z5caTUAWXG(Lzrakj4;vK31Pf76=9q;1!0V}Bf>~)62cH`B0{4z0im}w9-*r>4xzys
zi%_=4AmpqTm5Te(YDRe18l_sG;%->mBvj!tPW<^SJ
zO;+pycf@K!c*tr*__{R!VT08l;d-kt!c|r;gv+fS2%omPBV1&4Luj?SBAjP+K{(Uu
zgs|M|pi(X1N~{L_G0Cb!IMJ#_INYj1IM6C1%(Y4g`&iWoyIVzs$yNbjgq1_sZaxC1
zc?jg$2*^y8iu^PKLEAJ0w<{3boQmMO2HCWGR`Fg`li2g2~8E
zGN~tmB4j2Rj=UrTx+Ca~{3Jcn5u~Oe{YeMpEb&K{5+CFx@k&PEjQk`H$Vj3?4iXKr
zj;N4xs$YP)FqbhPlFa}wqdP0fib|ypTExWh85Uwz~#V`S)=(okb$c!~y^ze{k3%Jal5
z^~>m;-92M4END*xAt#Ec;Yuj+hlqvF-cZ-U$pNBVi4&jQJq2=)I;KI%d8aTqTr;n-VoO%(GeOh
z=}lnd4F;$h&FP__gp;5l!a;%!5s3~kBGy$0u@NK|O2YJEaLkQZ;Nbf~255>WGW3|3
z;=(AAWh^NjT{yKUGS(apC8JZ_;hSHydf2p$XbjymGBffsj6M40WEm?gweFlylt*7`hGc?nO)Pn^)=?_7z?4bi`o;ucPC!X-TGx!ra7h29eK*+dN!(zxgE||w1QJ(hiFH-Ok@m#o7ikO~9vU7wwPZqBSy4q;MMZ^i
zKrU+tTQ`E=$kbTy9T@HiX}N*UkeeImuC`O$2r0W#q9DG%(G7CL^#Ks&jRf7j$3+LF
z%Q#I)r_hQSp~jqk#!;O@Crl4b(e%fDb;~!7o;GDlQAx$fF@+UHVMSn$B!f^7RoU>m
zH`(Qw5ND1zKPg*igz7F)-Y)6+`RUzy87rntD>A0{Hx^Et83WDlNv@E)B{2jV?j$04
zyCdtb`Va@PT_;OuI9M+5fnb^F;tOVz#Ru9)5(5L5a
z+u#XJecc2YUWKHo_b0=kt!I)3CQNoV0U6}%3U!m6)xa;{oEWYuFa(ewC^VBYcrAeR
z1aAw`fwMNi8RqXyao`Z`4xwJYuzilv9a1eQN3X}Yy1@Ixkk3^k_0Di-XtEAA9q~pH
zG9uAdTSx+gn#c?&4fTqL3nmfU11b
z1(8Agh?wEnNzoO43nIbrrqQX}+O{B_V~WON?A_m(os)0uk)GK<0}9om2|n!Mybulq
z6L+p67Fu&O0q|om@sOk9lM<6+l4HQ}tg{<*2_Y6z2+jN4y=x`T0n7=+1DgE9gZa>K
z<3pM|#=1&ys{?U?!~O^y!V^s}@o<6k9m=Z}GGZJV9Re5lI2nm77
zuEauzhLP<&=?4)bQ)}V0H<<-HhdFuBh$s>y6NTo)lLk)A#g7KShVI0N1|$(LMbrqY
zowLC)D>aNx&L({cZRkpJh?tM%218mB@ng7Bb9ZuHk_W4}&Z^_8!8P?g`|#^B_3%L!
zDVB#lJ3%L?whgpb0$7Qb6hYxfdN+^Au+X5PF-(upJfUEvXu4+f?41oAqKJ{q2J6UR
zS9wscjDDz8F_4!_{4K`N{Iuf0j5Bi=D7n*aIZY8Szcnc5*Wv09p*jnfVh#~;;Ds9w&w
z!20e)51TtXx|7aesUe<9_#^uh11&R>yw;{UI>Oa?#0lV7UC9XHpfRMo6X6Q$TFFm_w29ssT`$SHHI$142
z(~%T~w1?*R9bKZwl};%dIl8oDYQ>bo322>0k1rZMacZZW9z9Yt-Ey+BdgrHT9t|~!
zBs52)`hfR9MGM&*JY1lvpN|CQD|#7jcSIs=?t<0k#JlU|*+b)oGqHf?9;jNUPdR(Q
zZ;IBSHsVAL%}C{jV0UgMJNUAFqBj`Zhd9)p*P}f%I;E*C(MXR3Mn#jxPC!P=
zaA=JnKCmE#l-o_1Ur#asO2fkAp<%XOfu5-(9ZvQn7M}I?ja1TJNJ@eKo$Umbq^9s
zcjc2o5-EUsb!vY)Xc*bWlR_#KkOw>&1y{B19$=n~mLYQtp*$H4cYg~R1*IcNHB5d>
zHsfax#!KRuGdQ;-Ij}%$|nQteNCho{VjrOZuoq
z7eTcsfj#$zE@Qo%VUCS_BRUJJXG83T0Sm{$J99|9I0i{DzIG9L7su$6i%79{;^JPe
zf@+1UCMpWr788Fud@*^EBa>j-GdS`zeM!_bdMWu(l1oNTE}U9XGzH3ol@4&YuUk8c
zgIJ)92Dfq@DHh6V)$a86I-CQEld+L<@Y_aK(yHglRGv(s#ySH}s8mm0*2+GDYEKDk
zZ)7qn#JjOLSFq?@p)d5$+Vy+Ztnb}lXV5>$7_{<&1~ZY(uzc~4KecQ?r!A#Jpf_d7-}zDhV~Iz=LC7YoZ+3-h5lic6zS
z*GN5~U$hc`jx2!sn;HwOj^hr|qpy*44vfLv8CJNG-hCHI0xhcrGjx8BjE7U9TpWF1
zb(lq9UO2a&6|zF}D~M0-n;j2PY$=Msh>wjmVBSae!=9@opV(-VJC{ZvYl%?*XMzl*
z7n{i@!fIIvj_;Gtq0KL4Jk9-r>{FA)VCsoud($c(Ee*d(KHRRIiD1!kXUNmFI&M7iqZ4%8K!F6%CP!T5%ByS<
z{wVZ=VX}_%q2D`m20~Ut-bu&517fv-u65%|IKB!8#?~g}{*k5r5{>fY&hx0KPbdvY
z=~7zY$8F)rvylFFM?2?o=(V>y8aa6GA|i9uD@6uFJMMc@19>zo5RM)X^M!`XDbC=uN_B&PSq|-K7n?&ep~#&j99e4@MQCy5o?=`XMgJDbdGn+e
zoEphEI?>Fn;|W0PTf`5_d`-&$1+g9$94B31(+GnEns>tdpujy)rj7Ajlq4Dj)yh<;
zmU&mWHD2#T^_{pMIP9^I#-WLN4xGFr0>HQ<+>NoTmey`39W_2-=E>O8KD6W60mYyzjzoG&%za~4?)6jZx=
zv0|>Yco?^q7hk{Nk)3k|R4|qa0pCp^}@#lb7L^tG*}2*9UpB
z3$owfmeFUHa?^R~75i9SSo;1;~Zm)s^-uIKxgleF$i3^3>i@5oa`;{wbKHeTCx;*}kn2V#eUZF|gR*@%Su4HB
zRl~gZP}&bC!1Y7iNA%JuE|e!n!1At3Fyx%#4AAyss0*|madC!*_gr$J>a2?gTx)XC
zK;;&f4siLXOFJl-=im;PziQ_M#uZ$DnEfUfLEmcS(l~My_QtrnLBn=e0}VaLU6M#M
z6)tfnWfD%$e$J&6;jNm2FzWgx_YD!7kch{iKA9j@zUDsQ$=hK4np*%rufjpkF~lX5
z9=*v`YjGBk_aj$NwQ{DJ*(rDzf)Fg^#hwyue_%1eZ4$KphZ-Fr<
zp$AP2=TC9uLuzSGN+ytINDKpf^g0cQ=07LoJQd75+K`W6?`BgW5?RV9#1a7-Wz-(O-bcX@Z=M)oYSkdx9J7@BKV79nrz_lzs6i%n{`80b3e}Irr>6LP~K#nSk%P00R
z@H6`HG`DSp?kM7ia5xyYrn@~yH;w1V@Z<|BOkzFz5|WRlzCn+c@!fgy6%{Jj!>@tF
zy8BVnO#V}z{0;K_L;BL3x%_^f+<>M8We#0X$uHu`H&j@}2P&ik4Sk0Hm=mvH_it07
zidAuk3TxQC4XRC@`ar=HFEzX{&o3Pu{fr7YEOrv1Z4?ecWzk+bnzqjG5LeSSK?l*E
zUf$68Rlh7|Jno`{#)Q+`=Xtbh-$MGk$%!=qA(4>sv7d9z@DL5;^z-Wg#-#{y>-_4W
zZK>ZGn!B0bN62?z?CBKt`}r9>`4O(`g?KpgsdEq=evp5WCqF^+
z0KN}2JmoT(zHx}}#gm_*X}d2jott<`(U?V*^+swux>msy&1Zn)Z$4@|=UsjgC*H#D
z{YJ}^{7-YW5&mBE#u?s=koz@--UI277Jdg$9@KU;`9X(7-V+>OHZG)x&hgL4I9Km;
znLogZzoKV?qjx*`YB@B=DZ`;)j!Ots89Gg(_dmtS3rBdk`%LHQOr<*0gP-$#a2_du
z$>fjB`fzeF0~=s$>u2S4!JklN@7A~XDOzSD+$=78)jfDZ5e)j##IAldz`gsgfuR2+Z$KIbs9y4
zcRYk-i2W|n&2?sKYD{}vyRn4|$2`FIRSTHOo2p)3kszqnLSeP52}T|l+@S!ROz6|{
z)qy!rC(t|If+LX}SImePQ~*wg9eyw72RqXA271d|aKPDZw98DG>nb=fvKn4=6@(Xk
z1wm(TkUXd26!IK(3gTB2eraeD1b7O?g3F3YiS!vy;X6W{8jS*S&<#481(c*9;d7q2
zQz1-1;q{`AfY(?LDupTb
z4})p74WH7M&*L*WsQQkivk!4q_Z>PWM*h+zwoeiq+b+kw1m*Q
z{TL&Hg7HE-i29V=VeLnQDbArB8frY_z#QY?2Uk8rhas*VI#66Y;9}?T6t-vMN@0K~
zb{16cm%!a)LKi50R!D;j)k1H@{8mCIRQ4qgUr>CpmWUV#KsWaNXNCJvm60sb*?B@7
zp`B`lD=uM3$1Y}YdnE$e1gPrFD
z16^}UDCIF!;51V};c8*RmCmrSQN#sD;I1&AV%ey(f`(RoEa2Rv8$)RVEI5NtW?T|h
zN+g2{p9}XD5vAs(u~6+P#L|wpg|~^=9h>e2rbzKadZA62A>+4sKcQ&%Srgxt9{mZ|
z5@Js*(w7RqG9AhU(@cMK<^LvV5401nNw~zd4)SrOp0fB2PjaZB6R}h-eCR5gX`G{Y
zmM3}8!9fh8k*?xL=s=}{Co9n(_J)e+#rGC9w4JYbjVJk3Fp3Xkb$1kn6)_A&3+)&#
zzRihQ*#026`itNPDcuA|aBUObrawfAdY&7c3>!KL=};Fey5MLiI@Wd+McC9s5b0F2
zSjCg4pfynpqG563MV<_S)_Bnq>Qcl4aO@`L(bGv{0#AnGNGW!Jwir=@BV7>HQK@1*
zkG}Aw-Nczt87qcD`|jdgFvp4p8kH`-B#Rk>>PK&eqnRpw#2<*rVrnC4`83~Xj`?R(
zQeB|oyh{Kr7%x6&SMdU)
z{KQo=)Dl}%G~AqEjx(b$v;SkEYL(ayo?Dur5!qN^0n=OJQ{cH;bmWpyuZqQBR!cW7
zAs+UYh`FePrV_C;7oP})v&4n0tTr
z26rFma@XXI_O-QrawNu<4DPV!JA+z4=U_IZ-*!j@OQu7hGw~;(k0Oa
z9I2xN3{44jQxC{K!Fxj@}u@!cNJ?
zQ5a)b<>SraJ+Hvv>6;Y(*eUkIIG4
zoHcv)EJW{7aLfpWzqC(a{nw+zf~1(-oc>J_hw9Q2i?OJraMYxtKn#Gv{B%#>;KEMv
z#`Ns&7^<yl#@=;&{EHOe!5`F^3srjWv0NUQo8k-EHj~
zt`3maKQQtSbZvbr5Ebt?4+Tn+gA}-HOmK1T-n)N(?`({_O)jh$J$^#T*iu$^yD$vQ
zO)V`B4V_XkrKrf5osr(p7+5^Dw1nY1>6<|IuwQYp1wGe47=vI)N~lh1Z$z|1F=B8$
z%u9-iG?q-8Gzki6SOQ96dHXOIc>bt2#zVIyJHcqR7yt(n4Xy(7>O-H^zF~0nId64s
z5(>(871_>a4KEPsP<#(m-V&y~Cg{8YC2+|GF$SDBB|6ivF=9_#-q-j9)T9|FV;G2x
zz-t_sY~q%`s&!}X&&s@+>Be}de^>mL=`9NHGSQbw{&MnXjTTtJ2{d}9`1$W@ZGzz|
zAL?^ArWVo@Rql*_GN#R|*;mD|@=dY&->K{@arGlz{rEp>=xBzQ-Do7S$}w~@2P1N*
z!5Eoj3e8lP;W3{ZjR7RPDVi(>GCii(7a{VsYeY#w&Hbm!>VtanUyC#}dl(}^{yX^q
zhZv)q>4}8@_iap_>JtOsZo`%Ce2rEOd7aTl4_V-#1OH`7YT&4g>;H^K%tJID3iSVg
zzWU*JaQ#hB43PiQ-t@op{r|L4xRYme*T!S4#U2#z+zIY}s&<1TF9|;O={!+Is8kUc
zeKe|RVoyPJ`{5+L(+1I#qKZr>HErXsk%WD%6H@IX+SuAm(IWN{R5cM#l*u3N7(FDY
zdP?j8QMqDI4F8eRrIEccdMOqQC5yRUbbgljj#lU^sFnli?Pvn5KfwMK#jmET)d4E<
z1v+Nmk#g*bM0UoQ@2bE&B-9W&8o6ZGW0KjfO+W1#6%XPFj_
z5;qXB9E(-Z)+t`-7LKKND|~nVX@JJ*tcdYd6`2O*R9ubG3Dor86`SerB71MA)AYrn
z3-@PLc4z9*!akotJ4_bQ|Mz&9{%88^0PClVkxZ>HvthE>la16&y(y}wl2b
zPJguFOhLS6j$
z$>8#r(a;z<6u$;_D4PL|k59_P`Kqj1oE)c$|41^G6-XKYE*7Suprf5cvN=)H?ksqo-n~@zI$5S7!ceM*h#_
z@KYPZW+E}5I-7IhAOFEc&Vuql62s(o4z1StMeu(dhnet>{%%0)h6=-
zojgHAXZn-LHdA9)PKq(dV%d4rX^mL{nfuzd2cY~c)QoQKX3=~gXSKitd-VZa2Uze-qm!X
zYk$%dusT<7TI=OW@@}#1}NNMlYB&%~6J(Qw>^Zs&~V9-83H;e|uiae^zJ95KO4@
z%kq^%{!ynZERUo4VWDLe6DCiXT@?Cc_W5{13_CCDT_ATUu1jCo?BWf5erfLr8-6gR
zGYb?A&lPFhFwI5}BRur3(toGkf0~gpYZeVR4kkOh*fR~1W9)e-MKdeH+s`t?ye#7H
znrKc+O2#a*hi)o^ihB_wYB+|WFYwh_IfCko=}*R}hhrGsxIVrR}u
zrlDS}n_d1HhgR4*^b9MM$PAI=f5)cZXBGc?d7sEITg6PAH>>&aGXFm>9sXizx{%rv
zI4#4Ojoq*D?|EdWogXd_{>!2M->r8aEs0@g7IFR$BlbV2bigB@@+}p&fZSrM!|OzS
zuoUND7&@7cPIsJ{j$;a1_3Efx)ZkwKM1$Q4)6ivjRa0RMb8I~egNPo16
zGI=~6)pDeUnrDhzIEucVVFa@Ts#l6VD9#u$OuM$G{(CptunIjc(D1JK8KY&^LmjaD
zRSG7FU%@Lgm?F@^HDU{)SfGi}HFLyLfvf|<^TGSljAuCJaZ>COv!1T16Q}U3Cj01C
z!I-^)F*}gSnlJgYkLk4iqvzoIWbrAAi&2cwJkJW7U&6xVcU0)LL*gc`agDf55c(ro
zp#Jj!JFR*{RW$DeLF>i4@(cU=_7hZJ*o&6|(KKee*vgYF_OXqbvClaA>uymJ$u?SE
z;Tz0DI2Au3FT&m~81MVzwBQdde8pOL392WHK%YA#j_1jCRyk(&OcwXp*W(oZYXO*J
zK=Wqf!k31;E%uj$0fOpjwsZ-hTTY1|5Fy`Agw3A66Ty@IdPd|4+1l75hO5Pa81OLG
z>>V3Q2b>po67q86$6~E0U=H$nXkMoa1AH7yzrQSMIPn!kseuaDm?-Uq>To@Jd_Nca
z%HmUkYH=o9&y+26<4v60kiqoqEz!)8J+*COkvK$9txB@LhCBDsO}V2@9Kw?WP`J&#
zCmm7leuhx5AH?58ak!w`5ci~D1T>i3WoQf1Xd!o-d(=yfzlxmn`ug_61l6m|fo*}?
z_r)bLt(rSjP}R@_G4zP5I)h~gr0);F*qx^uV|Pa({b0Z;+TyE@%52`bycNxpqP1YE6!23UWq@j~XsGlX|RAYg)vHNM<0SO}K^!lr8r`2%p@yRk&PlYTOzlskb1T*3a6t^^X-JGe
z)lo;p_YwIIVQ+(D47~Eavm>U^2Dm`W_s$l&yn-?9JXFt8WBSfa^>v8_`l~x*eArbO
zMlnPiL}1Upc5=>E4tK1!pVdp#Vs2#;Gv8Okn?nk#&ns!1xMJG%ZR2#vRYIs&j@)Xzrk*W`)A0TLNBuje4*av`=F_w<)JHk-
z4z`HF{xG*y^x3b~dTuj5v5=?ebXnvb|k3E<_)hz%p;lZ6I-&3FD
zxgQd1BScr~^`rU*&;4Dq_N?SieSTGc%?m%GpAX6(sQnHENkkTB2&z}Q|AE%eCu)pz
zsVphH{BsjO9jCLEaJL1m$3q!Brq<0k`Cqmug
zrCS`wsp(z4PduT?$>?}JNYIT*LuZdgwxUT{Za{m1-ImMx-U=4!RGWp
z)*It!Qoe-zz+@?tV(b7TMt8)p%yelo=DEotOdMx)pce*9;XLjhh$)IS$6+d_DVC-V
zlaAv@j?jFI^QQg<(s)^%C#bGQKjhS=2~vAhP|mXG+mF8f7y;v<@)0>MVcYNo~Y8gz2EtOv619_*ob*QP0~L6h57S4q>i-nG3kV)8LlFyNv7(QYB>5@v*f4eSaB7w
zdNyk}8R||+QDS04ft5h(DQUKvvosW1G1ud?G)Lsx?{{55TTV;S$dw?(ERx>M57hE-
zZLRSx4y;@hwALDXJRDeepTiDwTr}kE55P(0$I?Ok)dBXFnck=8FG-O+X29ef3U~##
zq+FN!sW~o&RtK622+bWBxQno{`df~R1?x8fJs(!M=cd#jKLV#-rVPN5x;tIjCQY|L
z$u#w*nfD~jf=>X;7UOD6a0&1sboWovV1v3?#aF9}v8yA5-CCR;8Zbb<%vMZXCsdNajc|6I)(6VY
z1^UvDUFG&XZX{`SZMTiS(p~P)L&5iw(C8~;GDsSb746FCB%Qp{UR^qMni&{sukJ&8
zbzQ;KD|FkF>WuVKn(S*Y+6_#al)bFRzI>xuRtum`E@>$8%!Oyl-36~6
ze?hzFU(xRMXSD6@U~Xh@C_f*vgEjJ$1nSJB4;Z1;4+$mW)=MrE3cpEVI~8QKgIV;#nC9*$lzl(xuf
z8jyuVhFr5&VEyWgS3m0H8uE8+@qjGa>4m}j8f`pHo+O`Sar+0`WN%Vi?kCW|a``$(
z20-h8;EiCxj`SykR^et&uL}MhN2Ghi8lV(;9|A^#D1Ac3CPPV^RC`QGszZd%OH9&suS3
z{T&ABV*}$MXP2zdu2u43g=lIw$log?_7+vw4*jQcnTvRvJBHN)@ac@AC$k~F}7H}PCEe1FUb-uI3#c3
zF@)HB`?HDaZ<`iI5|_+GlVBV
zYlCJWjhZDNBh>%6`~@M!R5&3=%Ys%=-G}U-P9CExdDA5~>UB@P!ISCGIjSQjiT)^KlIRQ|HJWK~
zHLIgct-s3ONo;G&mVQ8Tlvvm$C~qjU_RqB9CYZlf*q_lYqB4w=aZ@xmTN9TE4Q`qj
z=r&myA)ynvwM=b<5pJ45NEDSQc*RZAO1nELXC<~TW?3eyAPw%nW|#p56J#fP%}aTX
zu-!5B59?;_^=3VqgVzGMHd4XNEnfxGaVnv(zo!fJFe=Ao;!3YzY8Wrh$5IQ~^1%a+
zMkts_m#lW9uS6<~6u}MWqHF>b3#)V*1C;Lcb)-uYlvzZy;YUm0Zj^%QF-c0YjM-@=
zX-YLOF2)zjz>=uEN3qH%jo^WFU}N+j>Hw_cWrpBVyjB9@Hj$R*Drb}y2ldHU
z;$?#4>@cNRT>XOC>Pef1DP4GR1%6NkPRo^V*0!ZOLtSrmKI9ZR80hFirH8Gk70me_uLzA53Yz3v=+aAa1MgMJ
zA^PD=1#_hV3Nj^J?9Np%y=fg>KdE5KP^A(st9@}c`D!ujU8Y=QUEgvd(&_`9mnp^a
zhOJ$!-h%2~xZCM5m7ZIwJh!$owT%9{T;Ykh7C(3n4lh+^;X@nib{O5=pj@zUcnzVK2B5F3eNfLqWErhoe+UhuzsyJ6g9!
z8O@Uypn9Q_LK}`LxjdMg6-+EHQ6iZ_Zlb17l&!dK^6dCDMZy%I!fwI3udP!o>^-_a
zrYUi-X_QkHTpf!3rrcu1NU!ctOdJ#xIW2&uvsgOkkb;7s;_9J!k+PJo+^S$Q?Pe%H
ztE^`4%At~keFVl~&Nh}PiY=h>mYA@=yU-^
zAj5KpIycyH0K@@Un=gUW86|?&?PR$B38ivqd0vU8H;*VD1T!nHpHPy}Z#7lPgtQlw
zDKO8m<5oyJr+mqJhjUF8w*%@wR9xv*=Z+=
zN_$p(Cs?0GjjB7U6wtEgl>qx-{4!Y2Dck-+FotY1O*x~SAh@;T?)}iYw6aB6$dgxS
z^>GCa_>*oi(rUQIj~Q9^!1XVj+@Ro|^NaN8C8bHh?QWG{A{xrx)n!&c+*~*2p|QZV
zbvsPX=XT@uYAjCiT>T-ZT`SLWmE$*hgt=qx-o-VMzoH4IL+&Z)>u99HkIDmy9HezO7?G=PI62Y^qFK$M
z3#IP1(v|iQG)}S@AgGSS*)gKe>oh2Kw9!%1BoHHQcGYy|(c9sv86~pKI~$@OB7SFw
zn=hb`#*<$3(*$wkaHCQ4w7~Z5Y<$!;ED;K6z8*6DB}gOi;!*74oAklB-VHu)A`gm6Ux_M!eI#RK^n%8=}7x@)?w2BwJ_ak8Zkoi
zArVhu;TF1Knr19oqLaAfojOWWMMx{%FiQgjN-SOybZo%=9e5mrh8{1{bmGYSR2Z*m
zr-)&K>P>HZy`W6d3}@?~b6ZW;P(gKq`Rig~M7gGjj-8@ePsFqM@Ffm=+Q-*?znM+rg!bw
zo6xLfnnsRXg!CRAU!pIs)C^|ZC-R0%uhPaUO%_isLtddY9U>PHEMDV`N}?vbF*8u>(E@I4S=}K=$)#{
z3f92tH#FstRv#oo)rufYi#dosvp(B2uW{s4s1B8JrL$f00Z%@I>)*P(0@sepMyN~G
z#zCiJ8WRn9MRQ&fa0AUn<~FpCSu$L*28YvY9|k>x4y;##z5&M%WFxcTSMmCiUVlLj
zK$|#AtDz6-HMq2>JQP&Ou&6+v%k|B21#2Cb#|5(k_tK58%cGIQWjKAskH3ai@8GWR
zpe!VqPHfWPzPZ1F)4F!a6mhvFiD*Nv%%|jl<`=B=V9@)l%`fn}3F-Ra8FWsI2DfqE
z0%DSVaGek|9&l#n3Qg78Z2Grz8gHIp?n`kn?il-6gFD9VfK#}Pns`ZbnAf(&#pB8}
zAr6l_fXa_TJZSJW4LSy*1l1{2j02h!y5wt(hL^wHGt`R1z*T5H?e_<2FigI|>pO6|
zuJ};L8yYokzqzLw1;3s2H`CXD(qI5U|GnlX*2{Zv_ZCW8+ut-B2`&3UgQoLIQNW@-
zS)uPK`B|e7iXZ);*8Dv=)|?m@Yr#R=@mmA!%nrzi!~aZcw_Bdf>#dV=FB0X&h8K(X|IVtV6#6%
z+Vc)L$Cb4>$NiON?sha08tkOKqDHrkrA`w7?RNVCZC(>N5);}7$i1K{D&;Dz
z+^wC?X4$+7(#zxoFgIvlr}vCn1J9vpbJC>XBH(neHcJw5q`c_Q(4?JiX?Jjpe81s$
z0_3@<1EBJq&Kk@Cz_~Lvc8WE|i%?w`G?3={YSF8JztvE^H7Jd>aD@JvtG&-eANN)@
z`v*^hrt=}i&~PgFN7h&{*O;aa5=G24xTvwWI6OmJ&xt&bAHd#eoxK0t-23+GwY2(5
z5DMm>`ZmShHyu=e8r1Pg%WCYK9`eqITzJxCd#-V?)?dWDq=4bttDKr`1LGb4Og-M|
zUsKQ7PCeZ4r#)^*2E8EsAmfKtmo6gyGRsvpTRnT$_sPXJbX6God*bv|H@-
z@u1c*p@aU?tNHd`c|!BZz-ZRy8GD;vkJ+_Yn<0s~x8q{;V|MLj?Belc9^Mzob>5XR
z=^76$4lB%`i+pRzcf;bmLf0M{@x#)y2wGSr52o72`2l)0BBv7`Xw|8Ar~0a
zVmWB*AZr@yw6ZAT{*#McA2UDsh!3Q#%iDFpjTlRVFvxmAyWif$c3}D?_$nAD
z>Zkvic{alFL120ijP|ZUi!Lob7+U>$p48~bLtA@U!%AEJIo-b2rU|4Y
zq~FvY(eSaajJ75t4f{N%VKc|^QH^cdO#(@wb@#M81u+%#_DZ1HU6%}R)VdjwSw;N0`B|3DEAfF0#zLxWQh2}$qA>RF6hQ6
zQ0ul3M4^1FxD{^3dOAXrRYcNqPLycP~=7l3V
z)DW-hz&2ELPSrINrDsi6Q|b
z1=TSLxP;Ev-H=EQpzo%PmPJS_N#h6|ZaK>Zqq~H@kpdn1M)JVuEe(eN2hUS9sz`U9
z!-H##{!$@y?(V&dN{e-Om{*tYZ!wz_V$BI)>Zv(K&rZ^9l1Lv~TA_QFhy(V8T6@z@
z({*nWF&oPcg!=D;$3ATF#SuD;)4EG`$r?nfs*@`Syx<{?V*dJG5IIVxryb_&&S8)e
zs@5j=qXlDh)r5X!)%kMh(WzRW91kP?rNAfX{K}zkr=`8O8JadGS2Ij3xEH6hq-k8K
z!`b>U*t0qyixvc?b|AE}TGvU!eJDrP=?*F**37c@6;wMOQE&b;0l(1W8+6G;9Ev!P
zq{8z$jC~Y@fz!`AjBC{C(EWgCcx=U|=&~uS)18Hm6Y=<{vU;5egX?uK)73k46>2gD
z(gvlPpkTjFi&j9V$O7h}?q+_HG?uH1yX0IF@$9V54mw(QP&bknM`Ls2z_MN!Ov4Z9
zaLd(rDm1ZHCeY^#NIHR&#Uza`ep@%6v%6*3tBF)N#qN`+(8BJMsc??nOQ`TMyO-j|
zW_B;bcrd${;~pM%pF)MN*?lT5G}yg@3T^B@4X$0&F((V_<#b$Gu!l3~yu(hDI9hgJ
zhda?{9uV|MkXeCXBKjDbDCkeI^DK;aFzVwe>v0Ru9NfZ#MbMe@(Mqn3-gDGrglZn0
zzteRZp|jld%Q-S1%!(fO)OhOeOCshr{W=$Azsq0f0!Wt_deo?Yi_=tEPdHjJ$7x{|
zb2k2!f~=&TjTB??vV!Feod>;iB{_)DF2VX^oM^+NMmoUt1Pp~6!}Oo=WFZW_nS2?y
znqgWSo}3}m`;mGKw=aUSo5>hkG3$ZXEbiSiJEvbpcz7qMOwqeiQ=A@m<1V2YKPA7x
z(W4#pRU&FhZkm3%xO9ohnoF;y>4Vrw74_>44Rn8ZeGWURBDc=a34_4;qte3+X|jo>
zFkq(0S|TkPZp9RbWi0rY22HQymXznJ-3-Ao=CR4R{mwjgjD`KB8H!+dYz%HVOt8e`
z-b{-*2_qT}H?>jT<~U0{zR}>qCq8a8Ua|3UtXRxw*t^Z$#V`gp>?Bwc?H^e%X78rK
z1h@50!BCl~V9cgKZAeZwV+)qCV+)6yID|h=2DiTtgENO+y><2vyJqHe4UZfJt^Hj+h3OS$JY@?opX$hQ
zA}P4N!oI(zJrw5YeWChNm^bWs2amwmFwE6WCt`ZwEHW1%9|F2#`u~@XsZ<3kZc4YZ(V?pSm&X6xo<@)!~bfXgYfTG
zOq1omx6Z)V{CC#r2=7{_A#Af&AiQJ66QcNUtQa=nzqDe&g1=&&jPMidM1-x@VubHl
z$0Iy$Ekf929fNScwGiP>>qvwzS%)Kh(K-y_HtP_CTda7bD*u9YFv1O1+yKh2whq88
z@%##FKV(@48&-#%5QA*v5SnbG5c=A%M$yxTHHz*wtWnh4utt%$VU5B)8`da%Ys0#P
zHroJ%w`}SC2>05$Alzl^jBvXx6>YcYLgboSzt9sQ
zzt9~~{AnR_O?=jdQ4evI4Jj|$Y)E-=fo>Qrk>~lWo(G{^CR%(p(&FLz;{IZAfjg
zmkp^crr9PTm7ca@4}L#I82|pi=@4PjVw<3%Bv(H{5HU&b%?Pl*ZWvrU#VZ7EO#eV`k#rk3JX-5%}}>1*^34Y
z)_*Qx*yHvR{ZKlxK);oRJ*tzqF3|D?mq1I)_0{M_FVT00Jv;R}s4L@eap&Qx;LO$$
z59}({o58V}U?fV#uLY;EA?OSpuRkDR=%Wkho8i6D`grQFM1L0(LTvga(6B+jnw4D#
zt!qgTtlp`Q{HJxc%n8Pdcj(8_`P1}^IkFzol~4>K&D1ZHSnlB&Jk9S9bTB=^|7H6U
zxfYvv9xR7k{b{dS{Xy~sk9&k{#C%A72AHSnTmD1G9wRY`E?llJQHz5GRdd?ocAXiW
zH*J)yg9O#<50`;;wQkvrE5Bn?%Tj6i=kThd&6WBbLi?}PH*lB&`WM1bBusz8Z5{z;^12a0c2V|r$7gML04Mi(@&
zUqh+Gt9q+IhSTas{S-oWK;JkWIusA;Ka+54x2Z{=N#vK;a#qYX+{t2l_F117J=3hW
zaN>5vdl!@i88EBplzupdAMmIvLjvvCqJNhiDz!ILk6xB@Z2Gzf3Zo6^-2GTTm=_ze
zyWhpFXNwHO!8kNgh8*6om-=7Uf5Bn;XZd;kIM_9dli}ugJi^sDC$SwAe-mng7qkJ6
z(3WM8!NJ>5N^`I4_u*+$P^vNfjo$iPzgdfmoT@hc6(S#4AzBLrRV_<8E1>7U)rS*t
zAL7~wcY_QjhO5HS=pXbSViF9^n{1eh5?pP#4i`SqheFFRgD)V`3T*vFKN7P%(>G{v
zY5uDoy}+-**#~+*`m$mez`=}*`aJp$XGmqoMj`f}a+A^ai9|*Dqivm|0=s
zr~2JA{DPh*v^_EOC5<`*F7FOQYoi+Lbu?hTN2qC%VGGZ&Kz6G5qhKmC9Ds(iP6FKC
zXK;q9dN({SDpRkfH$4q5GRCn@hEgKGT|dw|T2Q^kQo!t-34{xQhDCC7y~a8UjRBZ;
zy4jx_;hXs>PViv4A%qFsA-vv%!hAy-)QvZsp;a3VDd>g|F*FkL7A+iX_!0vMrG{w?
zp?ZeUF(@2n*h;rY8f-e2;JG52NgUEU+3*a9(R=??!#d^k_5|xVLDf>m-i>DBe`4`K
zE2ej@c!D1uf411ciEi#>DCEeyP`=)9nO;vb1hSK*t`9Na*bGtwc*(dKqHzxGA{%t%B>nOapod&Om*W9#iY`4WoE+
z7M%7N?m&kYy_N>l8+volbEx4EX#uBwh5_LCi@p~$^+IXNj5G|RO1S}*FMotVP_rb@
z=IN{tJl60sAs^7{^@d_XOC}iBa^xKK
zt1~q5aIDnOg?tE(&k}ZQi(vyjUuKAs$Vb$=!7vB?+XD@l=Zl@bM?PlVHlnNRXZ_MA
zh-EV3U!Xsg8FmmjdL7Rz&8_N;2X03C_oJmYlmv02pnBV`{^Kaah=}L$i%Ycn1(Xlk
zw%dR~#>W(R=%Kw#t2g62XnWN#{hv@_B57P>SSN^>SbB8K6GmR$INmx*P`v?`YG1oR
zg|XHQc;wV6{cI*anAn2tUc~DfG`BOLPv&_8`ed$y(=n8nl?MRfbBmU6rhIp
zqV{4?C!kv^8iF`wT1G=qja&|p>mx@YN(f&LADh=sb5Zb@%U^I70g1ROh41Z2Q_7>X)bA4bACE8vtMGe!{Qikfsytz1zo
z0`BZbca~|mebk!u=%#r~l;q9ey`Yz#*NkUVdurCoM0o(^Y&2kK?yGsA6pQ7|GguRh
zDh9pcEQa_0Pzo<$1cjJFg4nSknogo9_pceQx$CbeMwo7&ogW^{$J-#9GDgt~EiTtR
zKc^Vjxs{wK3SpV$8Yey2XHemjks~M}M;6Z#^;3U=76vn5RQ97(1Lf}r9?0$1I_Z=C
z0IJL=RY%au9w|w5x>OxZh2?5FHM+Gn=ANRtsu1z2)VnkuTGvza47f%#ne2}|jS>%J
zrY98OJjMgH^bvSdbzVvkZS1Sjv-xv0OK^sTs^)5*Vj~MR&*KsOp#Aw`&AnuBaWm4b(@aswLzd1h_Gg9b
zG>h^2Ts7-80JzFSD>AfSvP+ek7D`bbMny^55K4Gf6NnJ4#vULKlKXAofUk5aJ*7Bz2Z`pV@1SzYD9Y~LAk74kN#pDEU|pd*?h(O(|%{Jdff-qF*($|~fo
zP^H#%ED?P)t5&lYw`@yUt<`I3!@G9nnsu@vl%55YQ)P$~XxjvUKmcG0p@r|+^Qj>T
zScy-bv^Hn1k2GK72_h-@Wm^`t?Qh*o4=>v0vss^LO3_B`C~%|g7UdP$!)RkFfK*Z2
z?fXT#_^GC)D37AR%{Fd7X|CcCqUm&w4iJ`enxX)~0M=biBPt!cc&YVF+b(O4c1>M^)NxGLVSH^awjm$8y7h=!8{UM~BmO
zX7+xdHboRtS$s2!_>FF9j^rjx+BxU{vRkWn$8
zL)F~c8-Wr4QKb`nZQw8Owq#7P4Q-PC=hol+k(7ue{Bf#c!m2gzyF$ee*JZ?HC71$u}2QQ9aOXLbTTvMyWO
zi`?1TK=wqo7N8h#L`~41Qp??Pzc-rPtEi2Qw9&u>kC~yZ5`@f(JZ(8gyDT5Y2g!l#
z`#dd>H$%a|sBNW^FspvhhU#1C)7i|0+N*+kczJMfb3pggo6df1v33w59Ju)iy3$Lx
zheE#9MzYI=T6ln;V7hm$h=tBrqg@4CxX6l?jGufY>26tT$@!9Y8OwY@3qIu0Ea$kk
zy}+;f5QC|od<9$iG?t+tv%u^xY0YX7yv1zNo)Uyn
z6dQAj>KrQIwEGbn$yZa!6>ZKBlM^l?IyJyht@7
z8x-Sj3TK%g*j5OiUTk
z{kHZT)s4R^z2@3cY1z(m_6>;h|O)PAo7HK5Q%SGO5@TGck$E
zmPhvGq|bM0V{2U^D{QIriU_7$8RT(*@KZchL9JD^_?~c;F7y;@8MV<(lZ0p4-fLRD
zK)vp1$55fV<6A5`R)@&mbCfYgx02kF&Q1NVU>tetJM9D(+(Czx>+`I3OjtUGtt_3A
zW!}PPQjrn1iQLJ$uY@J+__#1|Gu(eIVGiY)wL{s%RNc=i4!fxD-PAZ}f&d!bL#J0Q
z-9D!n2$1?FW8ts%iIz(6;4jjZ9y$;t_S9XI3CpPdx)zppUmYy%)VNL?Pqhb4a+a2jwn74L)n*VsMxRo{
zg|kx)E}RLv8%hqMsM0^KpF%e>K5jJkqON}RiQ@JUHc9;Z7(G{&9KdjRiKoN1@dBk=t-&`jOcwxg|1v(xg@5zBPNYpeqcNwAT}=PSB$T{Eco%B4NH=X
z6LHRbz9*-t%=I;Eb%>@{QB*QXCL6p(ha|JjA
zUXOw44c#6khaa4p^Is1DFr<-g$n}$0?a#U_@T|YBD;A_Jc!r%6dR>>rhMdst<^u{f38s?+I^=38@C2UC9!X*ThWbq*cNzuGe~
zX<~==6DD*(mX_K{_E&Wa+13j>U@|+&{SNyE?wQnh2+~YwOe5?2wQj#C?M4OmlgD3=
zys_)L?>H88@qHb@@IUBsfj?licXhyI@55P)D%HTC?)*(RLM8wO8mPZ4{IeZ2tjz;m
zs6y(DcjtTQMO28?B>L;or>YLUVlK|$o;9EA17At!f1WXk&^Vvdmn!{xyg%09_ZHo$
z*L}{gt2J1>*Btdn;!=RVK?Yxp^R{{t^}D4Dr*#KWbkX
zTI1G#tN<6P-)au`LrkB~{ngppU=9=8D%93Q=o93eCUK*jGP3mZSxuzAmrQuO#-qom
z-W~R7?&JLlK0EtFO``sYT3hVA*)kK2>E1$36{}4-(@|g(^Yt5m|0Gv`Jzn=5{TzP)H%=|q
zPnFKS)V{bcr55Pl7S7fb>e11@1Ov1lp?2_OFX8{cz~syH8EScdK8N_MFzruzC&4Pv
zv6?mdUZQj!6}U{HJM^tso3;A$GNFO$E3x3M{vHmD^gV5mceq|3p^^_k*KAsc=T+;I
z*pRLIoxW^Z`ByaRfPNSoxn19&MEpCd%-Mx-lTcP!tsfw$zh3QEoQVagoa%qnXA^dQ
zMald1C#0*m@i$cZsy>D~T~voNl=2`zj`;VwCIby+G-tKP^;pk;TXRCcMj^qazNRNH
z=Fw2|pxE#o?|t9l_XE}b9u!aQ&g;V|Vuaqx=6$ShP)YF3@5C_rqrT~bV&IC763G7$
z09ffag;Pjfl;6PbcDr`$^lw2(;6ec~TH)${wP~?~TEsJ~qdEz~t(t54#d27L1=sb3
zGT~0m5Be}kK7#jGAY>;{!_O%#XwMz}PU+W`Gm3}Pm>>01RX;CnTMQTVqb^-|M~@`i
zKZ7L7{7Jt@`U$uGrO69Wc}K5jp4Em$0^9zxexyIBtjm@uP|F2|?QB(y!6vfrMFS|Q
z@3EtChR!lN{gLTuI;=GG5dL7HIkL-G9Q>?EBu6vDbzmoj84-U7>|vlmE+Ppw=Xt=?
z+&dx~L^j|ovctI5^?=HTIi6&Bxe=u}(Zo-D$d2~pMc1~8ID}IqKX$Y)|NCKo!w$L~
zVlY5BfHt}e;GcIJ&dNkdqS|KycqS6wXhJ6xe=z#r7w5cMUG$&2*{3*M#
zqlt#D*bni!W`;w|Gdkj9k?MjBPxFeZSw>#OF&X9cY-u64!2lE24-}ypb0V6<<99aV
zBXC9=uv%`G6w@IgCMlkZ21l4#Xivixlo&vJ8zZ`qn?(SElN_$32Rcwsy4ps3#g;k^
zhsByqLy07fLUt==i68aj15tL+$qB_H@w^1{;=iAFxS)U|!cWrpUMj1bYiL9ZT!NjD
zeKe)3Kto3wpuV6b-C-G$^F|ql;Ql%aon*L7wP(;WAx2|wO0$}kv}?N)LK?NQIQB}8
zVImTW^_0IVa55D>3%dSiCKz7Cl?Gb2-8sN_7U3*^RyNs?uM`1ci87{wE$$sB(h-&`
z)U+WST;z>goOdazjbT}Zguk+n$uKW&P?%})F&QB18x#SQc0ksj3dS02l&&{E%{;RW
zVLoz)-LUxalnih6mcVM~8`1<(GS)0KfJht62|ilu_Eh?r9uBI*P?R#C)PDnAByA}b
z7AiE*W(bq0U9lluE!kd_iV^GZg$@AeJDk$z@yS>r`$?9X5(9h@l7n)poW*~U@}GUo
z6F`MWWbv%}1%rmuFw~YArYIy=dAH(h7QM=F8jX(#qZACLdjnFkr4S}x>-&eBgnBWQ
zwOns#p_0a7WrIoYNBs!4ZHr+f&I@b$1U=E{ei7RZ3Y9R4MOPdCKzXf86~(#a*~f1b
zzGOl1MB2E|P^6YxE%7g&0OO@81OV$kfS%fKu&bq(rQM3h`=HS&aR2+v%iHV1RZ5@B
zP-NmL}R&ZP3#C)g~iLJ#2UvZw~OyBL<|_o-iP_R%%Ok7Q(5z_?V%%
zNxh=sGf~Zsd|>E?gOL>Tw&7<=|IiThzi3_rvFx`ECV{=uS{_R7H8Hk#+yga6}fE=!uV?7@r&89&jZ{
z^z}ud$3712M|)0(f)yyUqlIkul+EZuzFW->-8aAxNTNGy0*6uEDNzBfB4^0KLZg@a
zPu9I=0S}1WxI+eCN!bDSFBSD^S>$;mwI$0_8_PvFP0G$VkwbG%md(}#7-z@?AiRnd
zAXv~EvF1yoqURKCsB*hA`Oz0?H0E+T?Ru{X+9KUdt=I^w@jIm)F8sYsYpaG;MjN+Z
zbTECTE-S|uBaX1K_g@X%j1M6hKf8*jVhH&@#kZR~wp+8;LycLYLW;%l&W}5#ny}mV
zD$Xf|u5_nw05UxzjbF=zZq#X_p*;jJlq}6-d{-&-p!_pNPXlQDr!$uzE$3H_OTun`6ZvVp^5qCn$oXMKkok*=LdLV*>Iqfy4M
z02+n189!?vjh!!|Ur#U|Qu@pMnnT6WugtG`S%y*h{EXr}pYQfZ7#(Q07QD%Zt?g2b
z*uq|a-Zp&wAPxR3vv>xYYgZH84<|;jyy?c3q6Bb)G=zkckhgsBrSSnZ{vlUW{;VBDTzxPP|9aU
zFjj*F;WML!Vow>v{oP%lRmufLC(>T6r62VutujuP#_a4;r}JgTepGirS^{^M5!lhvNz!okT!nFw
zAY@a{4TRp%mJ)w;MpKXO#;@4HmyG>I47a5}8G)EyZ$xV7IF{efs1oVsJ1*or
zDO(3J_a@_4f-oM0@?tjSof7vzuS(3KCx+ld82gROpLQ=5`;+E~@efw_sxmTmU{q!jPoxqdmDU`yIfK1%}S#MUb%lL7qQca
zjByftR#%ebM$+aRpJy9ujX$Y5p$f7cxsN-u-smHR4T8Fs@f%*3DK#G(10)`9dYLa^
z(iu+K1F^fBv&J=Y2_d0(qDWV7oZYlkEu0Q5)t2XtBUE#$h880L&OQ;J2xH{YGKZ&}sl+C?+S)6IB<*B5Z!M*eX=Q(iv1!FBcp)z#>
zs+Y8Zrg3!PG}yLl-?Jfebqyqr^Pqf0z1}oEM*4Nu>KbRVG#fM6fP=CR~nEi8fU_^vxLPz
zZTd)Hr;=e^xjsc$EJ^ne$tAha1pQ(Vd-$*xEWx|VC3ngx5+q#-Y
zDdBIb7h#(<8qFgqX{4zcE9`5kMLIgm7;HK!la}F8;B#tjhIq_yQwe-dETy06gh-v{
zn{{-{YM##qjWv}@(qe9;a#z;~${Z~7&Fs3zPrV*aL8<(uCyPPovftNbIn{9_pZ=Hd
zL+~<5t7AMMODR;e{mU48tdJA{b-^hns0*&4`XSYn%Em4L!^Q#oVXjYp(lnIq|<%5*x*^6sUb7k;5RX?N0
zVv2r>?Id@I7eDNel14T@D!-VXKofNYdwBn0$O@;qcuWAI;woGS4c%%MOr>YeQ+Em9W
z@_o}6!fO>#2)jQKV{-hhO~vV&2CxFjkc#TXnY1+Iq-nSCI$NkRB#A8blnH7myD9$}
z(@NfXW094y5bUeT^GyZxN=K7{Mty4928UMu0@F%5m1+WPZJ`O26?I>j+Jj~;J;RhL
zu#EGjw>jDE@im4dVb4F*QJzUFPTVyI<2m0mG-
zWdm=T{FS0t#>U(=Rmr3SIOh!(bKU%o$lkwaN)cplCdRR%d*)n$P5aYCqHu`vPpbMJ
z%rwIn12@zuH%vFV8K&D|s$U_3IY?!m>o0ocY=hpM1Dz!lc#LA|&9hKzMI4|nvbz}BFyPrHBOsuPGl*OX4ug0
zQRo3JvQ8y4$Z`-CfiHX67+q@`)en%A(jF}nkQ#1w(8dSmR#dApQ%#&1zMc;#<7ZQA
zN*iM8OrC7ZYn0j2tYOJRO~(cD{9uAtzUUEaqslxAj`%pe=Uz4knz!^C~OxtYz)FjuN2uaeJDAjAW!Lm%@V
z&RQpZLPg>JZD`NM2rWzNYhI{QcoC?6Z4Pgoo9y)==7AzlnwIKV{w(v0nAP7jzr-S*
zF#iWh)0Ds0v>B>t7B_o;lsQPP@Tw7-i)XkrNZ=ojfkR$+F0^!(jvLLXH30@y1{%(a5*!Y+lk8I*T9-eXSF+@3dBre}>y%^DwGNJ4^jxe+P|
zznFTloMq-sGT{=doM724vVE(}SrYfSeSr-0+U;gD46`fd<4m#6{HFkTPuT!d4C}Do
zoUP)K{v(OJdESIq|FV=xjoEm0%^pbGfu%GT^TxW2-!-}vW)7y&Pd)0~ywomGm!tYW
z%ur?9XEL$0G~9nB}7E`yQ?7N_Ok!^yLnyn2l_yeMVq=j+;S%sRbqf
zqoval^L##!|FETn7l45e`u?j9;k*vt;&+p@m!u*51G8W>Ib}vF(k;qpX)a>V)|nUc
z6ziP5rjUxw79~49!D1Cz=g-Z@1)-5b7XxI}zaPZOmR~kId7Q>V)jwhisoMfZ(ZV>h
zomHPR4}ymegj?nh{@rmHI!>GbM!eb=v{9^dxmkha%-_vAkyh?9$5zZUKU;H+f1Y=l
zHqr7xWa168AP7HG{-@@ZAZs=65LwD?^AaV;OB`sLb{|G*Hu{wp_A7pWG%X^1{V}hN
z1&FeOY|Chdfue&*>8CA->-b6ceKQj~b}0hug7o{Qt-c4TnP>LVw@QCf)#v8#NITG+
zNRvH6UzQ(eStas}>=|b8k7+Fka6M#lqXlpttSqx;TXwO+pG^xfyNt7Zh8rkE2s4=n
zQ0Av*e{|i5RSfBF$CO~H*%M)DC-^IrFKfMU|J1bLkFi$3+gHffPW2kG00f6qsCgD1
zM*#pi*!TWfePpNAfj_G-*-}W_t7bsO{1ggSbk$sdaORbWo-jlD3LR?VEbu8QRP6Xx
zvkv&TT1zf#s58TRi3^KG_{Z{xVF0W=hiiR91!1UwF_LE4EQtzaV@sBqB7YxU`2`cm
z(Zlks2zOc0PBWwcE#_^k@TU2&zzTX>-jn3OLey}7a5}?VeTK7fD}r90?1htq`35Y$
zn+N7DO9}k3;DJ_Xn69OHj_-y1{Y1X|?BY)Z&H5B`D%GV}HZput&C$$yLJOZ`7qTs_
zWTL{r@~4<1#J@YLgI4Z0r6MWP0@;-@=45L4J`m%#p90E9TP?#VQ?5|b(jP&(w|;&~
zOZM_)OQ}+B=iwfX>mt-}C$r^S4hw39d6Uj-llz@$3P8ID%f=A~wsKx|Y8Y>)3`u%LLTYK~>k9Ye(;%sAzVEmdxf6TOzpE+7qv&Hg_oRgo_!`ZgV2%OOli`HM!a!s%o
zxRagfyu74
zZ$7q1yjbZe4|u0x`??n?B+6~xDcDweCu3XYMcRjQnYSPp|6A;xfbBdl@EgiG-fV31
zy<@PQ>_rZUa*P*wAIgzlxB!$xy+g6>?M2>)GTDnv31y^r0Jbf?{jfEA`(mr~_C`b9
z_4dTJ(F>Q6;s-C%I~3QvU9r9BMS6$gb8lyCPk7UjkfAu_O~ZDlHx=8>-V|)Byvf+E
z@^-{_r8f!N<=#YWmwJIeQ$$qy@IF5|p4em7oN5Pzg#4%o}3Pro}IbL_oN0tYILeT~{iDFqln|6r|vkRu1gQqS1L`5{*B<7VMerau<3Z#k|
z6vtO0J{4-t`UVP+d)8Vy@G-waV5iSp+GC`OrR=ZFoPfnLP|X>P-h@fN%9zD&eQnX=
zFpz$hvl2&rfqwu8`mh$aEMKAqy!&FU<}giT@WZUa)4`wq(1+lz-PIPz~_-cO=
z;ddTmQEu|_)e`t>hf{i*UC)vOtsjVRK5uxv;{m44@P{dPN@sXNBQ;E&NS_XBo%9u
zW<}aZkD7GrXA;Mdt?kJV_G}Vk^>nwM79>8-^kXqq_Im<*&=1cq^rt;r?Qk_`TH$IQ
zKznxBf%F(`1=1sv?RniUL9Kj*6>8;KRK3H7W$`HMM($F+^13a9b<4Ki_R$nQXfma$
z>#cga&_k!9hc9UqG~hE^b9QL5wVO=pi~A0tqEkvYrJb?vDX;GLU*r%3a)@uq^Uxl|
zJb||1Sm*mGhEhzkfDOpQw!X|#^R4fR!Z6bPYQ6m!inoXzJDl_^w|Et>Q?vmgRCm`}
zPL|gjEESq#GFg+SGtvV54@ZAlza_A;!d}2Q)R)iQkQm1RSp1er7m^ayof_K@kR(z&;
zNDt1~lW6%cYc{Qa-F^cjo&x%ifZuy!<8t7IY)`ej?a^X_hwkjQ52A!^wsblnc1f=I+qF`lY^uuUTEOzgO`O>}&+Ls$&vwcgBmG-Y`
zMYgpIKNB)mHTGzsVw|-XJ62}T5NXAPrXv$s{RFF95XU7_-F};g{`lFJB*ak8Vf*J|
zOfCifYO|4lSbVcCNPq9RXf5>gaJ7j?`vO3f1zO6+qHu}a^A-N&o(rz?
z@Rn}MS!Zxk;ReJN$Iew?{e=H$##}{jSbDg?r^a0Q4G5^epQ~6Cn35VE-r5ZXCQoa3
z4&}U!GhUykh!;D>(DiwW&Z0YqMa@Sz^zYEeIEr7O_=w~SK}esLmOyP5DiZx;B4d5B
zC5lOuvfK&?P^q<5GcEcUQUxY)X5uk^*Zd}du6LNcbh_6AMIGy0_4LxI-e`m)hd1?J
zAS29}yA)3@8RiA3u`KrQPK^mnF?CtEw;k)W%nB{k$*-=r%K2NGM#qi>W4hU5{Z1*&
zIOuY&64?5!Rv;HY+imqobpK$IgIQ~mh6#Adc`PZ924*5Iu;*hCJWm`GXr{_N$sqv|
z3P5SFHC}$YFF1#Y6X1tqk@8akwG<@sqY*)6S`8m)}lu
z;RBPPULJ8E2~d2`1loQu2`Cpo#mrX^SmiY>l3k+e#bI6m8OhfmP5x|xKU>Y(RavL`
zwCEIbfcj~j0CO>S2Xa8xYn`ga*RnQHqjs5Yq6$H7@uq(QN5RqY6
zx#;^i=d!A$)-kBZk02xcZjF}5LW-<&YCg73ljQBek?OO{83vI7qBI*-Tfj1`HkHT%
zKDUnaVHkHh`GZZO>gkB8y}lf{0?Y!fnDUbKH$j5ot5{r~^G({{L_Gf-YnS`R&jLE4
zu_03SmbDWbdCj_=)1zWUby2A{pbwjN-AXc{h}A!3jYjmq5D>yJ((d-vznJYklr#WS
z{~YUE{6X_rk4RS~{yYE|n5Ts|{8sP1~bPueze3)0o
zb1Zba6(E|-v;I1^qK!4cSHklYns0Sbt;W`hb(7nUDuoxytEMLW^9f#7$rCUQHo2qF
zP7%B%g1B=~#rm0T`vhqT8eth};;fg-Yx@VVTUOg1m5|6bgxZj&_hL;8+c~)eaOC>V
zj~g-k*J;QdVBL1wH~l#TvSE!Fg_f-C_?jIx*+_DPE$y2A5@j>5@EI`78H*7p&W#|M3%W>}A=u0&qG$F3!^d3T9Nl
z+G$`RgKfauuBR(u9NakE_MHq_!n)}YS9grET?Zd3D?8IN1gaXjw&z%BMM@{cUdmG<
z$v7U5yOA>1wmiVzm|*L}z4^ND451YLa$-A5y>2nG+{w0Dl_D9_9OCSM^->eto^Kll
z?VOr9wqJexQ|smY;5asBo(+D)O?ZT@aVCFSOyq+6L&672@h8
zHWT;O*XgaGu3lpM2!KzjGh30}w9NLFn$uT(3vXx#`$(U4L~qUsXvOAL*q-y@NfobA
z{X6!y)VMN5Nevn5Ko{Kl3bRD7XXO*e;I^=$vEwoCyY`Os=R*uwhXuQv$Zc>z9JT>aRzp>%R2if_Vk=~~PiQ%BrqKlEC5rFJuoHqOs3xN_!5m5j
zI@2Jkje(Q0@PrsddB<#N?CJ?yD6pz@{8M))%08(I#VzGJVF~{LJ4{zj*vott4#C3tn(~trZnoh)JN*B!a*B|Kpqb0(q$7#3o(T!#Jw98f
zzZB~kpF5uNUbdC0V2g~)P0Hy&jUU>d{-^1a?HkvQlD1A01_R+}3fv+6>oh@P`-wDW
zn|)J7y~adS2O{4f_>{eq%mc_lPQ4~uL}3}l_Iuozh&ke1$c>|V-g?JKyUYH%IH3bO
zc2<)v{L?tPt$Az|d6E$01~zK9eY(YmWB{0fuPab_R7Up<=wQ?Bxr(m3
z&fNwN>jvwqNwPW#<4){6MJG256u(E>eKFh$8s}cP@R32p|JP&@F<3;Yf((Dt&H0L6
z|1yQT(4qy3Sb2DO>NwiJKoKd#Qo{m;+tF=cH+T4)@RYP1U%`LbS-e=p(-h6EFqk@b
z>(Q$}B+L4DeJsP-#!Y2M?JhCdzdQ%P{o6E^=Ml=Zc}i#ju7;NV_^dkyGMSuI2t9olGjH7S$%&F~X*{bmqk1jnh~
z$@He)-8ESuakUQ+r%KLOV&G8xASO@?snZld!&Zu^m$b
z+WJoVh%Wbb++;~p9q$V?c7<&S{m{=5LpOTcvjh*#?C$`|$WL*SF86m#V{c4%7y%Wz
zsxwn&Zis{43J$YV?V^?%DjjETO9N80LDaBV45m*$azOmaWpz^aX`NPr{P+|!UP(|Y
zHGX3cZ<2X_Z$qfn@K{i_E2NMIcf+kdru-#=Hul_y4hZDNM$+Mr9Mkm?|J1IW6Wf}i
zPC6zUn@G0eI=~DaA34ECmlXl^cax*%oDS|GgL?Jv!Ij?o_UhMbu)71S^+(0{&W@bu
z?mlopKlhxt4({FqxEy=@-xavXP=S8jE`2qbjwhE62i(Fu(CX!#LlX2oKb>CW?*!YfY5Yv?mse
zBi|}1Ha4MYPeOZ7)1LP6e_e&;lJA_vxJT=zxY+iwah`+@_!G~7`cEW0#yNRSZN=}SC-A$^4+%C*nbE6
zrO!Muu`$eZ$X+K@JxuSUx1kHwfO&?6%6Tl}TTG
zu+W=9^=ECHdE$WL9B?W2Q8LPYXxl8DXUC@dd?kYYSH!6O6#pTinQ}Q*CbV|5li%5~
zENTq28$^&lcZvdAcx$bFmx^a$AV}`>`ggE*r43wkX`#*T6{Rmx#AV7D=6DOK>k%E<
z?@qfvvICf>(3XerRC!Vb4ajiprvAG+PNxE!@<05ZSIARhJ4*O~M+0?Zzs7lu|7D?d<+4p(}f(gMFMYwLtL=#SC+t
zTRxKOb{Ly@KorM+#z>wWjk<<$T
z)eQd%f{QGW{n**A6NK+5v?SmgI&Hud2ank#R@}{ABnsbCMi2kJEOV+O84cBoH`ER0
zF*&*mtam^A5Ea-tD~H&}iqhA3%v-dwnSDBAQ|!G&*6)GM0Flj+_ISh`kL%Pf+Wycs
zoWG3>ksTUie@VfUQvi(*9qf3XU7l!ni_%RL@+0fzZ{IKQQu>O*Pk)!wzG9|5gmyl(
z4dsQbRw{a84BisuyPg`JvL96ayl$ws2ak?ah1y22>WOxRFVJ)crTzkAg)%P28(8)f
z>sO$)Xai!uc}WWE-0P4l+c2eIyp?MDRRH`1m+p8+l#zzR0n;;1eQ
zE~Zbn+1vfYZh4k9FScJ1kgTwBlWpz)#dGsL?-=)J<*T+9^l-Sn3?+ZqW&+Ol^
zNlWeP!E?Y}Gz%)u+oRd;Wp;c=_t}aX`>esL*5k?O)Hx!TCz0JA7zI&nYN?jrX5S>+yd+VYH|eA3r36
zaduVUUMkjUr~Ms4RLcJ8nqqKGHG1yXd0-e8Y3-=8N
z{PE_XFvZ^_|wVgL29
z{mLN#iibE|&4jn@GXys4T|2VimHz*?#+c9W!k6)p4LEAyv}O@~k!gMRpN;YN>*g(S
z4OI>x;ZqF~TwKdaVHA5v!B#_O
z%GTK@QG-_5kyh$auUkv8G10LglN{jN*EznznJzjWWw$U_
ze@BtP(ziRdU~6%_Ef?CYqZ!l?mg*y!GltthB19gDPo
zO6gCcGTiWEF#Mtw2qZWMI}WLp?P^qBq`&>(OI~BzA&y(3LWy9YGK$6QcC<#y*9gaF
zxNkJ+<~ttJq5_+j>in(ksCI!P9e{&?6O4^<^udihRHk$Q+MewIwn)jcTG==L{hFfK
zcM}~ploLy38V7WJCOdAR{_P=<v3?<^xd5
z!60uYMEu-*T-wjFyDQrYlvwU~PoV^Xg)$YI9DuL+^a)wv@+4r9-J-+o8(GqruA{vj
zvONwuHjAVg2bUgZZ0?v=c49(v`$L!#uo!qXJNYh1XF@Cc?WT5R=>AxY&und9#V^QU
zG0z2@#GxMkXZS=t)^|Z?5~A#5SoYF@=gI#QHWyXTxCCF@X(t>U-Be+K5(*>xXG>=IWkkHUlnbAL^?}#V5QD`LO
zkIprZ31r_ikFg2#X-B~&h0j?Z-kPfV+k@$yh}L+MM?^bSsr=*VeWgEOI^1-=qxNqr
z#MZ&X%;==h|4CH>w5eE8xM*x)`>KFtfUZaZIMhcpyQ)qKA
z@&P`$?bP_x;sbL2QX0>lGn?w8bund`DpA>u#U$Dx9osO<(SnwZ4Vc5Jw1@FF>&~(k
z2HY2F);YNDWDk~A7_dg5v?805RledFhkZR+XoTHgWCh*)@oed4>k`_t*)d2|_F|!t
z_I&L6>%;P`sMuStIu1)bv2qjCJ9*$KvyTh7R-Udr@{+@!_m@G(MtR}Jeu&hT4t9=I
zQuaA8)jJT*Q0#oLATKIc4
zxq?4vf67o|WtaDc13_8k06Jde_?bmVaHA0n)bSxYf95~eju0epH&-5KFTCxT
zhof2S_zR9y;lDmt)q9S6I53bhEd0~|z;PA!#$d|2=y--MTyng^to4q~%{V9GmVl<_
zaQ9A)q0yHd1^m&5EsO9DVRaWB&{tG~9Yi^t#XNAJ4_8kM38c#Q$d=3d9vKSm16DO#
zdB%a}9&p1E%(i{y7>RNG2|C^~B#v!-;28bCUP8EJEKB{~QKb}y)8#vkdVl4pRcT(l
z`mKKdtj?Rfkw(+wUI7=ypN%#*y;W*2;V0x$)g9Y`$1W~4jz|7v!}9Kt-IDC9
z@FZ~BgL8@+C)FK3GrY<7q*=PGiML*%4z}Pg3GIqBK(<|&&&)*CY>V5=ik~EKVR{`
zMgrq0d7&ag1IHBB_3(SeMDlCaBhI4@1q2f_
zPT{6771hlbbv_S7eoJ+1dTRK%M^#S?pAw$z4_8^&fdew(7wpFt@+4rp~GX3djuAXvooR{Y_Q@C)LY>~>zk<)%k5bzuM{yb`I8M2O`I534OZ6U$rv4xCd
zQ&z#Ot}vtwrs1mt5-Gc9h@9;XabA`SW7vuo&U~3P6J^Y%n3W+X*<;NDQLKq{hRUUE
zXhm>&neHH}ca{jMr^*Yw$jjZ%iNMlXVyyFhfwRsipZ-fWBHlSw66UfjK_-LvL5k~V
zDBX8*7E8$MD(L3aiK_W47khKiF6Gs^!#Q+7BRzxb7qH+==PZFe-OIULfmEM6H41QA
zWIA`KB;>+g<2ot%zOWYv=A3OPZ-ld4T~I#FJ0A5Lg@eNhQQp>U`4cEa0y<6!L1(oK
zG&iH1Amu2c<6V)XmN&~4OxeFUe`Gm1&P}3FOnW~<7#ATZn78j=L5#P2Gg(y3thXcKMf&%|1rXWjZx$|AO<3Lh0AfPrT~a58W|CxkmB=
zH30$H?D&xHzw9IabkPV#GDD9iSZsTYwe+iGUo&G
zeBt~Ugb+@pwL>mQ{}UeZ_v7Zv-<z$yh
z`JjCOS=KnCka+|qOMeQAZeiA<<3b{!Lu_16
z!plL;=*D21j>49iAU^g}pwflwCPHE$>EGqx?*xAkIk;?;_oYom>93%G<|{RN)p!UC
zB!EJZX1;>t^%p9fJt%O4a||Vu^IggtYLisCpsbsi6XSvWmNS(ut#!7dIcuFjXL6fr
z+ECk@G<~DfM#Eon_M+#9+2)WT!4ga>51W+WbkhLa5T*~LA3TDZ*4=IqNNL}KIr+;Q
zLNkgQZVOib9RxVL&KX8ya}@yrk1V|=_wJp@)>hNt0jaUcNbB@jfWG}vrrjldhd$lPAT+CsNsWL3XNMrBhJQ&uXh7eA>)sCe8}?Aqc{s%FDyQss4swq_e}Y
z-u?emX`us#XwjkNSOkPG+&rLx*IUZFMj2bP+WF)oH3_k&pV*V>y6VzId3l6)5(6E_
zet~ClDa&~mG7^HVFVUhk&W`NHdMDD(R+q}!E<%iDuBK!cJW=U94e(d~SrI?Ii{reP*Mn%4FkPeqQU351E40Cy{V%kz+DLmrs
zRyotzgwLH&a$SX%+q6GsGEz^H&pUy<+sy9#?0i>XA6|5J6ooD9&hO55d;=41yOr+z
z=}adKN&c+=HRnODhIvPDy|eB8>rQ{3WPdGX|K3~=&umdv;kN@L6s)MzW1TU`HFw<>
z$_KOr6xvU@6DuX>to;{ThKc1fXZ%SEH@T+r{U9CsI0^I{_nn`~1V~dJakVN>KDw92
z-bH>%bsyL}j{@&I#TvQm4Y?dwU1(wy_2`9dE?vw)-J&H
zxlE|upK*P(Q0`fLiW;kV25o2C0P6pna}c|(cR3I=E_a7B_LkArljn2Q7a&78Z>vmQ
zemQ?VJ7;x4E_*+c;<2}Kr%Ya6{aRId_Pwv!5toZ8}kZq)oUUj|BW_NIbi0Lg>bloMBfrG+TN|_H_gD71W!NZ%%!<40v
zK_)ldHCQFhz=Fh18K+#2X05f0Ts=64ftobW>Lh9$7XfMHC|dwaU+Wsr17gafFD>*=
z2S|0{-_rf2)V^J4So=1-C5EtO{buXI$tip7pXkp}f?ru6RGmMxJL~
zvv^f%5l52Tbol^oI`eZ^2UeNs8ZQ%$BbP17P+mJ&&D?`sU&$12W3+4^1Nj!$Y_@Q?
z>vy09LjT!)oNB%3LKr5Cd}XC(eJWxLM|eUHk-;5vF3lsbroPjOukp_N&s
zk|j~Wbk}E0Kizc)ghy1A>jJ@RmR(+=o9j^aSfqkXI+7mnPG^f>ak8a
zMZF@M^;dH;G$(RzPf_rAr~Osc%3q82x}Fn-^Hk=q^8D33hOsRNTw@{NNf=y0*vcvy9EQ!Vc>B?a9kGozFg^P5$qYId_6E1(XgoO1g^QkB_&?5DF7I@F~izNKO%2J(A0?{`u`w<2c}Uk
z14;GwvT^*0kU-`N#(ZWB#(ef8i_rz27OB=Gn@GFAmZg&065NY!8-p>_)XMaS`3GRcgKFL-0c$-+3=xbzE~Le01`qP}fQRhPT^C|$
z9}Nypqlb;IT{ZoK;kHuwv8*h|qDKaQDyn2GG%FaOzB)i{m6HAsW8VVbbM^nf_hJk|
zK9dr*!b=jhe
zO>?eWYUrS1(+UG5?V1!S>5~YnxEY3c4z4sDK$Ex#78^5?@Oi=G)3I)Gys^Rn<%gyv
z1%K5IxT32Hg&$mNfbHl^E_>N98DoG_L(_%_J!$B#2$bP_ZYWLGQ_@GNsmtaWoP6O`
z1Rzyu+LC#EM8FuL04d
zi(;bAz|rz{!$V|fX-ubyhYYX8YRoTPJ9jo4KQSBw_~J5;g}=B%YEljxph?kKxqd)*
zY%m>uGn}BJ))38|$?m>^tG~ooq|(@^eo%K9Yu#%L@U?Y@Z2-eg!BI9i=o;328NYwR
z&<#lr)~k$X6#nCTgBDFXX=a_l$Jwz)hr**z8D5N4Y25T(zwS3t(Y3ZDp8Ts}32LR$
zciG*yiJmeQ@(s7e(zk=UCv%H)hM&-LM+%O#;jnw&@HNVM_;gP9*A&|Dtzo3->^GF~
zivBv_V5c?;T);=q=9oWQuOnl7{)P^TBV#-VvW@dpZ0uZR3eK(3%5dPJH?5guguFJ}cpP}>L&}bJeaMkvT)_K=7+1!{hM^4H
zWfO3%6dz31^P|HsDgOX&1+t7Y;7acy<6Qzs+=J2drP}+AC-|5t;{z4FcC&GqN^=b-
zw>2i>TE`{m2+;N8H^&(VU`qN?oioEkwVgBc?9VfP9H-I@pmIA-(RF<@Iw;GW9nLdG
zTrLMY5O?T}ed(btZOy!Jp7B21Q2)JsbN=xj<7hw$(b48?@G9`kbfJASe&&8-3q`BB
zc15Q!EIc+vPG{9wMmU>Y-b*dK6zHD#0jB>z@;U)N%#bvLNVx_PEHR>JU}7*A%`=wB
zPFm64I%_;F7-#g-+wJj~+r2{zZaLd{O0CjdN4aH)nYePA5n(wS97Z#(b{g~L%u?V6
zbWxXsZLDFE@#L2I#y?_W;ifq1r3WrUN-KYKLaaB^n9KzWjf*f*LjXz+)u^Hk2vBW&
zS>f7pV+a$K%UMsFV91#>&ao
zw~6@V2rA!S=Tw@%!>!)Irh94b
zPGgZuGluKeny}5leOXKHR%3i0d%`%*wOO;HuLQ$K6(1OHQEA3=uFJX`ZKRo3(H;AZ
zD^;32&h=P93u_te~@K8C+#wBQD|Kc>kxkBOEKT!cwTkF=u>o>+uuwGLtXs4iE3^#<XlMDEJF89mRPgv+Ww1=<
zDH>C`h+A4^u^4b5(wJ}KdCg3-gm>>My?Gc_6kC7fKFOwJtvU=J3ExN`70cqR4tnKe
zN;7_=ovELqz8g^A$MuQ{`jy0aF!QTEZ(dEG43A3|h|Z(TZKfOfl);3X`ctXoTYG>j
zJ~X}q&TXL??m~?(njyBm!!$vl`hF^@#^zpGYPyFqcbclXa)JpPr)iIQ5Fc`wdfjE=KCTy1wK2O;=qg#Im(#YYUut!6ss-e#_dhQDBqu*%cS;M@sjaUgol2&H?JW+vxOGRHzg
zlHVgl`wf;OTzrSA7>5h5S;!4EvpBcFyiLX12bcyZxKVUqP>(_?F0yvyifj{@&LZ5O
zG-CJMKg}FeQ9+j;KJ0BKfEcAIrkWl==Jp%R&A4lh=?;x5oXo37n{XTO(P~#XiQc@)
zG*LIFCKyh{*>nz68^4;Ti>*jYC+C>`G;)loofyV6{N@Tpahty~8JW1{7pB5fnq72p
zhj|t~Jv^>E*KRcl!V#q@<=`As!9T_|S9l5!&NHpy>L-o8q29Y0dd=$oCTXOnd6<%G
z;-*r?`{oLMIotG|Y-c_tza7_x1B*;J8`j!laqxT3WRzKtkfLaD2AyhpHcnZ{J3ptf|H=7oScLON|m$Xrt^m9O}GNFjFMZJh@V<#
znyOK78>Gtgvv&C#H-?+XME%x9Oyzps^r~sFyi}rjl9OY#Kj5o4m69xRw}O(L*7=n8
zGz^F?O|$PkPil&(65MqOj7N%Fnf$cu1JgYa?=^m8F68_7
znifSX6~gTpT+-H>z7_tQc84tzvo@8_4;%taDrwEr%SwEO|
zQt?;jBJQg-BM8AOTz;+TUYv5)81+0m!CWeClaya4k}_wSf2F`RFiQAfbaD$S@U%*x
zo&h?TZjj4yk*d}3m2Aus`&c`8G|4qTr&4OT&}+I*#hD(k?
z1C(84+HK6Dq;I3`lsL=mq4j%BGwIZb_&9ERqxqx?0>gUv;^PIirXb8YVp}bs?~_`7
zFWm68pld!hZI@SWD5q7+0G}Ukj*Ed%5yGIB1RsUEWriL$uKdF^M8&mxjQ2>`-(ho}
z=@>@n)})FNzRTv@Oe2)F9Wfrv15ON0L%miO-^1n!rdZrfJY+m8ioXZhT91vF>5onD
z{+jnMZ-;F(YIy$m?GAx?t+=hDIkGJ=+>R#CF~6+-cxz4=jOASOy_&sS2ZZ5mr7?2J
zr}kH~O_be@--jaHSX-_fX#txez8l7OW0gC}K046B^c+0#nMTWQ_fytV;~^^OWr5mt
zuBn0=7UIO0xze=q@*sxFLDb@)YTW*h`TCE5`~V$rnd%9XG@MPpW4lMd4NEGO9X7rw
zvOl5&9#dcO0nNcy9kvE2r_j`y^QM>p+@-Bdzh$KvQnG_w^@nM&#B`PH^$<1M&9!98
zx4@pE>5M85hw{vFnm~|#q6sgUpMs3B(QU>a1N_hA#V?wtDhPwu=#@$Fre#zyz?90E
zfgZBm&$uxtvTC0*LE_fQoGeohb7N=o5qw)yOryBd7W00!^7#|>ceQ3ymbr(Duis&Q
zSy7IPL)u=htu|w;hij`_dTitEyUhdO)rxZO=pl?`%wI(-$7s#WxIE5z%rpTXpe?qO
zz(pNg3F0iB_o)%&wWB46GFzIK^M(WF8)Bo6ce#~=Cyh@j!h>)MZ#oP@3@h=h4~?-Z
z9%HaP7a?>6LN`>jb%L@E7<;IA7g<9S@W;Vjmp=&=Gq=>
z@bQUVxAtpux=Q(mvJM-E(W!x!MC$XPIc`}#j9ObSiwp4c-KOf_|)
z#2(;F#`r8D&iKh(uU1mY@T+;E`uiOt!X0?wujVPy>Usck@`;@(E&1lomNlx!hc&0N
zuBMv_`|@D{=nvv+L3;&7rpZ*d1^pC1FHVM;r{i?XQZ0i-nIFX$)Li-dICJ_~DyhM1
zEfixii$bR;_m{YiVsr=GZ*)AX&~@;JTS-*TS)ItyZ`oED!^Yu=b`fqHIoqGc&$
zl=(lYT5+D&QUP=H=9X*K5JfhgH|40fqPt~-ocLcTYXMACi(TeE64x&v0vGPtnsZ!!(%4h3gK1Y{?L`Ug
zf5_a&bc`xn$7;DE)slxx05|~=5cZmKo({B&HLxYqQXj2cpsd-}UX(eg$IlW`3`F%-
z#r+wC7CjK;9WG1XXt4x03G70KInO$mOp3PG<*83%&2<(_oNyQP=VZcuQ~)Kr=D+88
zpxAjJ-qfl%t4!Yk8aPmAUoD{4MswB%eH##`WtNkOg=Kq}KOAT2tf*jv
zXuikZmntsW^WYBK6~lkN>QLb$9AU4dq`RF(bZon(B{$q+X^z5hz-_P}qUui^6S;D)
zy*nHo?b3ur`?1vce8y}F{Fbtd``u+35T`bQ#pojVxY3mOo~7-ULd&1KCk&0_L4Lo~awJwbaXBR|Pr#116&<%n$8};K*NR^fty!Eg9n4%hf|R+Ii`4LZMv=foEdwy8LW`faKD^~QONm--fzB^m;)DU3L4uVC
zuv&9+nZEDeF@lM^SGEbKRvYxtvR7K}!HC;Z<0Si(|6{hu#FpbKZ95Jc>}qhWm@Sxi
z+As3#-!1Y^q_#cPJfHEhfHBB7AGO3P{QY(d%!d&V=0KxeY_FE%aWU4IsPocRwj3g8-P%{u+-f15u*`qaLyO2#7yPO^}VV1m0qz3
z-)F%wrJ$!io2oyx^i^psU~@9SMpnl->IA5*#HX%>d;FI*kgp!K?2l91VxoR};4=PB
z;dD3wl5*2JeTkS{*m`Rnd|;uaql)V8vw#*%wQQDPIXQWQ<8(9yCTp6(3z60p3UE~?
z2ap5!O1Z4jG6jQoV|8O8&G^;wFi?$nYrA#rC{yjo6VQZ_Bzy)rM(_>iEmL$cc43?^
z0@PeuX`cuf?D+XOzbxZD?D_%6cU=32eXxYV&sA^Q7NEyL`s=77S!3e!&8)HLHbCZg
z?Z>zx&$3z(ozIrVgIu%HQlb)F&yWd-`Lav%vp|F{dP@iE+c9bf?8-AQW8;WiOZKuqxrkBJSeKxcbPV2`iZ5OWZXU>q!lQ=
z^gt}|pJ9anRGR?}LQ-o^8g6Y+Xh&}H{aoDFItRsiZ5bt^YMpP2ob?sWx;}XnE)-c4
z<%oNWNP=+ak!^LM6^Kz+i1~OwE)KUAJ>|rM-PPU#_Vzm%RYvHZvHPZr0(iw6DtMxiRS!lfr9bHRn
zx?4b1rdsRJ#~=zm76*;zLsr~N(GI4@-g%nG}TGV4I(GM~t)>!RGWWcXbhRw{y
zTdivq{-Da*HCCm)i7Mwi+fz=4Enj5J0VrcQXP*_UdF{O!t@(o*>ld*xJ`oK;_(2!l
zL9hS4)g^iww{%F@3t@2w(bHgl@IC9p*wb!C&Ui}RYMso6_pMOEp}AKv{dowLVr@Z_
z>#ex&6KhwquhyCpuLe7~svyz;+II{Rb|AOUR?N@*Xw3tHCs55R-Jua~u+G!Qz-i02
zCJzGT(NI_}F{oL8&iV@$%N=OoZm$2*DsJOkuxezmxyYDCi-JuC@j$POLb3Md{FU0)
zK@~d@)h2hP+-&HM>Jn^8WVq9IoR18$IS?OQXWODc(D}tgn^oZ>LuFcmNQ0!auz83Q
z@3l4Zk>N7ExkxYMFQ%X@9T{ay;T|n*@2TJrerSr##hx~{PoohI`Q&t4D;%4@1>nY1
z8*XDxrIWL5Sa@bzAT9<+^6E%{FU$};z`JY-x(D9r9!>{;{uumLlt+)=;sqX>U
z4@Q=9=Ad55-2R-k9#`>vw%--yA!vVW%jw>qtj%b35X!1u0b7;`Y8cbW1}X21%U?jE
zSZwpTGQ(CBr*x-4KU<~t@yb9LhU0aJ_L*-VLY@2D+UXvvz9ZZf5R?p+5D09VWb7=l
zj>B&xhP%W>oo%|Z-ZU*HMr^H+qMcRd3_~7XF+5UJ3`jVj(L&(axw+5=*}#|-2~6YK
zR5|&6+i4ZGYirv>zLvH)I+7i&r-Gqo4IO>RmPjXVwi%VVl-kbr8uJ+2
zkT|%MzjJ_?$+X*Thv8D5lCo_uUzuP_SUcDz*FpqBhXT{pjI%{U
zT>;X
zm~vb9@cu_^om9$Vs@dmgpk8h4kZ!f;s^g@EwqI0A8J&L8f}3Myw%0^Z#HtKEq@7D_
z2uJz^DWBL7+iJYi&BIsPs$hjkL8}Iydn;_SqhV|qbZTzryPmTl(8w}UuGb&r&(_&s
zUPfH_rhPHa?0sM)T^0!p+
z1<;RLPla?rE<9&nj1&3Y&DL_p4%@p51eICG^gE&0vfn3;co{sU##XL^WHR?Y4T7)j
zw!IjwUKQ*V>OxuNnhZX6oil{9Ri@s^OW(6i7N&;zjrL03wAc1doCuBh^JuZM$I{V*
zwh7ub+gpd>vFBV!rtyo1Y}c#QPXd-_I4jw4qrzhk+t$Lu5LXoK2Kek`tc79E@4O+GHwvECbvE+LD3pDJcz4PWeyER(b$T2bYB^nW7@f6~A
z=iBr6LcCoStzHL6D!C?Xdmp;wpuLTXzDcpCDpj=Rpbl|QTG$cy
z9_6*)plJAYUl{&)a9|XHW&*d^y=3v*zfivdShjNhcKd3GHN~Mwf;Wwv%3
zLh{-TDqhse4pZ_9yQU}Y?`rR)yw3S=qlP##j+G~+H)zcW`*_ORu89|5B1X!aRBmzf
z5dea>Q`slek)^hKI4{foY^<__lI^g}tMEETs`#Zr_R)&6lS&@34dvlO?D!n2DYq2%
z69wZeZMjR1{X=0ExaLW{m5XOv`ort}^>$JzySQYC6O3YmL;nOnd82)VCZ-P@4n_QR
zVSwK_T(Qj2MIzumuK&!D1$Oi`
zTQ{EdfPJ0<_wq`k{Z4vih9j5qj#(b(q0{W~nwU%x+d~+_Q_|D+F3Sobx4w6;4r6;7
zEQ~n8@5b*#PQKQ@LVm)945)uqVB?px-_pQ&OD!)#MYhmZBo^W~F!ZZkZx3Md)?y{j
zTV$W5D7BRIsRef$%j}kDxSG$}s2LvlBDi6V1*e6>Kibw);BC!-Ez9kDW0WlZaHTyI
zt=@}%4?;&`KZG6TnB6HBz#%$NuFvAkTnEnYWl!h}1Y5dGN$d(ogdzM*55U$@`w1Ob
zt4pCgo%0obXPv!QwDKtxzM#R0af2Olh|dr;SOl4d{z|H5|ZxJN#$g6|GePg1&ju;dHWj!y~BcKfa6yLDt3g7qI&#C-`
z#eTWPnb13JZQ_fMQgVv@5C=v&AICCo4TkF8B@jM{5kiEgb$-mB?zVe`WBQmqc5Eic
z5ZG4#9KOyWP8={QZi+MT_xtSa6a^Bz`|aZTxA?&8Dff0mDh(QE&!gRz_*7nX(0+TI
z^3~Da_%&W00OV@5n>54N6zc@x8@tyb+(^|A(hF};+MlWXQQJ*i
zR&OtWnOChNBuD!Tl`pb=L3NLTdTs3LfZ6jmJ?69D;DBK8SE}!;+0J=qEz=cx+UxAY
z(=CoigkyT;20bJudu(Gl&+fqH^cxoraV(Brb|y7d(AW{m?_8MU7>s4mPTy7n!V7|q
zhg8ZRl-taD18um+q2WFEINGUr@p4N*5nYc`&QWeMj(g}F3aHa7^mDnc2ZjLC!Q7VC
zC6^(X2RZ0QO&Oo+?P#Sa=eaOXbbXBhj(OaU8@BXwY>kb{j){VyWpjA#2c|@PFzuh)
zx`hXVx=y_k!Qy*x2uz;E@8ac?r$o)F$YwzC5tejcjh?Q(&#_IV(^C0*
z&A_W{(0P#P^wuvI03k-?Mom|2tF`t9PVCV$tcdM-gi5EU1GlwZKy@z11N8LMj(NOb
zmO~wsOhIPsLQo^_4eDC4l7MZE4eK2zfaum#U#<@_
z&bD>Hk<#;Ls=dp;ippl`Zx-FPq57qIqO!R-+&663W%Ey!juse8TPk@$esPJG|Ha3N0{`+{un%^yk(-J>8ah|O~45>X1#I@8JspdlqqLS}*Kr*5;
zQDLQH7F92_Wm2V6ldyJ%1?%Ftt%3pvEtB}P%W0R>Wag3$IABqM!Tt_IatRAaorMdx
zItQknlCJHba2%1L!3%y=f)uppCbC+Cw6$9gUWL?op`(1d5sGC
zZcC|b-HCt!j!lr*Uy^py%THPc5qe)CD!J%DvK3c#8XR!`pmS6CvoL1HZZ!+1^tqP0
z%L`$f0OfiWqR$*?Yh5K^_z~eJbWJ?@Cr^#nBisCvg6*;$3
z<l~$G8}E(@E2_)<5NyM58U8<1Fd1ui<~{VPo?uMe9|{@%vNW)
zMmRUvm?_%f!_`hZAioh!jHTd0=X?C&Zs&H58iw`jM_uYEnU8(wG@_?5D3-^SyPo$bkS01$)=*mKj
zWS5>Re|L_ER_>GiVT?Il$r@N1;+PY>yi{L7bRzsex!=~5Zd`sey
zfXAn~rN#9VJf(8u_pU@0A3N)Wy20plorqB$6#c?0jK?)M8h67>3SC7wOlR9=Ku6{UWz36&Y&U7)?Hc!Dp@^Yt~w9)mJ{4`47UpM7iF
zMj6k^V_iR~)U(lHn6qMC5d36j>)o7F=WHYElu~(Wht^ycbm6cJSngN0OmNk!#l88h
zrpx$cte*W!5?Yz7j9V^jV+8xg}rQjVClS)H)YD-~dpKz`;famw6
zK0LoF#pa*zWobt|50xT@Ny5jaPJ}*5_^1@#ixLi$LeZ75x73E`8>Ln}VY-Otx>6|N
z5}qyXfai)*+;vD;RN5BLM@n(?B4KVRw1)|^OL168C@gJ(=Y&#R=SaA<6iU#9F{KH3
zjxNQ?C?Tg52knHur8s^hbScHPm4sj^d;Dq+2(Rj8hg-$u4c`0y^
z5FZAH65_&`jb<0Zv+(>aJOj^P!w|$aI~|^e=S|^<@Qe%J9~Bk9IXo55Tf+C@nG}Yt
ztA2a95OeT$xB$@V2}5qKdoer#&!Saf$li5J!?)qNAbbm+^TK&}&Iya%qcA)U
z&q?8%@Vp}|_NiOKqwyRU#(ins&EZjaULU?5&)o0`Jg*Cj?eN-gE}nhEIe7L655qGQ
z7F%t{@O5~02oJ%tMOf_D@kQZl!CPDiXXAM~JOIzb;eL326wbo)gK#FEZ-p`I+AZPU
zc)lFQtVd;pG3%G2r-bok{&(<{e~Vm`WGKZBlhmRV!%otb7Tu12qDnFP#IvQ?)DnLz
z1r8DqmqOW*xW5!QNPN2#I7ob>6sFpVRi)U36JIL58P8Rvz)IrdrNBqx!ct%&ab77f
zkvO*$I7pmb3LGR(FU9B+A1KA>6Q`77^of&72je-R6vIxutu!0UC-LUefq33n+8@u+
zr5L^L5w4lz>Vr6F>s?h~m=8MRW03kN*UUpIcD^&>bMFWziQhO|Q$pJm8;yU|b<38A
zToYnMJof5-m%l=)d%bP(M>tN`ae#BsDK)>k#T4A>+E0}k?H&JwgaOHOYRISm(PDM4lxH9}cpO_2tZ>mN
zIF}`^(r5^;(bf*$wcG_Y2jtdoxm@JCHf07GN4c)&^DA8s#l_qf6SY_R8>2F~LnT3+
zxcWI)txB_Ooj-hQOjK>;Dzv0pV#LB}yN)sa1AQVL;a2yCOkxO_cd*3xrv-%lF_;x{sWbmC!nLh|>vjV>gs?oSwvft}EfFofO
zWyXOfO1FmA-0B)HXtXe1y+k9#cKw9h$)BM$cZ&R$DebVGH__NSDj4WmM71kj9xD37
zIg)aoc4Y`Q%|&TOsw%ABT`P#mC_+t?aFIt?=BX=W$0}
z&&RS={J{#&o{U@PCWrS()cSd1kbF0xVmXy+Gq;j854EnZz~lmav$fP
zbFEU;&ja`kye+|f4S;_L+O{DVTpSCV+JP5b6L?aLdzwZ)5%?81WctwO0XKX*uW)K;
zXNf&d99VEGx|#d1w(^NyVR#8xJNpU~!E{%rPc6BzRjm#wPw{Drw_J+-{e9ZCuPf2zwTpW5Cdw3IcAcX8SXt
zFfQlsmRC6Wvw&NzXtq743*U|4ixHXQ-{4JhSm>r^?pyf%kh`-YLbK{#=f-~SGhijZ
zPi@7CUEGk=zCj22yP&-%`yE1SUah@)`<%<+3wGUxVx%j
zTsq|qg9K#I5cjs|*c#y(B|y0gdpju5p^ch5<+%69DQ|JiXiRkZuT~fYjjVp8$+}}hidpP+*$J4k*<_R{F
z>+?NIRy-RyCC58VZXfS+vf3jGbZRQ_0Viu^Lbs-by`0?41MbB*+kHY&Af`^1*_ln*
z`#8BJ63EyuxR(BNhZk!mO1Gbq54&+Gw|{Vjid#(dN{domEhVRVpy+?hJwr&T5B%cx
z)BdO66nJr}zYwRPH+|BxwGIZPzlp5Xp&;eG?{jk?HUOu=JACaau-u)%4flJe%fWn1
zSuFwsxWMfxgZa%3|+NIZuOo9{*l&
z6e2o(ga|F1(;;w!1nD!X;7}elOmutsyF)%`dU8yGFnM2be}YTzN`DnrNu^jNN2p?_
zC^*G!po(};JTKbhzCRlG-7DS-a|3W1JodPItpYpM
ziqmMi_8w0&-qXzA4dS*3JwZP5jp!GO%wI$k$+F=wO$~oX6~75+TKc>5(?7cJ5clXy
zHv7y3?~r~T+2F=)o0AlLD&*onl>jW215dd1wDS#L7U#qS=E*7hfwMLTcfz0~Hoccj
z_>r@=ApzIm(?6k~2CB5n+Xe#*=XVu7r=1mEwIqPj%HCq+Kfs@|u
zvcU$*Ho;LvOWyL%qS_%jeGK>kQ=VTHU~ny=s<7^AhD$Pmlc2E;Cjz~NL~Je
zAkMw}`CT&gR|;h@I%??1b-ZSRrwt<^#TKu7-hMGCM3tCkD{#XG{hMhlJ-%wO0RIR-qTjasl(H7
zgIcfRs<#7Q!QQMGo&I!vS__p*AI(+o1%|;v@edyGP+fiPxngfXO1WV=TQxqdC68?z
zdKT!InBGqSp;vR&0a@V}R9Hpn@mzOHngy-La@8S`k<>n9<+Lg3kILe4RCPFjSS1tE
zW&$7$SA8KXUqt1cU>bU>YwAr)RrP_}d80RktBQsxX>cm6*HQALAapVX)$b?nFbR#eKRUg@b=)cULi1f
z1&h+%CuWCfR?;7If(vDE7N>@s>HWY
z_SXsyb$q}~e&~6H2bcQ%a{R5SB-WeB7uyDL?5cP=P0u+mroF0GK|gbe+Tp^uzMUX<
zI~9Iwb6OuPf%aDtJAH?L5IcS9KZu>)@E5WB3Ij6!gWBm$SD|)#_!ItbYNxkcrgkuE
z(_8XX0g7o1Q
zwLbU{+UEjhLRTYx`t++2KT*8X|D=8}8oCPggCW6{)Nd^s>iQ4z2fxnxZvRUEMAzM~
zMga9at|WlBW0*a!q<}9YDdT^WKz*-&kU)L!e<6YTKK~$r`b+`|yayW8j^*em>uU5*
z-}fK%Pk+s2`Uf*xeZPMtfcpMdBY^q=R}w(|z<&@xefB>Hp#Ivc5kUQ*s}Vr`;C~Q6
zBalDjY7|g^-PI_de(2RGpnll@q=0&u#5PetBQTPCRT4P-3KBTtN)kBoDkSjwe+J-4fr`!|;ailYBImm^kt0Cvbx`Ukiq20546J}O?|fr2MW
z{~(uWL>1qkZXuV~Lv|l83O?b10ofBCh@ztO)2M2n&r1yh(wgzTdwk{5l+z;8>~t<^
zA!--9ljEs+zb}(=+C*|@P}Wmm>sGf3j8ORg?w&;|WhR$&5QWFS9O-Hnmzc!+upDm-
z`n=o=*+rCoHka4}Fw+~--@__c+m^UwkF07uH<>ZP8=}SUy9bNJFqdSA
z#IgG#z?E`Irg*>bMM&ah9+&i!`JY7cALf#5`FkQM2+>~?)`kvglMIV^Q&cMd?d4+OA17T)xWvBQ)WVXKhfahoWDmFY7r^)1n2LS
z?`=ez<-+VYlyHK`5OV*Ojvad#HS0>s?I8TGn@
z!Pk)JNN)ofzkWHa+bH;~r!!YO(qYb$G#JO!^@oGd6+ic~2kzgVqyz2KtjnHuYdKKq
z`B-@FEZpS5v3QdQy!=yCvIugiK_`M+u#$)PWk)Ny!*{_G=%YuZx~94L<#mDKu*-`HwWJOM(jl>mf@FKIj-j2iP#pe;i-%?f|UKqx5SL$1#w`uj~%w!bQio
zo-pD=HeR3Bj#uvq}Dreq;
zu5c5>n@YulLNR<#S$ccf@@u3#oQA3G7sAwn$&%$aQF)&bmQ4pQmd$3$ob3C7Pn*0g
zL`2EP2huFKm+f^?(i3S7R539Grs+N~O_vxgsoc{uWj^4;rKksi1jC15!HP$QfXK3E
zBM@yR^D4iS^LG0yfZe2^oUm1s&XnKRPHl!JN+&tei
zFlGA4pTgrerMu-|-h|Jav~FCzMSLBZKLjv@t?9cIzNwFQpjut1j(T(*C9mn}CestX
zqqOSzB$(CT6Y2m&JrHUSsk;7d{B~0PVX&PtgOLG(Q)CQy5X3&H6UeOQ#-+YQ74(??
zQ<4{~;g}pRq@TOE@oAayT~o$e+_*+2{MeMRn;W0^&4Oxow!0qJa~u7uM1ya0<9b=_
z*QR3caN|ZKP|olE?-;^L#0P$t8>>W_l!@L3McG4z8gQSP=R?&%RH;X3$Mx@V<2Kn$
zOdtZ+``ox)CTN-xKH$b0nGoNU0HNuWz-gc=T9qJ#j(35!z63#)kTw#ejjcqxA9CY+
zvQ~?xTKl;1Lz&Q~DPcc19*_wgni6Wc@emR&3l$N6?F}LSI_$$GktqEEZagf@+nUOM
zM7jMykcU=_MF^pyEcG!r*2_|!rc&_c`L#?4G$kB@s#_*>3KS~@_6c(IC_Qf6pOUHF
znu_7ReWOgsXiC5>`!g~jvnk;)+y%>oet~y!Z|60yTR8c=;FA)=br5%Qqv97+KBTF_
zQEpVrgq)^?FSt=F6Gk>Ad`Sm}fnpAAkV8uL%OM@(#$;J)OjD^kZfuDJ%E?0jcKvDh
z87jNm8xafAj{V;LNRGt{6a{>{y#$paCx%SBdN}DHouN6At6katN$xD?~nRf
z0f;R?#?~q{uDhQ^Q{Qve9Hdgwvk)nj-R*D1!!rD9<%a?Ppz~zb3&^V7=kfF4gTaXW
zm0Bi8DFq61qz
z5R3)VpT!}^l_t>vndS;nG^f#>%5_?wRi!|nxk}dFDL`uyAFh<3HFDN7BCGavP|HcZ
z(;J|v>J(|{XUEjxSq4S)zPh<(A
z$RLW}0=0P&3|!!>k7TXOBFLP+KKRY~le0b%>6avspP6S{l_y!kV`qQ@ll-hrEK@_(#Z#4A?FQsL{-?tWE~GIQFwW-Z=y;C4|pZr
zyuWZ|?XsWo`XQ$P3eYdLO6R4ij5OM5A1Rm^oOXznYrevTkk?I>DWe3q*
zgL4~*BvsxO@@#p`_j7FQ6p+Z(F;xGVzfib8OD59<_Z&eOcL0v&Ts6@>3;}+=@aL;&
zVaFhBW253zxN5RYtrw|*FMKIf;SWm0w&1EMGV5!ZRqsQ*<@BK7_u^Y})dR?)%3Kdv
zx#Qrz^49pC0d%dnYPzg*O4j+_XQ5Ym25|>A3Vsi(X3MNb*?*r%|82Nxj!ZoxD>RD!
zuZi^Ema68tac8OrIK|q2L9I|j#J5Ap36!ZD7>woAO+LtD~#N$ZPixNG6{=8#l5Zd;#v$~4z|ycLzEC*Vig!|ekD!I`em{ihRhP7S
z2p$;kqWvR0LE4+=P2{pp5`e#Piyl$eO=f*ZT-R>!;ktHw8oVNc;hFwPXdb#eBfEq@
zu1wM8!o`uP_Ha%=@jmtww_JK&&dHYVMe@WWN|@h|Cwjjg37UdKPfBlxgV<`dk?ehEX=ti33}Gwb&J60v`GK=DzMr
zHbN*gh}_`_H>S6?<=dS2FigwWo#^
z?$0FI-s1MFfTM13P4DeSIo9;JCUHTT+aqz=U1)^`NNoc0y$5cQDOMpQcnR_7ivq_5
z?-xu6VIdcP*f`rR584=P_akoEK5OdsckMD(xY65j-
zEz+=SzvSs9!0e5CFDhKI@8`!A`}jW8X!c<~v;AT|Gs$dAgMNRAUwmO%WOj*OL+F)3
zv4_be-IsG#ibjieM*2k%xJHOJCRYR=hqVnTGbGKyYeY}|$UFgOgu1spCWglEUHK*V
z=bUw-y5v1K{1)sgN)Cun=RiAOEokasRl8+x1WfF|!~Ze9kAX`Yg=Tw#U+kONf*kj_
zq~ViBf<8aU{OlIr^alvEAV(loTXYpCC{oL~%>@9KE(75rsI&yd9b4P;LArm$h0
z?>HLuc{^}jviAqMR!4LB95l*1&j_xxsI^xvp&Pk;9#WSrNK56iDnFcv#NWi_AE9}w
zYah_?xNAeD5~iEEe37iK2qjyR4h-r_t5=)^X;
zn72yojN|eZvdw0q&B__R7WC51A-VI7=kise&EmBXxfQ?Xp98@1xcnK}PZRCT=cD2Jgd3M=-&Y9)s;r
z<+Z^tWY#^D+uo0$kwyh7M+IIh3wP7teTDg{FjQ#Cx|O;Q0VP58Q>h7Iv%aqrhd5D$Pa
zjR5@sU)V0Nd<99|FURvB4IAmj#jssq!30T+RCtIlye%v2!nU|~wmXHt_}UlQ!>3Vl
z91L@k-WRyNL>l+Xwx&a?;cZ9$-a#k#-X|eAg$82*?To;!)c8=a4HySCclaoD0(IwM
zPdwb{`&`zYNy8vrW&bA`V7^k+Xl!;TG7k&1XH&lbGQXj1N}WSV!C+gitMQtE!26pJIG4tPigM2A0632@
zPO#pVeDpmp&c)TUnu?V2g+D_7L0ISfK#cIEP|^eJOwNi>B~CS|e!HBwhpF+5yESL7
z3RQy~{2(Mm4Tv(5ab$ucMWP5pI^j&5n`)EuySf0)1%5v!1?}x!K$0
z@>@(rf9GR|$iy-#dI@aeCCirwWMVlLy@JHLfqoNZn$z3y&ayziXqc;JHM$`@ToQor
z@Chnn!PA}y&X9GMP`(AH^;K_pZlTPM*qrL7bTlb6KE~(dg71S)3EWc3Z*Zq`j~?mo
zfQ$yxz(fK$%c$rr(NsfIQ$)GO^x=GCU)V-4xYkIi<&^tUpfwu?q+<&gY%7Cp{YA)(
z&C3PHoC@WKuzcAmm)QzZ&IEf>!{>;uI&5fql_D5cEY~xYc5HD8zfUp$}w@rv+X!Y3DIdmcVOkK|61gBVR>DUkUJ&LJ>^B
zSHm2?8+S_6hcYZ>N@bynD-C3B6;5Q6JA_iW-Nf{7AOp#38s#%oXb5%VK9keo?KEdY
z$H>^9rQ{e@OIox)kRU8${?3;&_|iQR!sn>yKLQR{6CBS|;ZL4U+;e*R+h7>Sr^QgQ
zf<@lyIAk~Q>QK1P4||YYUy6#421C+zCH@5}{K%ip!{z{C430DwhONBwMjxn9@ly~y
zkN+v~oT9AfonuAPB|0jdO2xm3undrawO^F}HR_%bbzc%zF({b#FxJEO{X;KHI5$w?
zH82$OFH46o=o0&R4IjO>35bo9JR~GdW4^{N2sV_#hMtyHU#9YtAU8(~eKvFt!x#`#
zk~yzHd6?D_0^qd8S5nm068)7Fe6wRNCr$TZGrMFR^CV6ZGt-)hC0IpOYtT{q7XdsK
z&xB;BBIrFPTYi
zB8Fa(9Q1HQFYiP+i~H1X-(m_n)v;4SdDpgsV*~$wVR{~aD}GG%1HIT0T+lHnTN!#q
zL9#$`*RJqEzIMXz6mY_CP%g|7$8U05xnQ`^B?emHkXsuJLhSN77t9g0F40{v)GBWb
zeQ={!XawTlfVVC`j(OdJ*iGN$f=8ujxQW(Yqf)lRzDXoqqOq_cg9KOhi$Kbc%hLa?
zY?S#s|3PEnKcpJrh@kA~y%oHiU^Qg98eVhOJ^mk5^>0R}f+fWT+oxmo?ck>!mnrQy-CZ|K>Ci6D0i4|Fw=T<|(DA!u%Y;Kvq8
zeUA%v2>kp-cy|;A`>T}qxnP$pEeuTw45)1511@++mi{}{wIV+d$=}Nb@5}tlW~P+W
zDU$Ue)$S5|aB&cO@IEg1NS14&uue3Q5h=Hy3qFw@3v*Kf8!9`lg$Dys;S!mRkcLYcj>}YGV@hC5WeXp3!8bBhEmLzMsRy~>q)gSy)RB?YLsT;rJs^CGFAaltu}x@2SUUJ=YH{};ELhYbl<
zfx9}AW)bV;2%Am*V~~AR`%=aG=Wx{M9mxeQPZ{_S*eb{Ax+0K5{82D){!jjU-4v+k
z!d{PAwv^vD1#0C
zP7(6%3|VA;q{wk_KfwV!=wNUgB3iMzpUf&^YUViU||f8{irr^;g0kzx&0*g4Hd
z!yfYQXQf$46|FQ<{XBd_ZIePLg$ZuSSiw`b2*GCl7b-0B!&m1GX_~*QFW0vZ-2|r+
z=K22dd~1hLMYM8;&5y}WK8tjMcvRUwL{gZNo`=2el6+Rs!A?T-Y+fP@*F_5d&gSLf
zy<%#bMA;u~UMcgxi{zhUbA@@_r0RYVaQ_$?XWEwjx-<{+G%UEak1j9c+Jp
zOYSue)}-9IS7@I~xxnTPvgO|+E&s{pO8I_1@_v!>Q@ovoPI8YRNzJ0zyjA2^&X&uq
znZo8b#e4O7Il0YLY_1mX`-34!7(05!8f_NM=H0T=qmfE6Y~CZ@n}*j+&E~!0J*Q1j
z47VAiz`eb&di_h+2nO)&SP}2*|JC&!;87Lb`?+^(Lbil70x6pS2|c^)-nJzqH0dN1
zL8T=0DhW+gkf7uf5h1i3R1|_>MM#t|sGtEs0V%;BAPQ(u^aGJ**AL{yYyn
z?A&{2&di)?XU=)wg{$alO;k2N`<=o-Je8Tjm!hrsC>&U~N(?I=*Rt3^FqR^CCCnC~
zUm}8ts{N-1(bnMR(u5exOvV>Vkf9bx9xN}#?O~m;*=TNSci^U%OAaC%RL>0kMHqI^
zwu`%Y0L;VY;*pjSFov|7s6Thq9RS^n^rD<>()^Zf(N3^}60D%Rd0A1nyS+3NS)i=_
z$AV~UNMHW1Jy@8kaDQ_1(rL4vE!<|8^Qm*So^1?W?JmZ$njP)jBFnWRvYzJ~%eUfQ
z`YO)tyxp#~U;KOSSSH%y*pildD8=4(PwSt>bDx%5;v4Ex8_~Q!T4G-x=f>IKrXvi4
zjjOJ(1S+_Uu~BnG7a_4ewec-c4GgPJ-MdZd7955Jr!FD!mbIo`b^D`e@}#=cQp)c3
zpm($-k5oNg+W8m`UpUh>MJ3(!pQhYA&eg>))Me;m?_I?F&vMoJ*I=++-aek-Wn|&U
zw+uWA);~)7Cyb%)E+F_}GJ+o{`_Yy-iGSbzaeSY_k8u3^0rjP}VDH)Z@}P$+!05>fX-P$0
zaFtdQmC3ttNd23wxaE_7n(y8$(5CJlE6%32)?;LTmJ`G(w_86!+S;(nq|Ck|kBNCx
z@5r{Gnb8xf>l511yw$MTt$l_|=UUU!$g&1|X6f$&_O+${?%w)$fjrw*PdHGY;9->>
zo{&4+U6*}(Rw?NT#q|kZR;gv;N-OsRH-PqEYIEi0nQeq#h7VZ8*tf2YX_b#P@0B(Y
zRG5>Q!!=c6l{tD=i|VtIS!EYJp|n0hVU^wWgcbD(Dy!_RC#2>Ksl`-uzS?#<`7kcPG{a0PV)S_ooQ=f1T
zRc>qzYTQX)KE%4Q%4hV)C+Z(}XO&C!gj4kiJy_*RJ)yQfp(m?+R!=xvpU{g{zMvvYY@X4^nxy5A6B`6r{)jCE*gf*=k(ORtnxLUigS~ZIYzX5O;63`u9Gkc
zlzL&hw&k(P%FM3?_T5TvqA1$>vC1lZQkCneQ$m2f4#dLdUhU;GIUHJd@C>o+w4!`?
zw@~ky?b_UahKkV(8AxZ2X9g(y5u7Bi?95!rPOSIh)M~pIF0sgg!3(CYfI;ww)n(j~
zsj%ey_A~X*2eZn9`fH8qU%L-pu>7^PYq+)fXeJ3;w|Sp1nrE597M<#aP{l0zc)NFY
zgl*{Zd*(j`uJ?vKjXk}?yF{?q9w=E7J%1*pe&9WAw(;3z2yHqSJ)bh4SKCtPT>MMa
z>LoRrP2A}vvuGOz{4wu!2s@k^59t5NXZyeR$~YK*>0L}~&*R?n&m&$dnyY~39rvcN
z>`lIE0c^`&-8aEDf)%awUB}(?aqm{P?F(-Y%snG1yT%KOpHtp-$axgy)p*-cZjCp@
zrqtrrRkV#}o^0u`fq&GN>-iXFJf{~vmMTB>j-@N#d++1Lny~^NMVap7-gv#O#&H>9
z!7Jpe5m>3!ryB`va7{h#_42oRg4yQ_Z#Ud5AM!eRk-Z2~e8J0@Ku1n^GwIa#-n6<0
zs9Pg;`Ls7mWc&a0YJxD4MGf{=p(10ro~;!7fw?dSiC;!^1GJhlhxq;k2Wefqv;3iDWfsC4OZubIEkcm1|PLYaH0
zM>nY%e~^e>gZDSS6}1(yoOB-ojU2JQpMf*W=J}<$IQAX)I(ZR01=_sLw~@a%jf#%q
zni%EiR|vN0%#+B=LCb~na=43tZ3c^qk@f&#Ez4J{=c0=M+?6mJ99@rlk+u7C?=#HV
z$_LZYLp;ky{NvW>3tt2dk`fLCYoGG1rGiY~I^b0p-9C6mJq&thpNmVC#szp+ujnIn
zt%KjSdTlMdlt=4Y1JygPOYw~W?^ZO(NRgNMtlr3TD90&vAXk(GcG=_Jh`R}Jj%W55
z^&0O3t$8=!E8P5f#wVq~E$^)FUdrz#J;~oFW_jJDBxrFXDUVIf^8r(I9=rj3KQT0$
zeqU^RoJ$1kDVOw#F7^{FFVZ&(`DFQ4@hs-UcgfeA3*zFvl7+o+E1%wCCFJ=LTAI?y
zcZQs8eTYID?OVw%r)4TEpQ1B>g}6!v}>Uq_L*?_~DN
zLZ4j#+AL&F;Y|SSOw{BlJ;&0zanDBx!Y6n$)A!4L3BppA?eRPR#u0cGTXL$p;DF2ub$B`=E*CO|zJ?cdyYDlUUSw(_R4-~XL&r@+2
zaY=QDk<~2Es&c64!755y|~>$BX*;T-+bY0%yHif0tmG55V!MZy(hpy+QcXE
z+NAOSAtd>@R|n0vy~O7A_5nGj=A3T>*Zvb+ruAGVu*m$aBPO1>fl^!frgHVRvpLz)
zY+Zntsq(1z9l|8ji0j2#UJpC_EJA9D>%b~sXNKV)Ex^BaQx_j%ZGZ5+O|Cvtcgp<)
zL*s%&3THKT$&FonKdBMheaY7WBwM(Q^x@vnRpWa`Z->`dQMQDE^>_XH8(-Hv?b%YF
zudm^bdhr@^mk`?~jNZ`>VsEXVKHsdRCPuLbMbP1?rM1IiP8`s#4&{J}7P
z=s=jZYO46b_o1#D%$XjBDJ83DN-Wk{zn3%%{IxxhK-Uo7+{>Nd;+V4
zZL4IXp;M(Os@NiBkZZnVV$;V-OE|c0<&zQ^Amv7pv}lafl)l=AY!VhpaNc@cN&93ViW6EDE8R0!HnOXI0sgprCz>LMx4TI?*>NSQc
z7D-90`F!b1*eR*}2?@6C1rluAV8+_(fJJDL1dC7&5XtZfU#4|LCu0C6y|sN)fE*mJa0ZGxv1t5DVaX`
zk7TFG&q>kbcvNc0XstBK05F0przLEW*Gu0T!jJn#`Xs>Y!Y$zy$<2bVN*^0QYh~QX
zWjR4nlcaRkszUnQ0HdSxDKt_36H+_YeG688IMznx^NhA3Bj5-O{tz<#wI8jVUn9xv
ziS1IcK{&;X)jX@y^g)f3Mr*gD`Y7EBzz{p&UQ+Io$V~0KOn&$wN`>Z>bJD?aU&e8&PpE|8hqz3m{~A>Qo)Ex
zqsjFX+Oc@4xPZNWPPz|dRkZU5X$E`v2Wg=}I7fLGr84&16=^(={P(ODf!_6k*p@cE
zAihGmzo2g;ev$qVfdO#l9o)yq|1SMt5H8Tp^*H&(U*kVuU^L55~$`?(O`)ESifnEDA7e;8DNL?Bz~vMU}Z3Dzb~{!9>lWS*nyG5{MU
z$dg6b9(NvB!9zCz1Rvf+`Bw|4RzJ+`VI3%?w;Il7G?Nz^Ojl6Qugus&jtMtD3T_GR
zETO*;#U^>=}xBUS|0vUY`?CA;>9BLm1c+Q{e2^OU);D5BXiw
z_17MrKbu|dAv*=r@5ti@r8dz{GFQ5M3Ku;#t(>lGPPCA7sN9KO?kf+m*u&go3J`I#
z^BUUXuuJWAyGS$G?tXHXV6_V#x6kW#uRNnFoI};j?inDzXA$iNswAZ+ZY>OHRQNx+
z9a}R*Mnt(CgZ?2opT76Y5_>jZ9*-mw71b#JV->UIM}V9$Mt({#+s&?`mMv-Zh?byG
zt4d5_-N(rztft3|VW(#ET1}*i0kL-QgR2*XvVoC)%AF=}GTTMKd?7C6T?IZC)8!A5
zcLaHE$Q@bNS@L%L0&7&M+?8q%%4XPACMoHkE`K!%lK)Y+VEVtndXH1k`pL%8H>>o2HO^yw-?NV32CxQAV+!
z*2)fK6-!I2WFUzApWKb1`~_AsM=agmkV`y^kjofWSR{ABGQC;8WVS~mzeWgakg+t@
zL~31VcB1kC`=(L`0iZpBj#Q{mv1hi(Gmvv*;PfaUW7sBVT21_#c^jv%(8bH4!>8na
ztkq7rn-FeKTsNINEA6={eFyf(F4=@W;@E9TELD=519|#S`9=2e9yx%5k|`=xL%8u?
zc_|dZMR{!usk#mjbYKfzj*(YTZGvoPrQa!q*cRE;|3an1x?6NIT_V70!6VG
zujX6^X)@6XyihB{cwlc%shXU{a`R*u^Jm%BX6&PHE)pD}`HcT;ht
zI*sQt6_Vj_h>)S6U6-sA?v0eiXnu~z=cOat6d*?>D!^E^`zUIh3SJqP(h0vLDoR%~
z>A7JbzX&x`MxjyRgT8AzZ`6h4X{!Vy?8^FwOK>>aHxF=%vPn~
z%v+JEv|w*|ltHMiMp4f~${s#t8%prgnaV^jpEyk{s45?!w}WinABs(&$)i-p_U0&l
zd=z5kqZAy*pOF=8CvGUwY~dJX1n#tt$$%WbM_DG?v*^e~HHkK>ik)S4Q{ZZd%0}hL
z3Jdg7KE^NLvo26F4dmz>)tWLFDIIBTe`SPd&mkcXaRIrPoGyCrb>%Jg!vJNs#az+=
ztO|v7HO(HXd=zf)^xlAy2xHi9RDL!^Z^vE?Ei(%32oyYfXSVdTJWU@onOydBZ1D(X
zIy#~YulNCuc*t>b?>h8D%mRzX7%4Y9Qg2~zLW<~O`fsT?HD$oTKTvwfwaIkn&
zNu}x^oz1q+QbeO@?@6f}%&Bb22&D*m*4=0!_e4xSwR2S$UGXVdU|~>T__p_=^2r)D
zAjQfFl+&9EUR5(Fcd~kbRrgS`k?$Ak0xT?;>lc>C0@kRPG69Y*z>FRCq_SSL_n{-3
zli(;*sC;d(bQ<77+w|2NouSbkR+<5wD+S_S;nqzgyLY@DrFx^>`(J<
zC~3Thry^G21qHDR_5oCWL21gcVise#{~VkE&wI?k@#~Zeka!>!>_U5cT?^Xbt6^e
zE8WWr}DSdui1A8ltlc>r_>3`eyZK6
zWDyn?EV|_wCT|^4a#2hH6(oQZe#vVwCQ9j*2yg$R3XFdC5p?x?5fH;)Dlj({ex^)f
zGrv%-nam{)aFdK;s1-nSp7>gM6!idZq8)MTA17X>wQUT0XmgCbo(ktEZFODXGwD<`
z(HM4hrfk8G-Jw|Zkw)kT2b0b#2O-B;Dmy2q0XeC;#W
zb|{H9hVA5ZkN*fhb)8lM;^W=A;9dBQl6^A%PW%4~eh;-vQICO}3Q~hI!=-{UV+I`=
zuYwMxnObS#_P-_S)3?_)nO$qET0~(MMY*)c*yC<>o+13TyUSw9U5xFsY2G*$7M*j!%~ZNtxu31iQHP7d9F73WllQzI3UZ;-lgpR5GsCEiB#v8-n{ei6)uX|Tr!ugQ!X(}jHe`T2L_ha;pR7!83Rk^EVRA;#*9Ui5$
zzFll5>uXbC`>DuQe+G$BV$VC|CCIy)chWPobR72Pmj!hgmp-1ZFP1x&jg)O%{_{5l
zHi=sosP`L<37kWWA0xP+Lv$To^3ueTMod_&UKdOYkz*-Eb&vA1tWtFkr>|P-#(k@A
zg?gC#R~Auh4E5a=n?j|nW6i*bR^cM@tO_&U^5x}mI7_Woah6&^Mc>MCI1Q@<$$dHA
z$>y$A=W}|iD}}c1toM3#E9MWn+E~kF12(FFW&_~o5gBBE6)K!qo~3zBwYi`!Rl<3%
zT!YinIgHOYK0}t->Do7xKS&<2b(@-C;&j;`cO)pq=j^u~YOG*-zWjlb#uW8|ddXCV
zs;nl@moixGs?}NptcIA0Lsa}EX3
z(R)9r+;D1N$FBaM=3<$N)87^teMOb8%CU6lqFTfj8nuTlu=M5Zk~3M~^!hEl
zgN?Omt3?>}jyRM|x}K^|Wmp-PTTH3Ou+1`;YDlyP9pZDlAlzRmOskRw66
zW_s)S{E`&rY^+@tOq=k|+f=Ybeg5`o@*-tFrk=cc^u}x*X5YecveXZ7nSDaa0^m8?Xcr9O+uUv$3`jV*
zF3nT3SueN7EW*2#w+!AHS)*+avt_C_)zVOe3yttH{@GPj(iGH2C8KaX7-S!f)^hbl
zWc!L9C27Eq=UAgz>_UzfBbwep={qQNB6*iMLM7qz<@Ig4z`z$F3sAjNsuQ+-P4Y8)=vRU_O+c>9_{lige1p0Bz7?nZ~
zX!p~Zh!hVUctG>fs~OE>#1fbR+4P5t1u&MmJjwL(
zvV=G~nk%Hy_bqJ+v}6blvPF?1oVbTZS&XjkeOge_C?Ot9r;ERGK49{MT=?=vfDR?Ib;?8IM}>TWh@4&ny7Y4m$m!Uti)(s&SBnBz4mu6fdeY`E8ul!+
zr^HiQY_Js_eI(G3YQKQ{Pj-Q3HuV|Ut5-|9@v1h6a(Bc#sm%y2P0VmnZS#1E`ZkWY
z(8OiQ5ma-uX#;Xi1;}sy)`n)9i?>+i2ug@)DV3(Aga1k=PS
zZ6-I1X2&*4Wosrx7T}(Fi+>2^Pl}vEt*iVS%bseIz~a_u7meIHdZA&6?zzP4xzxHX8hmG5GI>&=`VKwFh7D;59IiLBAv|ew-ByVQ4DB$
zvsb%TQ}Gy=k?bS=KVpiuz6P7OD}oJeVc{S9$CbHT*k#$RNh!auG2p3h;S
z%BNkeDSv{0Ae-OI{}@EHGNDIWILv;#QWkKTiUelv?+;l_9_%55yqS0t&J)ZIm_!{7
zUJhUjQg|U{FlYOQPvlU48RUvYj7JI_6RubXfJMetOcn8FP(trYT}Hz?`PcDQY)&OGK-rhWr!4XSWyZQ?$*xJAQru>Wem7gPyuJ-Wf
zQSscSuG{Od_8(nH)N2~guJ+-Dp+fm|_~Fz8tixiz-)zLD60=4y(#tAV`0o|M9f?c(
zmH^%7C4TmjsB@XWJi^iV$x$T$Mp(kVlq70Kes{Pd;T>}cg5rOqyf{o0e>cfU(Gj(E
zl^^CGM-%L447deb?f=FiI+B>{8LhLxx^3{k3rvG#73TnK%i3!rY3uL>hYm}i|9z(x?8V8I(GE_>yW+$U40n$YX@t=&OGOIxQ$M(ObloK8vh$s
zQvlQD0#1kOVNE{wCyL>YR!fxRLY40Ks*c4TT=YuuwxPn(YU
zf?TnzVgYE4IWa7c(RZ|ANBUVap-8hE{9jqyKr`0rYyS!8QCsrdn+^o}vwrwmIoh!z
zYv5yWiJ$i?(4|a@if@Xk@drL(IoQ%9>ul`#6Pqq#4Sw|hhOa#|_q0+@vpWRlQ@+LA
zfcEVX<0yGgS}Ys>i~l7|5OALT!atq4&ZpJFJV3wWOC_qRG(3;Ph7toagn~`dM^#|Dc#K7!uA;?nG
z1E(=Pz|iZ+Vjgz`Y#~$ftPha$hW`q4*EXM~D|!daj_KF7whf5L3oxQOibTjy*?~{da{ZU}FUeu$j|GO}2S{2R1L*1Lftl=);=r^>p%c5bDBy%J1Gkn2`kOhy
zY8f9CZnmH-FcT^?XzQu~TqC;}!=C1Z^d8pz*#NkQ?qT-wz;MhQL!LI3bj3$}J#59+
zt_uu9F`O%9Xj$`^6YSLbKss_CMoW(b;5qSX;A>PfpFY?Z!0mWN;5?oc(3wvHDKvJF
z(?Q>!3^bv32LjuesVeXnRD1+|bT|M*!nVL}ygHK3%yXvF+N}Wx96sWbSl;%);&7oG
ztKAbwM&ob>7x*9U)mwEe9X}a>Q|p1i%5YP6Tulr?y)xM4V*!U~ag4^R6C}!cE;1S>
z1w(5#d2b*amm6Y?jg@{LKrFmtBL8+A7=up-##v0jN!-PANT(ZT11lmNlUENa=>d}a
z_B>ZYuHo$9w*e2N7>}$U1euc2DzM1&fnSjo=oLC725^fUSg^dhQ7((W7`TAsLfZLz
zQVlzLCGdgG)Eg7mbY#|ywqFl)44?MYj1rj8mOuD+QX<`RBf!j#B4j_E%D=M4(%}W+
zW2=gTe>D*Lu*V{U^9-gLcsPsl&NXQdJ4Z?jHq04>hXn}bV}diSroP6o9d-GY<^&tF
z!e>$z!S^;T_%`f}j)(AfHk`myhQKu}EePtCIqa%4_?f^?HV;;rg*>*jP4KW7KKI!M
zB_Ni2i?gG_(J?33fevH_y(TafIf|JlEqEAvi%^RO3b3(>#1uLgmBFX)L{S@NuhYpfPMcZ)g`g*ee(2>Q@YtgNE?Zkt3y{s_cc2#+jyx)bp?SNJ`w&v@z>b7_8#9t}`uzxCrfGx3J{t
z!E7rC+J?^#{w7+Nmq(Qhf(~(PyBL}}H~5TcF$!2gOP8dfno5H#%lGnf=A!k2rcn*F7(z^0(85Q_b+S
z3|hQ4_yrsFRB(+5+V?Y4GqBP)ldbQwGtUImM3~Bo6zkKJ-w;&fbKMQD+?-Jp7z+Q~
z#Qo`}r9FK&d4>u=sLcDa8SFxe3#nsIgGL$z1)-hION(TUxb3=rGZlzvs5XbDv9%RJ_`H-;-s9%}Y|xhAMuV`9m0MM;l$q}Y
zk8(QqdB++efPH)LZHushoc$W!!+P!x!nFP}6%I1QQ=}9L&g2457)kQ+nK>YGy$#JZGP4I}J!D|ZW^L)}s>_Py5Zfr%b6&og&txH_ZIvfk`
z7KPWD@kDTPxcLEN*dO^4MIFoPNVN;%deWP($6hP@CU}F}wj6L+J0o*fv2TNL6@#PN
zJQdK3=YlZ?ZmGH)gaPGX;utEt8dO=q#UM@`6=1Aw(wJ&<#Yic>(>n{7B!X)NX20Q`XxZdfQ-;+sk;7QBMX!P*g`LXkNsAe;Cyz6OuKKDDLeF|)jSLvuvI~}vnUi0!$(1|?f45v
zv91>PKdoldW!U>KG4~O~{G6R05K4zZ<4zGj`Im@8xrhgD74hJ$B97wCcIZ|S$Ay04
zgqYZhhgg$Mj2p=kpAzj9s=
z9U^q*VwOLL7kl(h@s9mVJiP^v-zwf`w~D9t>WN#$D-F%C2n8%_RcMwF@x_6plKeYc
zvj#GsB+sug3))q_;wGXPhllDEkjxP%#|bA7#EV4qfnJR-cr^3sxL(%PiZB!bos
zpe2rEum&YSZ?|p_!I*OPuDbE
z4mid2V?@1ve1j&vbXVyv|4X_ncS?8lPU(KUyL3O@D&5aFrTcr(|MD;CM%GJr5z+z1
z@Gj%(kAF$`=bh61?@sBi-CerBZk6u(zoffyt91I<8dWddZ(#Hj?tFoRzO`1?%Md&m;xjQR``!hQeS>Be=WPwfGm$igX9L}VhHOXK-*JpJM7sj&1
zZ)O#up=0sb1^JV*{+7RbQ)m^YV(Ac|4Pp{|AbnKaT(a

delta 79742
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%0AmK^d#_%Y{
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


From 5b56a13977af31461d4fde2e22ee44c9a3e15d82 Mon Sep 17 00:00:00 2001
From: stephan 
Date: Thu, 9 Feb 2023 12:59:44 +0000
Subject: [PATCH 28/45] Squelch two harmless signedness comparison warnings in
 shell.c.in.

FossilOrigin-Name: bdd3edec13fa1142a8074c316e9ecec93fb278d42836eeb38587376fdf22cebd
---
 manifest       | 14 +++++++-------
 manifest.uuid  |  2 +-
 src/shell.c.in |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 55cdd9fc22..a0f64761dc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C New\stest\scases\sadded\sto\sfuzzdata8.db.
-D 2023-02-09T12:47:15.432
+C Squelch\stwo\sharmless\ssignedness\scomparison\swarnings\sin\sshell.c.in.
+D 2023-02-09T12:59:44.336
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -622,7 +622,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d62c5665279cc7485f9d45b5e20911cc7b19c203f268321a90d05d74f4725750
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c c3ce1b49cca2c66c8c88fe7d9e1f3db23590deb4dd631619ad90e1e5d21bcf1f
-F src/shell.c.in 839d2b9f04f2b24e7032edb9ef756c34fbd60be91e24bc1ac8f1dae3a13c7742
+F src/shell.c.in 5cb750dc00bb8b20b020031fd1bb0cb8759a6e567c27aee6b0af31d187984985
 F src/sqlite.h.in c060f9e6f646fd817abf273c068666e079fc6e8467ea1d3e8b20f355f82722e9
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P f4ec68ceefa3a607f37d6355aac89fd1ae1704da4061bad7f271db1f17c1dd3a
-R 2ecfe56d715e0c05010edfc93912b400
-U drh
-Z 0e31dffba5097c501205fab7ba01a193
+P be67bafccd79ba835ed7e287e09852ce83805da0797b164d0c8e44be05d9d28a
+R 6fec803204a277eb62a55d0e585455e9
+U stephan
+Z 899d4fe4d75350213057d49c0ba2beed
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1f0074e652..6667ef8315 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-be67bafccd79ba835ed7e287e09852ce83805da0797b164d0c8e44be05d9d28a
\ No newline at end of file
+bdd3edec13fa1142a8074c316e9ecec93fb278d42836eeb38587376fdf22cebd
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 6c15ad285f..846569321b 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -5474,7 +5474,7 @@ static void linenoise_completion(const char *zLine, linenoiseCompletions *lc){
   char *zSql;
   char zBuf[1000];
 
-  if( nLine>sizeof(zBuf)-30 ) return;
+  if( nLine>(i64)sizeof(zBuf)-30 ) return;
   if( zLine[0]=='.' || zLine[0]=='#') return;
   for(i=nLine-1; i>=0 && (isalnum(zLine[i]) || zLine[i]=='_'); i--){}
   if( i==nLine-1 ) return;
@@ -5490,7 +5490,7 @@ static void linenoise_completion(const char *zLine, linenoiseCompletions *lc){
   while( sqlite3_step(pStmt)==SQLITE_ROW ){
     const char *zCompletion = (const char*)sqlite3_column_text(pStmt, 0);
     int nCompletion = sqlite3_column_bytes(pStmt, 0);
-    if( iStart+nCompletion < sizeof(zBuf)-1 && zCompletion ){
+    if( iStart+nCompletion < (i64)sizeof(zBuf)-1 && zCompletion ){
       memcpy(zBuf+iStart, zCompletion, nCompletion+1);
       linenoiseAddCompletion(lc, zBuf);
     }

From 3f4795a391597456f260f38012aa5cd8f26b4924 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 9 Feb 2023 15:32:24 +0000
Subject: [PATCH 29/45] Disable the double-quoted string misfeature by default
 in CLI builds. DQS can be reenabled at run-time using the ".dbconfig dqs_dml"
 and ".dbconfig dqs_ddl" dot-commands.

FossilOrigin-Name: c995932c3ffe7f2710ebce0fa407eca3200418aa84febc15fb15f20f3758a98d
---
 Makefile.in   |  3 ++-
 Makefile.msc  |  1 +
 manifest      | 16 ++++++++--------
 manifest.uuid |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index e5b0e9976b..2a71bd2c5c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -588,7 +588,8 @@ TESTOPTS = --verbose=file --output=test-out.txt
 
 # Extra compiler options for various shell tools
 #
-SHELL_OPT = -DSQLITE_ENABLE_FTS4
+SHELL_OPT += -DSQLITE_DQS=0
+SHELL_OPT += -DSQLITE_ENABLE_FTS4
 #SHELL_OPT += -DSQLITE_ENABLE_FTS5
 SHELL_OPT += -DSQLITE_ENABLE_RTREE
 SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
diff --git a/Makefile.msc b/Makefile.msc
index 884bb10654..5528b8e722 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1657,6 +1657,7 @@ FUZZDATA = \
 # when the shell is not being dynamically linked.
 #
 !IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_DQS=0
 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_FTS4=1
 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1
 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1
diff --git a/manifest b/manifest
index a0f64761dc..a30f9f9de8 100644
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Squelch\stwo\sharmless\ssignedness\scomparison\swarnings\sin\sshell.c.in.
-D 2023-02-09T12:59:44.336
+C Disable\sthe\sdouble-quoted\sstring\smisfeature\sby\sdefault\sin\sCLI\sbuilds.\nDQS\scan\sbe\sreenabled\sat\srun-time\susing\sthe\s".dbconfig\sdqs_dml"\sand\n".dbconfig\sdqs_ddl"\sdot-commands.
+D 2023-02-09T15:32:24.406
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 8cf9ca38d9a62173d36fe68370b0a95a1e83b93723d05dd76de7d4d7d6115873
+F Makefile.in 594f07f8829020a45d825234edf14046544b5bf6bc0057a9d5b83b58686b1c46
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
-F Makefile.msc 26e2fa6144907df27487b7c25767a87dbc5c4a312ccc382dbf44648f40073623
+F Makefile.msc b0026b61d1242add00c28dbe169271a763fffcb3af6762bcdbeb20c3efe6a69f
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
 F VERSION 413ec94920a487ae32c9a2a8819544d690662d6f7c7ce025c0d0b8a1e74fa9db
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P be67bafccd79ba835ed7e287e09852ce83805da0797b164d0c8e44be05d9d28a
-R 6fec803204a277eb62a55d0e585455e9
-U stephan
-Z 899d4fe4d75350213057d49c0ba2beed
+P bdd3edec13fa1142a8074c316e9ecec93fb278d42836eeb38587376fdf22cebd
+R 297e91bc0b9e7e7772648f2f80752169
+U drh
+Z 9a9ff0b12a67da05a6a51a651af86daf
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6667ef8315..845901eb26 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bdd3edec13fa1142a8074c316e9ecec93fb278d42836eeb38587376fdf22cebd
\ No newline at end of file
+c995932c3ffe7f2710ebce0fa407eca3200418aa84febc15fb15f20f3758a98d
\ No newline at end of file

From c9e3cbe87327d65bb8c4735fd3d6c93e2b01dece Mon Sep 17 00:00:00 2001
From: stephan 
Date: Fri, 10 Feb 2023 11:04:39 +0000
Subject: [PATCH 30/45] Fix ext/wasm/fiddle build, which was silently broken by
 recent build refactoring.

FossilOrigin-Name: dcf532931136d09bef23ccad669d486cb31daec8565317c3209c280b5695d45d
---
 ext/wasm/fiddle.make             |  3 +--
 ext/wasm/fiddle/fiddle-worker.js |  5 ++++-
 manifest                         | 16 ++++++++--------
 manifest.uuid                    |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/ext/wasm/fiddle.make b/ext/wasm/fiddle.make
index 1ef6436c95..7facd7e9e5 100644
--- a/ext/wasm/fiddle.make
+++ b/ext/wasm/fiddle.make
@@ -36,7 +36,6 @@ fiddle.emcc-flags = \
   -sWASM_BIGINT=$(emcc.WASM_BIGINT) \
   -sEXPORT_NAME=$(sqlite3.js.init-func) \
   -Wno-limited-postlink-optimizations \
-  $(sqlite3.js.flags.--post-js) \
   $(emcc.exportedRuntimeMethods) \
   -sEXPORTED_FUNCTIONS=@$(abspath $(EXPORTED_FUNCTIONS.fiddle)) \
   -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory \
@@ -59,7 +58,7 @@ fiddle.SOAP.js := $(dir.fiddle)/$(notdir $(SOAP.js))
 $(fiddle.SOAP.js): $(SOAP.js)
 	cp $< $@
 
-$(eval $(call call-make-pre-js,fiddle-module,vanilla))
+$(eval $(call call-make-pre-post,fiddle-module,vanilla))
 $(fiddle-module.js): $(MAKEFILE) $(MAKEFILE.fiddle) \
     $(EXPORTED_FUNCTIONS.fiddle) \
     $(fiddle.cses) $(pre-post-fiddle-module.deps.vanilla) $(fiddle.SOAP.js)
diff --git a/ext/wasm/fiddle/fiddle-worker.js b/ext/wasm/fiddle/fiddle-worker.js
index a60b79ab2e..e239cbf51e 100644
--- a/ext/wasm/fiddle/fiddle-worker.js
+++ b/ext/wasm/fiddle/fiddle-worker.js
@@ -46,7 +46,7 @@
     about module loading status so that, e.g., the main thread can
     update a progress widget and DTRT when the module is finished
     loading and available for work. Status messages come in the form
-    
+
     {type:'module', data:{
         type:'status',
         data: {text:string|null, step:1-based-integer}
@@ -370,6 +370,9 @@
   */
   sqlite3InitModule(fiddleModule).then((_sqlite3)=>{
     sqlite3 = _sqlite3;
+    console.warn("Installing sqlite3 module globally (in Worker)",
+                 "for use in the dev console.");
+    self.sqlite3 = sqlite3;
     const dbVfs = sqlite3.wasm.xWrap('fiddle_db_vfs', "*", ['string']);
     fiddleModule.fsUnlink = (fn)=>{
       return sqlite3.wasm.sqlite3_wasm_vfs_unlink(dbVfs(0), fn);
diff --git a/manifest b/manifest
index a30f9f9de8..b4aebdfdbc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\sthe\sdouble-quoted\sstring\smisfeature\sby\sdefault\sin\sCLI\sbuilds.\nDQS\scan\sbe\sreenabled\sat\srun-time\susing\sthe\s".dbconfig\sdqs_dml"\sand\n".dbconfig\sdqs_ddl"\sdot-commands.
-D 2023-02-09T15:32:24.406
+C Fix\sext/wasm/fiddle\sbuild,\swhich\swas\ssilently\sbroken\sby\srecent\sbuild\srefactoring.
+D 2023-02-10T11:04:39.253
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -508,9 +508,9 @@ F ext/wasm/demo-worker1-promiser.js b99c550763fa792c204e9a7cceadd976004036d9fc3e
 F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2eb1ab2c68ef5d
 F ext/wasm/demo-worker1.js a619adffc98b75b66c633b00f747b856449a134a9a0357909287d80a182d70fa
 F ext/wasm/dist.make f55f9c9e1980ea11a59964e59535c66175a17f004d1c2e274522c3366b3a084a
-F ext/wasm/fiddle.make d5308b5c35f691758ef20badd25f91f3780b20415760daf0d98afbe4f24921b9
+F ext/wasm/fiddle.make 396a0d6e2b3aa63ad448ea71d91676cb9cbbba8f5e6529cf1248d17f29142f47
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/fiddle/fiddle-worker.js b4a0c8ab6c0983218543ca771c45f6075449f63a1dcf290ae5a681b2cba8800d
+F ext/wasm/fiddle/fiddle-worker.js 163d6139a93fab4bcb72064923df050d4e7c0ff0d8aa061ce8776a6e75da8a10
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
 F ext/wasm/fiddle/index.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/index-dist.html c806b6005145b71d64240606e9c6e0bf56878ee8829c66fe7486cebf34b0e6b1
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P bdd3edec13fa1142a8074c316e9ecec93fb278d42836eeb38587376fdf22cebd
-R 297e91bc0b9e7e7772648f2f80752169
-U drh
-Z 9a9ff0b12a67da05a6a51a651af86daf
+P c995932c3ffe7f2710ebce0fa407eca3200418aa84febc15fb15f20f3758a98d
+R 2166498cee6aeed89f565b83160e6b5f
+U stephan
+Z 0d1df8d18003058c229f6d440938ce92
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 845901eb26..7a2f13a855 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c995932c3ffe7f2710ebce0fa407eca3200418aa84febc15fb15f20f3758a98d
\ No newline at end of file
+dcf532931136d09bef23ccad669d486cb31daec8565317c3209c280b5695d45d
\ No newline at end of file

From 98094e2f4ce770b32852a635cdde68f29556d7f6 Mon Sep 17 00:00:00 2001
From: stephan 
Date: Fri, 10 Feb 2023 11:05:16 +0000
Subject: [PATCH 31/45] Minor text-only updates to wasm demo/test HTML and
 license header.

FossilOrigin-Name: f28e2a8613571fe3c23bfbbb602311071f4cb9731653216cfe436c38b0a59736
---
 .../api/sqlite3-license-version-header.js     |  2 +-
 ext/wasm/index-dist.html                      | 26 +++++++++++----
 ext/wasm/index.html                           | 32 +++++++++++--------
 manifest                                      | 16 +++++-----
 manifest.uuid                                 |  2 +-
 5 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/ext/wasm/api/sqlite3-license-version-header.js b/ext/wasm/api/sqlite3-license-version-header.js
index f8b3eddc5f..4829894638 100644
--- a/ext/wasm/api/sqlite3-license-version-header.js
+++ b/ext/wasm/api/sqlite3-license-version-header.js
@@ -1,7 +1,7 @@
 /*
 ** LICENSE for the sqlite3 WebAssembly/JavaScript APIs.
 **
-** This bundle (typically released as sqlite3.js or sqlite3-wasmfs.js)
+** This bundle (typically released as sqlite3.js or sqlite3.mjs)
 ** is an amalgamation of JavaScript source code from two projects:
 **
 ** 1) https://emscripten.org: the Emscripten "glue code" is covered by
diff --git a/ext/wasm/index-dist.html b/ext/wasm/index-dist.html
index 1c23bd82c7..36e21117e3 100644
--- a/ext/wasm/index-dist.html
+++ b/ext/wasm/index-dist.html
@@ -41,13 +41,25 @@
     
diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index 969d9553eb..a9872a9eaf 100644
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -26,19 +26,25 @@
     
and the individual tests be started in their own tab.
       Warnings and Caveats:
       
    
-        
  • Some of these pages require that
-          the web server emit the so-called
-          COOP
-          and
-          COEP
-          headers. althttpd requires the
-          -enable-sab flag for that.
-        
    • 
-        
  • Any OPFS-related pages require very recent version of
-          Chrome or Chromium (v102 at least, possibly newer). OPFS
-          support in the other major browsers is pending. Development
-          and testing is currently done against a dev-channel release
-          of Chrome (v110 as of 2022-12-02).
+        
  • All of these pages must be served via an HTTP
+          server. Browsers do not support loading WASM files via
+          file:// URLs.
    • 
+        
  • Any OPFS-related pages or tests require:
+          
      
+            
    • That the web server emit the so-called
+              COOP
+              and
+              COEP
+              headers. althttpd requires the
+              -enable-sab flag for that.
+            
      • 
+            
    • A very recent version of a
+              Chromium-based browser (v102 at least, possibly newer). OPFS
+              support in the other major browsers is pending. Development
+              and testing is currently done against a dev-channel release
+              of Chrome (v111 as of 2023-02-10).
+            
      • 
+          
    
         
    • 
       

     

diff --git a/manifest b/manifest
index b4aebdfdbc..0688ec0fbb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sext/wasm/fiddle\sbuild,\swhich\swas\ssilently\sbroken\sby\srecent\sbuild\srefactoring.
-D 2023-02-10T11:04:39.253
+C Minor\stext-only\supdates\sto\swasm\sdemo/test\sHTML\sand\slicense\sheader.
+D 2023-02-10T11:05:16.954
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,7 +483,7 @@ F ext/wasm/api/sqlite3-api-glue.js 0a93e58aabf52b32ddccbb107a1fd4552f2505e103ab6
 F ext/wasm/api/sqlite3-api-oo1.js 9b50c188513c70438a497914089cfeac79b6ac2d73501775538f9e467325ea15
 F ext/wasm/api/sqlite3-api-prologue.js 5cc817b67a774bfa3c47d4c2fa484b10b24b5529a66094b35546f3ebba1ef646
 F ext/wasm/api/sqlite3-api-worker1.js 9551f04cdfcde354e5a6ccb48951e007d618abb4e95758297b7fd44ccffdf89f
-F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3
+F ext/wasm/api/sqlite3-license-version-header.js 0c807a421f0187e778dc1078f10d2994b915123c1223fe752b60afdcd1263f89
 F ext/wasm/api/sqlite3-opfs-async-proxy.js 7795b84b66a7a8dedc791340709b310bb497c3c72a80bef364fa2a58e2ddae3f
 F ext/wasm/api/sqlite3-v-helper.js 6f6c3e390a72e08b0a5b16a0d567d7af3c04d172831853a29d72a6f1dd40ff24
 F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js ca291837840b3eae3a60810721a7970c98f7c7cd3ee1c879acb7e91f1e3fe65a
@@ -513,8 +513,8 @@ F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d695
 F ext/wasm/fiddle/fiddle-worker.js 163d6139a93fab4bcb72064923df050d4e7c0ff0d8aa061ce8776a6e75da8a10
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
 F ext/wasm/fiddle/index.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
-F ext/wasm/index-dist.html c806b6005145b71d64240606e9c6e0bf56878ee8829c66fe7486cebf34b0e6b1
-F ext/wasm/index.html 6b7139e64eef500aee9315deac5e4ac84ef31453aaf053b794bb0505859dcde5
+F ext/wasm/index-dist.html 22379774f0ad4edcaaa8cf9c674c82e794cc557719a8addabed74eb8069d412e
+F ext/wasm/index.html dd900891844caebd9cadbddd704f66bd841d7c12fd69ce5af490e2c10fb49f45
 F ext/wasm/jaccwabyt/jaccwabyt.js 06f2ef1ad640c26c593def3d960336e9bb789819b920516480895c38ed5f58fa
 F ext/wasm/jaccwabyt/jaccwabyt.md 37911f00db12cbcca73aa1ed72594430365f30aafae2fa9c886961de74e5e0eb
 F ext/wasm/module-symbols.html 841de62fc198988b8330e238c260e70ec93028b096e1a1234db31b187a899d10
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c995932c3ffe7f2710ebce0fa407eca3200418aa84febc15fb15f20f3758a98d
-R 2166498cee6aeed89f565b83160e6b5f
+P dcf532931136d09bef23ccad669d486cb31daec8565317c3209c280b5695d45d
+R 04d85ae8958b88100d42ae71d2fbee4a
 U stephan
-Z 0d1df8d18003058c229f6d440938ce92
+Z 7813ea216bdc6db373adeddd4f0a5692
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7a2f13a855..7a5f3af500 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dcf532931136d09bef23ccad669d486cb31daec8565317c3209c280b5695d45d
\ No newline at end of file
+f28e2a8613571fe3c23bfbbb602311071f4cb9731653216cfe436c38b0a59736
\ No newline at end of file

From 74e6e30358e1e989ba204558b0e9e688edffd98f Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 10 Feb 2023 14:20:18 +0000
Subject: [PATCH 32/45] Ensure that the valueFromFunction() routine does not
 clear a prior parser error.  dbsqlfuzz
 6fa816f20cf5b62260d635d110b88f38e29d8fe1.

FossilOrigin-Name: 734766451123c98a467c3407562eaa097b3307c8a275e1c8dd93e4654fe78014
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/vdbemem.c |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 0688ec0fbb..65ecbf115d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\stext-only\supdates\sto\swasm\sdemo/test\sHTML\sand\slicense\sheader.
-D 2023-02-10T11:05:16.954
+C Ensure\sthat\sthe\svalueFromFunction()\sroutine\sdoes\snot\sclear\sa\sprior\nparser\serror.\s\sdbsqlfuzz\s6fa816f20cf5b62260d635d110b88f38e29d8fe1.
+D 2023-02-10T14:20:18.565
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -697,7 +697,7 @@ F src/vdbeInt.h a4147a4ddf613cb1bcb555ace9e9e74a9c099d65facd88155f191b1fb4d74cfb
 F src/vdbeapi.c 40c47b1528d308a322203de21d2e0d711753257ed9771771b6129214b1d65932
 F src/vdbeaux.c 3f9e3b6585e7434aa11300169dd66ddf0fc963a0c6f7940bdc058335dadeb353
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
-F src/vdbemem.c 86908c0ab1624df678458feb53319bf9720992e761cbccf77a36d671ce11693d
+F src/vdbemem.c 0388576b7cf0be13ce14b9e3b8aa90b8a1b923b60321d0242131ae0b5732b43b
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
 F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
 F src/vdbevtab.c aae4bd769410eb7e1d02c42613eec961d514459b1c3c1c63cfc84e92a137daac
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P dcf532931136d09bef23ccad669d486cb31daec8565317c3209c280b5695d45d
-R 04d85ae8958b88100d42ae71d2fbee4a
-U stephan
-Z 7813ea216bdc6db373adeddd4f0a5692
+P f28e2a8613571fe3c23bfbbb602311071f4cb9731653216cfe436c38b0a59736
+R a48d37eb8c6acd00e481b5287e828340
+U drh
+Z c4b57f5d57cd94eef2761849e9ee3247
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7a5f3af500..ff32e20994 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f28e2a8613571fe3c23bfbbb602311071f4cb9731653216cfe436c38b0a59736
\ No newline at end of file
+734766451123c98a467c3407562eaa097b3307c8a275e1c8dd93e4654fe78014
\ No newline at end of file
diff --git a/src/vdbemem.c b/src/vdbemem.c
index 31264f797f..be52062d55 100644
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -1530,11 +1530,11 @@ static int valueFromFunction(
     }
 #endif
   }
-  pCtx->pParse->rc = rc;
 
  value_from_function_out:
   if( rc!=SQLITE_OK ){
     pVal = 0;
+    pCtx->pParse->rc = rc;
   }
   if( apVal ){
     for(i=0; i
Date: Fri, 10 Feb 2023 17:17:04 +0000
Subject: [PATCH 33/45] Fix a problem with the fts5 trigram tokenizer and LIKE
 or GLOB patterns for which contain runs of 2 or fewer non-wildcard characters
 that are 3 or more bytes when encoded as utf-8.

FossilOrigin-Name: 00714b39b39c51519edbc0194f98c7275fecf96763a06fd95db6e1d81bb9f1f1
---
 ext/fts5/fts5_expr.c           | 16 +++++++++++++++-
 ext/fts5/test/fts5trigram.test | 18 ++++++++++++++++++
 manifest                       | 16 ++++++++--------
 manifest.uuid                  |  2 +-
 4 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/ext/fts5/fts5_expr.c b/ext/fts5/fts5_expr.c
index 66bd304d42..e4072db7aa 100644
--- a/ext/fts5/fts5_expr.c
+++ b/ext/fts5/fts5_expr.c
@@ -289,6 +289,19 @@ int sqlite3Fts5ExprNew(
   return sParse.rc;
 }
 
+/*
+** Assuming that buffer z is at least nByte bytes in size and contains a
+** valid utf-8 string, return the number of characters in the string.
+*/
+static int fts5ExprCountChar(const char *z, int nByte){
+  int nRet = 0;
+  int ii;
+  for(ii=0; ii=3 ){
+
+        if( fts5ExprCountChar(&zText[iFirst], i-iFirst)>=3 ){
           int jj;
           zExpr[iOut++] = '"';
           for(jj=iFirst; jj
Date: Fri, 10 Feb 2023 21:53:33 +0000
Subject: [PATCH 34/45] Do a better job of detecting when a WHERE clause term
 might be useful to an expression index.  Fix for performance regression
 reported by [forum:/forumpost/e65800d8cb|forum thread e65800d8cb].

FossilOrigin-Name: 44200596aa943963bc6ca98b5d4fd5b9235d1109d8dfc1a75eeae353b4239142
---
 manifest         | 16 ++++++++--------
 manifest.uuid    |  2 +-
 src/whereexpr.c  | 50 ++++++++++++++++++++++++++++--------------------
 test/whereL.test | 19 ++++++++++++++++++
 4 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/manifest b/manifest
index 1167feb4a9..0e777dd8cb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\sthe\sfts5\strigram\stokenizer\sand\sLIKE\sor\sGLOB\spatterns\sfor\swhich\scontain\sruns\sof\s2\sor\sfewer\snon-wildcard\scharacters\sthat\sare\s3\sor\smore\sbytes\swhen\sencoded\sas\sutf-8.
-D 2023-02-10T17:17:04.066
+C Do\sa\sbetter\sjob\sof\sdetecting\swhen\sa\sWHERE\sclause\sterm\smight\sbe\suseful\sto\nan\sexpression\sindex.\s\sFix\sfor\sperformance\sregression\sreported\sby\n[forum:/forumpost/e65800d8cb|forum\sthread\se65800d8cb].
+D 2023-02-10T21:53:33.465
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -709,7 +709,7 @@ F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c 5b20d08699c9a55c0556661ff6f937dd1c8e27567b7553e48d477d3fad22ec4c
 F src/whereInt.h e25203e5bfee149f5f1225ae0166cfb4f1e65490c998a024249e98bb0647377c
 F src/wherecode.c 76bca3379219880d2527493b71a3be49e696f75396d3481e4de5d4ceec7886b2
-F src/whereexpr.c 7c5671a04b00c876bec5e99fd4e6f688065feb4773160fbf76fd7900d2901777
+F src/whereexpr.c aa9467272033315424c76f446ca0b65683d6002ededaa65b6a6d4c00b3b525b8
 F src/window.c 76a27cff9ea2ded0c2c3527187029259440fabcc4cc4c07b11d942c78494a614
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@ -1884,7 +1884,7 @@ F test/whereH.test e4b07f7a3c2f5d31195cd33710054c78667573b2
 F test/whereI.test c4bb7e2ca56d49bd8ab5c7bd085b8b83e353922b46904d68aefb3c7468643581
 F test/whereJ.test fc05e374cc9f2dc204148d6c06822c380ad388895fe97a6d335b94a26a08aecf
 F test/whereK.test 0270ab7f04ba5436fb9156d31d642a1c82727f4c4bfe5ba90d435c78cf44684a
-F test/whereL.test 50171e3ec00b4c8ad5ec773119a35d9e9642cec45154b44c366d628326479f4d
+F test/whereL.test 9d7c8a9f4e5e82d6859e61cf8758c3856c7e0a7fd8be11c92cac8c3ec39228fd
 F test/whereM.test 0dbc9998783458ddcf3cc078ca7c2951d8b2677d472ecf0028f449ed327c0250
 F test/wherefault.test 6cf2a9c5712952d463d3f45ebee7f6caf400984df51a195d884cfb7eb0e837a7
 F test/wherelfault.test 9012e4ef5259058b771606616bd007af5d154e64cc25fa9fd4170f6411db44e3
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 734766451123c98a467c3407562eaa097b3307c8a275e1c8dd93e4654fe78014
-R 5bf915f087ec1f7e7765a72585c21ed1
-U dan
-Z 46cdaf9bdec2b8801443f3e6fa3042be
+P 00714b39b39c51519edbc0194f98c7275fecf96763a06fd95db6e1d81bb9f1f1
+R 122a35632c84f1a86bc1efeb49e3bb37
+U drh
+Z 7d2b0fd613ff6bddf59b196d4f5df2a1
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c8148f1b18..2fbc826de3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-00714b39b39c51519edbc0194f98c7275fecf96763a06fd95db6e1d81bb9f1f1
\ No newline at end of file
+44200596aa943963bc6ca98b5d4fd5b9235d1109d8dfc1a75eeae353b4239142
\ No newline at end of file
diff --git a/src/whereexpr.c b/src/whereexpr.c
index b466c2da2e..0be39b7d6a 100644
--- a/src/whereexpr.c
+++ b/src/whereexpr.c
@@ -974,36 +974,38 @@ static Bitmask exprSelectUsage(WhereMaskSet *pMaskSet, Select *pS){
 */
 static SQLITE_NOINLINE int exprMightBeIndexed2(
   SrcList *pFrom,        /* The FROM clause */
-  Bitmask mPrereq,       /* Bitmask of FROM clause terms referenced by pExpr */
   int *aiCurCol,         /* Write the referenced table cursor and column here */
-  Expr *pExpr            /* An operand of a comparison operator */
+  Expr *pExpr,           /* An operand of a comparison operator */
+  int j                  /* Start looking with the j-th pFrom entry */
 ){
   Index *pIdx;
   int i;
   int iCur;
-  for(i=0; mPrereq>1; i++, mPrereq>>=1){}
-  iCur = pFrom->a[i].iCursor;
-  for(pIdx=pFrom->a[i].pTab->pIndex; pIdx; pIdx=pIdx->pNext){
-    if( pIdx->aColExpr==0 ) continue;
-    for(i=0; inKeyCol; i++){
-      if( pIdx->aiColumn[i]!=XN_EXPR ) continue;
-      assert( pIdx->bHasExpr );
-      if( sqlite3ExprCompareSkip(pExpr, pIdx->aColExpr->a[i].pExpr, iCur)==0 ){
-        aiCurCol[0] = iCur;
-        aiCurCol[1] = XN_EXPR;
-        return 1;
+  do{
+    iCur = pFrom->a[j].iCursor;
+    for(pIdx=pFrom->a[j].pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+      if( pIdx->aColExpr==0 ) continue;
+      for(i=0; inKeyCol; i++){
+        if( pIdx->aiColumn[i]!=XN_EXPR ) continue;
+        assert( pIdx->bHasExpr );
+        if( sqlite3ExprCompareSkip(pExpr,pIdx->aColExpr->a[i].pExpr,iCur)==0 ){
+          aiCurCol[0] = iCur;
+          aiCurCol[1] = XN_EXPR;
+          return 1;
+        }
       }
     }
-  }
+  }while( ++j < pFrom->nSrc );
   return 0;
 }
 static int exprMightBeIndexed(
   SrcList *pFrom,        /* The FROM clause */
-  Bitmask mPrereq,       /* Bitmask of FROM clause terms referenced by pExpr */
   int *aiCurCol,         /* Write the referenced table cursor & column here */
   Expr *pExpr,           /* An operand of a comparison operator */
   int op                 /* The specific comparison operator */
 ){
+  int i;
+
   /* If this expression is a vector to the left or right of a 
   ** inequality constraint (>, <, >= or <=), perform the processing 
   ** on the first element of the vector.  */
@@ -1013,7 +1015,6 @@ static int exprMightBeIndexed(
   if( pExpr->op==TK_VECTOR && (op>=TK_GT && ALWAYS(op<=TK_GE)) ){
     assert( ExprUseXList(pExpr) );
     pExpr = pExpr->x.pList->a[0].pExpr;
-
   }
 
   if( pExpr->op==TK_COLUMN ){
@@ -1021,9 +1022,16 @@ static int exprMightBeIndexed(
     aiCurCol[1] = pExpr->iColumn;
     return 1;
   }
-  if( mPrereq==0 ) return 0;                 /* No table references */
-  if( (mPrereq&(mPrereq-1))!=0 ) return 0;   /* Refs more than one table */
-  return exprMightBeIndexed2(pFrom,mPrereq,aiCurCol,pExpr);
+
+  for(i=0; inSrc; i++){
+    Index *pIdx;
+    for(pIdx=pFrom->a[i].pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+      if( pIdx->aColExpr ){
+        return exprMightBeIndexed2(pFrom,aiCurCol,pExpr,i);
+      }
+    }
+  }
+  return 0;
 }
 
 
@@ -1149,7 +1157,7 @@ static void exprAnalyze(
       pLeft = pLeft->x.pList->a[pTerm->u.x.iField-1].pExpr;
     }
 
-    if( exprMightBeIndexed(pSrc, prereqLeft, aiCurCol, pLeft, op) ){
+    if( exprMightBeIndexed(pSrc, aiCurCol, pLeft, op) ){
       pTerm->leftCursor = aiCurCol[0];
       assert( (pTerm->eOperator & (WO_OR|WO_AND))==0 );
       pTerm->u.x.leftColumn = aiCurCol[1];
@@ -1157,7 +1165,7 @@ static void exprAnalyze(
     }
     if( op==TK_IS ) pTerm->wtFlags |= TERM_IS;
     if( pRight 
-     && exprMightBeIndexed(pSrc, pTerm->prereqRight, aiCurCol, pRight, op)
+     && exprMightBeIndexed(pSrc, aiCurCol, pRight, op)
      && !ExprHasProperty(pRight, EP_FixedCol)
     ){
       WhereTerm *pNew;
diff --git a/test/whereL.test b/test/whereL.test
index b6f86fc2d2..c3bdcb8f34 100644
--- a/test/whereL.test
+++ b/test/whereL.test
@@ -189,5 +189,24 @@ do_execsql_test 610 {
     AND A.RunYearMonth = B.RunYearMonth;
 } {4 202004 4 202004 5 202004 5 202004}
 
+# 2023-02-10 https://sqlite.org/forum/forumpost/0a539c76db3b9e29
+# The original constant propagation implementation caused a performance
+# regression.  Because "abs(v)" was rewritten into "abs(1)" it no longer
+# matches the indexed column and the index is not used.
+# 
+reset_db
+do_execsql_test 700 {
+  CREATE TABLE t1(v INTEGER);
+  WITH RECURSIVE c(x) AS (VALUES(-10) UNION ALL SELECT x+1 FROM c WHERE x<10)
+    INSERT INTO t1(v) SELECT x FROM c;
+  CREATE INDEX idx ON t1( abs(v) );
+  SELECT v FROM t1 WHERE abs(v)=1 and v=1;
+} 1
+do_eqp_test 710 {
+  SELECT v FROM t1 WHERE abs(v)=1 and v=1;
+} {
+  QUERY PLAN
+  `--SEARCH t1 USING INDEX idx (=?)
+}
 
 finish_test

From 0c55b5fd1ccab39a16fe0d0453c6882a83d42304 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 11 Feb 2023 21:11:39 +0000
Subject: [PATCH 35/45] Change a variable from 32 to 64-bits to avoid a
 harmless compiler warning in Xcode.  [forum:/forumpost/402d733c22|Forum post
 402d733c22].

FossilOrigin-Name: 0216ce23cf23bc147c5de6de178a6689b7ad744bf0ee0098809938b5fe10708b
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/date.c    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 0e777dd8cb..876d0db58d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\sa\sbetter\sjob\sof\sdetecting\swhen\sa\sWHERE\sclause\sterm\smight\sbe\suseful\sto\nan\sexpression\sindex.\s\sFix\sfor\sperformance\sregression\sreported\sby\n[forum:/forumpost/e65800d8cb|forum\sthread\se65800d8cb].
-D 2023-02-10T21:53:33.465
+C Change\sa\svariable\sfrom\s32\sto\s64-bits\sto\savoid\sa\sharmless\scompiler\swarning\nin\sXcode.\s\s[forum:/forumpost/402d733c22|Forum\spost\s402d733c22].
+D 2023-02-11T21:11:39.733
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -567,7 +567,7 @@ F src/build.c c55ab6d1b089ceef57160e840f05f692955ac90944c3d04fcf01d97fd7bfd08d
 F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 20507cc0b0a6c19cd882fcd0eaeda32ae6a4229fb4b024cfdf3183043d9b703d
-F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
+F src/date.c f21815ca7172ce073db3163ac54c8d9f2841077165c1a6123b4d1c376a0c7ec7
 F src/dbpage.c d47549716549311f79dc39fe5c8fb19390a6eb2c960f8e37c89a9c4de0c1052e
 F src/dbstat.c ec92074baa61d883de58c945162d9e666c13cd7cf3a23bc38b4d1c4d0b2c2bef
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 00714b39b39c51519edbc0194f98c7275fecf96763a06fd95db6e1d81bb9f1f1
-R 122a35632c84f1a86bc1efeb49e3bb37
+P 44200596aa943963bc6ca98b5d4fd5b9235d1109d8dfc1a75eeae353b4239142
+R 903a02fdade5e55a6ea70a4f3fe0e724
 U drh
-Z 7d2b0fd613ff6bddf59b196d4f5df2a1
+Z 17dea032ba0170dfca46315f56d7ffa6
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 2fbc826de3..3ed1c6912c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-44200596aa943963bc6ca98b5d4fd5b9235d1109d8dfc1a75eeae353b4239142
\ No newline at end of file
+0216ce23cf23bc147c5de6de178a6689b7ad744bf0ee0098809938b5fe10708b
\ No newline at end of file
diff --git a/src/date.c b/src/date.c
index a3e58bc4e3..7cc6fa684e 100644
--- a/src/date.c
+++ b/src/date.c
@@ -749,7 +749,7 @@ static int parseModifier(
           i64 iOrigJD;              /* Original localtime */
           i64 iGuess;               /* Guess at the corresponding utc time */
           int cnt = 0;              /* Safety to prevent infinite loop */
-          int iErr;                 /* Guess is off by this much */
+          i64 iErr;                 /* Guess is off by this much */
 
           computeJD(p);
           iGuess = iOrigJD = p->iJD;

From 9e463e878db0ec610ec3b14d30b0bcdf5bd053ba Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 13 Feb 2023 12:46:22 +0000
Subject: [PATCH 36/45] In the LIKE optimization, do not analyze the new
 virtual WHERE clause terms until both have been added, since they are
 expected to be consecutive and the analysis might add complementary terms.
 This fixes a problem caused by [44200596aa943963] and discovered by dbsqlfuzz
 and recorded as case 7e3b5983727d843b910b2d9ab556e4afcd777cfb.

FossilOrigin-Name: d35de3ad3fac6b30d3f266cbe4b1e9923eb31a1eff4a869205bbc3ba122eeec5
---
 manifest        | 12 ++++++------
 manifest.uuid   |  2 +-
 src/whereexpr.c |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 876d0db58d..bc6af60ba4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sa\svariable\sfrom\s32\sto\s64-bits\sto\savoid\sa\sharmless\scompiler\swarning\nin\sXcode.\s\s[forum:/forumpost/402d733c22|Forum\spost\s402d733c22].
-D 2023-02-11T21:11:39.733
+C In\sthe\sLIKE\soptimization,\sdo\snot\sanalyze\sthe\snew\svirtual\sWHERE\sclause\sterms\nuntil\sboth\shave\sbeen\sadded,\ssince\sthey\sare\sexpected\sto\sbe\sconsecutive\sand\nthe\sanalysis\smight\sadd\scomplementary\sterms.\nThis\sfixes\sa\sproblem\scaused\sby\s[44200596aa943963]\sand\sdiscovered\sby\sdbsqlfuzz\nand\srecorded\sas\scase\s7e3b5983727d843b910b2d9ab556e4afcd777cfb.
+D 2023-02-13T12:46:22.331
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -709,7 +709,7 @@ F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c 5b20d08699c9a55c0556661ff6f937dd1c8e27567b7553e48d477d3fad22ec4c
 F src/whereInt.h e25203e5bfee149f5f1225ae0166cfb4f1e65490c998a024249e98bb0647377c
 F src/wherecode.c 76bca3379219880d2527493b71a3be49e696f75396d3481e4de5d4ceec7886b2
-F src/whereexpr.c aa9467272033315424c76f446ca0b65683d6002ededaa65b6a6d4c00b3b525b8
+F src/whereexpr.c bbf7259c6c53c728b505eae6c4965c7c0b1abb853aadcc7cbbf4f2d1b38d6b6b
 F src/window.c 76a27cff9ea2ded0c2c3527187029259440fabcc4cc4c07b11d942c78494a614
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 44200596aa943963bc6ca98b5d4fd5b9235d1109d8dfc1a75eeae353b4239142
-R 903a02fdade5e55a6ea70a4f3fe0e724
+P 0216ce23cf23bc147c5de6de178a6689b7ad744bf0ee0098809938b5fe10708b
+R 09e9d8286e23e9b338083a6379ec9988
 U drh
-Z 17dea032ba0170dfca46315f56d7ffa6
+Z 7381f85d2ea8678673eb457bc621469f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3ed1c6912c..be067174f2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0216ce23cf23bc147c5de6de178a6689b7ad744bf0ee0098809938b5fe10708b
\ No newline at end of file
+d35de3ad3fac6b30d3f266cbe4b1e9923eb31a1eff4a869205bbc3ba122eeec5
\ No newline at end of file
diff --git a/src/whereexpr.c b/src/whereexpr.c
index 0be39b7d6a..e458952c4a 100644
--- a/src/whereexpr.c
+++ b/src/whereexpr.c
@@ -1376,7 +1376,6 @@ static void exprAnalyze(
     transferJoinMarkings(pNewExpr1, pExpr);
     idxNew1 = whereClauseInsert(pWC, pNewExpr1, wtFlags);
     testcase( idxNew1==0 );
-    exprAnalyze(pSrc, pWC, idxNew1);
     pNewExpr2 = sqlite3ExprDup(db, pLeft, 0);
     pNewExpr2 = sqlite3PExpr(pParse, TK_LT,
            sqlite3ExprAddCollateString(pParse,pNewExpr2,zCollSeqName),
@@ -1384,6 +1383,7 @@ static void exprAnalyze(
     transferJoinMarkings(pNewExpr2, pExpr);
     idxNew2 = whereClauseInsert(pWC, pNewExpr2, wtFlags);
     testcase( idxNew2==0 );
+    exprAnalyze(pSrc, pWC, idxNew1);
     exprAnalyze(pSrc, pWC, idxNew2);
     pTerm = &pWC->a[idxTerm];
     if( isComplete ){

From 0c699385111dceb708dd493fa14ecf19f3737e8f Mon Sep 17 00:00:00 2001
From: dan 
Date: Mon, 13 Feb 2023 16:10:31 +0000
Subject: [PATCH 37/45] Allow vector-IN expressions like "(a, b) IN ( (?,?),
 (?,?) )" to use an index.

FossilOrigin-Name: 1815b15ddb8785a25b7617aab19e13c2410b9377389c16a85176025b3d9400e8
---
 manifest            |  21 ++++----
 manifest.uuid       |   2 +-
 src/wherecode.c     | 113 +++++++++++++++++++++++---------------------
 src/whereexpr.c     |   2 +-
 test/rowvalue9.test |  40 ++++++++++++++++
 5 files changed, 114 insertions(+), 64 deletions(-)

diff --git a/manifest b/manifest
index bc6af60ba4..4d859e0eac 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\sLIKE\soptimization,\sdo\snot\sanalyze\sthe\snew\svirtual\sWHERE\sclause\sterms\nuntil\sboth\shave\sbeen\sadded,\ssince\sthey\sare\sexpected\sto\sbe\sconsecutive\sand\nthe\sanalysis\smight\sadd\scomplementary\sterms.\nThis\sfixes\sa\sproblem\scaused\sby\s[44200596aa943963]\sand\sdiscovered\sby\sdbsqlfuzz\nand\srecorded\sas\scase\s7e3b5983727d843b910b2d9ab556e4afcd777cfb.
-D 2023-02-13T12:46:22.331
+C Allow\svector-IN\sexpressions\slike\s"(a,\sb)\sIN\s(\s(?,?),\s(?,?)\s)"\sto\suse\san\sindex.
+D 2023-02-13T16:10:31.626
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -708,8 +708,8 @@ F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c 5b20d08699c9a55c0556661ff6f937dd1c8e27567b7553e48d477d3fad22ec4c
 F src/whereInt.h e25203e5bfee149f5f1225ae0166cfb4f1e65490c998a024249e98bb0647377c
-F src/wherecode.c 76bca3379219880d2527493b71a3be49e696f75396d3481e4de5d4ceec7886b2
-F src/whereexpr.c bbf7259c6c53c728b505eae6c4965c7c0b1abb853aadcc7cbbf4f2d1b38d6b6b
+F src/wherecode.c b82d0d33315e1526904b95155e55e61149c4462147668e1cc4567c812735eff1
+F src/whereexpr.c 60dbc85ef8948cf16e306ac28c4bf6a73cf86be4afb134fa79bd20f61c501f14
 F src/window.c 76a27cff9ea2ded0c2c3527187029259440fabcc4cc4c07b11d942c78494a614
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@ -1421,7 +1421,7 @@ F test/rowvalue5.test 00740304ea6a53a8704640c7405690f0045d5d2a6b4b04dde7bccc14c3
 F test/rowvalue6.test d19b54feb604d5601f8614b15e214e0774c01087
 F test/rowvalue7.test c1cbdbf407029db01f87764097c6ac02a1c5a37efd2776eff32a9cdfdf6f2dba
 F test/rowvalue8.test 5900eddad9e2c3c2e26f1a95f74aafc1232ee5e0
-F test/rowvalue9.test cb5380df82dca9db463081e26952c1e097b34fc2c2ac87453970c048d97df687
+F test/rowvalue9.test 138252b53b835208a5712e01595403a0ae32b4bc58284d9fe6bea10e58203fe4
 F test/rowvalueA.test 51f79b6098c193f838168752c9640f4eae6c63346bf64b5bed4f4e22fe2c71d0
 F test/rowvaluefault.test 963ae9cdaed30a85a29668dd514e639f3556cae903ee9f172ea972d511c54fff
 F test/rowvaluevtab.test cd9747bb3f308086944c07968f547ad6b05022e698d80b9ffbdfe09ce0b8da6f
@@ -2045,8 +2045,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 0216ce23cf23bc147c5de6de178a6689b7ad744bf0ee0098809938b5fe10708b
-R 09e9d8286e23e9b338083a6379ec9988
-U drh
-Z 7381f85d2ea8678673eb457bc621469f
+P d35de3ad3fac6b30d3f266cbe4b1e9923eb31a1eff4a869205bbc3ba122eeec5
+R 429262141303fdf6f44e745033f25b12
+T *branch * vector-in-fix
+T *sym-vector-in-fix *
+T -sym-trunk *
+U dan
+Z 208a1c0d241050968b174afabb5133b9
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index be067174f2..e798d489d7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d35de3ad3fac6b30d3f266cbe4b1e9923eb31a1eff4a869205bbc3ba122eeec5
\ No newline at end of file
+1815b15ddb8785a25b7617aab19e13c2410b9377389c16a85176025b3d9400e8
\ No newline at end of file
diff --git a/src/wherecode.c b/src/wherecode.c
index 4c22e5dd61..860acb44cf 100644
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -489,68 +489,75 @@ static Expr *removeUnindexableInClauseTerms(
   Expr *pX              /* The IN expression to be reduced */
 ){
   sqlite3 *db = pParse->db;
+  Select *pSelect;            /* Pointer to the SELECT on the RHS */
   Expr *pNew;
   pNew = sqlite3ExprDup(db, pX, 0);
   if( db->mallocFailed==0 ){
-    ExprList *pOrigRhs;         /* Original unmodified RHS */
-    ExprList *pOrigLhs;         /* Original unmodified LHS */
-    ExprList *pRhs = 0;         /* New RHS after modifications */
-    ExprList *pLhs = 0;         /* New LHS after mods */
-    int i;                      /* Loop counter */
-    Select *pSelect;            /* Pointer to the SELECT on the RHS */
+    for(pSelect=pNew->x.pSelect; pSelect; pSelect=pSelect->pPrior){
+      ExprList *pOrigRhs;         /* Original unmodified RHS */
+      ExprList *pOrigLhs = 0;     /* Original unmodified LHS */
+      ExprList *pRhs = 0;         /* New RHS after modifications */
+      ExprList *pLhs = 0;         /* New LHS after mods */
+      int i;                      /* Loop counter */
 
-    assert( ExprUseXSelect(pNew) );
-    pOrigRhs = pNew->x.pSelect->pEList;
-    assert( pNew->pLeft!=0 );
-    assert( ExprUseXList(pNew->pLeft) );
-    pOrigLhs = pNew->pLeft->x.pList;
-    for(i=iEq; inLTerm; i++){
-      if( pLoop->aLTerm[i]->pExpr==pX ){
-        int iField;
-        assert( (pLoop->aLTerm[i]->eOperator & (WO_OR|WO_AND))==0 );
-        iField = pLoop->aLTerm[i]->u.x.iField - 1;
-        if( pOrigRhs->a[iField].pExpr==0 ) continue; /* Duplicate PK column */
-        pRhs = sqlite3ExprListAppend(pParse, pRhs, pOrigRhs->a[iField].pExpr);
-        pOrigRhs->a[iField].pExpr = 0;
-        assert( pOrigLhs->a[iField].pExpr!=0 );
-        pLhs = sqlite3ExprListAppend(pParse, pLhs, pOrigLhs->a[iField].pExpr);
-        pOrigLhs->a[iField].pExpr = 0;
+      assert( ExprUseXSelect(pNew) );
+      pOrigRhs = pSelect->pEList;
+      assert( pNew->pLeft!=0 );
+      assert( ExprUseXList(pNew->pLeft) );
+      if( pSelect==pNew->x.pSelect ){
+        pOrigLhs = pNew->pLeft->x.pList;
       }
-    }
-    sqlite3ExprListDelete(db, pOrigRhs);
-    sqlite3ExprListDelete(db, pOrigLhs);
-    pNew->pLeft->x.pList = pLhs;
-    pNew->x.pSelect->pEList = pRhs;
-    if( pLhs && pLhs->nExpr==1 ){
-      /* Take care here not to generate a TK_VECTOR containing only a
-      ** single value. Since the parser never creates such a vector, some
-      ** of the subroutines do not handle this case.  */
-      Expr *p = pLhs->a[0].pExpr;
-      pLhs->a[0].pExpr = 0;
-      sqlite3ExprDelete(db, pNew->pLeft);
-      pNew->pLeft = p;
-    }
-    pSelect = pNew->x.pSelect;
-    if( pSelect->pOrderBy ){
-      /* If the SELECT statement has an ORDER BY clause, zero the 
-      ** iOrderByCol variables. These are set to non-zero when an 
-      ** ORDER BY term exactly matches one of the terms of the 
-      ** result-set. Since the result-set of the SELECT statement may
-      ** have been modified or reordered, these variables are no longer 
-      ** set correctly.  Since setting them is just an optimization, 
-      ** it's easiest just to zero them here.  */
-      ExprList *pOrderBy = pSelect->pOrderBy;
-      for(i=0; inExpr; i++){
-        pOrderBy->a[i].u.x.iOrderByCol = 0;
+      for(i=iEq; inLTerm; i++){
+        if( pLoop->aLTerm[i]->pExpr==pX ){
+          int iField;
+          assert( (pLoop->aLTerm[i]->eOperator & (WO_OR|WO_AND))==0 );
+          iField = pLoop->aLTerm[i]->u.x.iField - 1;
+          if( pOrigRhs->a[iField].pExpr==0 ) continue; /* Duplicate PK column */
+          pRhs = sqlite3ExprListAppend(pParse, pRhs, pOrigRhs->a[iField].pExpr);
+          pOrigRhs->a[iField].pExpr = 0;
+          if( pOrigLhs ){
+            assert( pOrigLhs->a[iField].pExpr!=0 );
+            pLhs = sqlite3ExprListAppend(pParse,pLhs,pOrigLhs->a[iField].pExpr);
+            pOrigLhs->a[iField].pExpr = 0;
+          }
+        }
+      }
+      sqlite3ExprListDelete(db, pOrigRhs);
+      if( pOrigLhs ){
+        sqlite3ExprListDelete(db, pOrigLhs);
+        pNew->pLeft->x.pList = pLhs;
+      }
+      pSelect->pEList = pRhs;
+      if( pLhs && pLhs->nExpr==1 ){
+        /* Take care here not to generate a TK_VECTOR containing only a
+        ** single value. Since the parser never creates such a vector, some
+        ** of the subroutines do not handle this case.  */
+        Expr *p = pLhs->a[0].pExpr;
+        pLhs->a[0].pExpr = 0;
+        sqlite3ExprDelete(db, pNew->pLeft);
+        pNew->pLeft = p;
+      }
+      if( pSelect->pOrderBy ){
+        /* If the SELECT statement has an ORDER BY clause, zero the 
+        ** iOrderByCol variables. These are set to non-zero when an 
+        ** ORDER BY term exactly matches one of the terms of the 
+        ** result-set. Since the result-set of the SELECT statement may
+        ** have been modified or reordered, these variables are no longer 
+        ** set correctly.  Since setting them is just an optimization, 
+        ** it's easiest just to zero them here.  */
+        ExprList *pOrderBy = pSelect->pOrderBy;
+        for(i=0; inExpr; i++){
+          pOrderBy->a[i].u.x.iOrderByCol = 0;
+        }
       }
-    }
 
 #if 0
-    printf("For indexing, change the IN expr:\n");
-    sqlite3TreeViewExpr(0, pX, 0);
-    printf("Into:\n");
-    sqlite3TreeViewExpr(0, pNew, 0);
+      printf("For indexing, change the IN expr:\n");
+      sqlite3TreeViewExpr(0, pX, 0);
+      printf("Into:\n");
+      sqlite3TreeViewExpr(0, pNew, 0);
 #endif
+    }
   }
   return pNew;
 }
diff --git a/src/whereexpr.c b/src/whereexpr.c
index e458952c4a..5a84b98e74 100644
--- a/src/whereexpr.c
+++ b/src/whereexpr.c
@@ -1440,7 +1440,7 @@ static void exprAnalyze(
    && pTerm->u.x.iField==0
    && pExpr->pLeft->op==TK_VECTOR
    && ALWAYS( ExprUseXSelect(pExpr) )
-   && pExpr->x.pSelect->pPrior==0
+   && (pExpr->x.pSelect->pPrior==0 || (pExpr->x.pSelect->selFlags & SF_Values))
 #ifndef SQLITE_OMIT_WINDOWFUNC
    && pExpr->x.pSelect->pWin==0
 #endif
diff --git a/test/rowvalue9.test b/test/rowvalue9.test
index 611aa3fbb7..aee5e7ea4f 100644
--- a/test/rowvalue9.test
+++ b/test/rowvalue9.test
@@ -308,6 +308,46 @@ do_catchsql_test 8.2 {
   SELECT a FROM t1 NATURAL JOIN t1 WHERE (a,b)> (SELECT 2 IN (SELECT 2,2), 2);
 } {1 {sub-select returns 2 columns - expected 1}}
 
+#-------------------------------------------------------------------------
+#
+reset_db
+do_execsql_test 9.0 {
+  CREATE TABLE t1(a, b);
+  INSERT INTO t1 VALUES(1, 1), (1, 2), (2, 2), (2, 3), (3, 3), (3, 4), (4, 4);
+}
+
+do_execsql_test 9.1 {
+  SELECT * FROM t1 WHERE (a, b) IN ( (3, 3), (2, 2) );
+} {
+  2 2 3 3
+}
+do_execsql_test 9.2 {
+  CREATE INDEX i1 ON t1(a);
+}
+
+do_execsql_test 9.4 {
+  SELECT * FROM t1 WHERE (a, b) IN ( (3, 3), (2, 2) );
+} {
+  2 2 3 3
+}
+do_eqp_test 9.4e {
+  SELECT * FROM t1 WHERE (a, b) IN ( (3, 3), (2, 2) );
+} {
+  *SEARCH t1 USING INDEX i1*
+}
+
+do_execsql_test 9.5 {
+  CREATE INDEX i2 ON t1(b, a);
+  SELECT * FROM t1 WHERE (a, b) IN ( (3, 3), (2, 2) );
+} {
+  2 2 3 3
+}
+do_eqp_test 9.5e {
+  SELECT * FROM t1 WHERE (a, b) IN ( (3, 3), (2, 2) );
+} {
+  *SEARCH t1 USING COVERING INDEX i2*
+}
+
 
 finish_test
 

From 5c84aafd774e6a8b2bb5525d443fc3acf08792c8 Mon Sep 17 00:00:00 2001
From: dan 
Date: Mon, 13 Feb 2023 18:26:58 +0000
Subject: [PATCH 38/45] Fix compile time option SQLITE_DEFAULT_SYNCHRONOUS so
 that it works consistently.

FossilOrigin-Name: bf6f1ee77c4bf653f6cd2a3db5292b8c5c83f18ea9acf951107d22807546b28a
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/pager.c   | 15 +--------------
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/manifest b/manifest
index bc6af60ba4..fbd071ad49 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\sLIKE\soptimization,\sdo\snot\sanalyze\sthe\snew\svirtual\sWHERE\sclause\sterms\nuntil\sboth\shave\sbeen\sadded,\ssince\sthey\sare\sexpected\sto\sbe\sconsecutive\sand\nthe\sanalysis\smight\sadd\scomplementary\sterms.\nThis\sfixes\sa\sproblem\scaused\sby\s[44200596aa943963]\sand\sdiscovered\sby\sdbsqlfuzz\nand\srecorded\sas\scase\s7e3b5983727d843b910b2d9ab556e4afcd777cfb.
-D 2023-02-13T12:46:22.331
+C Fix\scompile\stime\soption\sSQLITE_DEFAULT_SYNCHRONOUS\sso\sthat\sit\sworks\sconsistently.
+D 2023-02-13T18:26:58.275
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -608,7 +608,7 @@ F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d87210
 F src/os_unix.c 90c4fa0a88c8b0817c7ce4dbea0ac3aebfd7deb0797945ac34dfd25006ba393a
 F src/os_win.c 295fe45f18bd86f2477f4cd79f3377c6f883ceb941b1f46808665c73747f2345
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c 7d1e34befba172b7f84b53c0c714e06661b22742312ad2fbb0a3bbd2d5d4f939
+F src/pager.c 39af8ff7c73a991f61f4d1e3a6f8f98b1c8e29144723507822774cac5e6ee0b5
 F src/pager.h f82e9844166e1585f5786837ddc7709966138ced17f568c16af7ccf946c2baa3
 F src/parse.y 8e67d820030d2655b9942ffe61c1e7e6b96cea2f2f72183533299393907d0564
 F src/pcache.c f4268f7f73c6a3db12ce22fd25bc68dc42315d19599414ab1207d7cf32f79197
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 0216ce23cf23bc147c5de6de178a6689b7ad744bf0ee0098809938b5fe10708b
-R 09e9d8286e23e9b338083a6379ec9988
-U drh
-Z 7381f85d2ea8678673eb457bc621469f
+P d35de3ad3fac6b30d3f266cbe4b1e9923eb31a1eff4a869205bbc3ba122eeec5
+R 3b8ce287af44119ec32e692d8c73f32f
+U dan
+Z 66ee548c8bc79c01702d3938217e9a09
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index be067174f2..fb5f4c0f5b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d35de3ad3fac6b30d3f266cbe4b1e9923eb31a1eff4a869205bbc3ba122eeec5
\ No newline at end of file
+bf6f1ee77c4bf653f6cd2a3db5292b8c5c83f18ea9acf951107d22807546b28a
\ No newline at end of file
diff --git a/src/pager.c b/src/pager.c
index 5f6e975fd8..89073b8c78 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -3556,7 +3556,6 @@ void sqlite3PagerShrink(Pager *pPager){
 ** Numeric values associated with these states are OFF==1, NORMAL=2,
 ** and FULL=3.
 */
-#ifndef SQLITE_OMIT_PAGER_PRAGMAS
 void sqlite3PagerSetFlags(
   Pager *pPager,        /* The pager to set safety level for */
   unsigned pgFlags      /* Various flags */
@@ -3591,7 +3590,6 @@ void sqlite3PagerSetFlags(
     pPager->doNotSpill |= SPILLFLAG_OFF;
   }
 }
-#endif
 
 /*
 ** The following global variable is incremented whenever the library
@@ -4995,18 +4993,7 @@ act_like_temp_file:
   pPager->memDb = (u8)memDb;
   pPager->readOnly = (u8)readOnly;
   assert( useJournal || pPager->tempFile );
-  pPager->noSync = pPager->tempFile;
-  if( pPager->noSync ){
-    assert( pPager->fullSync==0 );
-    assert( pPager->extraSync==0 );
-    assert( pPager->syncFlags==0 );
-    assert( pPager->walSyncFlags==0 );
-  }else{
-    pPager->fullSync = 1;
-    pPager->extraSync = 0;
-    pPager->syncFlags = SQLITE_SYNC_NORMAL;
-    pPager->walSyncFlags = SQLITE_SYNC_NORMAL | (SQLITE_SYNC_NORMAL<<2);
-  }
+  sqlite3PagerSetFlags(pPager, (SQLITE_DEFAULT_SYNCHRONOUS+1)|PAGER_CACHESPILL);
   /* pPager->pFirst = 0; */
   /* pPager->pFirstSynced = 0; */
   /* pPager->pLast = 0; */

From b4dc263ec5379c8fd4d4d2b89e46a7ab42cb3279 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 13 Feb 2023 18:42:01 +0000
Subject: [PATCH 39/45] Do not allow WHERE clause terms to match constant
 string index terms, which can happen if DQS_DDL is enabled.  Follow-up to
 [44200596aa943963].  dbsqlfuzz 54c9db85ed4af7055f5fd0d50877875c82b11d46.

FossilOrigin-Name: 2d2b91cc0f6fed8cb6f738dc7019047ce0f1e86b5eb8efa997095d08a32cbcb6
---
 manifest             | 17 ++++++++---------
 manifest.uuid        |  2 +-
 src/whereexpr.c      |  4 +++-
 test/indexexpr1.test | 26 ++++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/manifest b/manifest
index ba223386cc..e3e4f5a582 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\svector-IN\sexpressions\slike\s"(a,\sb)\sIN\s(\s(?,?),\s(?,?)\s)"\sto\suse\san\sindex.
-D 2023-02-13T18:37:48.912
+C Do\snot\sallow\sWHERE\sclause\sterms\sto\smatch\sconstant\sstring\sindex\sterms,\swhich\ncan\shappen\sif\sDQS_DDL\sis\senabled.\s\sFollow-up\sto\n[44200596aa943963].\s\sdbsqlfuzz\s54c9db85ed4af7055f5fd0d50877875c82b11d46.
+D 2023-02-13T18:42:01.372
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -709,7 +709,7 @@ F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c 5b20d08699c9a55c0556661ff6f937dd1c8e27567b7553e48d477d3fad22ec4c
 F src/whereInt.h e25203e5bfee149f5f1225ae0166cfb4f1e65490c998a024249e98bb0647377c
 F src/wherecode.c b82d0d33315e1526904b95155e55e61149c4462147668e1cc4567c812735eff1
-F src/whereexpr.c 60dbc85ef8948cf16e306ac28c4bf6a73cf86be4afb134fa79bd20f61c501f14
+F src/whereexpr.c a60a1f88650c561eded95c5affbe846cda71fac35033e1280f28e47934df33c8
 F src/window.c 76a27cff9ea2ded0c2c3527187029259440fabcc4cc4c07b11d942c78494a614
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
@@ -1189,7 +1189,7 @@ F test/index7.test b238344318e0b4e42126717f6554f0e7dfd0b39cecad4b736039b43e1e3b6
 F test/index8.test caa097735c91dbc23d8a402f5e63a2a03c83840ba3928733ed7f9a03f8a912a3
 F test/index9.test 2ac891806a4136ef3e91280477e23114e67575207dc331e6797fa0ed9379f997
 F test/indexedby.test f21eca4f7a6ffe14c8500a7ad6cd53166666c99e5ccd311842a28bc94a195fe0
-F test/indexexpr1.test 1cd460113e3999a1477754fd0e3ac0d7bcbbbc742b427b418945f28af708c695
+F test/indexexpr1.test b2a15637dcbae7fd8d7e2fc51f74ac4feaf5510130ee2089a5ec5bd1ef7270e1
 F test/indexexpr2.test 2c7abe3c48f8aaa5a448615ab4d13df3662185d28419c00999670834a3f0b484
 F test/indexfault.test 98d78a8ff1f5335628b62f886a1cb7c7dac1ef6d48fa39c51ec871c87dce9811
 F test/init.test 15c823093fdabbf7b531fe22cf037134d09587a7
@@ -2045,9 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P bf6f1ee77c4bf653f6cd2a3db5292b8c5c83f18ea9acf951107d22807546b28a 1815b15ddb8785a25b7617aab19e13c2410b9377389c16a85176025b3d9400e8
-R a03dd87796b00ce341f74d97782ef151
-T +closed 1815b15ddb8785a25b7617aab19e13c2410b9377389c16a85176025b3d9400e8
-U dan
-Z bda945499e0359a4cf67b9c6621c26ff
+P 18a99d9cfbc3a0419342b3fe91a83d2217578d0f6e8ee1084237d000946b1942
+R 14cd5c9df254cbcecf85cb65ce18e847
+U drh
+Z b1bb2528b9652ea8949295007f6e79e5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3a7c6c3d86..db1274c827 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-18a99d9cfbc3a0419342b3fe91a83d2217578d0f6e8ee1084237d000946b1942
\ No newline at end of file
+2d2b91cc0f6fed8cb6f738dc7019047ce0f1e86b5eb8efa997095d08a32cbcb6
\ No newline at end of file
diff --git a/src/whereexpr.c b/src/whereexpr.c
index 5a84b98e74..4f86753bf7 100644
--- a/src/whereexpr.c
+++ b/src/whereexpr.c
@@ -988,7 +988,9 @@ static SQLITE_NOINLINE int exprMightBeIndexed2(
       for(i=0; inKeyCol; i++){
         if( pIdx->aiColumn[i]!=XN_EXPR ) continue;
         assert( pIdx->bHasExpr );
-        if( sqlite3ExprCompareSkip(pExpr,pIdx->aColExpr->a[i].pExpr,iCur)==0 ){
+        if( sqlite3ExprCompareSkip(pExpr,pIdx->aColExpr->a[i].pExpr,iCur)==0 
+          && pExpr->op!=TK_STRING
+        ){
           aiCurCol[0] = iCur;
           aiCurCol[1] = XN_EXPR;
           return 1;
diff --git a/test/indexexpr1.test b/test/indexexpr1.test
index a5d1514bcd..7d94806cdd 100644
--- a/test/indexexpr1.test
+++ b/test/indexexpr1.test
@@ -565,6 +565,32 @@ do_execsql_test indexexpr1-2030 {
     FROM t1;
 } {/.*SCAN t1 USING INDEX t1x.*/}
 
+reset_db
+do_execsql_test indexexpr1-2100 {
+  CREATE TABLE t1(a INTEGER PRIMARY KEY, b INT);
+  INSERT INTO t1(a,b) VALUES(1,0);
+  CREATE INDEX x1 ON t1( "y" );
+  CREATE INDEX x2 ON t1( +"y" );
+  CREATE INDEX x3 ON t1( +'y' );
+  CREATE INDEX x4 ON t1( "y*" );
+}
+do_execsql_test indexexpr1-2110 {
+  UPDATE t1 SET b=100 WHERE (SELECT 'y') GLOB "y";
+  SELECT b FROM t1;
+} 100
+do_execsql_test indexexpr1-2120 {
+  UPDATE t1 SET b=200 WHERE (SELECT 'y') GLOB +"y";
+  SELECT b FROM t1;
+} 200
+do_execsql_test indexexpr1-2130 {
+  UPDATE t1 SET b=300 WHERE (SELECT 'y') GLOB +'y';
+  SELECT b FROM t1;
+} 300
+do_execsql_test indexexpr1-2140 {
+  UPDATE t1 SET b=400 WHERE (SELECT 'y') GLOB "y*";
+  SELECT b FROM t1;
+} 400
+
 
 
 finish_test

From d6ba4252b2059de5e905c7d43c29974f9693bf29 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 13 Feb 2023 19:32:40 +0000
Subject: [PATCH 40/45] Ignore extra parentheses around a subquery on the RHS
 of an IN operator, because that is what PostgreSQL does.

FossilOrigin-Name: ecdeef43b27412b0b0b09e09a62ad3a03836a3fc80f2070268090e7ca8f02712
---
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 src/parse.y   |  5 +++++
 test/in.test  | 25 +++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index e3e4f5a582..f3adfae385 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sallow\sWHERE\sclause\sterms\sto\smatch\sconstant\sstring\sindex\sterms,\swhich\ncan\shappen\sif\sDQS_DDL\sis\senabled.\s\sFollow-up\sto\n[44200596aa943963].\s\sdbsqlfuzz\s54c9db85ed4af7055f5fd0d50877875c82b11d46.
-D 2023-02-13T18:42:01.372
+C Ignore\sextra\sparentheses\saround\sa\ssubquery\son\sthe\sRHS\sof\san\sIN\soperator,\nbecause\sthat\sis\swhat\sPostgreSQL\sdoes.
+D 2023-02-13T19:32:40.855
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -610,7 +610,7 @@ F src/os_win.c 295fe45f18bd86f2477f4cd79f3377c6f883ceb941b1f46808665c73747f2345
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 39af8ff7c73a991f61f4d1e3a6f8f98b1c8e29144723507822774cac5e6ee0b5
 F src/pager.h f82e9844166e1585f5786837ddc7709966138ced17f568c16af7ccf946c2baa3
-F src/parse.y 8e67d820030d2655b9942ffe61c1e7e6b96cea2f2f72183533299393907d0564
+F src/parse.y 960d2da92a23f8ba2ca22748a51bd75ee2c575564f2cbc59f119640e7f5b4c5d
 F src/pcache.c f4268f7f73c6a3db12ce22fd25bc68dc42315d19599414ab1207d7cf32f79197
 F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
@@ -1162,7 +1162,7 @@ F test/hook2.test b9ff3b8c6519fb67f33192f1afe86e7782ee4ac8
 F test/icu.test 716a6b89fbabe5cc63e0cd4c260befb08fd7b9d761f04d43669233292f0753b1
 F test/ieee754.test b0945d12be7d255f3dfa18e2511b17ca37e0edd2b803231c52d05b86c04ab26e
 F test/imposter1.test c3f1db2d3db2c24611a6596a3fc0ffc14f1466c8
-F test/in.test 55503d3633c434120d8b2d5966a34f0d9a55393a589050b1366afe4b188093c7
+F test/in.test 7399a6562fb09de7f786901f0b24b7bbe7c0b541f29ead9eb13f091edea37da4
 F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
 F test/in3.test 3cbf58c87f4052cee3a58b37b6389777505aa0c0
 F test/in4.test fdd1d8134da8376985c2edba6035a2de1f6c731524d2ffa651419e8fe2cd1c5a
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 18a99d9cfbc3a0419342b3fe91a83d2217578d0f6e8ee1084237d000946b1942
-R 14cd5c9df254cbcecf85cb65ce18e847
+P 2d2b91cc0f6fed8cb6f738dc7019047ce0f1e86b5eb8efa997095d08a32cbcb6
+R d11f5b53cbab7b688fd4e7709fbb9569
 U drh
-Z b1bb2528b9652ea8949295007f6e79e5
+Z b222c56e62c7c39c1ac608fb3a8f1732
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index db1274c827..901cc2e36e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2d2b91cc0f6fed8cb6f738dc7019047ce0f1e86b5eb8efa997095d08a32cbcb6
\ No newline at end of file
+ecdeef43b27412b0b0b09e09a62ad3a03836a3fc80f2070268090e7ca8f02712
\ No newline at end of file
diff --git a/src/parse.y b/src/parse.y
index d627f22ba2..760cb114ad 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -1302,6 +1302,11 @@ expr(A) ::= expr(A) between_op(N) expr(X) AND expr(Y). [BETWEEN] {
         sqlite3ExprListDelete(pParse->db, Y);
         pRHS = sqlite3PExpr(pParse, TK_UPLUS, pRHS, 0);
         A = sqlite3PExpr(pParse, TK_EQ, A, pRHS);
+      }else if( Y->nExpr==1 && pRHS->op==TK_SELECT ){
+        A = sqlite3PExpr(pParse, TK_IN, A, 0);
+        sqlite3PExprAddSelect(pParse, A, pRHS->x.pSelect);
+        pRHS->x.pSelect = 0;
+        sqlite3ExprListDelete(pParse->db, Y);
       }else{
         A = sqlite3PExpr(pParse, TK_IN, A, 0);
         if( A==0 ){
diff --git a/test/in.test b/test/in.test
index 7c4cc51878..716c17f593 100644
--- a/test/in.test
+++ b/test/in.test
@@ -806,5 +806,30 @@ do_execsql_test in-21.1 {
   SELECT COUNT(*) FROM t0 ORDER BY (t0.c0 IN ());
 } {0}
 
+# Ignore extra parentheses around a subquery on the RHS of an IN operator,
+# because that is what PostgreSQL does.
+#
+do_execsql_test in-22.1 {
+  DROP TABLE IF EXISTS t1;
+  CREATE TABLE t1(x INT PRIMARY KEY, y INT);
+  WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM c WHERE x<8)
+    INSERT INTO t1(x,y) SELECT x, x*100 FROM c;
+  DROP TABLE IF EXISTS t2;
+  CREATE TABLE t2(a INT);
+  INSERT INTO t2 VALUES(2),(4),(6);
+  SELECT * FROM t1 WHERE x IN (SELECT a FROM t2);
+} {2 200 4 400 6 600}
+do_execsql_test in-22.2 {
+  SELECT * FROM t1 WHERE x IN ((SELECT a FROM t2));
+} {2 200 4 400 6 600}
+do_execsql_test in-22.3 {
+  SELECT * FROM t1 WHERE x IN (((SELECT a FROM t2)));
+} {2 200 4 400 6 600}
+do_execsql_test in-22.4 {
+  SELECT * FROM t1 WHERE x IN ((((((SELECT a FROM t2))))));
+} {2 200 4 400 6 600}
+
+
+
 
 finish_test

From bdb2ec409a380cdc936183ccb92e00de92d366c8 Mon Sep 17 00:00:00 2001
From: dan 
Date: Tue, 14 Feb 2023 18:09:40 +0000
Subject: [PATCH 41/45] Update testrunner.tcl to run zipvfs test scripts on
 unix.

FossilOrigin-Name: e6c8e19ab0d6e7526d4596b75a45bb6becaf3c029690f7e75c016eac803c9990
---
 manifest            | 14 +++++++-------
 manifest.uuid       |  2 +-
 test/testrunner.tcl | 28 ++++++++++++++++++++++------
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/manifest b/manifest
index f3adfae385..91f4eba3e3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ignore\sextra\sparentheses\saround\sa\ssubquery\son\sthe\sRHS\sof\san\sIN\soperator,\nbecause\sthat\sis\swhat\sPostgreSQL\sdoes.
-D 2023-02-13T19:32:40.855
+C Update\stestrunner.tcl\sto\srun\szipvfs\stest\sscripts\son\sunix.
+D 2023-02-14T18:09:40.825
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1563,7 +1563,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 8d54d40a55e12554b4509bc12078b201b233c8e842a7543629094a21b1ba956d
-F test/testrunner.tcl cd6fbd8c0fdb61b3b3cdd732c2d4fa9065b1b976815145b8cfdcb7ddad2a0bef
+F test/testrunner.tcl e0b36a732956c69ce19370611b8dc69b44e627d5ea8ec2a5455ca3e8a170ddaa
 F test/testrunner_data.tcl 8169c68654ac8906833b8a6aadca973358a441ebf88270dd05c153e5f96f76b8
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2d2b91cc0f6fed8cb6f738dc7019047ce0f1e86b5eb8efa997095d08a32cbcb6
-R d11f5b53cbab7b688fd4e7709fbb9569
-U drh
-Z b222c56e62c7c39c1ac608fb3a8f1732
+P ecdeef43b27412b0b0b09e09a62ad3a03836a3fc80f2070268090e7ca8f02712
+R 008d808935e4782501905c43f1b48b8b
+U dan
+Z 0a26d7ad99fa8ab0735a6c8903ff6006
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 901cc2e36e..d9053da512 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ecdeef43b27412b0b0b09e09a62ad3a03836a3fc80f2070268090e7ca8f02712
\ No newline at end of file
+e6c8e19ab0d6e7526d4596b75a45bb6becaf3c029690f7e75c016eac803c9990
\ No newline at end of file
diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index 9d06ba1c1c..a71b055e4c 100644
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -24,6 +24,7 @@ Usage:
   where SWITCHES are:
     --jobs NUMBER-OF-JOBS
     --fuzztest
+    --zipvfs ZIPVFS-SOURCE-DIR
 
 Interesting values for PERMUTATION are:
 
@@ -106,6 +107,7 @@ set TRG(patternlist) [list]
 set TRG(cmdline) $argv
 set TRG(reporttime) 2000
 set TRG(fuzztest) 0                 ;# is the fuzztest option present.
+set TRG(zipvfs) ""                  ;# -zipvfs option, if any
 
 switch -nocase -glob -- $tcl_platform(os) {
   *darwin* {
@@ -344,6 +346,10 @@ for {set ii 0} {$ii < [llength $argv]} {incr ii} {
       if {$isLast} { usage }
     } elseif {($n>2 && [string match "$a*" --fuzztest]) || $a=="-f"} {
       set TRG(fuzztest) 1
+    } elseif {($n>2 && [string match "$a*" --zipvfs]) || $a=="-z"} {
+      incr ii
+      set TRG(zipvfs) [lindex $argv $ii]
+      if {$isLast} { usage }
     } else {
       usage
     }
@@ -573,6 +579,12 @@ proc make_new_testset {} {
   global TRG
 
   set tests [testset_patternlist $TRG(patternlist)]
+
+  if {$TRG(zipvfs)!=""} {
+    source [file join $TRG(zipvfs) test zipvfs_testrunner.tcl]
+    set tests [concat $tests [zipvfs_testrunner_testset]]
+  }
+
   r_write_db {
 
     trdb eval $TRG(schema)
@@ -700,13 +712,17 @@ proc launch_another_job {iJob} {
     set builddir [build_to_dirname $b]
     create_or_clear_dir $builddir
 
-    set     cmd [info nameofexec]
-    lappend cmd [file join $testdir releasetest_data.tcl]
-    lappend cmd trscript
-    if {$TRG(platform)=="win"} { lappend cmd -msvc }
-    lappend cmd $b $srcdir
+    if {$b=="Zipvfs"} {
+      set script [zipvfs_testrunner_script]
+    } else {
+      set     cmd [info nameofexec]
+      lappend cmd [file join $testdir releasetest_data.tcl]
+      lappend cmd trscript
+      if {$TRG(platform)=="win"} { lappend cmd -msvc }
+      lappend cmd $b $srcdir
+      set script [exec {*}$cmd]
+    }
 
-    set script [exec {*}$cmd]
     set fd [open [file join $builddir $TRG(make)] w]
     puts $fd $script
     close $fd

From ab31a5df93101250ee6a4df3e52ac6aa629835f3 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 17 Feb 2023 18:27:48 +0000
Subject: [PATCH 42/45] Do not allow the COUNTOFVIEW optimization to run if the
 count() contains a FILTER clause.  dbsqlfuzz
 4f8e0de6e272bbbb3e1b41cb5aea31e0b47297e3

FossilOrigin-Name: 29fc06465efb948f98d2733bb25ffa1e0662a0189304006b3d0be9fec7dd28c5
---
 manifest          | 16 ++++++++--------
 manifest.uuid     |  2 +-
 src/select.c      |  1 +
 test/filter1.test | 14 +++++++++++++-
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 91f4eba3e3..953ef78145 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\stestrunner.tcl\sto\srun\szipvfs\stest\sscripts\son\sunix.
-D 2023-02-14T18:09:40.825
+C Do\snot\sallow\sthe\sCOUNTOFVIEW\soptimization\sto\srun\sif\sthe\scount()\scontains\na\sFILTER\sclause.\s\sdbsqlfuzz\s4f8e0de6e272bbbb3e1b41cb5aea31e0b47297e3
+D 2023-02-17T18:27:48.113
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -621,7 +621,7 @@ F src/printf.c ff4b05e38bf928ff1b80d3dda4f977b10fe39ecbfe69c018224c7e5594fb2455
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d62c5665279cc7485f9d45b5e20911cc7b19c203f268321a90d05d74f4725750
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c c3ce1b49cca2c66c8c88fe7d9e1f3db23590deb4dd631619ad90e1e5d21bcf1f
+F src/select.c 5f6b393b7748a95d54d26e568e699cbe81bd8d6d39fddbf55fd6ec85afc4b7f8
 F src/shell.c.in 5cb750dc00bb8b20b020031fd1bb0cb8759a6e567c27aee6b0af31d187984985
 F src/sqlite.h.in c060f9e6f646fd817abf273c068666e079fc6e8467ea1d3e8b20f355f82722e9
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -982,7 +982,7 @@ F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79
 F test/fallocate.test 37a62e396a68eeede8f8d2ecf23573a80faceb630788d314d0a073d862616717
 F test/filectrl.test 6e871c2d35dead1d9a88e176e8d2ca094fec6bb3
 F test/filefmt.test f393e80c4b8d493b7a7f8f3809a8425bbf4292af1f5140f01cb1427798a2bbd4
-F test/filter1.test 6c483ecf7886c8843a8612c021aa23f33c581f584151f251842b3a3592c95ac8
+F test/filter1.test caa347bebbbb755b8774b6fba17d5cb6584d458c538469c8fb71f1c8d17584e3
 F test/filter2.tcl 44e525497ce07382915f01bd29ffd0fa49dab3adb87253b5e5103ba8f93393e8
 F test/filter2.test 485cf95d1f6d6ceee5632201ca52a71868599836f430cdee42e5f7f14666e30a
 F test/filterfault.test c08fb491d698e8df6c122c98f7db1c65ffcfcad2c1ab0e07fa8a5be1b34eaa8b
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P ecdeef43b27412b0b0b09e09a62ad3a03836a3fc80f2070268090e7ca8f02712
-R 008d808935e4782501905c43f1b48b8b
-U dan
-Z 0a26d7ad99fa8ab0735a6c8903ff6006
+P e6c8e19ab0d6e7526d4596b75a45bb6becaf3c029690f7e75c016eac803c9990
+R bcfa89eca9835e46bea960712899b9fd
+U drh
+Z 616fd89c19968483e79b848ffb0587c2
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d9053da512..8a7d86630b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e6c8e19ab0d6e7526d4596b75a45bb6becaf3c029690f7e75c016eac803c9990
\ No newline at end of file
+29fc06465efb948f98d2733bb25ffa1e0662a0189304006b3d0be9fec7dd28c5
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index b0e303066a..170eb0cd4e 100644
--- a/src/select.c
+++ b/src/select.c
@@ -6812,6 +6812,7 @@ static int countOfViewOptimization(Parse *pParse, Select *p){
   assert( ExprUseXList(pExpr) );
   if( pExpr->x.pList!=0 ) return 0;                 /* Must be count(*) */
   if( p->pSrc->nSrc!=1 ) return 0;                  /* One table in FROM  */
+  if( ExprHasProperty(pExpr, EP_WinFunc) ) return 0;/* Not a window function */
   pSub = p->pSrc->a[0].pSelect;
   if( pSub==0 ) return 0;                           /* The FROM is a subquery */
   if( pSub->pPrior==0 ) return 0;                   /* Must be a compound ry */
diff --git a/test/filter1.test b/test/filter1.test
index 7b2cf9cc3a..d1549151cd 100644
--- a/test/filter1.test
+++ b/test/filter1.test
@@ -220,6 +220,18 @@ do_execsql_test 7.1 {
   444 {} 120000
 }
 
-
+# 2023-02-17 dbsqlfuzz 4f8e0de6e272bbbb3e1b41cb5aea31e0b47297e3
+# count() with FILTER clause using the COUNTOFVIEW optimization.
+#
+reset_db
+do_execsql_test 8.0 {
+  CREATE TABLE t0(c0 INT);
+  CREATE TABLE t1a(a INTEGER PRINARY KEY, b TEXT);
+  INSERT INTO t1a VALUES(1,'one'),(2,NULL),(3,'three');
+  CREATE TABLE t1b(c INTEGER PRIMARY KEY, d TEXT);
+  INSERT INTO t1b VALUES(4,'four'),(5,NULL),(6,'six');
+  CREATE VIEW t1 AS SELECT a, b FROM t1a UNION ALL SELECT c, d FROM t1b;
+  SELECT count()FILTER(WHERE b IS NULL) FROM t1;
+} 2
 
 finish_test

From 16cdb4b6323ce160e9cbd8debd8545b986de692c Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 17 Feb 2023 22:48:46 +0000
Subject: [PATCH 43/45] Fix a harmless typo in the test case added by
 [29fc06465efb948f].

FossilOrigin-Name: e0a0bf56f11f32f58705098e76c276deaf90cfa87e110032bdaad10ce9674f61
---
 manifest          | 12 ++++++------
 manifest.uuid     |  2 +-
 test/filter1.test |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 953ef78145..44e0c45330 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sallow\sthe\sCOUNTOFVIEW\soptimization\sto\srun\sif\sthe\scount()\scontains\na\sFILTER\sclause.\s\sdbsqlfuzz\s4f8e0de6e272bbbb3e1b41cb5aea31e0b47297e3
-D 2023-02-17T18:27:48.113
+C Fix\sa\sharmless\stypo\sin\sthe\stest\scase\sadded\sby\s[29fc06465efb948f].
+D 2023-02-17T22:48:46.796
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -982,7 +982,7 @@ F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79
 F test/fallocate.test 37a62e396a68eeede8f8d2ecf23573a80faceb630788d314d0a073d862616717
 F test/filectrl.test 6e871c2d35dead1d9a88e176e8d2ca094fec6bb3
 F test/filefmt.test f393e80c4b8d493b7a7f8f3809a8425bbf4292af1f5140f01cb1427798a2bbd4
-F test/filter1.test caa347bebbbb755b8774b6fba17d5cb6584d458c538469c8fb71f1c8d17584e3
+F test/filter1.test 590f8ba9a0cd0823b80d89ac75c5ce72276189cef9225d2436adaf1ee87f3727
 F test/filter2.tcl 44e525497ce07382915f01bd29ffd0fa49dab3adb87253b5e5103ba8f93393e8
 F test/filter2.test 485cf95d1f6d6ceee5632201ca52a71868599836f430cdee42e5f7f14666e30a
 F test/filterfault.test c08fb491d698e8df6c122c98f7db1c65ffcfcad2c1ab0e07fa8a5be1b34eaa8b
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P e6c8e19ab0d6e7526d4596b75a45bb6becaf3c029690f7e75c016eac803c9990
-R bcfa89eca9835e46bea960712899b9fd
+P 29fc06465efb948f98d2733bb25ffa1e0662a0189304006b3d0be9fec7dd28c5
+R 94372f0056534229866ecfff803be692
 U drh
-Z 616fd89c19968483e79b848ffb0587c2
+Z 2a6aa3073b2b727399db2402d7718edb
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8a7d86630b..b547bf6342 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-29fc06465efb948f98d2733bb25ffa1e0662a0189304006b3d0be9fec7dd28c5
\ No newline at end of file
+e0a0bf56f11f32f58705098e76c276deaf90cfa87e110032bdaad10ce9674f61
\ No newline at end of file
diff --git a/test/filter1.test b/test/filter1.test
index d1549151cd..bb36e179b3 100644
--- a/test/filter1.test
+++ b/test/filter1.test
@@ -226,7 +226,7 @@ do_execsql_test 7.1 {
 reset_db
 do_execsql_test 8.0 {
   CREATE TABLE t0(c0 INT);
-  CREATE TABLE t1a(a INTEGER PRINARY KEY, b TEXT);
+  CREATE TABLE t1a(a INTEGER PRIMARY KEY, b TEXT);
   INSERT INTO t1a VALUES(1,'one'),(2,NULL),(3,'three');
   CREATE TABLE t1b(c INTEGER PRIMARY KEY, d TEXT);
   INSERT INTO t1b VALUES(4,'four'),(5,NULL),(6,'six');

From 3c7e90b89472f100a5f9608b4899bb801bec465b Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 18 Feb 2023 15:50:23 +0000
Subject: [PATCH 44/45] Fix a harmless UBSAN warning in debugging code of the
 new unhex() function.

FossilOrigin-Name: 315574d5cbe5c805ff2163052d986b054985984fb45bfb064d1a7b39a22b90eb
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/func.c    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 44e0c45330..c013f023e3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sharmless\stypo\sin\sthe\stest\scase\sadded\sby\s[29fc06465efb948f].
-D 2023-02-17T22:48:46.796
+C Fix\sa\sharmless\sUBSAN\swarning\sin\sdebugging\scode\sof\sthe\snew\sunhex()\sfunction.
+D 2023-02-18T15:50:23.240
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -574,7 +574,7 @@ F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
 F src/expr.c 2e5e67e800c9416996df52409746a2f3c7dadf5d38b5a367ce379b239e3f40c8
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
-F src/func.c 0bf5b82df41ffa1afe2bc67c3d0d361761c56c9e1785c999e24a15ba04c28d2b
+F src/func.c 64c4cb2eebf6ddb6b4b08dc17790e7152b887f223f8caf0c0fe96da1c5a876ca
 F src/global.c e06ff8e0acd85aec13563c9ecb44fbbf38232ccf73594998fd880b92d619594b
 F src/hash.c c6af5f96a7a76d000f07c5402c48c318c2566beecdee9e78b9d9f60ce7119565
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 29fc06465efb948f98d2733bb25ffa1e0662a0189304006b3d0be9fec7dd28c5
-R 94372f0056534229866ecfff803be692
+P e0a0bf56f11f32f58705098e76c276deaf90cfa87e110032bdaad10ce9674f61
+R 3050076bb8049141f9c9c7231ab9b1dc
 U drh
-Z 2a6aa3073b2b727399db2402d7718edb
+Z 469436a8ed3c4e499e4243df4cdf92db
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b547bf6342..f633c7abec 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e0a0bf56f11f32f58705098e76c276deaf90cfa87e110032bdaad10ce9674f61
\ No newline at end of file
+315574d5cbe5c805ff2163052d986b054985984fb45bfb064d1a7b39a22b90eb
\ No newline at end of file
diff --git a/src/func.c b/src/func.c
index 6a279a9d71..c1efd8acf8 100644
--- a/src/func.c
+++ b/src/func.c
@@ -1269,7 +1269,7 @@ static void unhexFunc(
   const u8 *zHex = sqlite3_value_text(argv[0]);
   int nHex = sqlite3_value_bytes(argv[0]);
 #ifdef SQLITE_DEBUG
-  const u8 *zEnd = &zHex[nHex];
+  const u8 *zEnd = zHex ? &zHex[nHex] : 0;
 #endif
   u8 *pBlob = 0;
   u8 *p = 0;

From 1603f7edee60b23d91dcce61ff5bbf86b596bc85 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 18 Feb 2023 20:31:26 +0000
Subject: [PATCH 45/45] Fix stale requirement marks and fix a typo in the
 documentation for sqlite3_preupdate_hook().

FossilOrigin-Name: 655991f5d9afdd3281049eb430921046e0ba90eef215020c2fb149adc0d3c4c5
---
 manifest                | 16 ++++++++--------
 manifest.uuid           |  2 +-
 src/sqlite.h.in         |  2 +-
 test/e_createtable.test | 13 +++++++------
 test/e_expr.test        |  9 +++++----
 5 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/manifest b/manifest
index c013f023e3..b4611ed397 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sharmless\sUBSAN\swarning\sin\sdebugging\scode\sof\sthe\snew\sunhex()\sfunction.
-D 2023-02-18T15:50:23.240
+C Fix\sstale\srequirement\smarks\sand\sfix\sa\stypo\sin\sthe\sdocumentation\sfor\nsqlite3_preupdate_hook().
+D 2023-02-18T20:31:26.492
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -623,7 +623,7 @@ F src/resolve.c d62c5665279cc7485f9d45b5e20911cc7b19c203f268321a90d05d74f4725750
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 5f6b393b7748a95d54d26e568e699cbe81bd8d6d39fddbf55fd6ec85afc4b7f8
 F src/shell.c.in 5cb750dc00bb8b20b020031fd1bb0cb8759a6e567c27aee6b0af31d187984985
-F src/sqlite.h.in c060f9e6f646fd817abf273c068666e079fc6e8467ea1d3e8b20f355f82722e9
+F src/sqlite.h.in 76159e46e7e1a8037131b07d86c945f59f87637f95cdae09f1d28e7cc950c43c
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
 F src/sqliteInt.h 4dcc36b21dd0c77efeb0bb38b0d31916bc63fb429c8a89d186c945eba0816447
@@ -941,11 +941,11 @@ F test/e_blobclose.test 692fc02a058476c2222a63d97e3f3b2b809c1842e5525ded7f854d54
 F test/e_blobopen.test 29f6055ee453b8e679fe9570c4d3acfedbef821622c5dad16875148c5952ef50
 F test/e_blobwrite.test 3075ff539827576d9a34cbb5a2ac75eb65fb49cd5aadc27686b0719fbf99c156
 F test/e_changes.test 0f8c3e6aab7335cb772d5a3ea34ca4c82f98d0eb896e2eb3add971c16984b405
-F test/e_createtable.test e3b9782e80c0cf2898ac0eb1d9cd058412955ff53a8e47307a60c8289d62ff9c
+F test/e_createtable.test 31b9bcb6ac8876bc7ec342d86d9c231a84c62b442093a6651dfd0fa93650eea3
 F test/e_delete.test ab39084f26ae1f033c940b70ebdbbd523dc4962e
 F test/e_droptrigger.test 235c610f8bf8ec44513e222b9085c7e49fad65ad0c1975ac2577109dd06fd8fa
 F test/e_dropview.test 74e405df7fa0f762e0c9445b166fe03955856532e2bb234c372f7c51228d75e7
-F test/e_expr.test bc6aa5906ba967587525bc746ea403011557cf6d8e4fc9efb1fab5dae7fb4fd6
+F test/e_expr.test 27e905ed17266c745bffe65f56b809c13ae6e225e56aeda1aaec926b32439286
 F test/e_fkey.test feeba6238aeff9d809fb6236b351da8df4ae9bda89e088e54526b31a0cbfeec5
 F test/e_fts3.test 17ba7c373aba4d4f5696ba147ee23fd1a1ef70782af050e03e262ca187c5ee07
 F test/e_insert.test f02f7f17852b2163732c6611d193f84fc67bc641fb4882c77a464076e5eba80e
@@ -2045,8 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P e0a0bf56f11f32f58705098e76c276deaf90cfa87e110032bdaad10ce9674f61
-R 3050076bb8049141f9c9c7231ab9b1dc
+P 315574d5cbe5c805ff2163052d986b054985984fb45bfb064d1a7b39a22b90eb
+R 68f946e70175917ceaa3524db0cdae27
 U drh
-Z 469436a8ed3c4e499e4243df4cdf92db
+Z 5037326c30e7dd9c662d141b97c2f282
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f633c7abec..9fd2adeb6d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-315574d5cbe5c805ff2163052d986b054985984fb45bfb064d1a7b39a22b90eb
\ No newline at end of file
+655991f5d9afdd3281049eb430921046e0ba90eef215020c2fb149adc0d3c4c5
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index ca20e2798c..e37ce840d7 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -10123,7 +10123,7 @@ int sqlite3_db_cacheflush(sqlite3*);
 ** function is not defined for operations on WITHOUT ROWID tables, or for
 ** DELETE operations on rowid tables.
 **
-** ^The sqlite3_update_hook(D,C,P) function returns the P argument from
+** ^The sqlite3_preupdate_hook(D,C,P) function returns the P argument from
 ** the previous call on the same [database connection] D, or NULL for
 ** the first call on D.
 **
diff --git a/test/e_createtable.test b/test/e_createtable.test
index 3ecffae5c6..92ccc80323 100644
--- a/test/e_createtable.test
+++ b/test/e_createtable.test
@@ -1514,9 +1514,10 @@ do_createtable_tests 4.14 -error {NOT NULL constraint failed: %s} {
   5    "INSERT INTO t3 VALUES(NULL, 'g', 'h')"    {t3.a}
 }
 
-# EVIDENCE-OF: R-42511-39459 PRIMARY KEY, UNIQUE and NOT NULL
-# constraints may be explicitly assigned a default conflict resolution
-# algorithm by including a conflict-clause in their definitions.
+# EVIDENCE-OF: R-34093-09213 PRIMARY KEY, UNIQUE and NOT NULL
+# constraints may be explicitly assigned another default conflict
+# resolution algorithm by including a conflict-clause in their
+# definitions.
 #
 #     Conflict clauses: ABORT, ROLLBACK, IGNORE, FAIL, REPLACE
 #
@@ -1631,9 +1632,9 @@ foreach {tn tbl res ac data} {
 }
 catchsql COMMIT
 
-# EVIDENCE-OF: R-12645-39772 Or, if a constraint definition does not
-# include a conflict-clause or it is a CHECK constraint, the default
-# conflict resolution algorithm is ABORT.
+# EVIDENCE-OF: R-17539-59899 Or, if a constraint definition does not
+# include a conflict-clause, the default conflict resolution algorithm
+# is ABORT.
 #
 #     The first half of the above is tested along with explicit ON 
 #     CONFLICT clauses above (specifically, the tests involving t1_xx, t2_xx
diff --git a/test/e_expr.test b/test/e_expr.test
index 3f8d5ad85c..5ad5993bb4 100644
--- a/test/e_expr.test
+++ b/test/e_expr.test
@@ -215,7 +215,7 @@ foreach {tn literal type} {
 #
 # EVIDENCE-OF: R-03679-60639 Equals can be either = or ==.
 #
-# EVIDENCE-OF: R-30082-38996 The non-equals operator can be either != or
+# EVIDENCE-OF: R-49372-18364 The not-equal operator can be either != or
 # <>.
 #
 foreach {tn literal different} {
@@ -1892,9 +1892,10 @@ do_expr_test e_expr-35.1.6 {
   (SELECT a FROM t2 UNION SELECT COALESCE(b, 55) FROM t2 ORDER BY 1)
 } integer 4
 
-# EVIDENCE-OF: R-22239-33740 A subquery that returns two or more columns
-# is a row value subquery and can only be used as the operand of a
-# comparison operator.
+# EVIDENCE-OF: R-43101-20178 A subquery that returns two or more columns
+# is a row value subquery and can only be used as an operand of a
+# comparison operator or as the value in an UPDATE SET clause whose
+# column name list has the same size.
 #
 # The following block tests that errors are returned in a bunch of cases
 # where a subquery returns more than one column.

and the individual pages be started in their own tab.
       Warnings and Caveats:
       
    
-        
  • Some of these pages require that the web server emit the
-          so-called
-          COOP
-          and
-          COEP
-          headers. althttpd requires the
-          -enable-sab flag for that.
+        
  • All of these pages must be served via an HTTP
+          server. Browsers do not support loading WASM files via
+          file:// URLs.
    • 
+        
  • Any OPFS-related pages or tests require:
+          
      
+            
    • That the web server emit the so-called
+              COOP
+              and
+              COEP
+              headers. althttpd requires the
+              -enable-sab flag for that.
+            
      • 
+            
    • A very recent version of a Chromium-based browser
+              (v102 at least, possibly newer). OPFS support in the
+              other major browsers is pending. Development and testing
+              is currently done against a dev-channel release of
+              Chrome (v111 as of 2023-02-10).
+            
      • 
+          
    
         
    •