[svn-commits] dlee: branch 10 r372695 - in /branches/10: ./ main/Makefile

[SVN commits to the Digium repositories]

Author: dlee
Date: Sat Sep  8 00:21:41 2012
New Revision: 372695

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=372695
Log:
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

Modified:
    branches/10/   (props changed)
    branches/10/main/Makefile

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/10/main/Makefile?view=diff&rev=372695&r1=372694&r2=372695
==============================================================================
--- branches/10/main/Makefile (original)
+++ branches/10/main/Makefile Sat Sep  8 00:21:41 2012
@@ -175,6 +175,10 @@
 
 $(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) -> $@"