Commit c9da387e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jwinstead2/mysql-4.1-7021 

into mysql.com:/home/jwinstead2/mysql-4.1-clean


scripts/mysql_config.sh:
  Auto merged
parents 7261f3c0 f89207c2

scripts/mysql_config.sh

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ client_libs='@CLIENT_LIBS@' 


libs="$ldflags -L$pkglibdir -lmysqlclient $client_libs"

libs=`echo "$libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`

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

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

libs_r=`echo "$libs_r" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`

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

include="-I$pkgincludedir"