Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint

into mysql.com:/usr/home/ram/work/5.0.b18267

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/usr/home/ram/work/5.0.b18267
ad1c1592 · ramil/ram@mysql.com/myoffice.izhnet.ru · d8e27606 · 2765b6fa · ad1c1592
Commit ad1c1592 authored Sep 18, 2006 by ramil/ram@mysql.com/myoffice.izhnet.ru
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

zlib/Makefile.am zlib/Makefile.am +2 -0

No files found.
--- 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