X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/blobdiff_plain/f0de8dceb57cad3a235439be3bc890a453801fe8..bf43e758ad604f4275956f0de73b91fa8329e485:/nmi/testscript?ds=sidebyside

diff --git a/nmi/testscript b/nmi/testscript
index 0b84d0b..9898d9a 100755
--- a/nmi/testscript
+++ b/nmi/testscript
@@ -44,12 +44,39 @@ cd zlib-1.2.3
 ./configure --prefix=$ZLIB_LOCATION
 make
 make install
+cd ..
 echo ==================================================
-flavor=`gpt-query -name=gsi_openssh | perl -n -e 'if (/gsi_openssh-(.*)-pgm/){print "$1\n";}'|head -1`
-echo GPT flavor is $flavor.  Installing globus_core.
-gpt-build -nosrc $flavor
-echo ==================================================
-echo Building GSI-OpenSSH...
-gpt-build -force -verbose gsi_openssh_bundle-*.tar.gz $flavor \
-  GSI_OPENSSH_GPTMACRO="--with-zlib=$ZLIB_LOCATION"
+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
+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 ==================================================
+  echo Installing autotools...
+  cd autotools
+  ./install-autotools $GLOBUS_LOCATION
+  cd ..
+  echo ==================================================
+  cd openssh
+  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 \
+      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