bk commit into 5.0 tree (joerg:1.1977)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg 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.1977 05/12/05 18:33:48 joerg@stripped +2 -0
  Merge from 4.1, partly manual.

  support-files/mysql.spec.sh
    1.129 05/12/05 18:33:43 joerg@stripped +7 -8
    Manual merge.

  scripts/make_binary_distribution.sh
    1.102 05/12/05 18:13:01 joerg@stripped +0 -0
    Auto merged

# 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:	joerg
# Host:	trift2.
# Root:	/M50/merge-5.0/RESYNC

--- 1.128/support-files/mysql.spec.sh	2005-11-22 20:15:50 +01:00
+++ 1.129/support-files/mysql.spec.sh	2005-12-05 18:33:43 +01:00
@@ -707,6 +707,13 @@
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Mon Dec 05 2005 Joerg Bruehe <joerg@stripped>
+
+- Avoid using the "bundled" zlib on "shared" builds: 
+  As it is not installed (on the build system), this gives dependency 
+  problems with "libtool" causing the build to fail.
+  (Change was done on Nov 11, but left uncommented.)
+
 * Tue Nov 22 2005 Joerg Bruehe <joerg@stripped>
 
 - Extend the file existence check for "init.d/mysql" on un-install