bk commit into 5.1 tree (kent:1.2166) BUG#19966

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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.2166 06/05/20 14:12:42 kent@stripped +1 -0
  Makefile.am:
    Specify yaSSL .a file, not .la (bug#19966)
    Don't use Mac OS X "__.SYMDEF SORTED" file in archives

  libmysqld/Makefile.am
    1.90 06/05/20 14:04:57 kent@stripped +5 -5
    Specify yaSSL .a file, not .la (bug#19966)
    Don't use Mac OS X "__.SYMDEF SORTED" file in archives

# 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:	kent
# Host:	c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-new

--- 1.89/libmysqld/Makefile.am	2006-05-09 00:49:10 +02:00
+++ 1.90/libmysqld/Makefile.am	2006-05-20 14:04:57 +02:00
@@ -88,11 +88,11 @@
 		$(top_builddir)/dbug/libdbug.a \
 		$(top_builddir)/vio/libvio.a \
 		@mysql_plugin_libs@ \
-		$(yassl_las)
+		$(yassl_inc_libs)
 
 if HAVE_YASSL
-yassl_las = $(top_srcdir)/extra/yassl/src/libyassl.la \
-	    $(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la
+yassl_inc_libs=	$(top_srcdir)/extra/yassl/src/.libs/libyassl.a \
+		$(top_srcdir)/extra/yassl/taocrypt/src/.libs/libtaocrypt.a
 endif
 
 # Storage engine specific compilation options
@@ -135,12 +135,12 @@
 		  (for arc in ./libmysqld_int.a $(INC_LIB); do \
 		    arpath=`echo $$arc|sed 's|[^/]*$$||'|sed 's|\.libs/$$||'`; \
 		    artmp=`echo $$arc|sed 's|^.*/|tmp/lib-|'`; \
-		    for F in `$(AR) t $$arc`; do \
+		    for F in `$(AR) t $$arc | grep -v SYMDEF`; do \
 		      if test -e "$$arpath/$$F" ; then echo "$$arpath/$$F"; else \
 		      mkdir $$artmp; cd $$artmp > /dev/null; \
 		      $(AR) x ../../$$arc; \
 		      cd $$current_dir > /dev/null; \
-		      ls $$artmp/*; \
+		      ls $$artmp/* | grep -v SYMDEF; \
 		      continue 2; fi; done; \
 		  done; echo $(libmysqld_a_DEPENDENCIES) ) | sort -u | xargs $(AR) cq libmysqld.a ; \
 		  $(RANLIB) libmysqld.a	; \