From: Andrew Deason <adeason@sinenomine.net>
Date: Tue, 26 Apr 2011 19:32:25 +0000 (-0500)
Subject: Fix --without-krb5
X-Git-Tag: upstream/1.6.11_pre2^2~17
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7308aab9d911d87bde8a0a8a1e6120b83ea9bde6;p=packages%2Fo%2Fopenafs.git

Fix --without-krb5

Currently, specifying --without-krb5 causes the AM_CONDITIONAL
KRB5_USES_COM_ERR to not be defined, which makes configure refuse to
run successfully. Fix this by forcing KRB5_USES_COM_ERR to always be
false if we are running explicitly without krb5.

Reviewed-on: http://gerrit.openafs.org/4576
Reviewed-by: Russ Allbery <rra@stanford.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry picked from commit 9b405a7b082a8498fb6e918df73482ad05e251ea)

Change-Id: I4e706a828e205cf649f09d770986bdfb27f984aa
Reviewed-on: http://gerrit.openafs.org/11636
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Daria Brashear <shadow@your-file-system.com>
---

diff --git a/src/cf/krb5.m4 b/src/cf/krb5.m4
index 898c29c61..08c8c5623 100644
--- a/src/cf/krb5.m4
+++ b/src/cf/krb5.m4
@@ -262,7 +262,8 @@ AC_DEFUN([RRA_LIB_KRB5_OPTIONAL],
  AS_IF([test x"$rra_use_kerberos" != xfalse],
      [AS_IF([test x"$rra_use_kerberos" = xtrue],
          [_RRA_LIB_KRB5_INTERNAL([true])],
-         [_RRA_LIB_KRB5_INTERNAL([false])])])
+         [_RRA_LIB_KRB5_INTERNAL([false])])],
+     [AM_CONDITIONAL([KRB5_USES_COM_ERR], [false])])
  AS_IF([test x"$KRB5_LIBS" != x],
     [AC_DEFINE([HAVE_KERBEROS], 1, [Define to enable Kerberos features.])])])