Commit f2d608dd authored by Monty's avatar Monty

Update to latest libmarias3

This removes dependency of libhmash
parent daeaa600
...@@ -107,17 +107,17 @@ INCLUDE (CheckIncludeFiles) ...@@ -107,17 +107,17 @@ INCLUDE (CheckIncludeFiles)
SET(S3_SOURCES ha_s3.cc s3_func.c SET(S3_SOURCES ha_s3.cc s3_func.c
libmarias3/src/debug.c libmarias3/src/error.c libmarias3/src/marias3.c libmarias3/src/debug.c libmarias3/src/error.c libmarias3/src/marias3.c
libmarias3/src/request.c libmarias3/src/response.c) libmarias3/src/request.c libmarias3/src/response.c libmarias3/src/sha256.c
libmarias3/src/sha256-internal.c)
IF(NOT PLUGIN_S3 STREQUAL NO) IF(NOT PLUGIN_S3 STREQUAL NO)
FIND_PACKAGE(LibXml2) FIND_PACKAGE(LibXml2)
FIND_PACKAGE(CURL) FIND_PACKAGE(CURL)
CHECK_INCLUDE_FILES (mhash.h HAVE_MHASH_H)
ENDIF() ENDIF()
IF (LIBXML2_FOUND AND CURL_FOUND AND HAVE_MHASH_H) IF (LIBXML2_FOUND AND CURL_FOUND)
MYSQL_ADD_PLUGIN(s3 ${S3_SOURCES} STORAGE_ENGINE STATIC_ONLY MYSQL_ADD_PLUGIN(s3 ${S3_SOURCES} STORAGE_ENGINE STATIC_ONLY
LINK_LIBRARIES aria myisam mysys mysys_ssl xml2 curl mhash LINK_LIBRARIES aria myisam mysys mysys_ssl xml2 curl
RECOMPILE_FOR_EMBEDDED) RECOMPILE_FOR_EMBEDDED)
ENDIF() ENDIF()
......
Subproject commit e3d1c9a754e7e1b90d5171696533b52abcca91e9 Subproject commit add9e1afb81ff171f8789b6fc81fe94e184b8f27
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment