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

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
36abb694 · unknown · 55d66b09 · c2b89b94 · 36abb694
Commit 36abb694 authored Sep 18, 2006 by unknown
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