diff options
| author | unknown <joerg@mysql.com> | 2004-12-30 16:47:37 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2004-12-30 16:47:37 +0100 |
| commit | 63af18b5bf3e3c428c2ab7464e4780eed6b19c2e (patch) | |
| tree | 516eb1ecbd169c1a75349e5f2ec081fa0b3cbde2 | |
| parent | 4ad77748b3ad558d4807d9aa31174eb8f72b90be (diff) | |
| parent | 2ec8327ea6ffa075cc75c87fa4e9f0a6eba5f13c (diff) | |
| download | mariadb-git-63af18b5bf3e3c428c2ab7464e4780eed6b19c2e.tar.gz | |
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
| -rw-r--r-- | .bzrignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.in | 16 |
3 files changed, 19 insertions, 3 deletions
diff --git a/.bzrignore b/.bzrignore index 37f82b008f8..ee48342fd37 100644 --- a/.bzrignore +++ b/.bzrignore @@ -946,3 +946,5 @@ libmysqld/ha_tina.cc analyse.test client/mysqladmin.c mysql-4.1.8-win-src.zip +ndb/include/ndb_version.h +ndb/include/ndb_global.h diff --git a/Makefile.am b/Makefile.am index c1ae9217e8b..93f34986a1b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,14 +23,14 @@ EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ @readline_topdir@ sql-common \ @thread_dirs@ pstack \ - @sql_server_dirs@ @sql_client_dirs@ scripts man tests \ + @sql_union_dirs@ scripts man tests \ netware @libmysqld_dirs@ \ @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ DIST_SUBDIRS = . include @docs_dirs@ zlib \ @readline_topdir@ sql-common \ @thread_dirs@ pstack \ - @sql_server_dirs@ @sql_client_dirs@ scripts @man_dirs@ tests SSL\ + @sql_union_dirs@ scripts @man_dirs@ tests SSL\ BUILD netware os2 @libmysqld_dirs@ \ @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ diff --git a/configure.in b/configure.in index f8b40872d3d..47447913168 100644 --- a/configure.in +++ b/configure.in @@ -2832,7 +2832,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 client" +sql_client_dirs="libmysql strings regex client" linked_client_targets="linked_libmysql_sources" CLIENT_LIBS=$NON_THREADED_CLIENT_LIBS if test "$THREAD_SAFE_CLIENT" != "no" @@ -3014,6 +3014,20 @@ AC_SUBST(sql_server_dirs) AC_SUBST(thread_dirs) AC_SUBST(server_scripts) +# Now that sql_client_dirs and sql_server_dirs are stable, determine the union. +# Start with the (longer) server list, add each client item not yet present. +sql_union_dirs=" $sql_server_dirs " +for DIR in $sql_client_dirs +do + if echo $sql_union_dirs | grep " $DIR " >/dev/null + then + : # already present, skip + else + sql_union_dirs="$sql_union_dirs $DIR " + fi +done +AC_SUBST(sql_union_dirs) + #if test "$with_posix_threads" = "no" -o "$with_mit_threads" = "yes" #then # MIT pthreads does now support connecting with unix sockets |