Skip to content

Commit

Permalink
THRIFT-1296 SSL detection is broken
Browse files Browse the repository at this point in the history
mingw toolchain used to build "Thrift Compiler for Windows"
does not support libcrypto, so we just check if we building the cpp library

git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1167013 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
bufferoverflow committed Sep 9, 2011
1 parent 2e9f510 commit 6869112
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -187,4 +187,5 @@
/test/rb/gen-*
/test/rb/Makefile
/test/rb/Makefile.in
/thrift.exe
/ylwrap
5 changes: 5 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,10 @@ dnl of the POSIX Real-Time Extensions. This seems necessary on Linux,
dnl and we haven't yet found a system where this is a problem.
AC_CHECK_LIB(rt, clock_gettime)
AC_CHECK_LIB(socket, setsockopt)

if test "$have_cpp" = "yes" ; then
# mingw toolchain used to build "Thrift Compiler for Windows"
# does not support libcrypto, so we just check if we building the cpp library
AC_CHECK_LIB(crypto,
BN_init,
[AC_CHECK_LIB(ssl,
Expand All @@ -326,6 +330,7 @@ AC_CHECK_LIB(crypto,
)],
[AC_MSG_ERROR(["Error: libcrypto required."])]
)
fi

AC_TYPE_INT16_T
AC_TYPE_INT32_T
Expand Down

0 comments on commit 6869112

Please sign in to comment.