From 5484ee58159917c2064711e5483c3e8fbd0881d1 Mon Sep 17 00:00:00 2001
From: "kent@mysql.com" <>
Date: Fri, 24 Feb 2006 01:24:41 +0100
Subject: Makefile.am:   Conditionally link with libmysqlclient.la or
 libmysqlclient_r.la configure.in:   Corrected help text for --with-debug
 option   Changed default to be with thread safe client   Added
 THREAD_SAFE_CLIENT to be used in 'if' in make files

---
 configure.in | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index 2d914d8f90c..49b94f1e1e3 100644
--- a/configure.in
+++ b/configure.in
@@ -589,10 +589,10 @@ AC_ARG_WITH(named-curses-libs,
 
 # Make thread safe client
 AC_ARG_ENABLE(thread-safe-client,
-    [  --enable-thread-safe-client   
-                          Compile the client with threads.],
+    [  --disable-thread-safe-client   
+                          Compile the client without threads.],
     [ THREAD_SAFE_CLIENT=$enableval ],
-    [ THREAD_SAFE_CLIENT=no ]
+    [ THREAD_SAFE_CLIENT=yes ]
     )
 
 # compile with strings functions in assembler
@@ -1564,7 +1564,8 @@ then
 fi
 
 AC_ARG_WITH(debug,
-    [  --without-debug         Build a production version without debugging code],
+    [  --with-debug            Add debug code
+  --with-debug=full       Add debug code (adds memory checker, very slow)],
     [with_debug=$withval],
     [with_debug=no])
 if test "$with_debug" = "yes"
@@ -2472,6 +2473,8 @@ dnl client is just using plain-old libs.
 sql_client_dirs="strings regex mysys libmysql client"
 linked_client_targets="linked_libmysql_sources"
 
+AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no")
+
 if test "$THREAD_SAFE_CLIENT" != "no"
 then
   sql_client_dirs="libmysql_r $sql_client_dirs"
-- 
cgit v1.2.1