bk commit into 5.1 tree (kent:1.2226)

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2226 06/03/25 12:42:09 kent@stripped +1 -0
  configure.in:
    AC_ARG_WITH inside "if" sometimes gives
    unexpected result, --with-fast-mutexes not
    disabled if --with-debug given

  configure.in
    1.352 06/03/25 12:06:13 kent@stripped +12 -10
    AC_ARG_WITH inside "if" sometimes gives
    unexpected result, --with-fast-mutexes not
    disabled if --with-debug given

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	c-4d4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-release

--- 1.351/configure.in	2006-03-22 07:59:49 +01:00
+++ 1.352/configure.in	2006-03-25 12:06:13 +01:00
@@ -1608,18 +1608,20 @@
   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