diff options
| author | cmiller@zippy.cornsilk.net <> | 2007-12-07 11:52:41 -0500 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2007-12-07 11:52:41 -0500 |
| commit | 34ca9adee7ee6133e656e0537176f50b40a6b7c8 (patch) | |
| tree | 3a88657d083e45a4aea6f3e5f36d6d16e49a1f04 | |
| parent | 2cdac34078243c73d23d6e195550fd10f033f534 (diff) | |
| parent | b058fce73d0d85c02e2552c656cdace977792720 (diff) | |
| download | mariadb-git-34ca9adee7ee6133e656e0537176f50b40a6b7c8.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-community
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
| -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" |