From: stephan <stephan@noemail.net>
Date: Wed, 22 Jan 2025 21:34:53 +0000 (+0000)
Subject: Replace the use of the Autools in ./autoconf/ with Autosetup and extend its configure... 
X-Git-Tag: version-3.49.0~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f52ed5fd613804a7d66585d6ffb986c90e20403b;p=thirdparty%2Fsqlite.git

Replace the use of the Autools in ./autoconf/ with Autosetup and extend its configure script to include many of the flags available in the canonical build.

FossilOrigin-Name: 8c60d4c901af716d4d4dfd1dd4aa626c758fac2cb46112b24b0838b7888fc66f
---

f52ed5fd613804a7d66585d6ffb986c90e20403b
diff --cc manifest
index 7b86302386,6bd9ed83f1..522504c0c9
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\s-q/--quiet\soption\sto\stest/speedtest.tcl.\s\sAutomatically\senable\n-DSQLITE_OMIT_LOAD_EXTENSION\sand\s-DSQLITE_THREADSAFE=0\sso\sthat\sno\sextra\nlibraries\sare\srequired.
- D 2025-01-22T17:18:53.134
 -C Explain\sthe\slack\sof\sdocs\sin\sautoconf/Makefile.in\sand\srefer\sinterested\sreaders\sto\smain.mk\sin\scanonical\stree.\sMinor\scleanups\sand\sfixes\sin\stool/mkautoconfamal.sh.
 -D 2025-01-21T15:45:03.498
++C Replace\sthe\suse\sof\sthe\sAutools\sin\s./autoconf/\swith\sAutosetup\sand\sextend\sits\sconfigure\sscript\sto\sinclude\smany\sof\sthe\sflags\savailable\sin\sthe\scanonical\sbuild.
++D 2025-01-22T21:34:53.714
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -14,14 -14,13 +14,13 @@@ F art/sqlite370.eps aa97a671332b432a54e
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
  F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
  F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531
- F auto.def 056352c70a74a82929bdb5aaef65b38d44e4b912a8c7ebcb0a7d87fa1fd7c185
- F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
- F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
+ F auto.def 7833c0a8630dd3a3410dcc6c8b4d1b63f25d03d6497267624b8a37aba119cb3e
  F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
 -F autoconf/Makefile.in 56697ad25ecf23afa317148b06bdc14f85960b42e5ec434ac1ba87f63a3cb789
++F autoconf/Makefile.in 56697ad25ecf23afa317148b06bdc14f85960b42e5ec434ac1ba87f63a3cb789 w autoconf/Makefile.am
  F autoconf/Makefile.msc ffff61fe851443015ddb6600ab69a9df503cfec25459b336be7ba8c9a9e473f8
- F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
- F autoconf/README.txt 5e946ffb6fbdbb114c81e1bdc862df27fce8beab557d7b0421820b0fe8fc048f
- F autoconf/configure.ac ec7fa914c5e74ff212fe879f9bb6918e1234497e05facfb641f30c4d5893b277
+ F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136
+ F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288
+ F autoconf/auto.def 623e0d2339cbccc86b1c5e58d65702dc91a9fec4843a4c6198139e248579858e
  F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e
  F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3
  F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43
@@@ -2143,7 -2142,7 +2142,7 @@@ F tool/logest.c c34e5944318415de513d29a
  F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
  F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176
  F tool/mkamalzip.tcl 8aa5ebe7973c8b8774062d34e15fea9815c4cc2ceea3a9b184695f005910876a
- F tool/mkautoconfamal.sh 4fbfd523330c8cf12ead8f0e0acdb3c5c9c08a1bcb293119267aeaa3e0bbe3e1
 -F tool/mkautoconfamal.sh 67e14ee5d0c6d8e83bca19807c4761ab3a22e14c8bf5f3bdc56989674770c25e
++F tool/mkautoconfamal.sh 14d2144043c6455958012f92324f4ce7c90a261b5daa2f2c7509498468475f8d
  F tool/mkccode.tcl 210159febe0ef0ecbc53c79833500663ceaba0115b2b374405818dc835b5f84b x
  F tool/mkctimec.tcl ef6a67ec82e5b6fc19152a4c79f237227b18bf67ff16d155bac7adb94355d9cf x
  F tool/mkkeywordhash.c 6b0be901c47f9ad42215fc995eb2f4384ac49213b1fba395102ec3e999acf559
