Changeset 12494

Timestamp:

2006-08-22T14:58:18+12:00 (18 years ago)

Author:

kjdon

Message:

d2m under the control of USE_Z3950 (set by --enable-z3950), but yaz compilation now under the control of USE_YAZ (set by --disable-yaz)

File:

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

trunk/gsdl/packages/configure

@@ -19 +19 @@
 USE_CORBA=false
 MICO_DIR=default
-
+# 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
 # parse any arguments given from toplevel configure
 while test $# -ne 0; do
@@ -39 +42 @@
     --enable-z3950)
         USE_Z3950=true
+        ;;
+    --disable-yaz)
+        USE_YAZ=false
         ;;
     --enable-corba)
@@ -160 +166 @@
 
 
-# YAZ Z39.50 toolkit
-echo ""
-echo "Configuring YAZ"
+# D2M stuff needed for z3950server
+echo ""
+echo "Configuring D2M"
 if test x$USE_Z3950 = xtrue ; 
 then
+  USE_YAZ=true
+  echo ""
+  cd "$PACKAGES/d2m"
+  ./configure $CACHE_FILE --prefix="$PACKAGES/d2m" $HOSTTARGETFLAGS
+else
+  echo "Z39.50 support disabled - D2M library not required."
+  echo "  add '--enable-z3950' to the configure command to include z39.50 support."
+  echo ""
+fi
+   
+# YAZ Z39.50 toolkit
+echo ""
+echo "Configuring YAZ"
+if test x$USE_YAZ = xtrue ; 
+then
+  echo "YAZ library support enabled"
+  echo "add --disable-yaz to the configure command to disable this"
   echo ""
   cd "$PACKAGES/yaz" 
   gzip -dc yaz-2.1.4.tar.gz | tar -xf -
   cd yaz-2.1.4 && \
-    ./configure $CACHE_FILE --prefix="$PACKAGES/yaz" --with-xml2=no --with-iconv=no $HOSTTARGETFLAGS
-  cd "$PACKAGES/d2m"
-  ./configure $CACHE_FILE --prefix="$PACKAGES/d2m" $HOSTTARGETFLAGS
+    ./configure $CACHE_FILE --prefix="$PACKAGES/yaz"  $HOSTTARGETFLAGS
 else
-  echo "Z39.50 support disabled - YAZ library not required."
-  echo "  add '--enable-z3950' to the configure command to include z39.50 support."
+  echo "YAZ support disabled"
   echo ""
 fi