summaryrefslogtreecommitdiff
path: root/zlib
diff options
context:
space:
mode:
authorramil/ram@mysql.com/myoffice.izhnet.ru <>2006-09-18 10:37:26 +0500
committerramil/ram@mysql.com/myoffice.izhnet.ru <>2006-09-18 10:37:26 +0500
commitad1c1592e168df1621186a9f8d6912f5c9e827e8 (patch)
tree1a0d24fe19cb23d99cca39391e9b0b47dcc6694c /zlib
parentd8e27606e1716d674ce03588cb8e763fbc260b62 (diff)
parent2765b6fa24228dc423f6e440e10bca6e20b5105a (diff)
downloadmariadb-git-ad1c1592e168df1621186a9f8d6912f5c9e827e8.tar.gz
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/usr/home/ram/work/5.0.b18267
Diffstat (limited to 'zlib')
-rw-r--r--zlib/Makefile.am2
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