Attachment 396 Details for Bug 635 – Try to use krb5-config where available

[patch] Try to use krb5-config where available

openssh-krb5_configure.patch (text/plain), 1.89 KB, created by Darren Tucker on 2003-09-10 14:24:22 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2003-09-10 14:24:22 AEST

Size: 1.89 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/configure.ac,v
>retrieving revision 1.148
>diff -u -p -r1.148 configure.ac
>--- configure.ac	10 Sep 2003 01:39:05 -0000	1.148
>+++ configure.ac	10 Sep 2003 04:20:56 -0000
>@@ -1940,9 +1940,14 @@ AC_ARG_WITH(kerberos5,
>                         else
>                                 KRB5ROOT=${withval}
>                         fi
>-			CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include"
>                         LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib"
>                         AC_DEFINE(KRB5)
>+			if test -x "${KRB5ROOT}/bin/krb5-config" ; then
>+				KRB5CONF="${KRB5ROOT}/bin/krb5-config"
>+				CPPFLAGS="$CPPFLAGS `${KRB5CONF} --cflags`"
>+			else
>+				CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include"
>+			fi
> 			KRB5_MSG="yes"
>                         AC_MSG_CHECKING(whether we are using Heimdal)
>                         AC_TRY_COMPILE([ #include <krb5.h> ],
>@@ -1961,18 +1966,28 @@ AC_ARG_WITH(kerberos5,
>                         if test ! -z "$blibpath" ; then
>                                 blibpath="$blibpath:${KRB5ROOT}/lib"
>                         fi
>+			if test ! -z "${KRB5CONF}" ; then
>+				K5LIBS="`${KRB5CONF} --libs`"
>+			fi
> 			AC_SEARCH_LIBS(dn_expand, resolv)
> 
> 			AC_CHECK_LIB(gssapi,gss_init_sec_context,
> 				[ AC_DEFINE(GSSAPI)
>+				  have_gssapi=1
> 				  K5LIBS="-lgssapi $K5LIBS" ],
> 				[ AC_CHECK_LIB(gssapi_krb5,gss_init_sec_context,
> 					[ AC_DEFINE(GSSAPI)
>+					  have_gssapi=1
> 				  	  K5LIBS="-lgssapi_krb5 $K5LIBS" ],
> 					AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]),
> 					$K5LIBS)
> 				],
> 				$K5LIBS)
>+
>+			if test ! -z "$have_gssapi" -a ! -z "${KRB5CONF}" ; then
>+				K5LIBS="`${KRB5CONF} --libs gssapi`"
>+				CPPFLAGS="$CPPFLAGS `${KRB5CONF} --cflags gssapi`"
>+			fi	
> 			
> 			AC_CHECK_HEADER(gssapi.h, ,
> 				[ unset ac_cv_header_gssapi_h

Actions: View | Diff

Attachments on bug 635: 396 | 525