Commit 1d28a6f1 authored by tim@work.mysql.com's avatar tim@work.mysql.com
Browse files

configure.in modifications to help libmysql_r work with distcheck 

Makefile.am	modifications to help libmysql_r work with distcheck
parent e9bc4066

Makefile.am

+6 −2
Original line number Diff line number Diff line
@@ -31,10 +31,14 @@ 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:

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

	echo timestamp > linked_client_sources



#avoid recursive make calls in sql directory

linked_server_sources:

configure.in

+3 −0
Original line number Diff line number Diff line
@@ -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