Changeset 15814 for gsdl/trunk/packages/configure

Timestamp:

2008-05-30T11:05:24+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Now only configures SQLite if --enable-sqlite has been specified.

File:

• gsdl/trunk/packages/configure (modified) (3 diffs)

gsdl/trunk/packages/configure

@@ -22 +22 @@
 ENVIRONMENT=""
 
-USE_CORBA=false
-MICO_DIR=default
+# SQLite support disabled by default, switch it on with --enable-sqlite
+USE_SQLITE=false
 # yaz compilation enabled by default, can switch it off with --disable-yaz
 USE_YAZ=true
 # z3950 server disabled by default, switch it on with --enable-z3950
 USE_Z3950=false
+# CORBA support disabled by default, switch it on with --enable-corba
+USE_CORBA=false
+MICO_DIR=default
 
 # parse any arguments given from toplevel configure
@@ -46 +49 @@
         fi
         ;;
+    --enable-sqlite)
+        USE_SQLITE=true
+        ;;
+    --disable-yaz)
+        USE_YAZ=false
+        ;;
     --enable-z3950)
         USE_Z3950=true
-        ;;
-    --disable-yaz)
-        USE_YAZ=false
         ;;
     --enable-corba)
@@ -269 +275 @@
 echo ""
 echo "Configuring SQLite"
-echo ""
-cd "$PACKAGES/sqlite"
-gzip -dc sqlite-amalgamation-3.5.9.tar.gz | tar -xf -
-cd "$PACKAGES/sqlite/sqlite-amalgamation-3.5.9" && \
-./configure $CACHE_FILE --prefix="$PACKAGES/sqlite" --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT
+if test x$USE_SQLITE = xtrue ; 
+then
+  echo ""
+  cd "$PACKAGES/sqlite"
+  gzip -dc sqlite-amalgamation-3.5.9.tar.gz | tar -xf -
+  cd sqlite-amalgamation-3.5.9 && \
+    ./configure $CACHE_FILE --prefix="$PACKAGES/sqlite" --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT
+else
+  echo "SQLite support disabled."
+  echo "  add '--enable-sqlite' to the configure command to include SQLite support."
+  echo ""
+fi