Tweak the amalgamation autoconf files so that the --disable-static-shell option works...

FossilOrigin-Name: 83efcdebfa255cd0663ecc6b74eb99183e2f3a10

diff --git a/autoconf/Makefile.am b/autoconf/Makefile.am
index 7b6934addeb08ab4c04d5e4f057c87c98d84a2f9..cca23ba67d7199c3e95e1e764678c28fb08c5a27 100644 (file)
--- a/autoconf/Makefile.am
+++ b/autoconf/Makefile.am
@@ -6,8 +6,9 @@ libsqlite3_la_SOURCES = sqlite3.c
 libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
 
 bin_PROGRAMS = sqlite3
-sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h
-sqlite3_LDADD = @READLINE_LIBS@
+sqlite3_SOURCES = shell.c sqlite3.h
+EXTRA_sqlite3_SOURCES = sqlite3.c
+sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
 sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
 sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
 

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 9492530680a166774fe0848cd5db830e8bfd05fd..f86a39c37b5a20113404c5a7cbdef9d0ac8657ce 100644 (file)
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -130,7 +130,7 @@ AC_ARG_ENABLE(static-shell, [AS_HELP_STRING(
   [statically link libsqlite3 into shell tool [default=yes]])], 
   [], [enable_static_shell=yes])
 if test x"$enable_static_shell" == "xyes"; then
-  EXTRA_SHELL_OBJ=sqlite3.$OBJEXT
+  EXTRA_SHELL_OBJ=sqlite3-sqlite3.$OBJEXT
 else
   EXTRA_SHELL_OBJ=libsqlite3.la
 fi

diff --git a/manifest b/manifest
index b0746bb445b31a9d11af35952d37a93cf0cd8c62..5e5214e2d207c3103b50c02a96317da1b2b1b79f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sspellfix1_scriptcode()\sto\soutput\s215\s(latin)\sfor\spure\snumeric\stext.
-D 2016-03-11T14:30:18.667
+C Tweak\sthe\samalgamation\sautoconf\sfiles\sso\sthat\sthe\s--disable-static-shell\soption\sworks\sagain.
+D 2016-03-11T15:25:13.462
 F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@ -10,11 +10,11 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
-F autoconf/Makefile.am 4b8bd7896fffb6b22a57747f1f98cba1da9108ae
+F autoconf/Makefile.am 42f7eb1fb2b06ddd6c6adab3e4388cc0a237ba40
 F autoconf/Makefile.msc b8ada5177e6f39c126a88295af5ad0255e08d280
 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
 F autoconf/README.txt 4f04b0819303aabaa35fff5f7b257fb0c1ef95f1
-F autoconf/configure.ac 72a5e42beb090b32bca580285dc0ab3c4670adb8
+F autoconf/configure.ac d807b567f73a2b0986ccdd206b782cecb4d08fff
 F autoconf/tea/Makefile.in b438a7020446c8a8156e8d97c8914a04833da6fd
 F autoconf/tea/README 3e9a3c060f29a44344ab50aec506f4db903fb873
 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43
@@ -1455,7 +1455,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d7c20f04e69fb1848b2e2f3b04fbd56e06c7c854
-R 6aa12144d3c644bf9edbd83316218d69
-U drh
-Z c13ed9f7b14004f5942c430b85f3af01
+P df44308b862e932ff0ad25b6328d13be22047b96
+R 19b1fa38a58d00a667be85fd411c2202
+U dan
+Z bd858a2f3f6240bb0acfbf97ee308bf8

diff --git a/manifest.uuid b/manifest.uuid
index 12423c25d8c4e8ee2fa3d775a8cfee9b50ae8a4f..d06900f0e616e05818a005221efd59e0c4c96fa4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-df44308b862e932ff0ad25b6328d13be22047b96
\ No newline at end of file
+83efcdebfa255cd0663ecc6b74eb99183e2f3a10
\ No newline at end of file