diff options
author | unknown <kent@mysql.com> | 2006-04-05 10:39:44 +0200 |
---|---|---|
committer | unknown <kent@mysql.com> | 2006-04-05 10:39:44 +0200 |
commit | bae996f67c96909abd5ed0d44072e03e72e8e360 (patch) | |
tree | cc22ce24422cf2acb4cfa7b627f762b32f4c66b3 /config | |
parent | 07302c60078b21b90d00b80677beced5de521f10 (diff) | |
parent | 57cfa4d17c1e2e05fa71e19c126a59c8a6a03c81 (diff) | |
download | mariadb-git-bae996f67c96909abd5ed0d44072e03e72e8e360.tar.gz |
Merge mysql.com:/Users/kent/mysql/bk/tmp_merge
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
config/ac-macros/yassl.m4:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
netware/BUILD/compile-linux-tools:
Auto merged
Diffstat (limited to 'config')
-rw-r--r-- | config/ac-macros/yassl.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4 index 0de93670663..c736f2f10f2 100644 --- a/config/ac-macros/yassl.m4 +++ b/config/ac-macros/yassl.m4 @@ -39,5 +39,5 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ AC_SUBST(yassl_libs) AC_SUBST(yassl_includes) AC_SUBST(yassl_dir) - AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ]) + AM_CONDITIONAL([HAVE_YASSL], [ test "$with_yassl" = "yes" ]) ]) |