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

Collapse All | Expand All

(-)configure.ac (-1 / +16 lines)
Lines 1940-1948 AC_ARG_WITH(kerberos5, Link Here
1940
                        else
1940
                        else
1941
                                KRB5ROOT=${withval}
1941
                                KRB5ROOT=${withval}
1942
                        fi
1942
                        fi
1943
			CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include"
1944
                        LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib"
1943
                        LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib"
1945
                        AC_DEFINE(KRB5)
1944
                        AC_DEFINE(KRB5)
1945
			if test -x "${KRB5ROOT}/bin/krb5-config" ; then
1946
				KRB5CONF="${KRB5ROOT}/bin/krb5-config"
1947
				CPPFLAGS="$CPPFLAGS `${KRB5CONF} --cflags`"
1948
			else
1949
				CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include"
1950
			fi
1946
			KRB5_MSG="yes"
1951
			KRB5_MSG="yes"
1947
                        AC_MSG_CHECKING(whether we are using Heimdal)
1952
                        AC_MSG_CHECKING(whether we are using Heimdal)
1948
                        AC_TRY_COMPILE([ #include <krb5.h> ],
1953
                        AC_TRY_COMPILE([ #include <krb5.h> ],
Lines 1961-1978 AC_ARG_WITH(kerberos5, Link Here
1961
                        if test ! -z "$blibpath" ; then
1966
                        if test ! -z "$blibpath" ; then
1962
                                blibpath="$blibpath:${KRB5ROOT}/lib"
1967
                                blibpath="$blibpath:${KRB5ROOT}/lib"
1963
                        fi
1968
                        fi
1969
			if test ! -z "${KRB5CONF}" ; then
1970
				K5LIBS="`${KRB5CONF} --libs`"
1971
			fi
1964
			AC_SEARCH_LIBS(dn_expand, resolv)
1972
			AC_SEARCH_LIBS(dn_expand, resolv)
1965
1973
1966
			AC_CHECK_LIB(gssapi,gss_init_sec_context,
1974
			AC_CHECK_LIB(gssapi,gss_init_sec_context,
1967
				[ AC_DEFINE(GSSAPI)
1975
				[ AC_DEFINE(GSSAPI)
1976
				  have_gssapi=1
1968
				  K5LIBS="-lgssapi $K5LIBS" ],
1977
				  K5LIBS="-lgssapi $K5LIBS" ],
1969
				[ AC_CHECK_LIB(gssapi_krb5,gss_init_sec_context,
1978
				[ AC_CHECK_LIB(gssapi_krb5,gss_init_sec_context,
1970
					[ AC_DEFINE(GSSAPI)
1979
					[ AC_DEFINE(GSSAPI)
1980
					  have_gssapi=1
1971
				  	  K5LIBS="-lgssapi_krb5 $K5LIBS" ],
1981
				  	  K5LIBS="-lgssapi_krb5 $K5LIBS" ],
1972
					AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]),
1982
					AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]),
1973
					$K5LIBS)
1983
					$K5LIBS)
1974
				],
1984
				],
1975
				$K5LIBS)
1985
				$K5LIBS)
1986
1987
			if test ! -z "$have_gssapi" -a ! -z "${KRB5CONF}" ; then
1988
				K5LIBS="`${KRB5CONF} --libs gssapi`"
1989
				CPPFLAGS="$CPPFLAGS `${KRB5CONF} --cflags gssapi`"
1990
			fi	
1976
			
1991
			
1977
			AC_CHECK_HEADER(gssapi.h, ,
1992
			AC_CHECK_HEADER(gssapi.h, ,
1978
				[ unset ac_cv_header_gssapi_h
1993
				[ unset ac_cv_header_gssapi_h

Return to bug 635