o Update linkline derivation technique to be more robust and easier to

    read.

diff --git a/openssh/configure.ac b/openssh/configure.ac
index 64097a44b73ef4f7704e51ad7e24024e2e7d336b..a2e407976b723c190d362c747464be4fafc5b6b5 100644 (file)
--- a/openssh/configure.ac
+++ b/openssh/configure.ac
@@ -606,16 +606,34 @@ if test "x$gsi_path" != "xno" ; then
        GSI_CPPFLAGS="-I${GLOBUS_INCLUDE}"
        AC_MSG_RESULT(yes)
 
-       AC_MSG_CHECKING(for Globus linkline)
+       #
+       # Find GPT linkline helper
+       #
+
+       AC_MSG_CHECKING(for GPT linkline helper)
        if test -x $GPT_LOCATION/sbin/gpt_build_config ; then
-               $GPT_LOCATION/sbin/gpt_build_config -f ${globus_flavor_type} -link shared -src pkg_data_src.gpt
-               . ./gpt_build_temp.sh
-               GSI_LDFLAGS="-L${gsi_path}/lib"
-               GSI_LIBS="$GPT_CONFIG_PGM_LINKS"
-               export LD_LIBRARY_PATH="${gsi_path}/lib:$LD_LIBRARY_PATH"
+               gpt_linkline_helper="$GPT_LOCATION/sbin/gpt_build_config"
+       elif test -x ${gsi_path}/sbin/gpt_build_config ; then
+               gpt_linkline_helper="${gsi_path}/sbin/gpt_build_config"
        else
                AC_MSG_ERROR(Cannot find gpt_build_config: GPT installation is incomplete)
        fi
+
+       #
+       # Build Globus linkline
+       #
+
+       ${gpt_linkline_helper} -f ${globus_flavor_type} -link shared -src pkg_data_src.gpt
+       . ./gpt_build_temp.sh
+       GSI_LDFLAGS="-L${gsi_path}/lib"
+       GSI_LIBS="$GPT_CONFIG_PGM_LINKS"
+       export LD_LIBRARY_PATH="${gsi_path}/lib:$LD_LIBRARY_PATH"
+
+       #
+       # Test Globus linkline
+       #
+
+       AC_MSG_CHECKING(for Globus linkline)
        if test -z "$GSI_LIBS" ; then
                AC_MSG_ERROR(gpt_build_config failed)
        fi