Use openssl prereqs to satisfy new globus_openssl package.

diff --git a/nmi/cmdfile b/nmi/cmdfile
index f53747b10a01c5b54c47129b1e6be79a751a37e1..14a2d826f2d7016cf4ef15bff71e09bf580aa306 100644 (file)
--- a/nmi/cmdfile
+++ b/nmi/cmdfile
@@ -12,7 +12,6 @@ remote_task_timeout = 86400
 platforms = ia64_sles_9, ppc_aix_5.2, ppc_macos_10.4, sun4u_sol_5.9, x86_64_rhas_3, x86_64_rhas_4, x86_deb_3.1, x86_fc_3, x86_fc_4, x86_rhas_3, x86_rhas_4
 #prereqs = zlib-1.2.3
 prereqs_ppc_macos_10.4 = curl-7.15.1
-prereqs_sun4u_sol_5.9 = curl-7.15.1, tar-1.14, patch-2.5.4, m4-1.4.1, flex-2.5.4a, make-3.80, byacc-1.9, gzip-1.2.4, gcc-3.4.3, coreutils-5.2.1, perl-5.8.5
-prereqs_ppc_aix_5.2 = tar-1.14, make-3.80, flex-2.5.4a, perl-5.8.5, bison-1.25, vac-6, vacpp-6
+prereqs_sun4u_sol_5.9 = curl-7.15.1, tar-1.14, patch-2.5.4, m4-1.4.1, flex-2.5.4a, make-3.80, byacc-1.9, gzip-1.2.4, gcc-3.4.3, coreutils-5.2.1, perl-5.8.5, openssl-0.9.8e-shared
+prereqs_ppc_aix_5.2 = tar-1.14, make-3.80, flex-2.5.4a, perl-5.8.5, bison-1.25, vac-6, vacpp-6, openssl-0.9.8e-shared
 notify = jbasney@ncsa.uiuc.edu
-#append_requirements_sun4u_sol_5.9 = (Machine != "nmi-solaris10.cs.wisc.edu")

diff --git a/nmi/testscript b/nmi/testscript
index 5f18844e0846ae66edff44d4c17fdf501302067e..5b488993f59a3143f27695b8588ab9c7c565f90e 100755 (executable)
--- a/nmi/testscript
+++ b/nmi/testscript
@@ -6,6 +6,27 @@ 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
+    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"
+    OPENSSL_LDFLAGS="-L${_NMI_PREREQ_openssl_0_9_8e_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_7_shared_ROOT}"; then
+    PKG_CONFIG_PATH="${_NMI_PREREQ_openssl_0_9_7_shared_ROOT}/lib/pkgconfig"
+    OPENSSL_CFLAGS="-I${_NMI_PREREQ_openssl_0_9_7_shared_ROOT}/include"
+    OPENSSL_INCLUDES="-I${_NMI_PREREQ_openssl_0_9_7_shared_ROOT}/include"
+    OPENSSL_LDFLAGS="-L${_NMI_PREREQ_openssl_0_9_7_shared_ROOT}/lib"
+    OPENSSL_LIBS="-lssl -lcrypto"
+    export PKG_CONFIG_PATH
+    export OPENSSL_CFLAGS OPENSSL_INCLUDES OPENSSL_LDFLAGS OPENSSL_LIBS
+fi
+if test -n "${LD_LIBRARY_PATH}" -a -z "${LIBPATH}"; then
+    LIBPATH=$LD_LIBRARY_PATH
+    export LIBPATH
+fi
 echo ==================================================
 echo Environment variables:
 env
@@ -34,6 +55,9 @@ make gsi-openssh install
 . $GLOBUS_LOCATION/etc/globus-user-env.sh
 cd ..
 echo ==================================================
+echo Environment variables:
+env
+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.
@@ -80,6 +104,9 @@ if test -f nightly.tar.gz; then
     . $GLOBUS_LOCATION/etc/globus-user-env.sh
     cd ..
     echo ==================================================
+    echo Environment variables:
+    env
+    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.