trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jackso...@apache.org
Subject trafficserver git commit: TS-4033 Fix openssl includes for Ssslheaders tests
Date Wed, 18 Nov 2015 23:41:19 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master b4ed14860 -> a0a8ea18a


TS-4033 Fix openssl includes for Ssslheaders tests

sslheaders tests always fail if ATS is built with external openssl


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a0a8ea18
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a0a8ea18
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a0a8ea18

Branch: refs/heads/master
Commit: a0a8ea18a1eea16ea1deb027f08497615caa119e
Parents: b4ed148
Author: Thomas Jackson <jacksontj@apache.org>
Authored: Wed Nov 18 15:37:01 2015 -0800
Committer: Thomas Jackson <jacksontj@apache.org>
Committed: Wed Nov 18 15:37:01 2015 -0800

----------------------------------------------------------------------
 plugins/experimental/sslheaders/Makefile.am | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a0a8ea18/plugins/experimental/sslheaders/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/experimental/sslheaders/Makefile.am b/plugins/experimental/sslheaders/Makefile.am
index 0eed061..f29a20f 100644
--- a/plugins/experimental/sslheaders/Makefile.am
+++ b/plugins/experimental/sslheaders/Makefile.am
@@ -16,7 +16,7 @@
 
 include $(top_srcdir)/build/plugins.mk
 
-AM_CPPFLAGS += -I$(top_srcdir)/lib
+AM_CPPFLAGS += @OPENSSL_INCLUDES@ -I$(top_srcdir)/lib
 
 noinst_LTLIBRARIES = libsslhdr.la
 pkglib_LTLIBRARIES = sslheaders.la
@@ -30,6 +30,9 @@ sslheaders_la_LIBADD = libsslhdr.la
 
 test_sslheaders_SOURCES = test_sslheaders.cc sslheaders.h
 test_sslheaders_LDADD = \
+  @LIBTOOL_LINK_FLAGS@ \
+  @OPENSSL_LIBS@ \
+  @OPENSSL_LDFLAGS@ \
   libsslhdr.la \
   $(top_builddir)/lib/ts/libtsutil.la \
   @OPENSSL_LIBS@


Mime
View raw message