diff --git a/Makefile.in b/Makefile.in index 530d82e4f7..390e707478 100644 --- a/Makefile.in +++ b/Makefile.in @@ -308,7 +308,7 @@ sqlite3.pc: $(TOP)/sqlite3.pc.in $(AS_AUTO_DEF) @touch $@ install: install-pc # defined in main.mk -sqlite_cfg.h: $(TOP)/sqlite_cfg.h.in $(AS_AUTO_DEF) +sqlite_cfg.h: $(AS_AUTO_DEF) $(AS_AUTORECONFIG) @touch $@ diff --git a/manifest b/manifest index ebaec925f5..b9f21671b1 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Remove\ssome\sobsolete\smacros\sfrom\sthe\sCLI. -D 2024-11-14T15:55:19.992 +C Remove\sunused\ssqlite_cfg.h.in\sfrom\sthe\sbuild. +D 2024-11-14T16:06:36.424 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d -F Makefile.in 580a60aa8deb37060c7973d9399c51c4388f1e0ad0be6555dcd44bc8d2ac3260 +F Makefile.in d941328627467c1bc2f13861b0bf5dc1e0c4669c072eec20b37285777f41d289 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 F Makefile.msc a92237976eb92c5efaa0dd2524746aec12c196e12df8d4dbff9543a4648c3312 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 @@ -706,7 +706,6 @@ F mptest/multiwrite01.test dab5c5f8f9534971efce679152c5146da265222d F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b F sqlite3.1 acdff36db796e2d00225b911d3047d580cd136547298435426ce9d40347973cc F sqlite3.pc.in 0977c03a4da7c4204bd60e784a0efb8d51a190448aba78a4e973fe7192bdaf03 -F sqlite_cfg.h.in be1d075cf77134d53fdf5cc2c0919842e7e02a648c66a56e735af25ccdcaff91 F src/alter.c aa93e37e4a36a0525bbb2a2aeda20d2018f0aa995542c7dc658e031375e3f532 F src/analyze.c 9a8b67239d899ac12289db5db3f5bfe7f7a0ad1277f80f87ead1d048085876eb F src/attach.c f35bb8cc1fcdde8f6815a7ef09ae413bcac71821d530796800ba24b3c7da1e80 @@ -2199,8 +2198,9 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P d15fb0f75e64bbfdb8df0c0d0358aafbbd7d5e2048df676dafe1abd5e9917f2a -R ea2490bd05c4dad29cbfefcd8763a20e -U drh -Z 85890363a91293052a9bfcb213db9376 +P 5c4eb625709eda24b11a0437b150a60fc1497c136a4a2ab2b9d559d893dd397a 9a726b4be8ddd4b388478024a0952cfd4f0b9f665ab69119a6de0b996ac72216 +R a15407640daa9f3a9447a9e78becdb8b +T +closed 9a726b4be8ddd4b388478024a0952cfd4f0b9f665ab69119a6de0b996ac72216 Closed\sby\sintegrate-merge. +U stephan +Z 19ed65a5f5fcf67d42d45f2f1b7e12e4 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index bff9245613..40230bb725 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5c4eb625709eda24b11a0437b150a60fc1497c136a4a2ab2b9d559d893dd397a +bba54e26de56ddf804990f5cd9a1978a14580f06c5771a79803907013df8491e diff --git a/sqlite_cfg.h.in b/sqlite_cfg.h.in deleted file mode 100644 index be6329e341..0000000000 --- a/sqlite_cfg.h.in +++ /dev/null @@ -1,194 +0,0 @@ -/* sqlite_cfg.h.in - autosetup input template for sqlite_cfg.h. */ - -/* Define to 1 if you have the header file. */ -/*#undef HAVE_DLFCN_H*/ -@if HAVE_DLFCN_H -#define HAVE_DLFCN_H @HAVE_DLFCN_H@ -@endif - -/* Define to 1 if you have the `fdatasync' function. */ -/*#undef HAVE_FDATASYNC*/ -#define HAVE_FDATASYNC @HAVE_FDATASYNC@ - -/* Define to 1 if you have the `gmtime_r' function. */ -/*#undef HAVE_GMTIME_R*/ -#define HAVE_GMTIME_R @HAVE_GMTIME_R@ - -/* Define to 1 if the system has the type `int16_t'. */ -/*#undef HAVE_INT16_T*/ -#define HAVE_INT16_T @HAVE_INT16_T@ - -/* Define to 1 if the system has the type `int32_t'. */ -/*#undef HAVE_INT32_T*/ -#define HAVE_INT32_T @HAVE_INT32_T@ - -/* Define to 1 if the system has the type `int64_t'. */ -/*#undef HAVE_INT64_T*/ -#define HAVE_INT64_T @HAVE_INT64_T@ - -/* Define to 1 if the system has the type `int8_t'. */ -/*#undef HAVE_INT8_T*/ -#define HAVE_INT8_T @HAVE_INT8_T@ - -/* Define to 1 if the system has the type `intptr_t'. */ -/*#undef HAVE_INTPTR_T*/ -#define HAVE_INTPTR_T @HAVE_INTPTR_T@ - -/* Define to 1 if you have the header file. */ -/*#undef HAVE_INTTYPES_H*/ -#define HAVE_INTTYPES_H @HAVE_INTTYPES_H@ - -/* Define to 1 if you have the `isnan' function. */ -/*#undef HAVE_ISNAN*/ -#define HAVE_ISNAN @HAVE_ISNAN@ - -/* Define to 1 if you have the `localtime_r' function. */ -/*#undef HAVE_LOCALTIME_R*/ -#define HAVE_LOCALTIME_R @HAVE_LOCALTIME_R@ - -/* Define to 1 if you have the `localtime_s' function. */ -/*#undef HAVE_LOCALTIME_S*/ -#define HAVE_LOCALTIME_S @HAVE_LOCALTIME_S@ - -/* Define to 1 if you have the header file. */ -/*#undef HAVE_MALLOC_H*/ -#define HAVE_MALLOC_H @HAVE_MALLOC_H@ - -/* Define to 1 if you have the `malloc_usable_size' function. */ -/*#undef HAVE_MALLOC_USABLE_SIZE*/ -#define HAVE_MALLOC_USABLE_SIZE @HAVE_MALLOC_USABLE_SIZE@ - -/* Define to 1 if you have the header file. */ -/*#undef HAVE_MEMORY_H*/ -#define HAVE_MEMORY_H @HAVE_MEMORY_H@ - -/* Define to 1 if you have the `pread' function. */ -/*#undef HAVE_PREAD*/ -#define HAVE_PREAD @HAVE_PREAD@ - -/* Define to 1 if you have the `pread64' function. */ -/*#undef HAVE_PREAD64*/ -#define HAVE_PREAD64 @HAVE_PREAD64@ - -/* Define to 1 if you have the `pwrite' function. */ -/*#undef HAVE_PWRITE*/ -#define HAVE_PWRITE @HAVE_PWRITE@ - -/* Define to 1 if you have the `pwrite64' function. */ -/*#undef HAVE_PWRITE64*/ -#define HAVE_PWRITE64 @HAVE_PWRITE64@ - -/* Define to 1 if you have the header file. */ -/*#undef HAVE_STDINT_H*/ -#define HAVE_STDINT_H @HAVE_STDINT_H@ - -/* Define to 1 if you have the header file. */ -/*#undef HAVE_STDLIB_H*/ -#define HAVE_STDLIB_H @HAVE_STDLIB_H@ - -/* Define to 1 if you have the `strchrnul' function. */ -/*#undef HAVE_STRCHRNUL*/ -#define HAVE_STRCHRNUL @HAVE_STRCHRNUL@ - -/* Define to 1 if you have the header file. */ -/*#undef HAVE_STRINGS_H*/ -#define HAVE_STRINGS_H @HAVE_STRINGS_H@ - -/* Define to 1 if you have the header file. */ -/*#undef HAVE_STRING_H*/ -#define HAVE_STRING_H @HAVE_STRING_H@ - -/* Define to 1 if you have the header file. */ -/*#undef HAVE_SYS_STAT_H*/ -#define HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@ - -/* Define to 1 if you have the header file. */ -/*#undef HAVE_SYS_TYPES_H*/ -#define HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@ - -/* Define to 1 if the system has the type `uint16_t'. */ -/*#undef HAVE_UINT16_T*/ -#define HAVE_UINT16_T @HAVE_UINT16_T@ - -/* Define to 1 if the system has the type `uint32_t'. */ -/*#undef HAVE_UINT32_T*/ -#define HAVE_UINT32_T @HAVE_UINT32_T@ - -/* Define to 1 if the system has the type `uint64_t'. */ -/*#undef HAVE_UINT64_T*/ -#define HAVE_UINT64_T @HAVE_UINT64_T@ - -/* Define to 1 if the system has the type `uint8_t'. */ -/*#undef HAVE_UINT8_T*/ -#define HAVE_UINT8_T @HAVE_UINT8_T@ - -/* Define to 1 if the system has the type `uintptr_t'. */ -/*#undef HAVE_UINTPTR_T*/ -#define HAVE_UINTPTR_T @HAVE_UINTPTR_T@ - -/* Define to 1 if you have the header file. */ -/*#undef HAVE_UNISTD_H*/ -#define HAVE_UNISTD_H @HAVE_UNISTD_H@ - -/* Define to 1 if you have the `usleep' function. */ -/*#undef HAVE_USLEEP*/ -#define HAVE_USLEEP @HAVE_USLEEP@ - -/* Define to 1 if you have the `utime' function. */ -/*#undef HAVE_UTIME*/ -#define HAVE_UTIME @HAVE_UTIME@ - -/* Define to 1 if you have the header file. */ -/*#undef HAVE_ZLIB_H*/ -#define HAVE_ZLIB_H @HAVE_ZLIB_H@ - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -/*#undef LT_OBJDIR*/ -/*#define LT_OBJDIR @LT_OBJDIR@*/ - -/* Define to the address where bug reports for this package should be sent. */ -/*#undef PACKAGE_BUGREPORT*/ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -/*#undef PACKAGE_NAME*/ -#define PACKAGE_NAME "sqlite" - -/* Define to the full name and version of this package. */ -/*#undef PACKAGE_STRING*/ -#define PACKAGE_STRING "sqlite @RELEASE@" - -/* Define to the one symbol short name of this package. */ -/*#undef PACKAGE_TARNAME*/ -#define PACKAGE_TARNAME "sqlite" - -/* Define to the home page for this package. */ -/*#undef PACKAGE_URL*/ -#define PACKAGE_URL @PACKAGE_URL@ - -/* Define to the version of this package. */ -/*#undef PACKAGE_VERSION*/ -#define PACKAGE_VERSION @VERSION@ - -/* Define to 1 if you have the ANSI C header files. */ -/*#undef STDC_HEADERS*/ -#define STDC_HEADERS 1 /* @STDC_HEADERS@ */ - -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - -/* Number of bits in a file offset, on hosts where this is settable. */ -/*#undef _FILE_OFFSET_BITS*/ -/*#define _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@*/ -/*@if _FILE_OFFSET_BITS != ""*/ -/*#define _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@*/ -/*@endif*/ - -/* Define for large files, on AIX-style hosts. */ -/*#undef _LARGE_FILES*/ -/*@if _LARGE_FILES*/ -/*#define _LARGE_FILES @_LARGE_FILES@*/ -/*@endif*/