Commit f1dc0ab0 authored by unknown's avatar unknown
Browse files

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
parents 96b2748a 3bbe813a

zlib/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -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