Mercurial > hg > release > icedtea7-forest-2.0 > jdk

changeset 4529:4da6bd3bb35e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow ZLIB_CFLAGS to be used when building libsplashscreen.
author andrew
date Thu, 04 Aug 2011 05:09:19 +0100
parents 353efa800ebe
children 55a2cf00dc6a
files make/sun/splashscreen/Makefile
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/sun/splashscreen/Makefile	Thu Aug 04 05:05:30 2011 +0100
+++ b/make/sun/splashscreen/Makefile	Thu Aug 04 05:09:19 2011 +0100
@@ -108,7 +108,9 @@
 else
   CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
 endif
-ifndef USE_SYSTEM_ZLIB
+ifdef USE_SYSTEM_ZLIB
+  CPPFLAGS += $(ZLIB_CFLAGS)
+else
   CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
 endif
 ifdef USE_SYSTEM_PNG