Changeset 21538

Show
Ignore:
Timestamp:
19.01.2010 16:34:42 (9 years ago)
Author:
mdewsnip
Message:

Added stuff for unpacking, configuring and compiling Expat (when Lucene is enabled).

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

Legend:

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

    r21532 r21538  
    2626 
    2727 
     28# Option: Lucene support 
     29if ENABLE_LUCENE 
     30  LUCENE_SUBDIRS = packages/expat 
     31endif 
     32 
    2833# Option: SQLite support 
    2934if USE_SQLITE 
     
    3136endif 
    3237 
    33 SUBDIRS = $(SQLITE_SUBDIRS) src/lib 
     38SUBDIRS = $(LUCENE_SUBDIRS) $(SQLITE_SUBDIRS) src/lib 
  • main/trunk/gs2-core/common-src/Makefile.in

    r21534 r21538  
    8686ETAGS = etags 
    8787CTAGS = ctags 
    88 DIST_SUBDIRS = packages/sqlite src/lib 
     88DIST_SUBDIRS = packages/expat packages/sqlite src/lib 
    8989DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 
    9090distdir = $(PACKAGE)-$(VERSION) 
     
    183183target_alias = @target_alias@ 
    184184 
     185# Option: Lucene support 
     186@ENABLE_LUCENE_TRUE@LUCENE_SUBDIRS = packages/expat 
     187 
    185188# Option: SQLite support 
    186189@USE_SQLITE_TRUE@SQLITE_SUBDIRS = packages/sqlite 
    187 SUBDIRS = $(SQLITE_SUBDIRS) src/lib 
     190SUBDIRS = $(LUCENE_SUBDIRS) $(SQLITE_SUBDIRS) src/lib 
    188191all: config.h 
    189192    $(MAKE) $(AM_MAKEFLAGS) all-recursive 
  • main/trunk/gs2-core/common-src/configure

    r21534 r21538  
    26832683_ACEOF 
    26842684 
     2685 
     2686  # Unpack Expat (if it hasn't already been done) 
     2687  if test ! -d "packages/expat/expat-1.95.8"; then 
     2688    cd packages/expat 
     2689    gzip -dc expat-1.95.8.tar.gz | tar -xf - 
     2690    cd ../.. 
     2691  fi 
     2692 
     2693  # Configure Expat manually 
     2694  cd packages/expat/expat-1.95.8 
     2695  ./configure --prefix=`pwd`/.. 
     2696  cd ../../.. 
    26852697fi 
    26862698 
  • main/trunk/gs2-core/common-src/configure.ac

    r21534 r21538  
    5757if test "x$enable_lucene" != xno; then 
    5858  AC_DEFINE(ENABLE_LUCENE, 1, [Lucene support]) 
     59 
     60  # Unpack Expat (if it hasn't already been done) 
     61  if test ! -d "packages/expat/expat-1.95.8"; then 
     62    cd packages/expat 
     63    gzip -dc expat-1.95.8.tar.gz | tar -xf - 
     64    cd ../.. 
     65  fi 
     66 
     67  # Configure Expat manually 
     68  cd packages/expat/expat-1.95.8 
     69  ./configure --prefix=`pwd`/.. 
     70  cd ../../.. 
    5971fi 
    6072AM_CONDITIONAL(ENABLE_LUCENE, test "x$enable_lucene" != xno)