diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-12-06 10:23:58 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-12-06 10:23:58 +0100 |
| commit | 7952ac489b22175c9fcd1448b4b6eda23792d858 (patch) | |
| tree | ea096cbe43e3603619bf88107a072766bff92b8e /configure.in | |
| parent | 9d7181844c24bd97dd9078047aaf600bf2fb40d2 (diff) | |
| download | mariadb-git-7952ac489b22175c9fcd1448b4b6eda23792d858.tar.gz | |
configure.in:
Merged missing change in the 5.0 community repository, --without-server
was not working if thread safe client was enabled (Bug#32898)
configure.in:
Merged missing change in the 5.0 community repository, --without-server
was not working if thread safe client was enabled (Bug#32898)
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 05a6620965b..000bc69a967 100644 --- a/configure.in +++ b/configure.in @@ -2675,13 +2675,17 @@ AM_CONDITIONAL(HAVE_NETWARE, test "$netware_dir" = "netware") export CC CXX CFLAGS CXXFLAGS LD LDFLAGS AR ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS'" -if test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no" +if test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no" then AC_DEFINE([THREAD], [1], [Define if you want to have threaded code. This may be undef on client code]) # Avoid _PROGRAMS names THREAD_LOBJECTS="thr_alarm.o thr_lock.o thr_mutex.o thr_rwlock.o my_pthread.o my_thr_init.o mf_keycache.o" AC_SUBST(THREAD_LOBJECTS) +fi + +if test "$with_server" != "no" +then server_scripts="mysqld_safe mysql_install_db" sql_server_dirs="strings mysys dbug extra regex" |