diff options
| author | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-03-07 16:38:39 +0000 |
|---|---|---|
| committer | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-03-07 16:38:39 +0000 |
| commit | 8a4084687fa692fa342e1e7586c48568502dc439 (patch) | |
| tree | 09d9249e89c5d365a2580bef356fc47e3a1c93b0 /ACE/include/makeinclude | |
| parent | 1ca46837f70a67bdff3406d2f115ea204664c650 (diff) | |
| download | ATCD-8a4084687fa692fa342e1e7586c48568502dc439.tar.gz | |
ChangeLogTag: Wed Mar 7 16:35:04 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'ACE/include/makeinclude')
| -rw-r--r-- | ACE/include/makeinclude/wrapper_macros.GNU | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU index 8e1f19aa57a..8cb0adab716 100644 --- a/ACE/include/makeinclude/wrapper_macros.GNU +++ b/ACE/include/makeinclude/wrapper_macros.GNU @@ -591,14 +591,18 @@ ssl ?= ifeq ($(ssl),0) override ssl = else - ifneq ($(SSL_ROOT),) - # Don't do a thing.. - else - CPPFLAGS += $(PLATFORM_SSL_CPPFLAGS) - LDFLAGS += $(PLATFORM_SSL_LDFLAGS) - LIBS += $(PLATFORM_SSL_LIBS) - ACE_MAKE_OPTIONS += ssl + ifneq ($(SSL_ROOT), /usr) + ifneq ($(SSL_ROOT),) + PLATFORM_SSL_CPPFLAGS += -I$(SSL_ROOT)/include + PLATFORM_SSL_LDFLAGS += -L$(SSL_ROOT)/lib + endif endif + PLATFORM_SSL_LIBS ?= -lssl -lcrypto + + CPPFLAGS += $(PLATFORM_SSL_CPPFLAGS) + LDFLAGS += $(PLATFORM_SSL_LDFLAGS) + LIBS += $(PLATFORM_SSL_LIBS) + ACE_MAKE_OPTIONS += ssl endif ## These are related to MPC. When 'requires' is used in a project |