X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/blobdiff_plain/19ba7c7122c6cd5f787c1ca83206189daca1fb16..HEAD:/nmi/testscript

diff --git a/nmi/testscript b/nmi/testscript
index 9a3d688..20ec1b3 100755
--- a/nmi/testscript
+++ b/nmi/testscript
@@ -6,7 +6,15 @@ LOGNAME=$USER
 X509_CERT_DIR=$GLOBUS_LOCATION/share/certificates
 export GLOBUS_LOCATION LOGNAME X509_CERT_DIR
 (
-if test -n "${_NMI_PREREQ_openssl_0_9_8e_shared_ROOT}"; then
+if test -n "${_NMI_PREREQ_openssl_0_9_8k_shared_ROOT}"; then
+    PKG_CONFIG_PATH="${_NMI_PREREQ_openssl_0_9_8k_shared_ROOT}/lib/pkgconfig"
+    OPENSSL_CFLAGS="-I${_NMI_PREREQ_openssl_0_9_8k_shared_ROOT}/include"
+    OPENSSL_INCLUDES="-I${_NMI_PREREQ_openssl_0_9_8k_shared_ROOT}/include"
+    OPENSSL_LDFLAGS="-L${_NMI_PREREQ_openssl_0_9_8k_shared_ROOT}/lib"
+    OPENSSL_LIBS="-lssl -lcrypto"
+    export PKG_CONFIG_PATH
+    export OPENSSL_CFLAGS OPENSSL_INCLUDES OPENSSL_LDFLAGS OPENSSL_LIBS
+elif test -n "${_NMI_PREREQ_openssl_0_9_8e_shared_ROOT}"; then
     PKG_CONFIG_PATH="${_NMI_PREREQ_openssl_0_9_8e_shared_ROOT}/lib/pkgconfig"
     OPENSSL_CFLAGS="-I${_NMI_PREREQ_openssl_0_9_8e_shared_ROOT}/include"
     OPENSSL_INCLUDES="-I${_NMI_PREREQ_openssl_0_9_8e_shared_ROOT}/include"
@@ -52,7 +60,7 @@ for installer in `ls gt*-all-source-installer.tar.gz *nightly.tar.gz`; do
   cd gt*-installer
   ./configure --prefix=$GLOBUS_LOCATION --with-buildopts="-verbose" \
               --with-gsiopensshargs="--with-zlib=$ZLIB_LOCATION"
-  make gsi-openssh install
+  make globus_usage gsi-openssh install
   . $GLOBUS_LOCATION/etc/globus-user-env.sh
   cd ..
   echo ==================================================
@@ -65,6 +73,7 @@ for installer in `ls gt*-all-source-installer.tar.gz *nightly.tar.gz`; do
   if test -f gsi_openssh_bundle-*.tar.gz; then
     echo ==================================================
     echo Building GSI-OpenSSH GPT bundle...
+    rm -rf BUILD
     gpt-build -force -verbose gsi_openssh_bundle-*.tar.gz $GLOBUS_FLAVOR_NAME \
       GSI_OPENSSH_GPTMACRO="--with-zlib=$ZLIB_LOCATION"
   fi
@@ -75,7 +84,9 @@ for installer in `ls gt*-all-source-installer.tar.gz *nightly.tar.gz`; do
     ./install-autotools $GLOBUS_LOCATION
     cd ..
     echo ==================================================
-    cd gssapi-openssh/openssh
+    cd gssapi-openssh
+    cp -r openssh openssh.build
+    cd openssh.build
     if test -f make_gpt_dist; then
       echo Building GSI-OpenSSH GPT package from CVS...
       rm -f gsi_openssh-*.tar.gz
@@ -91,7 +102,9 @@ for installer in `ls gt*-all-source-installer.tar.gz *nightly.tar.gz`; do
         --with-privsep-user=$USER --with-privsep-path=$GLOBUS_LOCATION/var/empty
       make install-nokeys # nonroot
     fi
-    cd ../..
+    cd ..
+    rm -rf openssh.build
+    cd ..
   fi
   rm -rf gt*-installer $GLOBUS_LOCATION
 done