bzr commit into libmysql branch (jimw:2824)

[Jim Winstead]

#At file:///Users/jimw/my/libmysql-1.0/ based on revid:jimw@stripped

 2824 Jim Winstead	2009-02-24 [merge]
      Merge with latest changes
modified:
  CMakeLists.txt
  extlib/yassl/CMakeLists.txt
  extlib/yassl/taocrypt/CMakeLists.txt

=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2009-02-23 23:38:52 +0000
+++ b/CMakeLists.txt	2009-02-24 19:28:21 +0000
@@ -58,7 +58,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DI
                ${CMAKE_CURRENT_BINARY_DIR}/include/mysql_version.h @ONLY)
 
 IF(NOT SKIP_SSL)
-  ADD_DEFINITIONS(-DHAVE_YASSL -DHAVE_OPENSSL -DYASSL_PURE_C)
+  ADD_DEFINITIONS(-DHAVE_YASSL -DYASSL_PURE_C -DHAVE_OPENSSL)
 ENDIF(NOT SKIP_SSL)
 
 # Set debug options

=== modified file 'extlib/yassl/CMakeLists.txt'
--- a/extlib/yassl/CMakeLists.txt	2008-11-26 01:22:33 +0000
+++ b/extlib/yassl/CMakeLists.txt	2009-02-24 07:23:37 +0000
@@ -27,6 +27,9 @@ ADD_DEFINITIONS("-D_LIB -DYASSL_PREFIX")
 SET(YASSL_SOURCES  src/buffer.cpp src/cert_wrapper.cpp src/crypto_wrapper.cpp src/handshake.cpp src/lock.cpp 
 				src/log.cpp src/socket_wrapper.cpp src/ssl.cpp src/timer.cpp src/yassl_error.cpp 
 				src/yassl_imp.cpp src/yassl_int.cpp)
+
+SET_SOURCE_FILES_PROPERTIES(${YASSL_SOURCES} LANGUAGE C)
+
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(yassl ${YASSL_SOURCES})
 ENDIF(NOT SOURCE_SUBLIBS)

=== modified file 'extlib/yassl/taocrypt/CMakeLists.txt'
--- a/extlib/yassl/taocrypt/CMakeLists.txt	2008-11-10 18:32:35 +0000
+++ b/extlib/yassl/taocrypt/CMakeLists.txt	2009-02-24 07:23:37 +0000
@@ -28,6 +28,9 @@ SET(TAOCRYPT_SOURCES		src/aes.cpp src/ae
 				include/error.hpp include/file.hpp include/hash.hpp include/hmac.hpp include/integer.hpp 
 				include/md2.hpp include/md5.hpp include/misc.hpp include/modarith.hpp include/modes.hpp
 				include/random.hpp include/ripemd.hpp include/rsa.hpp include/sha.hpp)
+
+SET_SOURCE_FILES_PROPERTIES(${TAOCRYPT_SOURCES} LANGUAGE C)
+
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(taocrypt ${TAOCRYPT_SOURCES})
 ENDIF(NOT SOURCE_SUBLIBS)