summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-09-18 12:48:27 +0300
committerunknown <monty@hundin.mysql.fi>2001-09-18 12:48:27 +0300
commitbe94b8d3c84ab16b0db6e4e2e7e1248c2035ecbb (patch)
treec382bc2b66f4c31e2fc296f88678d8d1fc94eaaa
parent8a787b37f731fa645cdf433965abf6e73229cdb5 (diff)
downloadmariadb-git-be94b8d3c84ab16b0db6e4e2e7e1248c2035ecbb.tar.gz
Remove pstack from default build (because conflict with mit-pthreads)
configure.in: Don't enable pstack if mit-pthreads
-rwxr-xr-xBuild-tools/Do-all-build-steps2
-rw-r--r--configure.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/Build-tools/Do-all-build-steps b/Build-tools/Do-all-build-steps
index 2e961af0620..cb7bb999513 100755
--- a/Build-tools/Do-all-build-steps
+++ b/Build-tools/Do-all-build-steps
@@ -65,7 +65,7 @@ aclocal; autoheader; aclocal; automake; autoconf
--enable-thread-safe-client \
--with-berkeley-db \
--with-innodb \
- --with-pstack \
+ --without-pstack \
--with-extra-tools \
--with-embedded-server
diff --git a/configure.in b/configure.in
index e2d7ec89a7e..8bc274421ab 100644
--- a/configure.in
+++ b/configure.in
@@ -688,7 +688,7 @@ int main()
[USE_PSTACK=yes])
pstack_libs=
pstack_dirs=
- if test "$USE_PSTACK" = yes -a "$IS_LINUX" = "true" -a "$MACHINE_TYPE" = "i686"
+ if test "$USE_PSTACK" = yes -a "$IS_LINUX" = "true" -a "$MACHINE_TYPE" = "i686" -a "$with_mit_threads" = "no"
then
have_libiberty= have_libbfd=
my_save_LIBS="$LIBS"