summaryrefslogtreecommitdiff
path: root/scripts/mysql_config.sh
diff options
context:
space:
mode:
authorunknown <kent@kent-amd64.(none)>2007-08-29 22:24:51 +0200
committerunknown <kent@kent-amd64.(none)>2007-08-29 22:24:51 +0200
commit33f12b2f536086fd8057978766199143b29ea066 (patch)
treec5cd3ae1a2bcb345b7049903bd3068f1ca88ed8c /scripts/mysql_config.sh
parent7388ea3c56a268387e60fc28b671d664ecfa8ad4 (diff)
parent16ce5d1173523463ae7fede6ebd35577ddc0fc08 (diff)
downloadmariadb-git-33f12b2f536086fd8057978766199143b29ea066.tar.gz
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build scripts/mysql_config.sh: Auto merged
Diffstat (limited to 'scripts/mysql_config.sh')
-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 f094cb060b7..6b054e83720 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -121,7 +121,7 @@ done
cflags=`echo "$cflags"|sed -e 's/ *\$//'`
# Same for --libs(_r)
-for remove in lmtmalloc static-libcxa i-static
+for remove in lmtmalloc static-libcxa i-static static-intel
do
# We know the strings starts with a space
libs=`echo "$libs"|sed -e "s/ -$remove */ /g"`