Commit 3754c4eb authored by unknown's avatar unknown
Browse files

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:
  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
client/Makefile.am:
  Conditionally link with libmysqlclient.la or libmysqlclient_r.la
parent 9805bd76

client/Makefile.am

+20 −13
Original line number Diff line number Diff line
@@ -21,6 +21,13 @@ if HAVE_YASSL 
else

  yassl_dummy_link_fix=

endif



if THREAD_SAFE_CLIENT

LIBMYSQLCLIENT_LA =		$(top_builddir)/libmysql_r/libmysqlclient_r.la

else

LIBMYSQLCLIENT_LA =		$(top_builddir)/libmysql/libmysqlclient.la

endif



#AUTOMAKE_OPTIONS =              nostdinc

INCLUDES =			-I$(top_builddir)/include \

				-I$(top_srcdir)/include \
@@ -50,11 +57,11 @@ mysqlbinlog_SOURCES = mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c \ 
mysqlbinlog_LDADD =		$(LDADD) $(CXXLDFLAGS)

mysqlslap_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \

				@CLIENT_EXTRA_LDFLAGS@ \

                                $(top_builddir)/libmysql_r/libmysqlclient_r.la \

				$(LIBMYSQLCLIENT_LA) \

				$(top_builddir)/mysys/libmysys.a 

mysqlimport_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \

				@CLIENT_EXTRA_LDFLAGS@ \

                                $(top_builddir)/libmysql_r/libmysqlclient_r.la \

				$(LIBMYSQLCLIENT_LA) \

				$(top_builddir)/mysys/libmysys.a 

mysqltestmanager_pwgen_SOURCES = mysqlmanager-pwgen.c 

mysqltestmanagerc_SOURCES=	mysqlmanagerc.c $(yassl_dummy_link_fix)

configure.in

+7 −4
Original line number Diff line number Diff line
@@ -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"