From: xdong <xdong@noemail.net>
Date: Tue, 23 Sep 2003 00:36:50 +0000 (+0000)
Subject: allow -enable-releasemode as an option and allow Makefile to produce version
X-Git-Tag: version-3.6.10~4967
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b5543c46dd5b25a22e7519aa9d379f47b3f5a58;p=thirdparty%2Fsqlite.git

allow -enable-releasemode as an option and allow Makefile to produce version
independent binary like libsqlite-2.8.6.so instead of libsqlite.so.0.0.0 (CVS 1101)

FossilOrigin-Name: 4fdd44a5ee5f7beb3cff11bc54fd3022b975b9e6
---

diff --git a/Makefile.in b/Makefile.in
index 9c8f475185..4c3e8e7784 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -34,6 +34,7 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@
 LIBTOOL = ./libtool
+RELEASE = @ALLOWRELEASE@
 
 # Compiler options needed for programs that use the TCL library.
 #
@@ -174,7 +175,7 @@ last_change:	$(SRC)
           | awk '{print $$5,$$6}' >last_change
 
 libsqlite.la:	$(LIBOBJ)
-	$(LIBTOOL) $(TCC) -o libsqlite.la $(LIBOBJ) -rpath $(exec_prefix)/lib \
+	$(LIBTOOL) $(TCC) -o libsqlite.la $(LIBOBJ) ${RELEASE} -rpath $(exec_prefix)/lib \
 		-version-info "8:6:8"
 
 libtclsqlite.la:	tclsqlite.lo libsqlite.la
diff --git a/configure.ac b/configure.ac
index 1ba578f6bf..3dc07852e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,7 +138,7 @@ AC_INIT(src/sqlite.h.in)
 dnl Put the RCS revision string after AC_INIT so that it will also
 dnl show in in configure.
 # The following RCS revision string applies to configure.in
-# $Revision: 1.5 $
+# $Revision: 1.6 $
 
 #########
 # Programs needed
@@ -320,6 +320,21 @@ else
 fi
 AC_SUBST(ALLOWATTACHMEM)
 
+##########
+# Do we want to support release
+#
+AC_ARG_ENABLE(releasemode, 
+[  --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=""
+  AC_MSG_RESULT([no])
+else
+  ALLOWRELEASE="-release `cat VERSION`"
+  AC_MSG_RESULT([yes])
+fi
+AC_SUBST(ALLOWRELEASE)
+
 ##########
 # Do we want temporary databases in memory
 #
diff --git a/manifest b/manifest
index e287fd3f23..e3bd7591e8 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
-C regenerate\sconfigure\sto\stake\s-enalbe-releasemode\sas\san\soption\s(CVS\s1100)
-D 2003-09-23T00:35:21
-F Makefile.in 0cf2ffb6dc35694895e0dac488bc1259b6a4eb90
+C allow\s-enable-releasemode\sas\san\soption\sand\sallow\sMakefile\sto\sproduce\sversion\nindependent\sbinary\slike\slibsqlite-2.8.6.so\sinstead\sof\slibsqlite.so.0.0.0\s(CVS\s1101)
+D 2003-09-23T00:36:50
+F Makefile.in ab585a91e34bc33928a1b6181fa2f6ebd4fb17e1
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
 F VERSION 97d209249f825001288ff942df07b48e1083af5c
@@ -10,7 +10,7 @@ F art/SQLite.gif 1bbb94484963f1382e27e1c5e86dd0c1061eba2b
 F config.guess 831db445a8ae31d1f773fce85e14c16c8677417d
 F config.sub 975368989965310238930ecf8e7f06a23061dbb1
 F configure a79b01eab6acd5e45f08a84b187c435d7d76e256 x
-F configure.ac 3c199bb4d54c6aa8501dcc84facb50bebfefeaad
+F configure.ac 85202fbe47e3d308406090d0016af2a4f6c5b9e6
 F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
@@ -173,7 +173,7 @@ F www/speed.tcl 2f6b1155b99d39adb185f900456d1d592c4832b3
 F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
-P 760f2fa2e5db102b970687f59b79bfb6f4d35b32
-R 9dcd523e3ea360fe30244e5007157ba8
+P b85847b8f28f8f4be9e7f3d8674ecf42e1c5db38
+R e1c1aae069ec958caa9969a82d5e8e98
 U xdong
-Z 0e700a84a79fd07ab1abefa3149913a2
+Z 34c69a53636ef0b13df9e88f8bafbccc
diff --git a/manifest.uuid b/manifest.uuid
index bd06f336bc..cef4837d23 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b85847b8f28f8f4be9e7f3d8674ecf42e1c5db38
\ No newline at end of file
+4fdd44a5ee5f7beb3cff11bc54fd3022b975b9e6
\ No newline at end of file