diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-11-21 05:23:34 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-11-21 05:23:34 -0600 |
| commit | ebee67dca17c9953ab348e6dcb4ddbbb7cf0f229 (patch) | |
| tree | 46daeb8409948fcfd8c540614cc0e746a26e82d6 /main | |
| parent | 051744c4b934bbf8746c4ee019cd3a0644b4a4c6 (diff) | |
| parent | 0b4fe4a0c71a33cfc208ad08bfbf40885b83183c (diff) | |
Merge "Build: Fix issues building without SSL." into 15
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 08d1f6558..c724e2012 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\" -DAST_NOT_MODULE $(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) -DAST_NOT_MODULE -$(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 8b19e247d..e2e256f8f 100644 --- a/main/libasteriskssl.c +++ b/main/libasteriskssl.c @@ -37,7 +37,7 @@ #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> |