List:Internals« Previous MessageNext Message »
From:sasha Date:March 30 2002 11:24pm
Subject:bk commit into 4.0 tree
View as plain text  
Below is the list of changes that have just been committed into a
4.0 repository of sasha. When sasha does a push, they will be propogated 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2002-03-30 16:24:30-07:00, sasha@stripped
  fix to make the compile work with --with-other-libc

  libmysqld/examples/Makefile.am
    1.8 02/03/30 16:24:29 sasha@stripped +1 -1
    honor client link flags in libmysqld example builds

  vio/Makefile.am
    1.8 02/03/30 16:24:29 sasha@stripped +4 -4
    honor client link flags in vio test program builds

# 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:	sasha
# Host:	mysql.sashanet.com
# Root:	/reiser-data/mysql-4.0

--- 1.7/vio/Makefile.am	Wed Aug 22 13:05:56 2001
+++ 1.8/vio/Makefile.am	Sat Mar 30 16:24:29 2002
@@ -15,18 +15,18 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 INCLUDES =		-I$(srcdir)/../include -I../include $(openssl_includes)
-LDADD =			libvio.a $(openssl_libs) 
+LDADD =			@CLIENT_EXTRA_LDFLAGS@ libvio.a $(openssl_libs) 
 pkglib_LIBRARIES =	libvio.a
 noinst_PROGRAMS	=	test-ssl test-sslserver test-sslclient
 noinst_HEADERS =	
 test_ssl_SOURCES =   test-ssl.c
-test_ssl_LDADD =   	../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
+test_ssl_LDADD =   	@CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
 			../strings/libmystrings.a libvio.a $(openssl_libs)
 test_sslserver_SOURCES =   test-sslserver.c
-test_sslserver_LDADD =   	../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
+test_sslserver_LDADD =   @CLIENT_EXTRA_LDFLAGS@	../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
 			../strings/libmystrings.a libvio.a $(openssl_libs)
 test_sslclient_SOURCES =   test-sslclient.c
-test_sslclient_LDADD =   	../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
+test_sslclient_LDADD =   @CLIENT_EXTRA_LDFLAGS@	../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
 			../strings/libmystrings.a libvio.a $(openssl_libs)
 libvio_a_SOURCES =	vio.c viosocket.c viossl.c viosslfactories.c
 

--- 1.7/libmysqld/examples/Makefile.am	Wed Jan  2 12:29:39 2002
+++ 1.8/libmysqld/examples/Makefile.am	Sat Mar 30 16:24:29 2002
@@ -11,7 +11,7 @@
 INCLUDES =	-I$(top_srcdir)/include $(openssl_includes) \
 		-I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/client
 LIBS =		@LIBS@
-LDADD =		../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS)
+LDADD =		@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS)
 
 mysqltest_SOURCES =	mysqltest.c
 
Thread
bk commit into 4.0 treesasha31 Mar