From: Date: March 29 2006 3:00pm
Subject: bk commit into 4.1 tree (kent:1.2481) BUG#13158
List-Archive: http://lists.mysql.com/commits/4275
X-Bug: 13158
Message-Id: <20060329130007.90449A2EA37@boortz.dyndns.org>

Below is the list of changes that have just been committed into a local
4.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.2481 06/03/29 14:59:53 kent@stripped +1 -0
  mysql_config.sh:
    If installed, search built in lib path first, bug#13158

  scripts/mysql_config.sh
    1.23 06/03/29 14:59:29 kent@stripped +6 -1
    If installed, search built in lib path first, bug#13158

# 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-4d4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-4.1-new

--- 1.22/scripts/mysql_config.sh	2006-03-27 23:04:21 +02:00
+++ 1.23/scripts/mysql_config.sh	2006-03-29 14:59:29 +02:00
@@ -82,10 +82,15 @@
 ldata='@localstatedir@'
 execdir='@libexecdir@'
 bindir='@bindir@'
+
+# If installed, search for the compiled in directory first (might be "lib64")
 pkglibdir='@pkglibdir@'
-fix_path pkglibdir lib/mysql lib
+pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
+fix_path pkglibdir $pkglibdir_rel lib/mysql lib
+
 pkgincludedir='@pkgincludedir@'
 fix_path pkgincludedir include/mysql include
+
 version='@VERSION@'
 socket='@MYSQL_UNIX_ADDR@'
 port='@MYSQL_TCP_PORT@'