diff options
author | unknown <serg@serg.mylan> | 2005-04-29 15:44:24 +0200 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2005-04-29 15:44:24 +0200 |
commit | e31358aecba242fc58ed30c81d71e46ff67ec4cb (patch) | |
tree | e40dbfe98b423eb0cf9eb6f69f9c1a42c0581900 /configure.in | |
parent | b890d3f50831158019c20408b5edbf93964f141f (diff) | |
parent | e28bf9ef5e6a4240755349a73094bc43806faa9f (diff) | |
download | mariadb-git-e31358aecba242fc58ed30c81d71e46ff67ec4cb.tar.gz |
Merge
configure.in:
SCCS merged
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.in b/configure.in index d71446aa91a..5b1ceaabdbb 100644 --- a/configure.in +++ b/configure.in @@ -47,6 +47,7 @@ sinclude(config/ac-macros/large_file.m4) sinclude(config/ac-macros/misc.m4) sinclude(config/ac-macros/openssl.m4) sinclude(config/ac-macros/readline.m4) +sinclude(config/ac-macros/yassl.m4) sinclude(config/ac-macros/zlib.m4) # Remember to add a directory sql/share/LANGUAGE @@ -2280,6 +2281,7 @@ AC_SUBST(tools_dirs) #MYSQL_CHECK_CPU MYSQL_CHECK_VIO MYSQL_CHECK_OPENSSL +MYSQL_CHECK_YASSL libmysqld_dirs= if test "$with_embedded_server" = "yes" |