diff options
author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-09-18 10:37:26 +0500 |
---|---|---|
committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-09-18 10:37:26 +0500 |
commit | 3bbe813a1429ea1d7df628ebd0337bf40f94bc2a (patch) | |
tree | 1a0d24fe19cb23d99cca39391e9b0b47dcc6694c /zlib | |
parent | 24cdd48020634acc1c2c2309a5c27d28368e0ba9 (diff) | |
parent | 1406d437e3ef7d778b4f1bb70ad84b6aa9dcd0bc (diff) | |
download | mariadb-git-3bbe813a1429ea1d7df628ebd0337bf40f94bc2a.tar.gz |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/usr/home/ram/work/5.0.b18267
zlib/Makefile.am:
Auto merged
Diffstat (limited to 'zlib')
-rw-r--r-- | zlib/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/zlib/Makefile.am b/zlib/Makefile.am index 0081c93a2ae..af7d60d8568 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -18,6 +18,8 @@ INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include +LIBS= $(NON_THREADED_LIBS) + pkglib_LTLIBRARIES=libz.la libz_la_LDFLAGS= -version-info 3:3:2 |