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
---
 server/configure.ac        | 3 ++-
 server/providers/ldap_be.c | 7 +++++++
 server/server.mk           | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'server')

diff --git a/server/configure.ac b/server/configure.ac
index 1a40e2be..0c1036a9 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 e5c31730..8967732f 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 0bf82a8b..cd3b19ad 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)
 
 
-- 
cgit