[PATCH] Add option to use external zlib (without awt/splashscreen changes)

[Diego 'Flameeyes' Pettenò]

Hi,

as I've just mailed to awt-dev a reduced copy of my previous
external-zlib patch that only changes splashscreen support (as it's
needed for external jpeg/giflib/libpng), I'm sending back a new copy of
external-zlib that excludes that particular part.

-- 
Diego "Flameeyes" Pettenò
http://farragut.flameeyes.is-a-geek.org/

Index: openjdk-b13/j2se/make/com/sun/java/pack/Makefile
===================================================================
--- openjdk-b13.orig/j2se/make/com/sun/java/pack/Makefile
+++ openjdk-b13/j2se/make/com/sun/java/pack/Makefile
@@ -61,6 +61,10 @@ vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR
 
 
 ifeq ($(STANDALONE),true)
+ ifeq ($(EXTERNAL_ZLIB),true)
+  ZIPOBJS = -lz
+  ZINCLUDE = -DEXTERNAL_ZLIB
+ else
   ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
 
   ZIPOBJS =  $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
@@ -76,6 +80,8 @@ ifeq ($(STANDALONE),true)
 	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
 
   ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+ endif
+
   OTHER_CXXFLAGS += $(ZINCLUDE)
   LDDFLAGS += $(ZIPOBJS)
 else
Index: openjdk-b13/j2se/src/share/native/com/sun/java/util/jar/pack/defines.h
===================================================================
--- openjdk-b13.orig/j2se/src/share/native/com/sun/java/util/jar/pack/defines.h
+++ openjdk-b13/j2se/src/share/native/com/sun/java/util/jar/pack/defines.h
@@ -87,11 +87,13 @@ extern void assert_failed(const char*);
 // bytes and byte arrays
 
 typedef unsigned int uint;
+#ifndef EXTERNAL_ZLIB
 #ifdef _LP64
 typedef unsigned int uLong; // Historical zlib, should be 32-bit.
 #else
 typedef unsigned long uLong;
 #endif
+#endif
 #ifdef _MSC_VER 
 typedef LONGLONG 	jlong;
 typedef DWORDLONG 	julong;
@@ -160,3 +162,7 @@ enum { false, true };
 #define BOOL_TF(x) (((x) != null && strcmp((x),STR_TRUE) == 0) ? true : false)
 
 #define DEFAULT_ARCHIVE_MODTIME 1060000000 // Aug 04, 2003 5:26 PM PDT
+
+#ifdef EXTERNAL_ZLIB
+# include <zconf.h>
+#endif
Index: openjdk-b13/j2se/make/java/jli/Makefile
===================================================================
--- openjdk-b13.orig/j2se/make/java/jli/Makefile
+++ openjdk-b13/j2se/make/java/jli/Makefile
@@ -56,15 +56,7 @@ FILES_c = \
 	$(CTARGDIR)parse_manifest.c \
 	$(CTARGDIR)version_comp.c \
 	$(CTARGDIR)wildcard.c \
-	$(CTARGDIR)jli_util.c \
-	$(CTARGDIR)inflate.c \
-	$(CTARGDIR)infblock.c \
-	$(CTARGDIR)inftrees.c \
-	$(CTARGDIR)infcodes.c \
-	$(CTARGDIR)inffast.c \
-	$(CTARGDIR)infutil.c \
-	$(CTARGDIR)zadler32.c \
-	$(CTARGDIR)zutil.c
+	$(CTARGDIR)jli_util.c
 
 OTHER_CPPFLAGS += -DEXPAND_CLASSPATH_WILDCARDS
 
@@ -74,6 +66,21 @@ ifneq (,$(findstring $(PLATFORM), linux 
 	LDLIBS = -lc
 endif
 
+ifeq ($(EXTERNAL_ZLIB), true)
+  LDLIBS += -lz
+else
+  OTHER_INCLUDES += -I$(ZIP_SRC)
+
+  FILES_C += $(CTARGDIR)inflate.c \
+	$(CTARGDIR)infblock.c \
+	$(CTARGDIR)inftrees.c \
+	$(CTARGDIR)infcodes.c \
+	$(CTARGDIR)inffast.c \
+	$(CTARGDIR)infutil.c \
+	$(CTARGDIR)zadler32.c \
+	$(CTARGDIR)zutil.c
+endif
+
 ifeq ($(PLATFORM), windows)
 	EXTRA_LIBS =
 	JAVALIB =
@@ -98,7 +105,6 @@ endif
 
 OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)
 OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC)
-OTHER_INCLUDES += -I$(ZIP_SRC)
 
 #
 # Library to compile.
Index: openjdk-b13/j2se/make/java/zip/FILES_c.gmk
===================================================================
--- openjdk-b13.orig/j2se/make/java/zip/FILES_c.gmk
+++ openjdk-b13/j2se/make/java/zip/FILES_c.gmk
@@ -33,7 +33,10 @@ FILES_c = \
 	$(CTARGDIR)Inflater.c \
 	$(CTARGDIR)ZipFile.c \
 	$(CTARGDIR)ZipEntry.c \
-	$(CTARGDIR)zadler32.c \
+	$(CTARGDIR)zip_util.c
+
+ifneq ($(EXTERNAL_ZLIB), true)
+FILES_c += $(CTARGDIR)zadler32.c \
 	$(CTARGDIR)zcrc32.c \
 	$(CTARGDIR)deflate.c \
 	$(CTARGDIR)trees.c \
@@ -43,5 +46,5 @@ FILES_c = \
 	$(CTARGDIR)inftrees.c \
 	$(CTARGDIR)infcodes.c \
 	$(CTARGDIR)infutil.c \
-	$(CTARGDIR)inffast.c \
-	$(CTARGDIR)zip_util.c
+	$(CTARGDIR)inffast.c
+endif
\ No newline at end of file
Index: openjdk-b13/j2se/make/java/zip/Makefile
===================================================================
--- openjdk-b13.orig/j2se/make/java/zip/Makefile
+++ openjdk-b13/j2se/make/java/zip/Makefile
@@ -78,7 +78,6 @@ else
 CPPFLAGS += -UDEBUG 
 endif
 
-CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
 CPPFLAGS += -I$(SHARE_SRC)/native/java/io
 CPPFLAGS += -I$(PLATFORM_SRC)/native/java/io
 
@@ -96,3 +95,9 @@ JAVAHFLAGS += -jni
 # Link to JVM library for JVM_Zip* functions
 #
 OTHER_LDLIBS = $(JVMLIB)
+
+ifeq ($(EXTERNAL_ZLIB), true)
+  OTHER_LDLIBS += -lz
+else
+  CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+endif

signature.asc
Description: PGP signature