Rename img libraries that have have common external equivalents as our internal versions may be slightly incompatible.

Bug #57247 sr=tor

configure

@@ -4057,13 +4057,13 @@ TARGET_MD_ARCH=unix
 DIRENT_INO=d_ino
 
 MOZ_JPEG_CFLAGS=
-MOZ_JPEG_LIBS='-L$(DIST)/lib -ljpeg'
+MOZ_JPEG_LIBS='-L$(DIST)/lib -lmozjpeg'
 MOZ_ZLIB_CFLAGS=
-MOZ_ZLIB_LIBS='-L$(DIST)/lib -lz'
+MOZ_ZLIB_LIBS='-L$(DIST)/lib -lmozz'
 MOZ_PNG_CFLAGS=
-MOZ_PNG_LIBS='-L$(DIST)/lib -lpng'
+MOZ_PNG_LIBS='-L$(DIST)/lib -lmozpng'
 MOZ_MNG_CFLAGS=
-MOZ_MNG_LIBS='-L$(DIST)/lib -lmng'
+MOZ_MNG_LIBS='-L$(DIST)/lib -lmozmng'
 
 MOZ_JS_LIBS='-lmozjs'
 XPCOM_LIBS='-L$(DIST)/bin -lxpcom'
@@ -4520,10 +4520,10 @@ EOF
     LD='$(CC)'
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS=''
-    MOZ_JPEG_LIBS='$(DIST)/lib/jpeg.$(LIB_SUFFIX)'
-    MOZ_ZLIB_LIBS='$(DIST)/lib/z.$(LIB_SUFFIX)'
-    MOZ_PNG_LIBS='$(DIST)/lib/png.$(LIB_SUFFIX)'
-    MOZ_MNG_LIBS='$(DIST)/lib/mng.$(LIB_SUFFIX)'
+    MOZ_JPEG_LIBS='$(DIST)/lib/mozjpeg.$(LIB_SUFFIX)'
+    MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.$(LIB_SUFFIX)'
+    MOZ_PNG_LIBS='$(DIST)/lib/mozpng.$(LIB_SUFFIX)'
+    MOZ_MNG_LIBS='$(DIST)/lib/mozmng.$(LIB_SUFFIX)'
     MOZ_JS_LIBS='$(DIST)/lib/mozjs.lib'
     OS_ARCH=OS2
     OS_TARGET=OS2

configure.in

@@ -382,13 +382,13 @@ TARGET_MD_ARCH=unix
 DIRENT_INO=d_ino
 
 MOZ_JPEG_CFLAGS=
-MOZ_JPEG_LIBS='-L$(DIST)/lib -ljpeg'
+MOZ_JPEG_LIBS='-L$(DIST)/lib -lmozjpeg'
 MOZ_ZLIB_CFLAGS=
-MOZ_ZLIB_LIBS='-L$(DIST)/lib -lz'
+MOZ_ZLIB_LIBS='-L$(DIST)/lib -lmozz'
 MOZ_PNG_CFLAGS=
-MOZ_PNG_LIBS='-L$(DIST)/lib -lpng'
+MOZ_PNG_LIBS='-L$(DIST)/lib -lmozpng'
 MOZ_MNG_CFLAGS=
-MOZ_MNG_LIBS='-L$(DIST)/lib -lmng'
+MOZ_MNG_LIBS='-L$(DIST)/lib -lmozmng'
 
 MOZ_JS_LIBS='-lmozjs'
 XPCOM_LIBS='-L$(DIST)/bin -lxpcom'
@@ -815,10 +815,10 @@ case "$target" in
     LD='$(CC)'
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS=''
-    MOZ_JPEG_LIBS='$(DIST)/lib/jpeg.$(LIB_SUFFIX)'
-    MOZ_ZLIB_LIBS='$(DIST)/lib/z.$(LIB_SUFFIX)'
-    MOZ_PNG_LIBS='$(DIST)/lib/png.$(LIB_SUFFIX)'
-    MOZ_MNG_LIBS='$(DIST)/lib/mng.$(LIB_SUFFIX)'
+    MOZ_JPEG_LIBS='$(DIST)/lib/mozjpeg.$(LIB_SUFFIX)'
+    MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.$(LIB_SUFFIX)'
+    MOZ_PNG_LIBS='$(DIST)/lib/mozpng.$(LIB_SUFFIX)'
+    MOZ_MNG_LIBS='$(DIST)/lib/mozmng.$(LIB_SUFFIX)'
     MOZ_JS_LIBS='$(DIST)/lib/mozjs.lib'
     OS_ARCH=OS2
     OS_TARGET=OS2

jpeg/Makefile.in

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

modules/libimg/mng/Makefile.in

@@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mng
-LIBRARY_NAME	= mng
+LIBRARY_NAME	= mozmng
 
 REQUIRES	= jpeg
 

modules/libimg/mngcom/Makefile.in

@@ -31,9 +31,9 @@ IS_COMPONENT	= 1
 REQUIRES	= xpcom string img layout util locale mng jpeg
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-EXTRA_DSO_LIBS  = libmng
+EXTRA_DSO_LIBS  = libmozmng
 else
-EXTRA_DSO_LIBS  = mng
+EXTRA_DSO_LIBS  = mozmng
 endif
 
 CPPSRCS		= \

modules/libimg/png/Makefile.in

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

modules/libjar/standalone/Makefile.in

@@ -43,7 +43,7 @@ override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
 
 #ifndef MOZ_NATIVE_ZLIB
-SHARED_LIBRARY_LIBS = $(DIST)/lib/libz_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS = $(DIST)/lib/libmozz_s.$(LIB_SUFFIX)
 #endif
 
 MDDEPDIR := $(MDDEPDIR)_S

modules/zlib/src/Makefile.in

@@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/objs.mk
 
 MODULE		= zlib
-LIBRARY_NAME	= z
+LIBRARY_NAME	= mozz
 
 CSRCS		= $(MODULES_ZLIB_SRC_LCSRCS)
 

modules/zlib/standalone/Makefile.in

@@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/../src/objs.mk
 
 MODULE		= zlib
-LIBRARY_NAME	= z_s
+LIBRARY_NAME	= mozz_s
 
 CSRCS		= $(MODULES_ZLIB_SRC_LCSRCS)
 EXPORTS		= $(MODULES_ZLIB_SRC_LEXPORTS)

xpinstall/packager/packages-unix

@@ -38,7 +38,7 @@ bin/libplc4.so
 bin/libplds4.so
 bin/libxpcom.so
 bin/libxpistub.so
-bin/libz.so
+bin/libmozz.so
 bin/components/libxpinstall.so
 bin/components/libjar50.so
 bin/components/libunicharutil.so
@@ -50,7 +50,7 @@ bin/icons/*
 bin/libcmt.so
 bin/libgtksuperwin.so
 bin/libgtkxtbin.so
-bin/libjpeg.so
+bin/libmozjpeg.so
 bin/libjsj.so
 bin/libmsgbaseutil.so
 bin/libprotocol.so