Added ifdefs for MOZ_NATIVE_{JPEG,PNG,ZLIB}. Approved by pnunn%netscape.com.

modules/Makefile

@@ -30,12 +30,15 @@ DIRS = \
 	rdf \
 	xml \
 	schedulr \
-	zlib \
 	li \
 	progress \
 	plugin \
 	$(NULL)
 
+ifndef MOZ_NATIVE_ZLIB
+DIRS += zlib
+endif
+
 ifndef MOZ_SECURITY
 DIRS +=	security
 endif

modules/libimg/Makefile

@@ -1,28 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-
-DEPTH		= ../..
-
-ifdef STANDALONE_IMAGE_LIB
-DIRS = png public src
-else
-DIRS = png classes public src
-endif
-
-EXTRA_LIBS	= libzlib.a libpng.a
-
-include $(DEPTH)/config/rules.mk

modules/libimg/src/Makefile

@@ -74,11 +74,30 @@ CPPSRCS		= color.cpp \
 
 EXPORTS		= PIMGCB.h PPSIMGCB.h
 
-REQUIRES	= jtools java zlib nspr dbm jpeg util img png layer js xpcom
+REQUIRES	= jtools java nspr dbm util img layer js xpcom
 
-LOCAL_INCLUDES	= -I../png -I. -I$(DEPTH)/dist/public/zlib
+LOCAL_INCLUDES	= -I.
+EXTRA_LIBS	= 
 
-EXTRA_LIBS	= $(DIST)/lib/libzlib.a $(DIST)/lib/libpng.a
+ifndef MOZ_NATIVE_JPEG
+REQUIRES	+= jpeg
+endif
+
+ifdef MOZ_NATIVE_PNG
+EXTRA_LIBS	+= -lpng
+else
+REQUIRES	+= png
+LOCAL_INCLUDES	+= -I../png
+EXTRA_LIBS	+= $(DIST)/lib/libpng.a
+endif
+
+ifdef MOZ_NATIVE_ZLIB
+EXTRA_LIBS	+= -lz
+else
+REQUIRES	+= zlib
+LOCAL_INCLUDES	+= -I$(DEPTH)/dist/public/zlib
+EXTRA_LIBS 	+= $(DIST)/lib/libzlib.a
+endif
 
 #
 # Generate MIMGCB.c (and similar sources) here.

modules/libimg/src/ipng.cpp

@@ -42,14 +42,14 @@ extern void info_callback(png_structp png_ptr, png_infop info);
 
 extern void il_create_alpha_mask( il_container *, int, int, int ); 
 
-
+#if defined(PNG_LIBPNG_VER) && (PNG_LIBPNG_VER < 100)
 extern png_structp png_create_read_struct(png_charp user_png_ver, png_voidp, png_error_ptr, png_error_ptr);
 extern png_infop png_create_info_struct(png_structp png_ptr);
 
 extern void png_destroy_read_struct(png_structpp, png_infopp, png_infopp);
 extern void png_set_progressive_read_fn(png_structp, png_voidp, png_progressive_info_ptr, png_progressive_row_ptr, png_progressive_end_ptr);
 extern void png_process_data(png_structp, png_infop, png_bytep, png_size_t);
-
+#endif
 
 /*-----------------------------*/
 int