Changeset 23800 for main/trunk/greenstone2/build-src/packages/configure

Timestamp:

2011-03-22T21:33:42+13:00 (13 years ago)

Author:

ak19

Message:

Added enable/disable-wvware flag to affected configure and Makefiles files in build-src, build-src/packages and top-level GS2, so we can turn off wvware compiling (such as for 64 bit Mac OS Snow Leopard Update 3 machines - MacOS 10.6.3 and over). By default wvware compilation is enabled.

File:

• main/trunk/greenstone2/build-src/packages/configure (modified) (3 diffs)

main/trunk/greenstone2/build-src/packages/configure

@@ -22 +22 @@
 ENVIRONMENT=""
 
+# WVWARE compilation enabled by default, can switch it off with --disable-wvware
+USE_WVWARE=true
 # GDBM compilation enabled by default, can switch it off with --disable-gdbm
 USE_GDBM=true
@@ -52 +54 @@
         CACHE_FILE="--cache-file=$cache_file"
         fi
+        ;;
+    --disable-wvware)
+        USE_WVWARE=false
         ;;
     --disable-gdbm)
@@ -135 +140 @@
 echo ""
 
-cd "$PACKAGES/wv"
-gzip -dc wv-1.2.4-gs.tar.gz | tar -xf -
-# datadir is for default location of wvHtml.xml config file
-cd wv-gs && \
-./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir="$bindir" --libdir="$libdir" --datadir="$prefix/etc/packages" $HOSTTARGETFLAGS
+# datadir flag is for default location of wvHtml.xml config file
+if test x$USE_WVWARE = xtrue ; 
+then
+  cd "$PACKAGES/wv"
+  gzip -dc wv-1.2.4-gs.tar.gz | tar -xf -  
+  cd wv-gs && \
+  ./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir="$bindir" --libdir="$libdir" --datadir="$prefix/etc/packages" $HOSTTARGETFLAGS
+else
+  echo "wvWare support disabled."
+  echo "  add '--enable-wvware' to the configure command to include wvWare support."
+  echo ""
+fi
 
 # configure the pdftohtml converter