diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-28 15:54:16 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-28 15:54:16 +0300 |
| commit | 6c716007d13ffd74bb5c3dd7c512d4d7026a23d8 (patch) | |
| tree | 0bab5217d4ea83929d314c2ce29f962a949c95c8 /configure.in | |
| parent | c3eabe01fc30ee38f64b17fabfd58c6328751660 (diff) | |
| parent | e7441f0b602735e2c40b0e0e7cfb01a2443aaa5a (diff) | |
| download | mariadb-git-6c716007d13ffd74bb5c3dd7c512d4d7026a23d8.tar.gz | |
Manual merge of WL#4738 from mysql-next-mr:
- backported code that handles %f/%g arguments in
my_vsnprintf.c from 6.0
- backported %f/%g tests in unittest/mysys/my_vsnprintf-t.c
from 6.0
- replaced snprintf("%g") in sql/set_var.cc with my_gcvt()
- removed unnecessary "--replace-result"s for Windows in
mysql-test/suite/sys_vars/t/long_query_time_basic.test
- some test results adjustments
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.in b/configure.in index ff6b486defb..26de7a637e9 100644 --- a/configure.in +++ b/configure.in @@ -2890,7 +2890,7 @@ case $SYSTEM_TYPE in fi # if there is no readline, but we want to build with readline, we fail - if [test "$want_to_use_readline" = "yes"] && [test ! -d "./cmd-line-utils/readline"] + if [test "$want_to_use_readline" = "yes"] && [test ! -d "$srcdir/cmd-line-utils/readline"] then AC_MSG_ERROR([This commercially licensed MySQL source package can't be built with libreadline. Please use --with-libedit to use @@ -3030,8 +3030,8 @@ AC_SUBST(server_scripts) AC_SUBST(mysql_plugin_dirs) AC_SUBST(mysql_plugin_libs) -AC_SUBST(mysql_plugin_defs) - +AC_SUBST(mysql_optional_plugins) +AC_SUBST(mysql_mandatory_plugins) # Now that sql_client_dirs and sql_server_dirs are stable, determine the union. # We support client-only builds by "--without-server", but not vice versa, |