use existing zlib install if available

[gssapi-openssh.git] / nmi / testscript

diff --git a/nmi/testscript b/nmi/testscript
index 9898d9a64cd0b7f8de7346a8768d34221ea5f71b..c6f3c42a68eb99fbb0acc3a245f48b7547aa6fa1 100755 (executable)
--- a/nmi/testscript
+++ b/nmi/testscript
@@ -39,12 +39,17 @@ make gsi-openssh install
 . $GLOBUS_LOCATION/etc/globus-user-env.sh
 cd ..
 echo ==================================================
-echo Building zlib-1.2.3...
-cd zlib-1.2.3
-./configure --prefix=$ZLIB_LOCATION
-make
-make install
-cd ..
+if test -d /prereq/zlib-1.2.3; then
+  $ZLIB_LOCATION=/prereq/zlib-1.2.3
+  echo zlib found in $ZLIB_LOCATION
+else
+  echo Building zlib-1.2.3...
+  cd zlib-1.2.3
+  ./configure --prefix=$ZLIB_LOCATION
+  make
+  make install
+  cd ..
+fi
 echo ==================================================
 GLOBUS_FLAVOR_NAME=`gpt-query -name=gsi_openssh | perl -n -e 'if (/gsi_openssh-(.*)-pgm/){print "$1\n";}'|head -1`
 export GLOBUS_FLAVOR_NAME
@@ -67,7 +72,7 @@ if test -d openssh; then
   if test -f make_gpt_dist; then
     echo Building GSI-OpenSSH GPT package from CVS...
     ./make_gpt_dist
-    gpt-build -force -verbose gsi_openssh_bundle-*.tar.gz $GLOBUS_FLAVOR_NAME \
+    gpt-build -force -verbose gsi_openssh-*.tar.gz $GLOBUS_FLAVOR_NAME \
       GSI_OPENSSH_GPTMACRO="--with-zlib=$ZLIB_LOCATION"
   else
     echo Building GSI-OpenSSH from CVS trunk...