Changeset 21532

Show
Ignore:
Timestamp:
19.01.2010 15:38:38 (9 years ago)
Author:
mdewsnip
Message:

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

Location:
main/trunk/gs2-core/common-src
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gs2-core/common-src/Makefile.am

    r21465 r21532  
    2626 
    2727 
    28 SUBDIRS = src/lib 
     28# Option: SQLite support 
     29if USE_SQLITE 
     30  SQLITE_SUBDIRS = packages/sqlite 
     31endif 
     32 
     33SUBDIRS = $(SQLITE_SUBDIRS) src/lib 
  • main/trunk/gs2-core/common-src/Makefile.in

    r21465 r21532  
    8686ETAGS = etags 
    8787CTAGS = ctags 
    88 DIST_SUBDIRS = $(SUBDIRS) 
     88DIST_SUBDIRS = packages/sqlite src/lib 
    8989DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 
    9090distdir = $(PACKAGE)-$(VERSION) 
     
    180180sysconfdir = @sysconfdir@ 
    181181target_alias = @target_alias@ 
    182 SUBDIRS = src/lib 
     182 
     183# Option: SQLite support 
     184@USE_SQLITE_TRUE@SQLITE_SUBDIRS = packages/sqlite 
     185SUBDIRS = $(SQLITE_SUBDIRS) src/lib 
    183186all: config.h 
    184187    $(MAKE) $(AM_MAKEFLAGS) all-recursive 
  • main/trunk/gs2-core/common-src/configure

    r21519 r21532  
    26822682_ACEOF 
    26832683 
     2684 
     2685  # Unpack SQLite (if it hasn't already been done) 
     2686  if test ! -d "packages/sqlite/sqlite-amalgamation-3.5.9"; then 
     2687    cd packages/sqlite 
     2688    gzip -dc sqlite-amalgamation-3.5.9.tar.gz | tar -xf - 
     2689    cd ../.. 
     2690  fi 
     2691 
     2692  # Configure SQLite manually 
     2693  cd packages/sqlite/sqlite-amalgamation-3.5.9 
     2694  ./configure --prefix=`pwd`/.. 
     2695  cd ../../../ 
    26842696fi 
    26852697 
  • main/trunk/gs2-core/common-src/configure.ac

    r21519 r21532  
    5757if test "x$enable_sqlite" != xno; then 
    5858  AC_DEFINE(USE_SQLITE, 1, [SQLite support]) 
     59 
     60  # Unpack SQLite (if it hasn't already been done) 
     61  if test ! -d "packages/sqlite/sqlite-amalgamation-3.5.9"; then 
     62    cd packages/sqlite 
     63    gzip -dc sqlite-amalgamation-3.5.9.tar.gz | tar -xf - 
     64    cd ../.. 
     65  fi 
     66 
     67  # Configure SQLite manually 
     68  cd packages/sqlite/sqlite-amalgamation-3.5.9 
     69  ./configure --prefix=`pwd`/.. 
     70  cd ../../.. 
    5971fi 
    6072AM_CONDITIONAL(USE_SQLITE, test "x$enable_sqlite" != xno)