diff options
author | jimw@mysql.com <> | 2005-01-06 20:03:06 +0100 |
---|---|---|
committer | jimw@mysql.com <> | 2005-01-06 20:03:06 +0100 |
commit | 488170d38c40bb1820d36b948e28260cd90e3e66 (patch) | |
tree | a7217b7a47ccd12e2ed73d61405299543d267d09 /scripts/mysql_config.sh | |
parent | 4149e1116a3d19c84c522fb00252e76a017a0947 (diff) | |
parent | 30808e9ab993a98220cd96290ff49a4d6212cd10 (diff) | |
download | mariadb-git-488170d38c40bb1820d36b948e28260cd90e3e66.tar.gz |
Merge mysql.com:/home/jwinstead2/mysql-4.1-7021
into mysql.com:/home/jwinstead2/mysql-4.1-clean
Diffstat (limited to 'scripts/mysql_config.sh')
-rw-r--r-- | scripts/mysql_config.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index 3676e03ab48..90418de3d1d 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -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" |