diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-09-28 10:54:49 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-09-28 10:54:49 -0600 |
| commit | ba0cd51eb19f1f8868901d4b2327e1c8f4745c19 (patch) | |
| tree | 3b7d7d44c9a9850c900bf0c7499f62818e36ed84 /scripts | |
| parent | db55af7c4073926e0b1b8ece0f50b4842a6a6d22 (diff) | |
| parent | adb1d7a32787e1e5c40a739b9f2e990e67ba946f (diff) | |
| download | mariadb-git-ba0cd51eb19f1f8868901d4b2327e1c8f4745c19.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
configure.in:
Auto merged
scripts/mysql_config.sh:
Auto merged
libmysql/libmysql.c:
Manual merge
Diffstat (limited to 'scripts')
| -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 ab58c512aac..ae58655ed0f 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -126,7 +126,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"` |