diff options
| author | Michael Widenius <monty@mysql.com> | 2008-10-11 11:27:03 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2008-10-11 11:27:03 +0300 |
| commit | 56100f3a49e528315bab335edd95542590a48e61 (patch) | |
| tree | df7b9d491e2cfc2c23afa2d60af01d332a8d8d10 /configure.in | |
| parent | f47e003e1bfc56c2bf5d0f144a35517f526b538b (diff) | |
| parent | ade71b252276f8cd3de2b325074ef1dfb5694daf (diff) | |
| download | mariadb-git-56100f3a49e528315bab335edd95542590a48e61.tar.gz | |
Merged 5.1 maria with 5.1 maria team tree. Automerge.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 7e3fbd1549e..b202c1b480a 100644 --- a/configure.in +++ b/configure.in @@ -2714,14 +2714,12 @@ if test "$with_server" = "yes" -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 waiting_threads.o" - AC_SUBST(THREAD_LOBJECTS) server_scripts="mysqld_safe mysql_install_db" sql_server_dirs="strings mysys dbug extra regex" sql_server="vio sql" fi +AM_CONDITIONAL(THREAD, test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no") # IMPORTANT - do not modify LIBS past this line - this hack is the only way # I know to add the static NSS magic if we have static NSS libraries with |