diff options
| author | unknown <tim@work.mysql.com> | 2000-08-28 18:27:12 +0200 |
|---|---|---|
| committer | unknown <tim@work.mysql.com> | 2000-08-28 18:27:12 +0200 |
| commit | b920d260564a8a0d9e60499fb4dcd0ce5f5f1a48 (patch) | |
| tree | 7798ef9f1b7a750107018c77f3671920bb7ebf0b | |
| parent | 9139e9764ef8aca77a2faddf6a5af42b9938706e (diff) | |
| download | mariadb-git-b920d260564a8a0d9e60499fb4dcd0ce5f5f1a48.tar.gz | |
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
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.in | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index f10e60f8c51..f4240ac94f0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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: diff --git a/configure.in b/configure.in index a65580c9699..5a9d79f3ae1 100644 --- a/configure.in +++ b/configure.in @@ -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 |