sqlite: turn back tcl support as multiversion spell option (tea)

(cherry picked from commit b114979bfcc77f22b35974d2bb314d64dc233470)

9 files changed, 35 insertions, 13 deletions

diff --git a/database/sqlite/BUILD b/database/sqlite/BUILD
index 54afa66a7a..42369d8cd3 100755
--- a/database/sqlite/BUILD
+++ b/database/sqlite/BUILD
@@ -8,6 +8,10 @@ fi &&
 
 LDFLAGS="-ldl $LDFLAGS" &&
 CFLAGS="${CFLAGS//-ffast-math}" &&
-OPTS="--enable-dynamic-extensions $SQLITE_TSAFE $OPTS" &&
+OPTS="$SQLITE_TSAFE $OPTS" &&
+
+if [[ $SQLITE_VERSION != tea ]]; then
+  OPTS="--enable-dynamic-extensions $OPTS"
+fi &&
 
 default_build
diff --git a/database/sqlite/DEPENDS b/database/sqlite/DEPENDS
index e0938a8e8f..51ae5723db 100755
--- a/database/sqlite/DEPENDS
+++ b/database/sqlite/DEPENDS
@@ -1,5 +1,9 @@
 depends g++ &&
 
+if [[ $SQLITE_VERSION == tea ]]; then
+  depends tcl "--enable-tcl"
+fi &&
+
 optional_depends readline \
                  "--enable-readline" \
                  "--disable-readline" \
diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index 95392fb9d6..94518d3593 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -1,9 +1,13 @@
            SPELL=sqlite
          VERSION=3.7.5
         VERSIONX=3070500
+if [[ $SQLITE_VERSION == tea ]]; then
+     SOURCE_HASH=sha512:69df969dc1e768fc938ac69b1fd548928bd235de1bf8664849ecefb39ed9dcc84aeeacb7d7565af5d24c0b9f660d0cb242b284378aa6039ffc1535e0d68dd033
+else
      SOURCE_HASH=sha512:5ad681f99e75849a5ca6f439c7a19bb51abc73d121b50f4f8e4c0da42891950f30407f761a53f0fe51b370b1dbd4c4f5a480557cb2444c8c7c7d5412b328a474
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-autoconf-$VERSIONX"
-          SOURCE=$SPELL-autoconf-$VERSIONX.tar.gz
+fi
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${SQLITE_VERSION}-$VERSIONX"
+          SOURCE=$SPELL-${SQLITE_VERSION}-$VERSIONX.tar.gz
    SOURCE_URL[0]=http://sqlite.org/$SOURCE
       LICENSE[0]=PD
         WEB_SITE=http://www.sqlite.org/
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 6dc9328574..b3bf06ada7 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,12 @@
+2011-02-02 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: added tea version
+	* PREPARE: added, to use tea version
+	* DEPENDS: readded tcl dependency
+	* BUILD: --enable-dynamic-extensions is allowed only in non-tea version
+	* SUB_DEPENDS: corrected selection of tea version
+	* {REPAIR^all^,}PRE_SUB_DEPENDS: use SQLITE_VERSION
+	* REPAIR^none^PRE_SUB_DEPENDS: removed, not needed anymore
+
 2011-02-01 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 3.7.5
 	* DEPENDS: there's no more tcl extension for sqlite
diff --git a/database/sqlite/PREPARE b/database/sqlite/PREPARE
new file mode 100755
index 0000000000..a4055cb4d7
--- /dev/null
+++ b/database/sqlite/PREPARE
@@ -0,0 +1,5 @@
+message "Autoconf is generic, TEA is Tcl Extension Architecture" &&
+
+config_query_list SQLITE_VERSION "What version do you want to use?" \
+                                 autoconf \
+                                 tea
diff --git a/database/sqlite/PRE_SUB_DEPENDS b/database/sqlite/PRE_SUB_DEPENDS
index 637246f719..76eff710a3 100755
--- a/database/sqlite/PRE_SUB_DEPENDS
+++ b/database/sqlite/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
 case $THIS_SUB_DEPENDS in
-       TCL) is_depends_enabled $SPELL tcl  ;;
+       TCL) [[ $SQLITE_VERSION == tea ]] ;;
      TSAFE) if [[ $SQLITE_TSAFE != "--enable-threadsafe" ]]; then return 1; fi ;;
 SECURE_DELETE) if [[ $SQLITE_SECURE_DELETE != "y" ]]; then return 1; fi ;;
          *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
diff --git a/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS b/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
index 637246f719..76eff710a3 100755
--- a/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
+++ b/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
 case $THIS_SUB_DEPENDS in
-       TCL) is_depends_enabled $SPELL tcl  ;;
+       TCL) [[ $SQLITE_VERSION == tea ]] ;;
      TSAFE) if [[ $SQLITE_TSAFE != "--enable-threadsafe" ]]; then return 1; fi ;;
 SECURE_DELETE) if [[ $SQLITE_SECURE_DELETE != "y" ]]; then return 1; fi ;;
          *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
diff --git a/database/sqlite/REPAIR^none^PRE_SUB_DEPENDS b/database/sqlite/REPAIR^none^PRE_SUB_DEPENDS
deleted file mode 100755
index e3a282ac9d..0000000000
--- a/database/sqlite/REPAIR^none^PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-case $THIS_SUB_DEPENDS in
-       TCL) is_depends_enabled $SPELL tcl  ;;
-         *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
-   return 1;;
-esac
diff --git a/database/sqlite/SUB_DEPENDS b/database/sqlite/SUB_DEPENDS
index 934f82a843..a28e3ec79b 100755
--- a/database/sqlite/SUB_DEPENDS
+++ b/database/sqlite/SUB_DEPENDS
@@ -1,6 +1,8 @@
 case $THIS_SUB_DEPENDS in
-        TCL) message "TCL support requested forcing TCL dependency" &&
-             depends tcl "--enable-tcl"  ;;
+        TCL) if [[ $SQLITE_VERSION != tea ]]; then
+               message "Requested TEA version of $SPELL, forcing tcl dependency" &&
+               SQLITE_VERSION=tea
+             fi ;;
       TSAFE) message "Thread support requested, forcing it" &&
              SQLITE_TSAFE="--enable-threadsafe" ;;
 SECURE_DELETE) message "SECURE_DELETE requested, forcing it" &&
@@ -8,4 +10,3 @@ SECURE_DELETE) message "SECURE_DELETE requested, forcing it" &&
           *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
    return 1;;
 esac
-