summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2005-09-12 17:36:10 -0700
committerTim Rice <tim@multitalents.net>2005-09-12 17:36:10 -0700
commitfd9e9e3ba6b43b4458846a1b5bb89de6d76c33a4 (patch)
treed6faac8232029a28161f6672ce8166ad7e63d592
parent784d4f538f26f5048c0c2de6239a7d65b5e393a4 (diff)
- (tim) [configure.ac] Bug 1078. Fix --without-kerberos5. Reported by
Mike Frysinger.
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac14
2 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index fc22408cf..16837870f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120050912
2 - (tim) [configure.ac] Bug 1078. Fix --without-kerberos5. Reported by
3 Mike Frysinger.
4
120050908 520050908
2 - (tim) [defines.h openbsd-compat/port-uw.c] Add long password support to 6 - (tim) [defines.h openbsd-compat/port-uw.c] Add long password support to
3 OpenServer 6 and add osr5bigcrypt support so when someone migrates 7 OpenServer 6 and add osr5bigcrypt support so when someone migrates
@@ -2994,4 +2998,4 @@
2994 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2998 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2995 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2999 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2996 3000
2997$Id: ChangeLog,v 1.3888 2005/09/09 04:56:33 tim Exp $ 3001$Id: ChangeLog,v 1.3889 2005/09/13 00:36:10 tim Exp $
diff --git a/configure.ac b/configure.ac
index 1e4df2e33..21d1719ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.292 2005/08/31 16:59:49 tim Exp $ 1# $Id: configure.ac,v 1.293 2005/09/13 00:36:10 tim Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -2757,14 +2757,14 @@ AC_ARG_WITH(kerberos5,
2757 if test ! -z "$blibpath" ; then 2757 if test ! -z "$blibpath" ; then
2758 blibpath="$blibpath:${KRB5ROOT}/lib" 2758 blibpath="$blibpath:${KRB5ROOT}/lib"
2759 fi 2759 fi
2760 fi
2761 2760
2762 AC_CHECK_HEADERS(gssapi.h gssapi/gssapi.h) 2761 AC_CHECK_HEADERS(gssapi.h gssapi/gssapi.h)
2763 AC_CHECK_HEADERS(gssapi_krb5.h gssapi/gssapi_krb5.h) 2762 AC_CHECK_HEADERS(gssapi_krb5.h gssapi/gssapi_krb5.h)
2764 AC_CHECK_HEADERS(gssapi_generic.h gssapi/gssapi_generic.h) 2763 AC_CHECK_HEADERS(gssapi_generic.h gssapi/gssapi_generic.h)
2765 2764
2766 LIBS="$LIBS $K5LIBS" 2765 LIBS="$LIBS $K5LIBS"
2767 AC_SEARCH_LIBS(k_hasafs, kafs, AC_DEFINE(USE_AFS)) 2766 AC_SEARCH_LIBS(k_hasafs, kafs, AC_DEFINE(USE_AFS))
2767 fi
2768 ] 2768 ]
2769) 2769)
2770 2770