mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
configure.in modifications to help libmysql_r work with distcheck
Makefile.am modifications to help libmysql_r work with distcheck Makefile.am: modifications to help libmysql_r work with distcheck configure.in: modifications to help libmysql_r work with distcheck
This commit is contained in:
parent
9139e9764e
commit
b920d26056
2 changed files with 10 additions and 3 deletions
10
Makefile.am
10
Makefile.am
|
@ -31,11 +31,15 @@ CLEANFILES = linked_client_sources linked_server_sources
|
|||
# This is just so that the linking is done early.
|
||||
config.h: linked_client_sources linked_server_sources
|
||||
|
||||
linked_client_sources:
|
||||
cd libmysql; $(MAKE) link_sources
|
||||
cd libmysql_r; $(MAKE) link_sources
|
||||
linked_client_sources: @linked_client_targets@
|
||||
echo timestamp > linked_client_sources
|
||||
|
||||
linked_libmysql_sources:
|
||||
cd libmysql; $(MAKE) link_sources
|
||||
|
||||
linked_libmysql_r_sources: linked_libmysql_sources
|
||||
cd libmysql_r; $(MAKE) link_sources
|
||||
|
||||
#avoid recursive make calls in sql directory
|
||||
linked_server_sources:
|
||||
cd sql; rm -f mini_client_errors.c;@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c
|
||||
|
|
|
@ -1757,14 +1757,17 @@ server_scripts=
|
|||
dnl This probably should be cleaned up more - for now the threaded
|
||||
dnl client is just using plain-old libs.
|
||||
sql_client_dirs="libmysql client"
|
||||
linked_client_targets="linked_libmysql_sources"
|
||||
CLIENT_LIBS=$NON_THREADED_CLIENT_LIBS
|
||||
if test "$THREAD_SAFE_CLIENT" != "no"
|
||||
then
|
||||
sql_client_dirs="libmysql_r $sql_client_dirs"
|
||||
linked_client_targets="$linked_client_targets linked_libmysql_r_sources"
|
||||
AC_DEFINE(THREAD_SAFE_CLIENT)
|
||||
fi
|
||||
AC_SUBST(CLIENT_LIBS)
|
||||
AC_SUBST(sql_client_dirs)
|
||||
AC_SUBST(linked_client_targets)
|
||||
|
||||
if test "$with_server" = "yes"
|
||||
then
|
||||
|
|
Loading…
Reference in a new issue