diff options
Diffstat (limited to 'gnu/usr.bin/cvs/configure.in')
| -rw-r--r-- | gnu/usr.bin/cvs/configure.in | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/gnu/usr.bin/cvs/configure.in b/gnu/usr.bin/cvs/configure.in index ce4f852a498..dd6172d7956 100644 --- a/gnu/usr.bin/cvs/configure.in +++ b/gnu/usr.bin/cvs/configure.in @@ -268,18 +268,33 @@ echo "default place for GSSAPI is $GSSAPI" AC_SUBST(GSSAPI)])dnl WITH_GSSAPI -AC_MSG_CHECKING([for gssapi.h]) hold_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$GSSAPI/include " -AC_CHECK_HEADER(gssapi/gssapi.h, - [AC_DEFINE(HAVE_GSSAPI) - LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err" - includeopt="${includeopt} -I$GSSAPI/include" - # This is necessary on Irix 5.3, in order to link against libkrb5 -- - # there, an_to_ln.o refers to things defined only in -lgen. - AC_CHECK_LIB(gen, compile)]) +AC_CHECK_HEADERS(gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h) CPPFLAGS=$hold_cppflags +if test "$ac_cv_header_gssapi_h" = "yes" || test "$ac_cv_header_gssapi_gssapi_h" = "yes"; then + AC_DEFINE(HAVE_GSSAPI) + includeopt="${includeopt} -I$GSSAPI/include" + # FIXME: This is ugly, but these things don't seem to be standardized. + if test "$ac_cv_header_gssapi_h" = "yes"; then + LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -ldes -lroken" + else + LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err" + fi + save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="-I$GSSAPI/include $CPPFLAGS" + if test "$ac_cv_header_gssapi_h" = "yes"; then + AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h, AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE)) + else + AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h, AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE)) + fi + CPPFLAGS=$save_CPPFLAGS + # This is necessary on Irix 5.3, in order to link against libkrb5 -- + # there, an_to_ln.o refers to things defined only in -lgen. + AC_CHECK_LIB(gen, compile) +fi + dnl dnl Use --with-encryption to turn on encryption support dnl |