svn commit: r1167013 - in /thrift/trunk: .gitignore configure.ac

[ro...@apache.org]

Author: roger
Date: Fri Sep  9 06:19:35 2011
New Revision: 1167013

URL: http://svn.apache.org/viewvc?rev=1167013&view=rev
Log:
THRIFT-1296 SSL detection is broken

mingw toolchain used to build "Thrift Compiler for Windows"
does not support libcrypto, so we just check if we building the cpp library

Modified:
    thrift/trunk/.gitignore
    thrift/trunk/configure.ac

Modified: thrift/trunk/.gitignore
URL: http://svn.apache.org/viewvc/thrift/trunk/.gitignore?rev=1167013&r1=1167012&r2=1167013&view=diff
==============================================================================
--- thrift/trunk/.gitignore (original)
+++ thrift/trunk/.gitignore Fri Sep  9 06:19:35 2011
@@ -187,4 +187,5 @@
 /test/rb/gen-*
 /test/rb/Makefile
 /test/rb/Makefile.in
+/thrift.exe
 /ylwrap

Modified: thrift/trunk/configure.ac
URL: http://svn.apache.org/viewvc/thrift/trunk/configure.ac?rev=1167013&r1=1167012&r2=1167013&view=diff
==============================================================================
--- thrift/trunk/configure.ac (original)
+++ thrift/trunk/configure.ac Fri Sep  9 06:19:35 2011
@@ -316,6 +316,10 @@ dnl of the POSIX Real-Time Extensions.  
 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,
@@ -326,6 +330,7 @@ AC_CHECK_LIB(crypto,
     )],
     [AC_MSG_ERROR(["Error: libcrypto required."])]
 )
+fi
 
 AC_TYPE_INT16_T
 AC_TYPE_INT32_T