View | Details | Raw Unified | Return to bug 635 | Differences between
and this patch

Collapse All | Expand All

(-)configure.ac (-20 / +49 lines)
Lines 2020-2058 AC_SEARCH_LIBS(getrrsetbyname, resolv, Link Here
2020
KRB5_MSG="no"
2020
KRB5_MSG="no"
2021
AC_ARG_WITH(kerberos5,
2021
AC_ARG_WITH(kerberos5,
2022
	[  --with-kerberos5=PATH   Enable Kerberos 5 support],
2022
	[  --with-kerberos5=PATH   Enable Kerberos 5 support],
2023
	[
2023
	[ if test "x$withval" != "xno" ; then
2024
		if test "x$withval" != "xno" ; then
2024
		if test "x$withval" = "xyes" ; then
2025
			if test "x$withval" = "xyes" ; then
2025
			KRB5ROOT="/usr/local"
2026
				KRB5ROOT="/usr/local"
2026
		else
2027
			KRB5ROOT=${withval}
2028
		fi
2029
2030
		AC_DEFINE(KRB5)
2031
		KRB5_MSG="yes"
2032
2033
		AC_MSG_CHECKING(for krb5-config)
2034
		if test -x  $KRB5ROOT/bin/krb5-config ; then
2035
			KRB5CONF=$KRB5ROOT/bin/krb5-config
2036
			AC_MSG_RESULT($KRB5CONF)
2037
2038
			AC_MSG_CHECKING(for gssapi support)
2039
			if $KRB5CONF | grep gssapi >/dev/null ; then
2040
				AC_MSG_RESULT(yes)
2041
				K5CFLAGS="`$KRB5CONF --cflags gssapi`"
2042
				dnl  m4 quadragraphs: "sed 's/-l[^- ]*//g'"
2043
				K5LDFLAGS="`$KRB5CONF --libs gssapi | sed 's/-l@<:@^- @:>@*//g'`"
2044
				K5LIBS="`$KRB5CONF --libs gssapi | sed 's/-L@<:@^- @:>@*//g'`"
2027
			else
2045
			else
2028
				KRB5ROOT=${withval}
2046
				AC_MSG_RESULT(no)
2047
				K5CFLAGS="`$KRB5CONF --cflags`"
2048
				K5LDFLAGS="`$KRB5CONF --libs | sed 's/-l@<:@^- @:>@*//g'`"
2049
				K5LIBS="`$KRB5CONF --libs | sed 's/-L@<:@^- @:>@*//g'`"
2029
			fi
2050
			fi
2051
			CPPFLAGS="$CPPFLAGS $K5CFLAGS"
2052
			LDFLAGS="$LDFLAGS $K5LDFLAGS"
2053
			AC_MSG_CHECKING(whether we are using Heimdal)
2054
			AC_TRY_COMPILE([ #include <krb5.h> ],
2055
				       [ char *tmp = heimdal_version; ],
2056
				       [ AC_MSG_RESULT(yes)
2057
					 AC_DEFINE(HEIMDAL) ],
2058
				         AC_MSG_RESULT(no)
2059
			)
2060
		else
2061
			AC_MSG_RESULT(no)
2030
			CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include"
2062
			CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include"
2031
			LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib"
2063
			LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib"
2032
			AC_DEFINE(KRB5)
2033
			KRB5_MSG="yes"
2034
			AC_MSG_CHECKING(whether we are using Heimdal)
2064
			AC_MSG_CHECKING(whether we are using Heimdal)
2035
			AC_TRY_COMPILE([ #include <krb5.h> ],
2065
			AC_TRY_COMPILE([ #include <krb5.h> ],
2036
				       [ char *tmp = heimdal_version; ],
2066
				       [ char *tmp = heimdal_version; ],
2037
				       [ AC_MSG_RESULT(yes)
2067
				       [ AC_MSG_RESULT(yes)
2038
					 AC_DEFINE(HEIMDAL)
2068
					 AC_DEFINE(HEIMDAL)
2039
					 K5LIBS="-lkrb5 -ldes -lcom_err -lasn1 -lroken"
2069
					 K5LIBS="-lkrb5 -ldes -lcom_err -lasn1 -lroken"
2040
					 AC_SEARCH_LIBS(k_hasafs, kafs,
2041
						[ AC_DEFINE(AFS)
2042
						  K5LIBS="-lkafs $K5LIBS"
2043
						]
2044
					 )
2045
				       ],
2070
				       ],
2046
				       [ AC_MSG_RESULT(no)
2071
				       [ AC_MSG_RESULT(no)
2047
					 K5LIBS="-lkrb5 -lk5crypto -lcom_err"
2072
					 K5LIBS="-lkrb5 -lk5crypto -lcom_err"
2048
				       ]
2073
				       ]
2049
			)
2074
			)
2050
			if test ! -z "$need_dash_r" ; then
2051
				LDFLAGS="$LDFLAGS -R${KRB5ROOT}/lib"
2052
			fi
2053
			if test ! -z "$blibpath" ; then
2054
				blibpath="$blibpath:${KRB5ROOT}/lib"
2055
			fi
2056
			AC_SEARCH_LIBS(dn_expand, resolv)
2075
			AC_SEARCH_LIBS(dn_expand, resolv)
2057
2076
2058
			AC_CHECK_LIB(gssapi,gss_init_sec_context,
2077
			AC_CHECK_LIB(gssapi,gss_init_sec_context,
Lines 2080-2088 AC_ARG_WITH(kerberos5, Link Here
2080
			AC_CHECK_HEADER(gssapi_krb5.h, ,
2099
			AC_CHECK_HEADER(gssapi_krb5.h, ,
2081
					[ CPPFLAGS="$oldCPP" ])
2100
					[ CPPFLAGS="$oldCPP" ])
2082
2101
2083
			KRB5=yes
2084
		fi
2102
		fi
2085
	]
2103
		if test ! -z "$need_dash_r" ; then
2104
			LDFLAGS="$LDFLAGS -R${KRB5ROOT}/lib"
2105
		fi
2106
		if test ! -z "$blibpath" ; then
2107
			blibpath="$blibpath:${KRB5ROOT}/lib"
2108
		fi
2109
	fi ]
2110
	AC_SEARCH_LIBS(k_hasafs, kafs,
2111
		[ AC_DEFINE(AFS)
2112
		  K5LIBS="-lkafs $K5LIBS"
2113
		]
2114
	)
2086
)
2115
)
2087
LIBS="$LIBS $K5LIBS"
2116
LIBS="$LIBS $K5LIBS"
2088
2117

Return to bug 635