Commit 4a090b18 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


configure.in:
  Auto merged
parents ec08ea70 190a79c7

configure.in

+5 −1
Original line number Diff line number Diff line
@@ -2528,10 +2528,14 @@ 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])

fi



if test "$with_server" != "no"

then

  # 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)