summaryrefslogtreecommitdiffstats
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 fc22408c..16837870 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20050912
+ - (tim) [configure.ac] Bug 1078. Fix --without-kerberos5. Reported by
+ Mike Frysinger.
+
20050908
- (tim) [defines.h openbsd-compat/port-uw.c] Add long password support to
OpenServer 6 and add osr5bigcrypt support so when someone migrates
@@ -2994,4 +2998,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3888 2005/09/09 04:56:33 tim Exp $
+$Id: ChangeLog,v 1.3889 2005/09/13 00:36:10 tim Exp $
diff --git a/configure.ac b/configure.ac
index 1e4df2e3..21d1719c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.292 2005/08/31 16:59:49 tim Exp $
+# $Id: configure.ac,v 1.293 2005/09/13 00:36:10 tim Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
@@ -2757,14 +2757,14 @@ AC_ARG_WITH(kerberos5,
if test ! -z "$blibpath" ; then
blibpath="$blibpath:${KRB5ROOT}/lib"
fi
- fi
- AC_CHECK_HEADERS(gssapi.h gssapi/gssapi.h)
- AC_CHECK_HEADERS(gssapi_krb5.h gssapi/gssapi_krb5.h)
- AC_CHECK_HEADERS(gssapi_generic.h gssapi/gssapi_generic.h)
+ AC_CHECK_HEADERS(gssapi.h gssapi/gssapi.h)
+ AC_CHECK_HEADERS(gssapi_krb5.h gssapi/gssapi_krb5.h)
+ AC_CHECK_HEADERS(gssapi_generic.h gssapi/gssapi_generic.h)
- LIBS="$LIBS $K5LIBS"
- AC_SEARCH_LIBS(k_hasafs, kafs, AC_DEFINE(USE_AFS))
+ LIBS="$LIBS $K5LIBS"
+ AC_SEARCH_LIBS(k_hasafs, kafs, AC_DEFINE(USE_AFS))
+ fi
]
)