1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.in modifications to help libmysql_r work with distcheck

Browse Source 
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:
unknown 2000-08-28 18:27:12 +02:00
parent 9139e9764e
commit b920d26056
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.am
View File

@ -31,11 +31,15 @@ CLEANFILES = linked_client_sources linked_server_sources
# This is just so that the linking is done early. # This is just so that the linking is done early.
config.h: linked_client_sources linked_server_sources config.h: linked_client_sources linked_server_sources
linked_client_sources: linked_client_sources: @linked_client_targets@
cd libmysql; $(MAKE) link_sources
cd libmysql_r; $(MAKE) link_sources
echo timestamp > linked_client_sources 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 #avoid recursive make calls in sql directory
linked_server_sources: linked_server_sources:
cd sql; rm -f mini_client_errors.c;@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c cd sql; rm -f mini_client_errors.c;@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c

3
configure.in
View File

@ -1757,14 +1757,17 @@ server_scripts=
dnl This probably should be cleaned up more - for now the threaded dnl This probably should be cleaned up more - for now the threaded
dnl client is just using plain-old libs. dnl client is just using plain-old libs.
sql_client_dirs="libmysql client" sql_client_dirs="libmysql client"
linked_client_targets="linked_libmysql_sources"
CLIENT_LIBS=$NON_THREADED_CLIENT_LIBS CLIENT_LIBS=$NON_THREADED_CLIENT_LIBS
if test "$THREAD_SAFE_CLIENT" != "no" if test "$THREAD_SAFE_CLIENT" != "no"
then then
sql_client_dirs="libmysql_r $sql_client_dirs" sql_client_dirs="libmysql_r $sql_client_dirs"
linked_client_targets="$linked_client_targets linked_libmysql_r_sources"
AC_DEFINE(THREAD_SAFE_CLIENT) AC_DEFINE(THREAD_SAFE_CLIENT)
fi fi
AC_SUBST(CLIENT_LIBS) AC_SUBST(CLIENT_LIBS)
AC_SUBST(sql_client_dirs) AC_SUBST(sql_client_dirs)
AC_SUBST(linked_client_targets)
if test "$with_server" = "yes" if test "$with_server" = "yes"
then then