diff options
| author | unknown <jimw@mysql.com> | 2005-01-06 20:03:06 +0100 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-01-06 20:03:06 +0100 |
| commit | cbcb7753e5c272f89f22c82133c92a6be25e627c (patch) | |
| tree | a7217b7a47ccd12e2ed73d61405299543d267d09 /scripts/mysql_config.sh | |
| parent | 3e6fa769e4764b0655ed6e7c2f309a78c409b202 (diff) | |
| parent | bcb68b26f0c19b87ca95f6b77b1d497d57027229 (diff) | |
| download | mariadb-git-cbcb7753e5c272f89f22c82133c92a6be25e627c.tar.gz | |
Merge mysql.com:/home/jwinstead2/mysql-4.1-7021
into mysql.com:/home/jwinstead2/mysql-4.1-clean
scripts/mysql_config.sh:
Auto merged
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" |