Commit 86ac1d94 authored by unknown's avatar unknown

Merge shellback.(none):/home/msvensson/mysql/bug20219/my50-bug20219

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint

parents f4e98df3 f5358d90
...@@ -1178,28 +1178,33 @@ sub executable_setup () { ...@@ -1178,28 +1178,33 @@ sub executable_setup () {
sub environment_setup () { sub environment_setup () {
my $extra_ld_library_paths;
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# We might not use a standard installation directory, like /usr/lib. # Setup LD_LIBRARY_PATH so the libraries from this distro/clone
# Set LD_LIBRARY_PATH to make sure we find our installed libraries. # are used in favor of the system installed ones
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
if ( $opt_source_dist )
unless ( $opt_source_dist )
{ {
$ENV{'LD_LIBRARY_PATH'}= $extra_ld_library_paths= "$glob_basedir/libmysql/.libs/";
"$glob_basedir/lib" . }
($ENV{'LD_LIBRARY_PATH'} ? ":$ENV{'LD_LIBRARY_PATH'}" : ""); else
$ENV{'DYLD_LIBRARY_PATH'}= {
"$glob_basedir/lib" . $extra_ld_library_paths= "$glob_basedir/lib";
($ENV{'DYLD_LIBRARY_PATH'} ? ":$ENV{'DYLD_LIBRARY_PATH'}" : "");
} }
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Add the path where mysqld will find udf_example.so # Add the path where mysqld will find udf_example.so
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
$extra_ld_library_paths .= ":" .
($lib_udf_example ? dirname($lib_udf_example) : "");
$ENV{'LD_LIBRARY_PATH'}= $ENV{'LD_LIBRARY_PATH'}=
($lib_udf_example ? dirname($lib_udf_example) : "") . "$extra_ld_library_paths" .
($ENV{'LD_LIBRARY_PATH'} ? ":$ENV{'LD_LIBRARY_PATH'}" : ""); ($ENV{'LD_LIBRARY_PATH'} ? ":$ENV{'LD_LIBRARY_PATH'}" : "");
$ENV{'DYLD_LIBRARY_PATH'}=
"$extra_ld_library_paths" .
($ENV{'DYLD_LIBRARY_PATH'} ? ":$ENV{'DYLD_LIBRARY_PATH'}" : "");
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Also command lines in .opt files may contain env vars # Also command lines in .opt files may contain env vars
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment