Changeset 21538 for main/trunk
- Timestamp:
- 2010-01-19T16:34:42+13:00 (14 years ago)
- Location:
- main/trunk/gs2-core/common-src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/gs2-core/common-src/Makefile.am
r21532 r21538 26 26 27 27 28 # Option: Lucene support 29 if ENABLE_LUCENE 30 LUCENE_SUBDIRS = packages/expat 31 endif 32 28 33 # Option: SQLite support 29 34 if USE_SQLITE … … 31 36 endif 32 37 33 SUBDIRS = $( SQLITE_SUBDIRS) src/lib38 SUBDIRS = $(LUCENE_SUBDIRS) $(SQLITE_SUBDIRS) src/lib -
main/trunk/gs2-core/common-src/Makefile.in
r21534 r21538 86 86 ETAGS = etags 87 87 CTAGS = ctags 88 DIST_SUBDIRS = packages/ sqlite src/lib88 DIST_SUBDIRS = packages/expat packages/sqlite src/lib 89 89 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 90 90 distdir = $(PACKAGE)-$(VERSION) … … 183 183 target_alias = @target_alias@ 184 184 185 # Option: Lucene support 186 @ENABLE_LUCENE_TRUE@LUCENE_SUBDIRS = packages/expat 187 185 188 # Option: SQLite support 186 189 @USE_SQLITE_TRUE@SQLITE_SUBDIRS = packages/sqlite 187 SUBDIRS = $( SQLITE_SUBDIRS) src/lib190 SUBDIRS = $(LUCENE_SUBDIRS) $(SQLITE_SUBDIRS) src/lib 188 191 all: config.h 189 192 $(MAKE) $(AM_MAKEFLAGS) all-recursive -
main/trunk/gs2-core/common-src/configure
r21534 r21538 2683 2683 _ACEOF 2684 2684 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 ../../.. 2685 2697 fi 2686 2698 -
main/trunk/gs2-core/common-src/configure.ac
r21534 r21538 57 57 if test "x$enable_lucene" != xno; then 58 58 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 ../../.. 59 71 fi 60 72 AM_CONDITIONAL(ENABLE_LUCENE, test "x$enable_lucene" != xno)
Note:
See TracChangeset
for help on using the changeset viewer.