Changeset 21538 for main/trunk/gs2-core

Timestamp:

2010-01-19T16:34:42+13:00 (14 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:

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

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

@@ -26 +26 @@
 
 
+# Option: Lucene support
+if ENABLE_LUCENE
+  LUCENE_SUBDIRS = packages/expat
+endif
+
 # Option: SQLite support
 if USE_SQLITE
@@ -31 +36 @@
 endif
 
-SUBDIRS = $(SQLITE_SUBDIRS) src/lib
+SUBDIRS = $(LUCENE_SUBDIRS) $(SQLITE_SUBDIRS) src/lib

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

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

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

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

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

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