From: jbasney <jbasney>
Date: Sun, 22 Apr 2007 14:39:22 +0000 (+0000)
Subject: build zlib before GT
X-Git-Tag: OPENSSH_GSI_GPT_4_0~1
X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/commitdiff_plain/9de400ec0614c0560e192340e080ccd795f10e0e

build zlib before GT
---

diff --git a/nmi/testscript b/nmi/testscript
index dbbd6ad..37b8a19 100755
--- a/nmi/testscript
+++ b/nmi/testscript
@@ -27,6 +27,18 @@ echo `which curl`
 echo `which ncftpget`
 echo `which ftp`
 echo ==================================================
+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 ==================================================
 echo Installing Globus Toolkit...
 if test -x `which wget`; then
   wget $GT_INSTALLER_URL
@@ -41,18 +53,6 @@ make gsi-openssh install
 . $GLOBUS_LOCATION/etc/globus-user-env.sh
 cd ..
 echo ==================================================
-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
 echo GPT GLOBUS_FLAVOR_NAME is $GLOBUS_FLAVOR_NAME.  Installing globus_core.