diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-11-02 09:14:22 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-11-02 09:14:22 +0100 |
| commit | 097e1e7f880b2e9f55a5cf557f373a44035e0b93 (patch) | |
| tree | 0f272881cdb19b44f6157f16035681e601d6792d | |
| parent | 6d9ac6c81aaf00b0ff733c72068ab5671a998e48 (diff) | |
| download | ATCD-097e1e7f880b2e9f55a5cf557f373a44035e0b93.tar.gz | |
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 |