Changeset 21532

Timestamp:

2010-01-19T15:38:38+13:00 (14 years ago)

Author:

mdewsnip

Message:

Added stuff for unpacking, configuring and compiling the SQLite package.

Location:

main/trunk/gs2-core/common-src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• configure (modified) (1 diff)
• configure.ac (modified) (1 diff)

main/trunk/gs2-core/common-src/Makefile.am

@@ -26 +26 @@
 
 
-SUBDIRS = src/lib
+# Option: SQLite support
+if USE_SQLITE
+  SQLITE_SUBDIRS = packages/sqlite
+endif
+
+SUBDIRS = $(SQLITE_SUBDIRS) src/lib

main/trunk/gs2-core/common-src/Makefile.in

@@ -86 +86 @@
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = packages/sqlite src/lib
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -180 +180 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SUBDIRS = src/lib
+
+# Option: SQLite support
+@USE_SQLITE_TRUE@SQLITE_SUBDIRS = packages/sqlite
+SUBDIRS = $(SQLITE_SUBDIRS) src/lib
 all: config.h
     $(MAKE) $(AM_MAKEFLAGS) all-recursive

main/trunk/gs2-core/common-src/configure

@@ -2682 +2682 @@
 _ACEOF
 
+
+  # Unpack SQLite (if it hasn't already been done)
+  if test ! -d "packages/sqlite/sqlite-amalgamation-3.5.9"; then
+    cd packages/sqlite
+    gzip -dc sqlite-amalgamation-3.5.9.tar.gz | tar -xf -
+    cd ../..
+  fi
+
+  # Configure SQLite manually
+  cd packages/sqlite/sqlite-amalgamation-3.5.9
+  ./configure --prefix=`pwd`/..
+  cd ../../../
 fi
 

main/trunk/gs2-core/common-src/configure.ac

@@ -57 +57 @@
 if test "x$enable_sqlite" != xno; then
   AC_DEFINE(USE_SQLITE, 1, [SQLite support])
+
+  # Unpack SQLite (if it hasn't already been done)
+  if test ! -d "packages/sqlite/sqlite-amalgamation-3.5.9"; then
+    cd packages/sqlite
+    gzip -dc sqlite-amalgamation-3.5.9.tar.gz | tar -xf -
+    cd ../..
+  fi
+
+  # Configure SQLite manually
+  cd packages/sqlite/sqlite-amalgamation-3.5.9
+  ./configure --prefix=`pwd`/..
+  cd ../../..
 fi
 AM_CONDITIONAL(USE_SQLITE, test "x$enable_sqlite" != xno)