From: Michiel van Baak <michiel@vanbaak.info>
Date: Fri, 28 Nov 2008 14:20:11 +0000 (+0000)
Subject: Make res_config_ldap compile with the official OpenLDAP 2.3.X versions.
X-Git-Tag: 1.6.2.0-beta1~756
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=445c5296da9c1dede150d945a6794e3085ad37e8;p=thirdparty%2Fasterisk.git

Make res_config_ldap compile with the official OpenLDAP 2.3.X versions.
They removed the LDAP_DEPRECATED define from their source and since we are using a couple
of deprecated function calls we should define it with a CFLAG.

Tested by me on OpenBSD 4.4 and snuff-home on Linux to make sure everything keeps compiling.
It shouldn't break, we only define the LDAP_DEPRECATED with this which is what
all 2.2.X and older versions of OpenLDAP did in their own tree.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159734 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/Makefile b/res/Makefile
index 8084858eeb..3129180e58 100644
--- a/res/Makefile
+++ b/res/Makefile
@@ -29,6 +29,8 @@ ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
   res_agi.so_LIBS:= -lres_speech.so
 endif
 
+res_config_ldap.o: ASTCFLAGS+=-DLDAP_DEPRECATED
+
 ael/ael_lex.o: ael/ael_lex.c ../include/asterisk/ael_structs.h ael/ael.tab.h
 ael/ael_lex.o: ASTCFLAGS+=-I. -Iael -Wno-unused