bk commit into 5.0 tree (kent:1.2102)

[kent]

Below is the list of changes that have just been committed into a local
5.0 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.2102 06/03/03 20:30:28 kent@stripped +1 -0
  mysql.spec.sh:
    Use installed libz.a to avoid hard to solve static linking problems

  support-files/mysql.spec.sh
    1.133 06/03/03 20:29:52 kent@stripped +9 -1
    Use installed libz.a to avoid hard to solve static linking problems

# 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-794072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.0-release

--- 1.132/support-files/mysql.spec.sh	2006-03-03 03:26:21 +01:00
+++ 1.133/support-files/mysql.spec.sh	2006-03-03 20:29:52 +01:00
@@ -369,8 +369,8 @@
 		--with-client-ldflags='-all-static' \
 		$USE_OTHER_LIBC_DIR \
 %else
-%endif
 		--with-zlib-dir=bundled \
+%endif
 		--with-comment=\"MySQL Community Edition - Standard (GPL)\" \
 		--with-server-suffix='%{server_suffix}' \
 		--with-archive-storage-engine \
@@ -690,8 +690,11 @@
 %{_libdir}/mysql/libndbclient.a
 %{_libdir}/mysql/libndbclient.la
 %{_libdir}/mysql/libvio.a
+%if %{STATIC_BUILD}
+%else
 %{_libdir}/mysql/libz.a
 %{_libdir}/mysql/libz.la
+%endif
 
 %files shared
 %defattr(-, root, root, 0755)
@@ -723,6 +726,11 @@
 * Fri Mar 03 2006 Kent Boortz <kent@stripped>
 
 - Don't output an embedded package as it is empty
+- Can't use bundled zlib when doing static build. Might be a
+  automake/libtool problem, having two .la files, "libmysqlclient.la"
+  and "libz.la", on the same command line to link "thread_test"
+  expands to too many "-lc", "-lpthread" and other libs giving hard
+  to nail down duplicate symbol defintion problems.
 
 * Fri Jan 10 2006 Joerg Bruehe <joerg@stripped>