From d8b1f9f16381231c9e0c1a4d6a7bf6eb71f47404 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Sat, 12 Dec 2009 22:25:11 +0000 Subject: [PATCH] fix mod_xml_ldap dependencies on Makefile git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15940 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/directories/mod_ldap/Makefile | 1 + src/mod/xml_int/mod_xml_ldap/Makefile | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mod/directories/mod_ldap/Makefile b/src/mod/directories/mod_ldap/Makefile index 883596587d..1fb1c2d17f 100644 --- a/src/mod/directories/mod_ldap/Makefile +++ b/src/mod/directories/mod_ldap/Makefile @@ -7,6 +7,7 @@ LDAP_BUILDDIR=$(switch_builddir)/libs/$(LDAP) LDAPLA=$(LDAP_BUILDDIR)/libraries/libldap_r/libldap_r.la LIBLBERLA=$(LDAP_BUILDDIR)/libraries/liblber/liblber.la + LOCAL_CFLAGS=-DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA) diff --git a/src/mod/xml_int/mod_xml_ldap/Makefile b/src/mod/xml_int/mod_xml_ldap/Makefile index 8fcea62939..ee963e0596 100644 --- a/src/mod/xml_int/mod_xml_ldap/Makefile +++ b/src/mod/xml_int/mod_xml_ldap/Makefile @@ -18,9 +18,12 @@ DEFAULT_ARGS+= --disable-slapd --disable-slurpd --disable-relay --disable-bdb -- $(LDAP_DIR): $(GETLIB) $(LDAP).tar.gz + +$(LDAP_BUILDDIR)/Makefile: $(LDAP_DIR) mkdir -p $(LDAP_BUILDDIR) cd $(LDAP_BUILDDIR) && $(DEFAULT_VARS) $(LDAP_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(LDAP_DIR) -$(LIBLUTILA) $(LDAPLA) $(LIBLBERLA): $(LDAP_DIR) +$(LDAPLA) $(LIBLBERLA): $(LDAP_BUILDDIR)/Makefile cd $(LDAP_BUILDDIR) && $(MAKE) $(TOUCH_TARGET) +