From: David M. Lee <dlee@digium.com>
Date: Sat, 8 Sep 2012 06:18:48 +0000 (+0000)
Subject: Add OPENSSL_INCLUDE to the CFLAGS for ssl.c and tcptls.c.
X-Git-Tag: 13.0.0-beta1~2558
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=569561b6f4ccd8c01b64e51410a4d36d1f4c89e1;p=thirdparty%2Fasterisk.git

Add OPENSSL_INCLUDE to the CFLAGS for ssl.c and tcptls.c.

Without this flag, those files will compile with the system installed
OpenSSL headers (if they exist). This is a real bummer if a different
path was specified using --with-ssl=

(closes issue ASTERISK-20392)
........
Merged revisions 372682 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Recorded merge of revisions 372695 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Recorded merge of revisions 372696 from http://svn.asterisk.org/svn/asterisk/branches/11


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

diff --git a/main/Makefile b/main/Makefile
index 9387a04870..5ec9b8fe0e 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -194,6 +194,8 @@ ASTSSL_SO_VERSION=1
 
 ASTSSL_LDLIBS=-L. -lasteriskssl
 
+libasteriskssl.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE)
+
 ifeq ($(findstring darwin,$(OSARCH)),) # not Darwin
 ASTSSL_LIB:=libasteriskssl.so
 
@@ -235,6 +237,8 @@ endif
 
 endif
 
+tcptls.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE)
+
 $(MAIN_TGT): $(OBJS) $(ASTSSL_LIB) $(LIBEDIT_OBJ) $(AST_EMBED_LDSCRIPTS)
 	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
 	$(ECHO_PREFIX) echo "   [LD] $(OBJS) $(LIBEDIT_OBJ) $(AST_EMBED_LDSCRIPTS) -> $@"