Changeset 24075

Timestamp:

2011-05-20T16:53:27+12:00 (13 years ago)

Author:

davidb

Message:

Updating SQLite to a more recent release (May 2011) supporting casting operations (used in our numeric searching)

Location:

main/trunk/greenstone2/common-src

Files:

• packages/Makefile.in (modified) (1 diff)
• packages/configure (modified) (2 diffs)
• packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz (deleted)
• packages/sqlite/sqlite-autoconf-3070602.tar.gz (added)
• win32.mak (modified) (1 diff)

main/trunk/greenstone2/common-src/packages/Makefile.in

@@ -45 +45 @@
 USE_SQLITE=@USE_SQLITE@
 ifeq ($(USE_SQLITE), 1)
-SQLITE_DIR = sqlite/sqlite-amalgamation-3.6.23.1
+SQLITE_DIR = sqlite/sqlite-autoconf-3070602
 SQLITE_DEFINES = -DUSE_SQLITE
 else

main/trunk/greenstone2/common-src/packages/configure

@@ -310 +310 @@
   echo ""
   cd "$PACKAGES/sqlite"
-  if test ! -d sqlite-amalgamation-3.6.23.1 ;
+  if test ! -d sqlite-autoconf-3070602 ;
   then 
-    gzip -dc sqlite-amalgamation-3.6.23.1.tar.gz | tar -xf -
+    gzip -dc sqlite-autoconf-3070602.tar.gz | tar -xf -
   fi
 
@@ -323 +323 @@
   echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --prefix="$PACKAGES/sqlite" --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT
 
-  cd "$PACKAGES/sqlite/sqlite-amalgamation-3.6.23.1" && \
+  cd "$PACKAGES/sqlite/sqlite-autoconf-3070602" && \
   CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --prefix="$PACKAGES/sqlite" --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT
 else

main/trunk/greenstone2/common-src/win32.mak

@@ -60 +60 @@
 
 EXPAT_DIR = packages\expat\expat-1.95.8
-SQLITE_DIR = packages\sqlite\sqlite-amalgamation-3.6.23.1
+SQLITE_DIR = packages\sqlite\sqlite-autoconf-3070602
 JDBM_DIR = packages\jdbm
 JDBMEDIT_DIR = src\jdbmedit