From: David M. Lee Date: Sat, 8 Sep 2012 03:54:28 +0000 (+0000) Subject: Add OPENSSL_INCLUDE to the CFLAGS for ssl.c and tcptls.c. X-Git-Tag: 1.8.17.0-rc1~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=245f869173a5f84c55ab005e4ed17c2b893c4910;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) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@372682 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/Makefile b/main/Makefile index 72465e56df..e877c7d9e7 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 db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) @$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS) $(ECHO_PREFIX) echo " [LD] $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@"