diff options
author | unknown <jimw@mysql.com> | 2005-08-23 11:25:24 -0700 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2005-08-23 11:25:24 -0700 |
commit | 4b9431369611b4c3938288c0ef9eaa282f1bb417 (patch) | |
tree | 8f25e99f65e13c5974f8f6c711c8e7e6a78520a7 /configure.in | |
parent | 4eccc160525552fd2421f5dc4b33afb320f2d52b (diff) | |
download | mariadb-git-4b9431369611b4c3938288c0ef9eaa282f1bb417.tar.gz |
Fix build using --without-server. (Bug #11680)
configure.in:
Fix directories built using --without-server, and add mf_keycache.o
to list of objects only built for thread-safe library, since it requires
threading.
dbug/my_main.c:
Don't try to initialize thread globals if not built with threading.
mysys/Makefile.am:
Remove mf_keycache.c from list of files to build (it will be included
in THREAD_LOBJECTS when appropriate).
mysys/mf_getdate.c:
Fix usage of gmtime().
sql/share/Makefile.am:
Allow removal of mysqld_error.h to fail, in case it doesn't exist yet.
tests/Makefile.am:
Don't link against libmysys explicitly.
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 8a5220dbf38..612a51586ab 100644 --- a/configure.in +++ b/configure.in @@ -2444,7 +2444,7 @@ thread_dirs= dnl This probably should be cleaned up more - for now the threaded dnl client is just using plain-old libs. -sql_client_dirs="libmysql strings regex client" +sql_client_dirs="strings regex mysys sql/share libmysql client" linked_client_targets="linked_libmysql_sources" if test "$THREAD_SAFE_CLIENT" != "no" @@ -2482,10 +2482,10 @@ 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" + 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) server_scripts="mysqld_safe mysql_install_db" - sql_server_dirs="strings mysys dbug extra regex" + sql_server_dirs="strings dbug extra regex" # @@ -2593,7 +2593,6 @@ esac # END of configuration for optional table handlers # sql_server_dirs="$sql_server_dirs myisam myisammrg heap vio sql" - fi # IMPORTANT - do not modify LIBS past this line - this hack is the only way |