From: mistachkin <mistachkin@noemail.net>
Date: Thu, 6 Dec 2012 00:16:51 +0000 (+0000)
Subject: Stop using the TCL_LIBS configuration variable when linking with Tcl.  Remove superfl... 
X-Git-Tag: version-3.7.15~16^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2FnoTclLibs;p=thirdparty%2Fsqlite.git

Stop using the TCL_LIBS configuration variable when linking with Tcl.  Remove superfluous 'rm' command.

FossilOrigin-Name: e1feab9834fe829d43ae895cc575ad269a36668c
---

diff --git a/Makefile.in b/Makefile.in
index f078cb68b4..8d9d3c9694 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -45,7 +45,7 @@ TCC += @TCL_INCLUDE_SPEC@
 
 # The library that programs using TCL must link against.
 #
-LIBTCL = @TCL_LIB_SPEC@ @TCL_LIBS@
+LIBTCL = @TCL_LIB_SPEC@
 
 # Compiler options needed for programs that use the readline() library.
 #
@@ -935,7 +935,6 @@ clean:
 	rm -rf .libs .deps
 	rm -f lemon$(BEXE) lempar.c parse.* sqlite*.tar.gz
 	rm -f mkkeywordhash$(BEXE) keywordhash.h
-	rm -f $(PUBLISH)
 	rm -f *.da *.bb *.bbg gmon.out
 	rm -rf quota2a quota2b quota2c
 	rm -rf tsrc .target_source
diff --git a/configure b/configure
index 0986b63667..badc9da34e 100755
--- a/configure
+++ b/configure
@@ -879,7 +879,6 @@ TARGET_EXEEXT
 TCL_VERSION
 TCL_BIN_DIR
 TCL_SRC_DIR
-TCL_LIBS
 TCL_INCLUDE_SPEC
 TCL_LIB_FILE
 TCL_LIB_FLAG
diff --git a/configure.ac b/configure.ac
index 882c3ccf92..4a7043ede1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -501,7 +501,6 @@ if test "${use_tcl}" = "yes" ; then
     AC_SUBST(TCL_VERSION)
     AC_SUBST(TCL_BIN_DIR)
     AC_SUBST(TCL_SRC_DIR)
-    AC_SUBST(TCL_LIBS)
     AC_SUBST(TCL_INCLUDE_SPEC)
     
     AC_SUBST(TCL_LIB_FILE)
diff --git a/manifest b/manifest
index 8fb7fa65fa..ef40548d0c 100644
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Disable\sa\scouple\sof\stests\sin\swhere.test\swhen\srunning\sthe\s"no_optimization"\spermutation.
-D 2012-12-05T19:04:32.951
+C Stop\susing\sthe\sTCL_LIBS\sconfiguration\svariable\swhen\slinking\swith\sTcl.\s\sRemove\ssuperfluous\s'rm'\scommand.
+D 2012-12-06T00:16:51.996
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in 82c41c0ed4cc94dd3cc7d498575b84c57c2c2384
+F Makefile.in 690d441a758cbffd13e814dc2724a721a6ebd400
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 F Makefile.msc 911b8188f5d67801035a113e063c3023a617525d
 F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
@@ -15,8 +15,8 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
 F config.h.in 0921066a13130082764ab4ab6456f7b5bebe56de
 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
-F configure 4907207e1627a394e8892cce8dcc8068fbe5f7cd x
-F configure.ac 6e909664785b8184db2179013cd9d574f96ca3a3
+F configure 252992f6588107ebd5d17c956d90cf7484580c6f x
+F configure.ac 81c43d151d0b0e406be056394cc9ff4cb3fd0444
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html 334dbf6621b8fb8790297ec1abf3cfa4621709d1
 F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
@@ -1025,7 +1025,10 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 51cbddd51d02bcd954be411ecc83556c049a2680
-R 004544aa2f154dd2f5140bcbbf89a0db
-U dan
-Z 47907e9189566266b1668203df85c209
+P 5e961e37c5357776bcb44c473cb5ee4b59561f07
+R c93349168a8ba9f9a5a912129488c71b
+T *branch * noTclLibs
+T *sym-noTclLibs *
+T -sym-trunk *
+U mistachkin
+Z c1e70093e440f3f1851be714ee963068
diff --git a/manifest.uuid b/manifest.uuid
index cd4d199854..1a5fc2a86a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5e961e37c5357776bcb44c473cb5ee4b59561f07
\ No newline at end of file
+e1feab9834fe829d43ae895cc575ad269a36668c
\ No newline at end of file