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

4 files changed, 36 insertions, 41 deletions

diff --git a/Makefile b/Makefile
index 2f1d2d6a..cfdcfcfd 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ bootstrap-autogen: version-update client-autogen
 	cd install; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
 
 client-autogen: version-update
-	cd ipa-client; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR) --with-openldap; fi
+	cd ipa-client; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
 	cd install; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
 
 install: all server-install
@@ -131,7 +131,7 @@ archive-cleanup:
 tarballs: local-archive
 	-mkdir -p dist/sources
 	# tar up clean sources
-	cd dist/$(TARBALL_PREFIX)/ipa-client; ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR) --with-openldap; make distclean
+	cd dist/$(TARBALL_PREFIX)/ipa-client; ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); make distclean
 	cd dist/$(TARBALL_PREFIX)/daemons; ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); make distclean
 	cd dist/$(TARBALL_PREFIX)/install; ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); make distclean
 	cd dist; tar cfz sources/$(TARBALL) $(TARBALL_PREFIX)
diff --git a/install/po/Makefile.in b/install/po/Makefile.in
index 8cb57891..1c597ca9 100644
--- a/install/po/Makefile.in
+++ b/install/po/Makefile.in
@@ -283,3 +283,6 @@ test_lang:
 
 test: test_lang
 	./test_i18n.py
+
+maintainer-clean:
+	
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
diff --git a/ipa.spec.in b/ipa.spec.in
index 3120cd45..2a46ab05 100644
--- a/ipa.spec.in
+++ b/ipa.spec.in
@@ -229,7 +229,7 @@ make version-update
 touch daemons/NEWS daemons/README daemons/AUTHORS daemons/ChangeLog
 touch install/NEWS install/README install/AUTHORS install/ChangeLog
 %endif
-cd ipa-client; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir} --with-openldap; cd ..
+cd ipa-client; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
 %if ! %{ONLY_CLIENT}
 cd daemons; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
 cd install; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..