From: basney <basney>
Date: Tue, 23 Sep 2008 19:47:57 +0000 (+0000)
Subject: move AC_TRY_LINK to later GSI section to avoid forcing the compiler
X-Git-Tag: OPENSSH_5_1P1_GSSAPI_20080923~1
X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/commitdiff_plain/3554247f52e96afa991cfd9cc77c5f2eba2181e1

move AC_TRY_LINK to later GSI section to avoid forcing the compiler
options to be set too early
---

diff --git a/openssh/configure.ac b/openssh/configure.ac
index 2b343f0..6125936 100644
--- a/openssh/configure.ac
+++ b/openssh/configure.ac
@@ -122,21 +122,10 @@ if test "x$gsi_path" != "xno" ; then
     LD="$GLOBUS_LD"
 	LDFLAGS="$LDFLAGS $GLOBUS_LDFLAGS"
 
-	# test that we got the libraries OK
-	AC_TRY_LINK(
-		[],
-		[],
-		[],
-		[
-			AC_MSG_ERROR(link with Globus libraries failed)
-		]
-	)
-    AC_CHECK_FUNCS(globus_gss_assist_map_and_authorize)
 	INSTALL_GSISSH="yes"
 else
 	INSTALL_GSISSH=""
 fi
-AC_SUBST(INSTALL_GSISSH)
 # End Globus/GSI section
 
 AC_PROG_CC
@@ -3460,7 +3449,18 @@ if test "x$gsi_path" != "xno" ; then
 	if test ! -z "$blibpath" ; then
 		blibpath="$blibpath:${gsi_path}/lib"
 	fi
+	# test that we got the libraries OK
+	AC_TRY_LINK(
+		[],
+		[],
+		[],
+		[
+			AC_MSG_ERROR(link with Globus libraries failed)
+		]
+	)
+    AC_CHECK_FUNCS(globus_gss_assist_map_and_authorize)
 fi
+AC_SUBST(INSTALL_GSISSH)
 
 # Check whether the user wants GSSAPI mechglue support
 AC_ARG_WITH(mechglue,