From: Automerge script <automerge@asterisk.org>
Date: Sat, 8 Sep 2012 06:19:10 +0000 (+0000)
Subject: Merged revisions 372695 via svnmerge from
X-Git-Tag: 10.9.0-digiumphones-rc1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f61becde23532fa5bfdc6ef5575798e8c4ffc09;p=thirdparty%2Fasterisk.git

Merged revisions 372695 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r372695 | dlee | 2012-09-08 00:21:41 -0500 (Sat, 08 Sep 2012) | 10 lines

  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
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@372701 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/Makefile b/main/Makefile
index e29e88fbde..2577628226 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -175,6 +175,10 @@ endif
 
 $(OBJS): _ASTCFLAGS+=-DAST_MODULE=\"core\"
 
+ssl.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE)
+
+tcptls.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE)
+
 $(MAIN_TGT): $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS)
 	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
 	$(ECHO_PREFIX) echo "   [LD] $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) -> $@"