summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rw-r--r--configure.in4
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 9f74861ce48..a24164f0bca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,8 @@ TAR = gtar
# These are built from source in the Docs directory
EXTRA_DIST = INSTALL-SOURCE README \
COPYING COPYING.LIB MIRRORS
-SUBDIRS = include @docs_dirs@ @readline_dir@ @sql_client_dirs@ \
+SUBDIRS = include @docs_dirs@ @readline_dir@ \
+ @thread_dirs@ @sql_client_dirs@ \
@sql_server_dirs@ scripts tests man \
@bench_dirs@ support-files
diff --git a/configure.in b/configure.in
index 5a9d79f3ae1..a26c45f4e2b 100644
--- a/configure.in
+++ b/configure.in
@@ -1753,6 +1753,7 @@ MYSQL_CHECK_BDB
# If we have threads generate some library functions and test programs
sql_server_dirs=
server_scripts=
+thread_dirs=
dnl This probably should be cleaned up more - for now the threaded
dnl client is just using plain-old libs.
@@ -1807,7 +1808,7 @@ install: all # modified by MySQL configure' \
if test "$with_posix_threads" = "no" -o "$with_mit_threads" = "yes"
then
# MIT user level threads
- sql_server_dirs="mit-pthreads $sql_server_dirs"
+ thread_dirs="mit-pthreads"
AC_DEFINE(HAVE_mit_thread)
MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include"
AC_SUBST(MT_INCLUDES)
@@ -1823,6 +1824,7 @@ install: all # modified by MySQL configure' \
fi
fi
AC_SUBST(sql_server_dirs)
+AC_SUBST(thread_dirs)
AC_SUBST(server_scripts)
if test "$with_posix_threads" = "no" -o "$with_mit_threads" = "yes"