bk commit into 4.1 tree (lenz:1.2352)

[lenz]

Below is the list of changes that have just been committed into a local
4.1 repository of lenz. When lenz 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.2352 05/07/27 16:42:13 lenz@stripped +1 -0
  - build the RPM binaries against the bundled zlib, when static linking is requested

  support-files/mysql.spec.sh
    1.99 05/07/27 16:42:08 lenz@stripped +1 -0
    - build against the bundled zlib, when linking statically

# 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:	lenz
# Host:	metis.lenznet
# Root:	/space/my/mysql-4.1-build

--- 1.98/support-files/mysql.spec.sh	2005-07-15 09:07:27 +02:00
+++ 1.99/support-files/mysql.spec.sh	2005-07-27 16:42:08 +02:00
@@ -348,6 +348,7 @@
 %if %{STATIC_BUILD}
 		--with-mysqld-ldflags='-all-static' \
 		--with-client-ldflags='-all-static' \
+		--with-zlib-dir=bundled \
 		$USE_OTHER_LIBC_DIR \
 %endif
 		--with-comment=\"MySQL Community Edition - Standard (GPL)\" \