summaryrefslogtreecommitdiff
path: root/zlib
diff options
context:
space:
mode:
authorunknown <ramil/ram@myoffice.izhnet.ru>2006-09-18 10:43:06 +0500
committerunknown <ramil/ram@myoffice.izhnet.ru>2006-09-18 10:43:06 +0500
commitf1dc0ab068b4011923e93aa21d62f33829fddf52 (patch)
tree82750d0742d07a550dc9964a90194d12a6f5f133 /zlib
parent96b2748a992d672b60a55285d8b8279d7281cbac (diff)
parent3bbe813a1429ea1d7df628ebd0337bf40f94bc2a (diff)
downloadmariadb-git-f1dc0ab068b4011923e93aa21d62f33829fddf52.tar.gz
Merge mysql.com:/usr/home/ram/work/mysql-5.0-maint
into mysql.com:/usr/home/ram/work/mysql-5.1-maint zlib/Makefile.am: Auto merged
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 40258ec589a..75100dc3f7b 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