From 3e49cc24642964a89478609ccfb409e59a445946 Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@pinterest.com>
Date: Thu, 11 Dec 2014 17:36:12 -0800
Subject: [PATCH] Respect --with-openssl when building C++ support.

---
 configure.ac        | 2 ++
 lib/cpp/Makefile.am | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index ce9191fd095..6d55f8a7acc 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
 
diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index d0bfe62490a..857569a9406 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