List:Commits« Previous MessageNext Message »
From:msvensson Date:January 3 2006 7:45pm
Subject:bk commit into 5.0 tree (msvensson:1.2009)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.2009 06/01/03 20:45:43 msvensson@neptunus.(none) +2 -0
  Add yassl libs to libmysqlclient_r as well.

  tools/Makefile.am
    1.23 06/01/03 20:45:38 msvensson@neptunus.(none) +1 -1
    mysqlmanager.c uses vio and thus implicitly includes the openssl headers. Add the include paths to yassl to INCLUDES so that the right includes are selected.

  libmysql_r/Makefile.am
    1.23 06/01/03 20:45:38 msvensson@neptunus.(none) +2 -2
    Inlude yassl libs into libmysqlclient_r(just as we do in libmysqlclient)

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/yassl_link_problem/my50-yassl_link_problem

--- 1.22/tools/Makefile.am	2005-07-06 00:05:21 +02:00
+++ 1.23/tools/Makefile.am	2006-01-03 20:45:38 +01:00
@@ -21,7 +21,7 @@
   yassl_dummy_link_fix=
 endif
 INCLUDES=	-I$(top_builddir)/include -I$(top_srcdir)/include \
-		$(openssl_includes)
+		$(openssl_includes) $(yassl_includes)
 LDADD=		@CLIENT_EXTRA_LDFLAGS@ \
 		$(top_builddir)/libmysql_r/libmysqlclient_r.la \
 		@openssl_libs@ @ZLIB_LIBS@ 

--- 1.22/libmysql_r/Makefile.am	2005-11-04 01:41:32 +01:00
+++ 1.23/libmysql_r/Makefile.am	2006-01-03 20:45:38 +01:00
@@ -22,7 +22,7 @@
 
 target = libmysqlclient_r.la
 target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
-LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@ @yassl_libs@
+LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
 
 INCLUDES =	-I$(top_builddir)/include -I$(top_srcdir)/include \
 		$(openssl_includes) $(yassl_includes) @ZLIB_INCLUDES@
@@ -32,7 +32,7 @@
 libmysql_dir = $(top_srcdir)/libmysql
 
 libmysqlclient_r_la_SOURCES = $(target_sources)
-libmysqlclient_r_la_LIBADD = $(target_libadd)
+libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_libs_with_path)
 libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
 
 # This is called from the toplevel makefile
Thread
bk commit into 5.0 tree (msvensson:1.2009)msvensson3 Jan