)
if test x"$compilegssapi" != x"no"; then
-
- if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto"; then
- GSSAPI_CFLAGS="-I$withval/include"
- GSSAPI_CPPFLAGS="-I$withval/include"
- GSSAPI_LDFLAGS="-L$withval/${atalk_libname}"
- FOUND_GSSAPI=yes
+ if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto"; then
+ GSSAPI_CFLAGS="-I$withval/include"
+ GSSAPI_CPPFLAGS="-I$withval/include"
+ GSSAPI_LDFLAGS="-L$withval/${atalk_libname}"
+ FOUND_GSSAPI=yes
AC_MSG_CHECKING([checking for GSSAPI support in])
AC_MSG_RESULT([$compilegssapi])
- fi
+ fi
# Do no harm to the values of CFLAGS and LIBS while testing for
# Kerberos support.
- ac_save_CFLAGS=$CFLAGS
- ac_save_CPPFLAGS=$CPPFLAGS
- ac_save_LDFLAGS=$LDFLAGS
- ac_save_LIBS=$LIBS
+ save_CFLAGS=$CFLAGS
+ save_CPPFLAGS=$CPPFLAGS
+ save_LDFLAGS=$LDFLAGS
+ save_LIBS=$LIBS
if test x$FOUND_GSSAPI = x"no"; then
#################################################
AC_PATH_PROG(KRB5_CONFIG, krb5-config)
AC_MSG_CHECKING(for working krb5-config)
if test -x "$KRB5_CONFIG"; then
- ac_save_CFLAGS=$CFLAGS
- CFLAGS="";export CFLAGS
- ac_save_LDFLAGS=$LDFLAGS
- LDFLAGS="";export LDFLAGS
- GSSAPI_LIBS="`$KRB5_CONFIG --libs gssapi`"
- GSSAPI_CFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`"
- GSSAPI_CPPFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`"
- CFLAGS=$ac_save_CFLAGS;export CFLAGS
- LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
- FOUND_GSSAPI=yes
- AC_MSG_RESULT(yes)
+ CFLAGS=""; export CFLAGS
+ LDFLAGS=""; export LDFLAGS
+ TEMP="`$KRB5_CONFIG --libs gssapi`"
+ if test $? -eq 0 ; then
+ GSSAPI_CFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`"
+ GSSAPI_CPPFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`"
+ GSSAPI_LIBS="$TEMP"
+ FOUND_GSSAPI=yes
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no. Fallback to previous krb5 detection strategy)
+ fi
+ CFLAGS=$save_CFLAGS; export CFLAGS
+ LDFLAGS=$save_LDFLAGS; export LDFLAGS
else
AC_MSG_RESULT(no. Fallback to previous krb5 detection strategy)
fi
fi
fi
- CFLAGS="$CFLAGS $GSSAPI_CFLAGS"
- CPPFLAGS="$CPPFLAGS $GSSAPI_CPPFLAGS"
- LDFLAGS="$LDFLAGS $GSSAPI_LDFLAGS"
+ CFLAGS="$GSSAPI_CFLAGS"
+ CPPFLAGS="$GSSAPI_CPPFLAGS"
+ LDFLAGS="$GSSAPI_LDFLAGS"
LIBS="$GSSAPI_LIBS"
-
# check for gssapi headers
gss_headers_found=no
AC_CHECK_LIB(gssapi, gss_display_status)
AC_CHECK_LIB(gssapi_krb5, gss_display_status)
+ AC_CHECK_LIB(gss, gss_display_status)
# check for functions
if test x"$ac_cv_func_gss_acquire_cred" = x"yes"; then
AC_DEFINE(HAVE_GSSAPI,1,[Whether to enable GSSAPI support])
AC_MSG_RESULT([yes])
- GSSAPI_LIBS="$LDFLAGS $LIBS"
+# GSSAPI_LIBS="$LDFLAGS $LIBS"
else
AC_MSG_RESULT([no])
if test x"$compilegssapi" = x"yes"; then
GSSAPI_LIBS=""
fi
- LIBS="$ac_save_LIBS"
- CFLAGS="$ac_save_CFLAGS"
- LDFLAGS="$ac_save_LDFLAGS"
- CPPFLAGS="$ac_save_CPPFLAGS"
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+ LDFLAGS="$save_LDFLAGS"
+ CPPFLAGS="$save_CPPFLAGS"
fi
if test x"$ac_cv_func_gss_acquire_cred" = x"yes"; then
AC_SUBST(GSSAPI_LIBS)
AC_SUBST(GSSAPI_CFLAGS)
+ AC_SUBST(GSSAPI_LDFLAGS)
])