From: Nalin Dahyabhai <nalin@redhat.com>
Date: Thu, 20 Dec 2012 21:47:50 +0000 (-0500)
Subject: Remove dangling reference to $with_edirectory
X-Git-Tag: krb5-1.12-alpha1~186
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6349bc7e32cdab69dc422122a1905a7aba581b02;p=thirdparty%2Fkrb5.git

Remove dangling reference to $with_edirectory

Remove a reference to eDirectory that persisted after support for
eDirectory was removed.  Almost certainly harmless anyway.

[ghudson@mit.edu: also quote $with_ldap]
---

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 4fef4b72ef..fb02956b9f 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1645,10 +1645,7 @@ AC_ARG_WITH([ldap],
     *)  AC_MSG_ERROR(Invalid option value --with-ldap="$withval") ;;
 esac], with_ldap=no)dnl
 
-if test $with_ldap = yes; then
-  if test $with_edirectory = yes; then
-    AC_MSG_ERROR(Cannot enable both OpenLDAP and eDirectory backends; choose one.)
-  fi
+if test "$with_ldap" = yes; then
   AC_MSG_NOTICE(enabling OpenLDAP database backend module support)
   OPENLDAP_PLUGIN=yes
 fi