a28acc2928
PR: 118027 Submitted by: Pietro Cerutti <gahr@gahr.ch> Approved by: portmgr (pav,linimon)
43 lines
2 KiB
Text
43 lines
2 KiB
Text
--- cvsunix/configure.in.orig 2001-03-06 20:23:49.000000000 +0100
|
|
+++ cvsunix/configure.in 2007-11-22 20:55:15.000000000 +0100
|
|
@@ -178,7 +178,7 @@
|
|
# the user's setting for LDFLAGS
|
|
hold_ldflags=$LDFLAGS
|
|
test -n "${krb_libdir}" && LDFLAGS="$LDFLAGS -L${krb_libdir}"
|
|
- AC_CHECK_LIB(des,printf,[LIBS="${LIBS} -ldes"])
|
|
+ AC_CHECK_LIB(des,printf,[LIBS="${LIBS} -lcrypt"])
|
|
LDFLAGS=$hold_ldflags
|
|
if test -n "$krb_incdir"; then
|
|
includeopt="${includeopt} -I$krb_incdir"
|
|
@@ -202,27 +202,22 @@
|
|
|
|
hold_cppflags=$CPPFLAGS
|
|
CPPFLAGS="$CPPFLAGS -I$GSSAPI/include "
|
|
-AC_CHECK_HEADERS(krb5.h gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h)
|
|
+AC_CHECK_HEADERS(krb5.h gssapi/gssapi.h gssapi/gssapi_generic.h)
|
|
CPPFLAGS=$hold_cppflags
|
|
|
|
if test "$ac_cv_header_krb5_h" = "yes" &&
|
|
- (test "$ac_cv_header_gssapi_h" = "yes" ||
|
|
- test "$ac_cv_header_gssapi_gssapi_h" = "yes"); then
|
|
+ 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"
|
|
+ LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lcom_err"
|
|
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
|
|
+ AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h, AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE))
|
|
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.
|