summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <dlenev@mysql.com>2006-03-25 18:55:02 +0300
committerunknown <dlenev@mysql.com>2006-03-25 18:55:02 +0300
commit157a6470e2195377e8cfb83e09029f8107fced6d (patch)
tree609d27c128223e080a900c09ebb3b1284083040b
parent2a60a43201ecffe2a2116bca7714e0db749666b8 (diff)
parentb16ef80fec150e222d14e9fb08b752d181ab1dd1 (diff)
downloadmariadb-git-157a6470e2195377e8cfb83e09029f8107fced6d.tar.gz
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into mysql.com:/home/dlenev/mysql-5.1-merges
-rw-r--r--configure.in22
1 files changed, 12 insertions, 10 deletions
diff --git a/configure.in b/configure.in
index 34562ce7df1..e1595c380ef 100644
--- a/configure.in
+++ b/configure.in
@@ -1608,18 +1608,20 @@ else
CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"
fi
-if test "$with_debug" = "no"
-then
- AC_ARG_WITH([fast-mutexes],
- AC_HELP_STRING([--with-fast-mutexes],
- [Compile with fast mutexes (default is disabled)]),
- [with_fast_mutexes=$withval], [with_fast_mutexes=no])
-fi
+AC_ARG_WITH([fast-mutexes],
+ AC_HELP_STRING([--with-fast-mutexes],
+ [Compile with fast mutexes (default is disabled)]),
+ [with_fast_mutexes=$withval], [with_fast_mutexes=no])
-if test "$with_fast_mutexes" = "yes"
+if test "$with_fast_mutexes" != "no"
then
- AC_DEFINE([MY_PTHREAD_FASTMUTEX], [1],
- [Define to 1 if you want to use fast mutexes])
+ if test "$with_debug" != "no"
+ then
+ AC_MSG_WARN(['--with-fast-mutexes' ignored when '--with-debug' is given])
+ else
+ AC_DEFINE([MY_PTHREAD_FASTMUTEX], [1],
+ [Define to 1 if you want to use fast mutexes])
+ fi
fi
# Force static compilation to avoid linking problems/get more speed