if --with-globus used w/o a path, default to $GLOBUS_LOCATION

if --with-globus used w/ a path, set $GLOBUS_LOCATION

diff --git a/openssh/configure.ac b/openssh/configure.ac
index 7cff95452d7e34daa33fd29642da583c83eda9b2..b854c406fc0aa579ee3c078a7ab1b1ddb55892fb 100644 (file)
--- a/openssh/configure.ac
+++ b/openssh/configure.ac
@@ -707,8 +707,17 @@ if test "x$gsi_path" != "xno" ; then
                GSSAPI="GSI"
        fi
 
-       if test "x$globus_install_dir" = "xyes" ; then
-                AC_MSG_ERROR(--with-globus=PATH must specify a path)
+       if test "x$gsi_path" = "xyes" ; then
+               if test -z "$GLOBUS_LOCATION" ; then
+                       AC_MSG_ERROR(--with-globus=PATH must specify a path)
+               else
+                       gsi_path="$GLOBUS_LOCATION"
+               fi
+       fi
+
+       if test -z "$GLOBUS_LOCATION" ; then
+               GLOBUS_LOCATION="$gsi_path"
+               export GLOBUS_LOCATION
        fi
 
         if test "x$globus_flavor_type" = "xno" ; then