diff options
| author | unknown <kent@mysql.com> | 2006-05-20 00:09:08 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-05-20 00:09:08 +0200 |
| commit | d2a430beaf725d7f127df0fc3dac0e19d3af34d1 (patch) | |
| tree | 3bdceaeb5154bbfbb13c92864ea2065f9ac1891e /configure.in | |
| parent | a2ed1df6814825f00a95308f2c259ef4e4819fbd (diff) | |
| parent | d922e834ea9b1b6148321674364800111312704e (diff) | |
| download | mariadb-git-d2a430beaf725d7f127df0fc3dac0e19d3af34d1.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
configure.in:
Auto merged
client/mysql.cc:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/configure.in b/configure.in index bd6383963d1..64886892e2e 100644 --- a/configure.in +++ b/configure.in @@ -36,10 +36,9 @@ sinclude(config/ac-macros/ha_berkeley.m4) sinclude(config/ac-macros/ha_ndbcluster.m4) 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/replication.m4) -sinclude(config/ac-macros/yassl.m4) +sinclude(config/ac-macros/ssl.m4) sinclude(config/ac-macros/zlib.m4) # Remember to add a directory sql/share/LANGUAGE @@ -2184,8 +2183,7 @@ MYSQL_CHECK_BIG_TABLES MYSQL_CHECK_MAX_INDEXES MYSQL_CHECK_REPLICATION MYSQL_CHECK_VIO -MYSQL_CHECK_OPENSSL -MYSQL_CHECK_YASSL +MYSQL_CHECK_SSL #-------------------------------------------------------------------- # Declare our plugin modules |