List:Commits« Previous MessageNext Message »
From:msvensson Date:January 4 2006 3:33pm
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/04 16:33:06 msvensson@neptunus.(none) +3 -0
  Add yassl libs to libmysqlclient_r as well.
  Add a link to extra/yassl/include/openssl to inlude when compiling with yassl
  Similiar to readline)

  libmysql_r/Makefile.am
    1.23 06/01/04 16:33:00 msvensson@neptunus.(none) +2 -2
    Inlude yassl libs into libmysqlclient_r(just as we do in libmysqlclient)

  include/Makefile.am
    1.55 06/01/04 16:33:00 msvensson@neptunus.(none) +2 -1
    Call yassl_h_ln_cmd when linking sources, this will create symlink to openssl in include when compiling with yassl
     

  config/ac-macros/yassl.m4
    1.11 06/01/04 16:33:00 msvensson@neptunus.(none) +3 -1
    Link extra/yassl/include/openssl dir to include/

# 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.54/include/Makefile.am	2005-11-04 01:58:17 +01:00
+++ 1.55/include/Makefile.am	2006-01-04 16:33:00 +01:00
@@ -33,7 +33,7 @@
 			mysql_version.h.in my_handler.h my_time.h decimal.h
 
 # mysql_version.h are generated
-CLEANFILES =            mysql_version.h my_config.h readline
+CLEANFILES =            mysql_version.h my_config.h readline openssl
 
 # Some include files that may be moved and patched by configure
 DISTCLEANFILES =	sched.h $(CLEANFILES)
@@ -41,6 +41,7 @@
 link_sources:
 	-$(RM) -fr readline
 	@readline_h_ln_cmd@
+	@yassl_h_ln_cmd@
 
 my_config.h: ../config.h
 	$(CP) ../config.h my_config.h

--- 1.10/config/ac-macros/yassl.m4	2005-11-28 16:27:56 +01:00
+++ 1.11/config/ac-macros/yassl.m4	2006-01-04 16:33:00 +01:00
@@ -30,7 +30,9 @@
         ;;
     esac
     AC_SUBST([yassl_taocrypt_extra_cxxflags])
-
+    # Link extra/yassl/include/openssl subdir to include/
+    yassl_h_ln_cmd="\$(LN) -s \$(top_srcdir)/extra/yassl/include/openssl openssl"
+    AC_SUBST(yassl_h_ln_cmd)
   else
     yassl_dir=""
     AC_MSG_RESULT(no)

--- 1.22/libmysql_r/Makefile.am	2005-11-04 01:41:32 +01:00
+++ 1.23/libmysql_r/Makefile.am	2006-01-04 16:33:00 +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)msvensson4 Jan