Rename libzlib -> libz complying with standard zlib naming convention.

[nsbeta3+ b=49735; r=sobotka@axess.com]

configure.in

@@ -350,7 +350,7 @@ SHLIB_LDENDFILE=
 MOZ_JPEG_CFLAGS=
 MOZ_JPEG_LIBS='-L$(DIST)/lib -ljpeg'
 MOZ_ZLIB_CFLAGS=
-MOZ_ZLIB_LIBS='-L$(DIST)/lib -lzlib'
+MOZ_ZLIB_LIBS='-L$(DIST)/lib -lz'
 MOZ_PNG_CFLAGS=
 MOZ_PNG_LIBS='-L$(DIST)/lib -lpng'
 
@@ -780,7 +780,7 @@ case "$target" in
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS=''
     MOZ_JPEG_LIBS='$(DIST)/lib/jpeg.$(LIB_SUFFIX)'
-    MOZ_ZLIB_LIBS='$(DIST)/lib/zlib.$(LIB_SUFFIX)'
+    MOZ_ZLIB_LIBS='$(DIST)/lib/z.$(LIB_SUFFIX)'
     MOZ_PNG_LIBS='$(DIST)/lib/png.$(LIB_SUFFIX)'
     MOZ_JS_LIBS='$(DIST)/lib/mozjs.lib'
 

embedding/config/basebrowser-unix

@@ -94,7 +94,7 @@ components/layout_xul.xpt
 
 ; netwerk
 
-libzlib.so
+libz.so
 components/libnecko.so                    
 components/necko.xpt                    
 components/libnecko2.so                   

modules/libimg/png/Makefile.in

@@ -55,11 +55,11 @@ EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 LOCAL_INCLUDES	= -I$(srcdir)
 
 ifndef MOZ_NATIVE_ZLIB
-EXTRA_DSO_LDOPTS = -L$(DIST)/bin -lzlib
+EXTRA_DSO_LDOPTS = -L$(DIST)/bin -lz
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-EXTRA_DSO_LDOPTS = -L$(DIST)/lib $(DIST)/lib/zlib.lib
+EXTRA_DSO_LDOPTS = -L$(DIST)/lib $(DIST)/lib/z.lib
 else
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=

modules/libjar/standalone/Makefile.in

@@ -41,7 +41,7 @@ CPPSRCS		= \
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
 
-SHARED_LIBRARY_LIBS = $(DIST)/lib/libzlib_s.a
+SHARED_LIBRARY_LIBS = $(DIST)/lib/libz_s.$(LIB_SUFFIX)
 
 include $(topsrcdir)/config/rules.mk
 

modules/zlib/src/Makefile.in

@@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= zlib
-LIBRARY_NAME	= zlib
+LIBRARY_NAME	= z
 
 
 CSRCS		= \

modules/zlib/standalone/Makefile.in

@@ -28,7 +28,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= zlib
-LIBRARY_NAME	= zlib_s
+LIBRARY_NAME	= z_s
 
 
 CSRCS		= \

xpinstall/packager/packages-unix

@@ -36,7 +36,7 @@ bin/libplc4.so
 bin/libplds4.so
 bin/libxpcom.so
 bin/libxpistub.so
-bin/libzlib.so
+bin/libz.so
 bin/components/libxpinstall.so
 bin/components/libjar50.so
 bin/components/libunicharutil.so

xpinstall/wizard/unix/src2/Makefile.in

@@ -52,7 +52,7 @@ CPPSRCS		= \
 
 LIBS        = \
         `gtk-config --libs` \
-        -ljar50_s \
+        -ljar$(VERSION_NUMBER)_s \
         $(NULL)
 
 LOCAL_INCLUDES += -I$(srcdir)/../../../stub