X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/blobdiff_plain/76076a3575bd79831ea62dc7e5804ac5d7fc4512..0cc09122d51ed0d61e544d54a26c81945f817429:/nmi/testscript

diff --git a/nmi/testscript b/nmi/testscript
index 24a0c13..c6f3c42 100755
--- a/nmi/testscript
+++ b/nmi/testscript
@@ -39,29 +39,49 @@ 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
 echo GPT GLOBUS_FLAVOR_NAME is $GLOBUS_FLAVOR_NAME.  Installing globus_core.
 gpt-build -nosrc $GLOBUS_FLAVOR_NAME
-echo ==================================================
 if test -f gsi_openssh_bundle-*.tar.gz; then
+  echo ==================================================
   echo Building GSI-OpenSSH GPT bundle...
   gpt-build -force -verbose gsi_openssh_bundle-*.tar.gz $GLOBUS_FLAVOR_NAME \
     GSI_OPENSSH_GPTMACRO="--with-zlib=$ZLIB_LOCATION"
 fi
 if test -d openssh; then
-  echo Building GSI-OpenSSH from CVS...
+  echo ==================================================
+  echo Installing autotools...
+  cd autotools
+  ./install-autotools $GLOBUS_LOCATION
+  cd ..
+  echo ==================================================
   cd openssh
-  make -f Makefile.in distprep
-  ./configure --prefix=$GLOBUS_LOCATION \
-    --with-globus-flavor=$GLOBUS_FLAVOR_NAME
-  make install
+  if test -f make_gpt_dist; then
+    echo Building GSI-OpenSSH GPT package from CVS...
+    ./make_gpt_dist
+    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...
+    autoreconf
+    ./configure --prefix=$GLOBUS_LOCATION \
+      --with-globus-flavor=$GLOBUS_FLAVOR_NAME \
+      --with-zlib=$ZLIB_LOCATION \
+      --with-privsep-user=$USER --with-privsep-path=$GLOBUS_LOCATION/var/empty
+    make install
+  fi
 fi
 ) 2>&1 # we want stdout & stderr mixed in the output file