From 49271571930ee976aac332f21230b245bbde39d0 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Fri, 6 Mar 2009 10:13:44 +0100
Subject: minor fixes for the build process

enable --without-tests
---
 Makefile                   | 2 ++
 server/configure.ac        | 3 ++-
 server/providers/ldap_be.c | 7 +++++++
 server/server.mk           | 1 +
 sssd.spec                  | 6 +++++-
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 8a38214f5..d8eb90ac1 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ TARBALL_PREFIX = $(PACKAGE_NAME)-$(PACKAGE_VERSION)
 TARBALL = $(TARBALL_PREFIX).tar.gz
 LIBDIR ?= /usr/lib
 RPMBUILD ?= $(PWD)/rpmbuild
+DOC = BUILD.txt COPYING
 
 all:
 
@@ -28,6 +29,7 @@ local-archive: realdistclean
 	@for subdir in $(SUBDIRS); do \
 	    cp -pr $$subdir dist/$(TARBALL_PREFIX)/.; \
 	done
+	cp -p $(DOC) dist/$(TARBALL_PREFIX)/.
 
 tarballs: local-archive
 	-mkdir -p dist/sources
diff --git a/server/configure.ac b/server/configure.ac
index 1a40e2be7..0c1036a9f 100644
--- a/server/configure.ac
+++ b/server/configure.ac
@@ -43,6 +43,7 @@ WITH_PID_PATH
 WITH_PIPE_PATH
 WITH_INFOPIPE
 WITH_POLICYKIT
+WITH_TESTS
 
 m4_include(pkg.m4)
 m4_include(libpopt.m4)
@@ -55,7 +56,7 @@ m4_include(ldap.m4)
 m4_include(util/signal.m4)
 
 PKG_CHECK_MODULES([DBUS],[dbus-1])
-if test xHAVE_TESTS != x; then
+if test x$HAVE_TESTS != x; then
     PKG_CHECK_MODULES([CHECK],[check])
 fi
 PKG_CHECK_MODULES([NSS],[nss])
diff --git a/server/providers/ldap_be.c b/server/providers/ldap_be.c
index e5c317306..8967732fe 100644
--- a/server/providers/ldap_be.c
+++ b/server/providers/ldap_be.c
@@ -22,6 +22,13 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifdef WITH_MOZLDAP
+#define LDAP_OPT_SUCCESS LDAP_SUCCESS
+#define LDAP_TAG_EXOP_MODIFY_PASSWD_ID  ((ber_tag_t) 0x80U)
+#define LDAP_TAG_EXOP_MODIFY_PASSWD_OLD ((ber_tag_t) 0x81U)
+#define LDAP_TAG_EXOP_MODIFY_PASSWD_NEW ((ber_tag_t) 0x82U)
+#endif
+
 #include <errno.h>
 #include <ldap.h>
 #include <sys/time.h>
diff --git a/server/server.mk b/server/server.mk
index 0bf82a8b5..cd3b19adf 100644
--- a/server/server.mk
+++ b/server/server.mk
@@ -71,6 +71,7 @@ PAMSRV_OBJ = \
 
 PAMSRV_UTIL_OBJ = responder/pam/pamsrv_util.o
 
+$(LDAP_BE_OBJ): CFLAGS += $(LDAP_CFLAGS)
 $(CRYPT_OBJ): CFLAGS += $(NSS_CFLAGS)
 
 
diff --git a/sssd.spec b/sssd.spec
index 053a65669..8b1ef6d3b 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -24,8 +24,10 @@ BuildRequires: libtdb-devel
 BuildRequires: libldb-devel
 BuildRequires: dbus-devel
 BuildRequires: dbus-libs
-BuildRequires: mozldap-devel
+BuildRequires: openldap-devel
 BuildRequires: pam-devel
+BuildRequires: nss-devel
+BuildRequires: nspr-devel
 
 %description
 Provides a set of daemons to manage access to remote directories and
@@ -46,6 +48,7 @@ pushd server
            --sysconfdir=%{_sysconfdir} \
            --without-tests     \
            --without-policykit \
+           --with-openldap \
            --with-infopipe
 
 make %{?_smp_mflags}
@@ -74,6 +77,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%doc COPYING
 %{_sbindir}/sssd
 %{_libexecdir}/%{name}/
 %{_libdir}/%{name}/
-- 
cgit