You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2014/12/13 21:36:48 UTC
thrift git commit: THRIFT-2887 Respect --with-openssl when building
C++ support.
Repository: thrift
Updated Branches:
refs/heads/master de76a3772 -> a195a2574
THRIFT-2887 Respect --with-openssl when building C++ support.
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/a195a257
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/a195a257
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/a195a257
Branch: refs/heads/master
Commit: a195a2574ef9729da9be65283d29b87e39e8ebcb
Parents: de76a37
Author: Jon Parise <jo...@pinterest.com>
Authored: Thu Dec 11 17:36:12 2014 -0800
Committer: Roger Meier <ro...@apache.org>
Committed: Sat Dec 13 21:36:25 2014 +0100
----------------------------------------------------------------------
configure.ac | 2 ++
lib/cpp/Makefile.am | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/a195a257/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index ce9191f..6d55f8a 100755
--- a/configure.ac
+++ b/configure.ac
@@ -137,6 +137,8 @@ if test "$with_cpp" = "yes"; then
have_cpp="yes"
fi
+ AX_CHECK_OPENSSL()
+
AX_LIB_EVENT([1.0])
have_libevent=$success
http://git-wip-us.apache.org/repos/asf/thrift/blob/a195a257/lib/cpp/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index d0bfe62..857569a 100755
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -32,7 +32,7 @@ pkgconfigdir = $(libdir)/pkgconfig
lib_LTLIBRARIES = libthrift.la
pkgconfig_DATA = thrift.pc
-libthrift_la_LDFLAGS = -release $(VERSION) $(BOOST_LDFLAGS)
+libthrift_la_LDFLAGS = -release $(VERSION) $(BOOST_LDFLAGS) $(OPENSSL_LDFLAGS)
## We only build the extra libraries if we have the dependencies,
## but we install all of the headers unconditionally.
@@ -50,8 +50,8 @@ pkgconfig_DATA += thrift-qt.pc
endif
AM_CXXFLAGS = -Wall -Wextra -pedantic
-AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(srcdir)/src
-AM_LDFLAGS = $(BOOST_LDFLAGS)
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(OPENSSL_INCLUDES) -I$(srcdir)/src
+AM_LDFLAGS = $(BOOST_LDFLAGS) $(OPENSSL_LDFLAGS)
# Define the source files for the module