From: jbasney <jbasney>
Date: Tue, 6 Jan 2004 14:37:25 +0000 (+0000)
Subject: if --with-globus used w/o a path, default to $GLOBUS_LOCATION
X-Git-Tag: start~7
X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/commitdiff_plain/8b1f0dfdce4658bcd56effd68a5987d28ecab498

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 7cff954..b854c40 100644
--- 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