update version number for new patch release

[gssapi-openssh.git] / openssh / configure.ac

diff --git a/openssh/configure.ac b/openssh/configure.ac
index afe47d0a350507a40728a27833d3593840f4c9eb..2cccf746dc623798f3a4b2a27d598689b35f95fc 100644 (file)
--- a/openssh/configure.ac
+++ b/openssh/configure.ac
@@ -1165,24 +1165,25 @@ if test "x$gsi_path" != "xno" ; then
        GSI_CPPFLAGS="-I${GLOBUS_INCLUDE}"
        
        if test -x ${gsi_path}/bin/globus-makefile-header ; then
-               GSI_LIBS=`${gsi_path}/bin/globus-makefile-header --flavor=${globus_flavor_type} ${gsi_static} globus_gss_assist | perl -n -e 'if (/GLOBUS_PKG_LIBS = (.*)/){print $1;}'`
+               ${gsi_path}/bin/globus-makefile-header --flavor=${globus_flavor_type} ${gsi_static} globus_gss_assist | sed 's/ = \(.*\)/="\1"/' > ./gpt_build_tmp.sh
        elif test -x ${gsi_path}/sbin/globus-makefile-header ; then
-               GSI_LIBS=`${gsi_path}/sbin/globus-makefile-header --flavor=${globus_flavor_type} ${gsi_static} globus_gss_assist | perl -n -e 'if (/GLOBUS_PKG_LIBS = (.*)/){print $1;}'`
+               ${gsi_path}/sbin/globus-makefile-header --flavor=${globus_flavor_type} ${gsi_static} globus_gss_assist | sed 's/ = \(.*\)/="\1"/' > ./gpt_build_tmp.sh
        else
                AC_MSG_ERROR(Cannot find globus-makefile-header: Globus installation is incomplete)
        fi
+       . ./gpt_build_tmp.sh
        if test -n "${need_dash_r}"; then
-               GSI_LDFLAGS="-L${gsi_path}/lib -R{gsi_path}/lib"
+               GSI_LDFLAGS="-L${gsi_path}/lib -R${gsi_path}/lib"
        else
                GSI_LDFLAGS="-L${gsi_path}/lib"
        fi
-       if test -z "$GSI_LIBS" ; then
+       if test -z "$GLOBUS_PKG_LIBS" ; then
                AC_MSG_ERROR(globus-makefile-header failed)
        fi
 
        AC_DEFINE(HAVE_GSSAPI_H)
 
-       LIBS="$LIBS $GSI_LIBS"
+       LIBS="$LIBS $GLOBUS_LIBS $GLOBUS_PKG_LIBS"
        LDFLAGS="$LDFLAGS $GSI_LDFLAGS"
        CPPFLAGS="$CPPFLAGS $GSI_CPPFLAGS"
 
@@ -1953,7 +1954,7 @@ AC_ARG_WITH(ssl-dir,
                fi
        ]
 )
-if test -z "$GSI_LIBS" ; then
+if test -z "$GSI_LDFLAGS" ; then
 LIBS="-lcrypto $LIBS"
 fi
 AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAVE_OPENSSL, 1,