Changeset 1715

Timestamp:

2000-11-29T14:57:41+13:00 (23 years ago)

Author:

jrm21

Message:

yaz library is now made by packages/Makefile instead of from src/recpt/Makefile

Location:

trunk/gsdl

Files:

• packages/Makefile (modified) (2 diffs)
• packages/configure (modified) (3 diffs)
• src/recpt/Makefile.in (modified) (2 diffs)

trunk/gsdl/packages/Makefile

@@ -30 +30 @@
 # clean, and distclean.
 
-PACKAGEDIRS = unix/wv/wv-0.6.0-gs wget/wget-1.5.3
+PACKAGEDIRS = unix/wv/wv-0.6.0-gs  wget/wget-1.5.3  yaz
 
 all:
@@ -55 +55 @@
           (cd $$subdir && if test -e Makefile; then $(MAKE) distclean;fi) || exit 1; \
         done
-

trunk/gsdl/packages/configure

@@ -7 +7 @@
 GSDLOS=`uname | tr A-Z a-z`
 
+# parse any arguments given from toplevel configure
+while test $# -ne 0; do
+    case "$1" in
+    --cache-file=*)
+        cache_filename=`echo $1 | sed s/--cache-file=//`
+        # turn relative path into an absolute path
+        cache_dir=`echo $cache_filename | sed 's@/[^/]*$@@'`
+        cache_dir=`cd $cache_dir 2>/dev/null && pwd`
+
+        cache_basefile=`echo $cache_filename | sed 's@.*/@@'`
+        cache_file="$cache_dir/$cache_basefile"
+        if test ! -f "$cache_file"; then
+        CACHE_FILE=""
+        else
+        CACHE_FILE="--cache-file=$cache_file"
+        fi
+        ;;
+    *)
+        # ignore all other options for now
+        ;;
+    esac
+    shift
+done
+
+
+
 # configure the wvWare Word document converter
 echo ""
@@ -12 +38 @@
 echo ""
 
-cd $PACKAGES/unix/wv
+cd "$PACKAGES/unix/wv"
 tar -xzf wv-0.6.0-gs.tar.gz
 cd wv-0.6.0-gs
-./configure --prefix=$PACKAGES/unix/wv
+./configure $CACHE_FILE --prefix=$PACKAGES/unix/wv
+
+
+# YAZ Z39.50 toolkit
+echo ""
+echo "Configuring YAZ"
+echo ""
+cd "$PACKAGES/yaz"
+./configure $CACHE_FILE
 
 
@@ -22 +56 @@
 echo "Configuring wget"
 echo ""
-
 cd $PACKAGES/wget
 tar -xzf wget.tar.gz
 cd $PACKAGES/wget/wget-1.5.3
-./configure --prefix=$PACKAGES/wget --bindir=$GSDLHOME/bin/$GSDLOS
+./configure $CACHE_FILE --prefix=$PACKAGES/wget --bindir=$GSDLHOME/bin/$GSDLOS

trunk/gsdl/src/recpt/Makefile.in

@@ -158 +158 @@
     cd $(YAZDIR)/client &&  make yaz_zclient.o
 
+# this should be done by the top level makefile...
 $(YAZDIR)/lib/libyaz.a:
-    cd $(YAZDIR) && ./configure && make all
+    cd $(YAZDIR) && make all
 
 # put a separate rule here, as it speeds up compilation of other objects
@@ -182 +183 @@
 distclean:
     rm -f $(OBJECTS) $(EXEC) $(PARSE_TMPFILES) Makefile
-    (cd $(YAZDIR) && make distclean)
 
 clean:
     rm -f $(OBJECTS) $(EXEC) $(PARSE_TMPFILES)
-    (cd $(YAZDIR) && make clean)
 
 install: