diff options
| author | guilhem@mysql.com <> | 2005-11-18 16:38:01 +0100 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2005-11-18 16:38:01 +0100 |
| commit | 2f95fc2701bd83a9aea31e167f69c16ee51a6317 (patch) | |
| tree | 07e22cfddd8927526e3bb2ef581822106278886f /support-files | |
| parent | 50afa94dd509be490ebe274b8feec966864b502b (diff) | |
| parent | 43bbd352e3aa4af23f479e33ba80a6dfdeb6774f (diff) | |
| download | mariadb-git-2f95fc2701bd83a9aea31e167f69c16ee51a6317.tar.gz | |
Merge mysql.com:/home/mysql_src/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 27aa05ebf27..e5ff026a851 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -361,8 +361,9 @@ BuildMySQL "--disable-shared \ %if %{STATIC_BUILD} --with-mysqld-ldflags='-all-static' \ --with-client-ldflags='-all-static' \ - --with-zlib-dir=bundled \ $USE_OTHER_LIBC_DIR \ +%else + --with-zlib-dir=bundled \ %endif --with-comment=\"MySQL Community Edition - Standard (GPL)\" \ --with-server-suffix='%{server_suffix}' \ |