summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2005-09-28 15:32:05 +0200
committermsvensson@neptunus.(none) <>2005-09-28 15:32:05 +0200
commit13161c2a847d0ed965ab1e9271a709e40741127f (patch)
tree1d29b6381ca710436adbad6b29d6b7bf43018332 /scripts
parentf8bb9a4be3a293f6bea193e47c60b84e661141ff (diff)
parent324f4be3d42e98557e7e103e47f95dfb67ddf97e (diff)
downloadmariadb-git-13161c2a847d0ed965ab1e9271a709e40741127f.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_config.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
index 15b45391ef8..5b35c0190a5 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -101,7 +101,7 @@ libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @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"
-embedded_libs="$ldflags -L$pkglibdir -lmysqld @LIBS@ @WRAPLIBS@ @innodb_system_libs@ $client_libs"
+embedded_libs="$ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@"
embedded_libs=`echo "$embedded_libs" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
# Remove some options that a client doesn't have to care about