From: jbasney <jbasney>
Date: Tue, 20 Feb 2007 00:06:53 +0000 (+0000)
Subject: use existing zlib install if available
X-Git-Tag: OPENSSH_4_6P1_GSSAPI_20070314~3
X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/commitdiff_plain/0cc09122d51ed0d61e544d54a26c81945f817429

use existing zlib install if available
---

diff --git a/nmi/testscript b/nmi/testscript
index b5eaa04..c6f3c42 100755
--- 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