bzr commit into mysql-6.0 branch (azundris:2922)

[Tatiana A. Nurnberg]

#At file:///misc/mysql/forest/34025/60-34025/

 2922 Tatiana A. Nurnberg	2008-11-14 [merge]
      automerge
modified:
  scripts/Makefile.am
  scripts/mysql_config.pl.in
  scripts/mysql_config.sh

=== modified file 'scripts/Makefile.am'
--- a/scripts/Makefile.am	2008-06-26 17:48:42 +0000
+++ b/scripts/Makefile.am	2008-11-14 07:42:49 +0000
@@ -163,6 +163,7 @@ SUFFIXES = .sh
 	  -e 's!@''CFLAGS''@!@CFLAGS@!'\
 	  -e 's!@''CXXFLAGS''@!@CXXFLAGS@!'\
 	  -e 's!@''LDFLAGS''@!@LDFLAGS@!'\
+	  -e 's!@''LIBDL''@!@LIBDL@!'\
 	  -e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \
 	  -e 's!@''ZLIB_LIBS''@!@ZLIB_LIBS@!' \
 	  -e 's!@''LIBS''@!@LIBS@!' \

=== modified file 'scripts/mysql_config.pl.in'
--- a/scripts/mysql_config.pl.in	2007-12-28 00:02:28 +0000
+++ b/scripts/mysql_config.pl.in	2008-11-10 21:12:15 +0000
@@ -202,7 +202,7 @@ $flags->{libs} =
 $flags->{libs_r} =
   [@ldflags,@lib_r_opts,'@ZLIB_DEPS@','@LIBS@','@openssl_libs@'];
 $flags->{embedded_libs} =
-  [@ldflags,@lib_e_opts,'@ZLIB_DEPS@','@LIBS@','@WRAPLIBS@','@innodb_system_libs@','@openssl_libs@'];
+  [@ldflags,@lib_e_opts,'@LIBDL@','@ZLIB_DEPS@','@LIBS@','@WRAPLIBS@','@innodb_system_libs@','@openssl_libs@'];
 
 $flags->{include} = ["-I$pkgincludedir"];
 $flags->{cflags}  = [@{$flags->{include}},split(" ",'@CFLAGS@')];

=== modified file 'scripts/mysql_config.sh'
--- a/scripts/mysql_config.sh	2008-03-27 22:47:31 +0000
+++ b/scripts/mysql_config.sh	2008-11-14 07:42:49 +0000
@@ -107,7 +107,7 @@ fi
 libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
 libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
 libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "
-embedded_libs=" $ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
+embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
 
 if [ -r "$pkglibdir/libmygcc.a" ]; then
   # When linking against the static library with a different version of GCC