bk commit into 5.0-community tree (kent:1.2542) BUG#32898

[kent]

Below is the list of changes that have just been committed into a local
5.0-community repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-06 10:23:58+01:00, kent@stripped +1 -0
  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@stripped, 2007-12-06 10:21:52+01:00, kent@stripped +5 -1
    Merged missing change in the 5.0 community repository, --without-server
    was not working if thread safe client was enabled (Bug#32898)

diff -Nrup a/configure.in b/configure.in
--- a/configure.in	2007-11-15 09:58:38 +01:00
+++ b/configure.in	2007-12-06 10:21:52 +01:00
@@ -2675,13 +2675,17 @@ AM_CONDITIONAL(HAVE_NETWARE, test "$netw
 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"