[svn-commits] dlee: branch 11 r372696 - in /branches/11: ./ main/Makefile

[SVN commits to the Digium repositories]

Author: dlee
Date: Sat Sep  8 00:51:48 2012
New Revision: 372696

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=372696
Log:
Recorded merge of revisions 372695 from http://svn.asterisk.org/svn/asterisk/branches/10

........
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/11/   (props changed)
    branches/11/main/Makefile

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

Modified: branches/11/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/Makefile?view=diff&rev=372696&r1=372695&r2=372696
==============================================================================
--- branches/11/main/Makefile (original)
+++ branches/11/main/Makefile Sat Sep  8 00:51:48 2012
@@ -194,6 +194,8 @@
 
 ASTSSL_LDLIBS=-L. -lasteriskssl
 
+libasteriskssl.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE)
+
 ifeq ($(findstring darwin,$(OSARCH)),) # not Darwin
 ASTSSL_LIB:=libasteriskssl.so
 
@@ -235,6 +237,8 @@
 
 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) -> $@"