Drop --with-openldap option in the client. This is no longer optional.

1 files changed, 30 insertions, 38 deletions

diff --git a/ipa-client/configure.ac b/ipa-client/configure.ac
index c9d9e435..bed2e297 100644
--- a/ipa-client/configure.ac
+++ b/ipa-client/configure.ac
@@ -84,47 +84,39 @@ fi
 AC_SUBST(KRB5_LIBS)
 
 dnl ---------------------------------------------------------------------------
-dnl - Check for Mozilla LDAP or OpenLDAP SDK
-dnl ---------------------------------------------------------------------------
-
-AC_ARG_WITH(openldap, [  --with-openldap            Use OpenLDAP])
-
-if test x$with_openldap = xyes; then
-        AC_CHECK_LIB(ldap, ldap_search, with_ldap=yes)
-        dnl Check for other libraries we need to link with to get the main routines.
-        test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes], , -llber) }
-        test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes], , -llber -lkrb) }
-        test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes with_ldap_des=yes], , -llber -lkrb -ldes) }
-        dnl Recently, we need -lber even though the main routines are elsewhere,
-        dnl because otherwise be get link errors w.r.t. ber_pvt_opt_on.  So just
-        dnl check for that (it's a variable not a fun but that doesn't seem to
-        dnl matter in these checks)  and stick in -lber if so.  Can't hurt (even to
-        dnl stick it in always shouldn't hurt, I don't think) ... #### Someone who
-        dnl #### understands LDAP needs to fix this properly.
-        test "$with_ldap_lber" != "yes" && { AC_CHECK_LIB(lber, ber_pvt_opt_on, with_ldap_lber=yes) }
-
-        if test "$with_ldap" = "yes"; then
-          if test "$with_ldap_des" = "yes" ; then
-            OPENLDAP_LIBS="${OPENLDAP_LIBS} -ldes"
-          fi
-          if test "$with_ldap_krb" = "yes" ; then
-            OPENLDAP_LIBS="${OPENLDAP_LIBS} -lkrb"
-          fi
-          if test "$with_ldap_lber" = "yes" ; then
-            OPENLDAP_LIBS="${OPENLDAP_LIBS} -llber"
-          fi
-          OPENLDAP_LIBS="${OPENLDAP_LIBS} -lldap"
-        else
-          AC_MSG_ERROR([OpenLDAP not found])
-        fi
-
-        AC_SUBST(OPENLDAP_LIBS)
+dnl - OpenLDAP SDK
+dnl ---------------------------------------------------------------------------
+
+AC_CHECK_LIB(ldap, ldap_search, with_ldap=yes)
+dnl Check for other libraries we need to link with to get the main routines.
+test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes], , -llber) }
+test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes], , -llber -lkrb) }
+test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes with_ldap_des=yes], , -llber -lkrb -ldes) }
+dnl Recently, we need -lber even though the main routines are elsewhere,
+dnl because otherwise be get link errors w.r.t. ber_pvt_opt_on.  So just
+dnl check for that (it's a variable not a fun but that doesn't seem to
+dnl matter in these checks)  and stick in -lber if so.  Can't hurt (even to
+dnl stick it in always shouldn't hurt, I don't think) ... #### Someone who
+dnl #### understands LDAP needs to fix this properly.
+test "$with_ldap_lber" != "yes" && { AC_CHECK_LIB(lber, ber_pvt_opt_on, with_ldap_lber=yes) }
+
+if test "$with_ldap" = "yes"; then
+  if test "$with_ldap_des" = "yes" ; then
+    OPENLDAP_LIBS="${OPENLDAP_LIBS} -ldes"
+  fi
+  if test "$with_ldap_krb" = "yes" ; then
+    OPENLDAP_LIBS="${OPENLDAP_LIBS} -lkrb"
+  fi
+  if test "$with_ldap_lber" = "yes" ; then
+    OPENLDAP_LIBS="${OPENLDAP_LIBS} -llber"
+  fi
+  OPENLDAP_LIBS="${OPENLDAP_LIBS} -lldap"
 else
-        PKG_CHECK_MODULES(MOZLDAP, mozldap > 6)
-	MOZLDAP_CFLAGS="${MOZLDAP_CFLAGS} -DWITH_MOZLDAP"
-	AC_SUBST(MOZLDAP_CFLAGS)
+  AC_MSG_ERROR([OpenLDAP not found])
 fi
 
+AC_SUBST(OPENLDAP_LIBS)
+
 
 dnl ---------------------------------------------------------------------------
 dnl - Check for POPT