Commit 1878b9f6 authored by unknown's avatar unknown
Browse files

Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  mysql.com:/home/hartmut/projects/mysql/dev/teamtrees/mysql-5.0-maint
parents 1c0c90bd 7974ef2c

scripts/mysql_config.sh

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ ldflags='@LDFLAGS@' 
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@"

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



cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!

include="-I$pkgincludedir"