From: David M. Lee Date: Sat, 8 Sep 2012 05:21:41 +0000 (+0000) Subject: Add OPENSSL_INCLUDE to the CFLAGS for ssl.c and tcptls.c. X-Git-Tag: 10.9.0-rc1~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c831bcb52bd78f879a1bd49c72463fe46f4b6b6;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 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@372695 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) -> $@"