diff options
author | Joshua Colp <jcolp@digium.com> | 2017-11-21 05:23:28 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-11-21 05:23:28 -0600 |
commit | 3ce96d2e03a5098e72688b1787e6a99e08f91012 (patch) | |
tree | 7aabad7d072560529412991461f58e5bb59a2b0a /main | |
parent | 1aba7dd2297846d77438753b9f4aac202269cbce (diff) | |
parent | 6a5ab65c88982707234a39a44030d0cb47c2b782 (diff) |
Merge "Build: Fix issues building without SSL." into 13
Diffstat (limited to 'main')
-rw-r--r-- | main/Makefile | 4 | ||||
-rw-r--r-- | main/libasteriskssl.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/main/Makefile b/main/Makefile index efb0cafc9..4646c1b99 100644 --- a/main/Makefile +++ b/main/Makefile @@ -273,7 +273,7 @@ endif $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTLDFLAGS+=-Wl,-soname=$(ASTPJ_LIB).$(ASTPJ_SO_VERSION) $(PJ_LDFLAGS) $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" $(PJ_CFLAGS) -$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): LIBS+=$(PJPROJECT_LDLIBS) -lssl -lcrypto -luuid -lm -lpthread $(RT_LIB) +$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): LIBS+=$(PJPROJECT_LDLIBS) $(OPENSSL_LIB) $(UUID_LIB) -lm -lpthread $(RT_LIB) ifeq ($(GNU_LD),1) $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): SO_SUPPRESS_SYMBOLS=-Wl,--version-script,libasteriskpj.exports,--warn-common endif @@ -298,7 +298,7 @@ ASTPJ_LIB:=libasteriskpj.dylib # /lib or /usr/lib $(ASTPJ_LIB): _ASTLDFLAGS+=-dynamiclib -install_name $(ASTLIBDIR)/$(ASTPJ_LIB) $(PJ_LDFLAGS) $(ASTPJ_LIB): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" $(PJ_CFLAGS) -$(ASTPJ_LIB): LIBS+=$(PJPROJECT_LIBS) -lssl -lcrypto -luuid -lm -lpthread $(RT_LIB) +$(ASTPJ_LIB): LIBS+=$(PJPROJECT_LIBS) $(OPENSSL_LIB) $(UUID_LIB) -lm -lpthread $(RT_LIB) $(ASTPJ_LIB): SOLINK=$(DYLINK) # Special rules for building a shared library (not a dynamically loadable module) diff --git a/main/libasteriskssl.c b/main/libasteriskssl.c index a89f19125..41c6bcbb5 100644 --- a/main/libasteriskssl.c +++ b/main/libasteriskssl.c @@ -39,7 +39,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #endif #if defined(HAVE_OPENSSL) && \ - !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + (!defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) #include <dlfcn.h> |