@@@ -2208,8 -2207,8 +2207,9 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P afb0a5923a6db4045fab5226198aab970d746d4866294ebba943c6986e97ecde
- R 9d6f6255d4d3d13ac3e7250fb9209015
- U drh
- Z 359fbb7e57428de2830f61ee25224064
 -P 646667af8ca2140d823facf4578105c3d9815ea34b2a4cb96103c2fe7d718229
 -R 9bbf87fd9926eb3023e4de6818e02af4
++P c20d21b473d8a45267262c5df1d7b102eccce8e4cfbe1e467ea66c474aea0af5 e5bbc2428f1000a451c1b4afd287742b9896a1a6c82d9706c6b8e7d6fb3b1e44
++R 2375827128bc5d50768932667a2d6889
++T +closed e5bbc2428f1000a451c1b4afd287742b9896a1a6c82d9706c6b8e7d6fb3b1e44 Closed\sby\sintegrate-merge.
+ U stephan
 -Z c74dae274099c477daebfdd70dd618de
++Z b7887b7452fd09e55e3fce7da3a1b70f
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index ad960cacc6,0adcfc52ad..02ec10f1aa
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c20d21b473d8a45267262c5df1d7b102eccce8e4cfbe1e467ea66c474aea0af5
 -e5bbc2428f1000a451c1b4afd287742b9896a1a6c82d9706c6b8e7d6fb3b1e44
++8c60d4c901af716d4d4dfd1dd4aa626c758fac2cb46112b24b0838b7888fc66f
diff --cc tool/mkautoconfamal.sh
index f3ce9dd5ba,0771d5bf84..c26ca47bf1
--- a/tool/mkautoconfamal.sh
+++ b/tool/mkautoconfamal.sh
@@@ -63,32 -65,29 +65,33 @@@ cp $TOP/sqlite3.pc.in     $TMPSPAC
  cp shell.c                $TMPSPACE
  cp $TOP/src/sqlite3.rc    $TMPSPACE
  cp $TOP/tool/Replace.cs   $TMPSPACE
+ cp $TOP/VERSION           $TMPSPACE
+ cp $TOP/main.mk           $TMPSPACE
  
- cat $TMPSPACE/configure.ac |
- sed "s/--SQLITE-VERSION--/$VERSION/" > $TMPSPACE/tmp
- mv $TMPSPACE/tmp $TMPSPACE/configure.ac
+ cd $TMPSPACE
  
- cat $TMPSPACE/sqlite3.pc.in |
- sed "s/^Libs.private:.*/Libs.private: @LIBS@/" > $TMPSPACE/tmp
- mv $TMPSPACE/tmp $TMPSPACE/sqlite3.pc.in
++# Clean up emacs-generated backup files from the target
++rm -f ./autosetup/*~
++rm -f ./*~
 +
- cd $TMPSPACE
- autoreconf -i
- #libtoolize
- #aclocal
- #autoconf
- #automake --add-missing
+ #if true; then
+   # Clean up *~ files (emacs-generated backups).
+   # This bit is only for use during development of
+   # the autoconf bundle.
+ #  find . -name '*~' -exec rm \{} \;
+ #fi
  
  mkdir -p tea/generic
- echo "#ifdef USE_SYSTEM_SQLITE"      > tea/generic/tclsqlite3.c 
- echo "# include <sqlite3.h>"        >> tea/generic/tclsqlite3.c
- echo "#else"                        >> tea/generic/tclsqlite3.c
- echo "#include \"sqlite3.c\""       >> tea/generic/tclsqlite3.c
- echo "#endif"                       >> tea/generic/tclsqlite3.c
+ cat <<EOF > tea/generic/tclsqlite3.c
+ #ifdef USE_SYSTEM_SQLITE
+ # include <sqlite3.h>
+ #else
+ # include "sqlite3.c"
+ #endif
+ EOF
  cat  $TOP/src/tclsqlite.c           >> tea/generic/tclsqlite3.c
  
- cat tea/configure.ac | 
-   sed "s/AC_INIT(\[sqlite\], .*)/AC_INIT([sqlite], [$VERSION])/" > tmp
+ sed "s/AC_INIT(\[sqlite\], .*)/AC_INIT([sqlite], [$VERSION])/" tea/configure.ac > tmp
  mv tmp tea/configure.ac
  
  cd tea