Changeset 2169 for trunk/gsdl/packages/configure

Timestamp:

2001-03-13T17:52:33+13:00 (23 years ago)

Author:

jrm21

Message:

Better check for bindir (can't cd to it if it doesn't exist yet...) Don't assume tar is GNU tar (with -z option)

File:

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

trunk/gsdl/packages/configure

@@ -6 +6 @@
 cd $PACKAGES
 GSDLOS=`uname | tr A-Z a-z`
+# bindir can be overridden on command line.
 bindir=$GSDLHOME/bin/$GSDLOS
 
@@ -33 +34 @@
         ;;
     --bindir=*)
-        bindira=`echo $1 | sed s/--bindir=//`
-        # turn relative path into an absolute path
-        bindir=`echo $bindira | sed 's@/[^/]*$@@'`
-        bindir=`cd $bindir 2>/dev/null && pwd`
-        bindirb=`echo $bindira | sed 's@.*/@@'`
-        bindir="$bindir/$bindirb"
+        bindir=`echo $1 | sed s/--bindir=//`
+        if test -d $bindir ; then
+          bindir=`cd $bindir ; pwd `
+          cd "$PACKAGES"
+        elif test -z `echo $bindir | sed '/^\// p;D'` ; then
+          # turn relative path into an absolute path
+          rel_bindir=`echo $bindir | sed s@/.*@@`
+          cd $rel_bindir
+          bindir=`pwd`/`echo $bindir | sed s@^[^/]*/@@`
+          cd "$PACKAGES"
+        else
+          # bindir doesn't exist, and isn't relative
+          true
+        fi
         ;;
     *)
@@ -47 +56 @@
 done
 
-if test -n "$USE_CORBA"; then
-  # configure the MICO CORBA ORB
+# we assume that gzip and tar are on the search path.
+# non-GNU versions of tar don't take the -z option.
+
+
   echo ""
   echo "Configuring MICO CORBA"
+if test x$USE_CORBA = xtrue ; then
+  # configure the MICO CORBA ORB
   echo ""
 
   cd "$PACKAGES/mico"
-  tar -xzf mico-2.3.5.tar.gz
+  gzip -dc mico-2.3.5.tar.gz | tar -xf -
   cd mico
   ./configure $CACHE_FILE    --prefix=$PACKAGES/mico/  --disable-coss --disable-naming --disable-relship --disable-events --disable-streams --disable-property --disable-trader --disable-time --disable-debug --enable-optimize --enable-final --enable-speed-tune
   sed 's/tools//'  $PACKAGES/mico/mico/Makefile | sed 's/ldconfig//' >$PACKAGES/mico/mico/Makefile.out
   mv $PACKAGES/mico/mico/Makefile.out $PACKAGES/mico/mico/Makefile
+else
+  echo "corba support disabled - mico compiler not required."
+  echo "  add '--enable-corba' to the configure command to include corba support."
+  echo ""
 fi
+
 
 
@@ -70 +88 @@
 
 cd "$PACKAGES/wv"
-tar -xzf wv-0.6.3-gs.tar.gz
+gzip -dc wv-0.6.3-gs.tar.gz | tar -xf -
 cd wv-gs
-./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir=$bindir
+./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir="$bindir"
 
 # configure the pdftohtml converter
@@ -80 +98 @@
 
 cd "$PACKAGES/pdftohtml"
-tar -xzf pdftohtml_0_22_gs.tar.gz
+gzip -dc pdftohtml_0_22_gs.tar.gz | tar -xf -
 cd pdftohtml_0_22
 
@@ -86 +104 @@
 echo ""
 echo "Configuring YAZ"
-if test x"$USE_Z3950" = "xtrue"; 
+if test x$USE_Z3950 = xtrue ; 
 then
   echo ""
@@ -104 +122 @@
 tar -xzf wget.tar.gz
 cd $PACKAGES/wget/wget-1.5.3
-./configure $CACHE_FILE --prefix=$PACKAGES/wget --bindir=$bindir
+./configure $CACHE_FILE --prefix=$PACKAGES/wget --bindir="$bindir"
+
+
+