diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | tests/SSL/Makefile.am | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 36b118d2030..32cab240e62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Feb 27 22:36:20 UTC 2006 Steve Huston <shuston@riverace.com> + + * tests/SSL/Makefile.am: Hand-corrected the addition of + ACE_TLS_CPPFLAGS, ACE_TLS_LDFLAGS, ACE_TLS_LIBS needed to pick up + user's specification of where the SSL libraries are. + Mon Feb 27 08:17:49 2006 Douglas C. Schmidt <schmidt@cse.wustl.edu> * ace/Dev_Poll_Reactor.cpp (acquire_quietly): Moved the error message diff --git a/tests/SSL/Makefile.am b/tests/SSL/Makefile.am index 4a67fb3cbe3..d4dcc3ab929 100644 --- a/tests/SSL/Makefile.am +++ b/tests/SSL/Makefile.am @@ -20,8 +20,7 @@ noinst_PROGRAMS += Thread_Pool_Reactor_SSL_Test Thread_Pool_Reactor_SSL_Test_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ - -I$(SSL_ROOT)/include \ - -I/usr/kerberos/include \ + @ACE_TLS_CPPFLAGS@ \ -DACE_HAS_SSL=1 Thread_Pool_Reactor_SSL_Test_SOURCES = \ @@ -30,7 +29,7 @@ Thread_Pool_Reactor_SSL_Test_SOURCES = \ Thread_Pool_Reactor_SSL_Test.h Thread_Pool_Reactor_SSL_Test_LDADD = \ - $(top_builddir)/ace/SSL/libACE_SSL.la $(top_builddir)/tests/libTest_Output.la $(top_builddir)/ace/libACE.la -lssl -lcrypto + $(top_builddir)/ace/SSL/libACE_SSL.la $(top_builddir)/tests/libTest_Output.la $(top_builddir)/ace/libACE.la @ACE_TLS_LDFLAGS@ @ACE_TLS_LIBS@ endif BUILD_SSL |