diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-11-02 09:16:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-02 09:16:03 +0100 |
commit | bb8c13028bf1879f28e8afd69000d4ef81b74faf (patch) | |
tree | 3b50f2e7796ec6f76ceb8a9d47700af7572f2371 | |
parent | 52158010b5864fddfa7ccf04dc372de09572b508 (diff) | |
parent | 097e1e7f880b2e9f55a5cf557f373a44035e0b93 (diff) | |
download | ATCD-bb8c13028bf1879f28e8afd69000d4ef81b74faf.tar.gz |
Merge pull request #737 from jwillemsen/jwi-gnuacessl
Use SSL_INCDIR and SSL_LIBDIR as they are now generated by MPC
-rw-r--r-- | ACE/bin/MakeProjectCreator/config/ace_openssl.mpb | 4 | ||||
-rw-r--r-- | ACE/include/makeinclude/wrapper_macros.GNU | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/ACE/bin/MakeProjectCreator/config/ace_openssl.mpb b/ACE/bin/MakeProjectCreator/config/ace_openssl.mpb index dd31898e0e8..b566b40300e 100644 --- a/ACE/bin/MakeProjectCreator/config/ace_openssl.mpb +++ b/ACE/bin/MakeProjectCreator/config/ace_openssl.mpb @@ -4,9 +4,9 @@ project : openssl { // the values provided by the openssl base project. specific (gnuace) { lit_libs -= ssl crypto - includes -= $(SSL_ROOT)/include + includes -= $(SSL_INCDIR) includes -= /usr/kerberos/include - libpaths -= $(SSL_ROOT)/lib + libpaths -= $(SSL_LIBDIR) } // These values get set in platform_macros.GNU or defaulted diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU index 9d2a25292cd..8627695fccd 100644 --- a/ACE/include/makeinclude/wrapper_macros.GNU +++ b/ACE/include/makeinclude/wrapper_macros.GNU @@ -677,8 +677,16 @@ ifeq ($(ssl),0) else ifneq ($(SSL_ROOT), /usr) ifneq ($(SSL_ROOT),) - PLATFORM_SSL_CPPFLAGS += -I$(SSL_ROOT)/include - PLATFORM_SSL_LDFLAGS += -L$(SSL_ROOT)/lib + ifneq ($(SSL_INCDIR),) + PLATFORM_SSL_CPPFLAGS += -I$(SSL_INCDIR) + else + PLATFORM_SSL_CPPFLAGS += -I$(SSL_ROOT)/include + endif + ifneq ($(SSL_LIBDIR),) + PLATFORM_SSL_LDFLAGS += -L$(SSL_LIBDIR) + else + PLATFORM_SSL_LDFLAGS += -L$(SSL_ROOT)/lib + endif endif endif PLATFORM_SSL_LIBS ?= -lssl -lcrypto |