Commit 90d6c062 authored by unknown's avatar unknown
Browse files

Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/jwinstead2/mysql-4.1-clean
parents 22de4885 6eb79230

libmysql_r/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


target = libmysqlclient_r.la

target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@

LIBS = @LIBS@ @openssl_libs@

LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@



INCLUDES = @MT_INCLUDES@ \

	   -I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@

scripts/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ SUFFIXES = .sh 
	  -e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\

	  -e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\

	  -e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \

	  -e 's!@''ZLIB_LIBS''@!@ZLIB_LIBS@!' \

	  -e 's!@''LIBS''@!@LIBS@!' \

	  -e 's!@''WRAPLIBS''@!@WRAPLIBS@!' \

	  -e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \