1 --- scripts/mysql_config.sh	2009-07-13 16:10:59.000000000 -0700

     2 +++ scripts/mysql_config.sh.org	2010-01-11 21:48:38.243564639 -0800

     3 @@ -85,7 +85,6 @@

     4  # If installed, search for the compiled in directory first (might be "lib64")

     5  pkglibdir='@pkglibdir@'

     6  pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`

     7 -fix_path pkglibdir $pkglibdir_rel lib/mysql lib

     8  

     9  plugindir='@pkgplugindir@'

    10  

    11 @@ -104,10 +103,10 @@

    12  

    13  # Create options 

    14  # We intentionally add a space to the beginning and end of lib strings, simplifies replace later

    15 -libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"

    16 +libs=" $ldflags -L$pkglibdir -R$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"

    17  libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "

    18 -libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "

    19 -embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "

    20 +libs_r=" $ldflags -L$pkglibdir -R$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "

    21 +embedded_libs=" $ldflags -L$pkglibdir -R$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "

    22  

    23  if [ -r "$pkglibdir/libmygcc.a" ]; then

    24    # When linking against the static library with a different version of GCC