diff -up openjdk/jdk/make/jdk_generic_profile.sh.sav openjdk/jdk/make/jdk_generic_profile.sh
--- openjdk/jdk/make/jdk_generic_profile.sh.sav 2012-03-19 17:33:21.147566973 -0400
+++ openjdk/jdk/make/jdk_generic_profile.sh 2012-03-19 17:33:32.877391463 -0400
@@ -381,24 +381,6 @@ if [ "${ZERO_BUILD}" = true ] ; then
fi
fi
-# Export variables for system LCMS
-# LCMS_CFLAGS and LCMS_LIBS tell the compiler how to compile and
-# link against lcms2
-pkgconfig=$(which pkg-config 2>/dev/null)
-if [ -x "${pkgconfig}" ] ; then
- if [ "${LCMS_CFLAGS}" = "" ] ; then
- LCMS_CFLAGS=$("${pkgconfig}" --cflags lcms2)
- fi
- if [ "${LCMS_LIBS}" = "" ] ; then
- LCMS_LIBS=$("${pkgconfig}" --libs lcms2)
- fi
-fi
-if [ "${LCMS_LIBS}" = "" ] ; then
- LCMS_LIBS="-llcms2"
-fi
-export LCMS_CFLAGS
-export LCMS_LIBS
-
# Export variables for system zlib
# ZLIB_CFLAGS and ZLIB_LIBS tell the compiler how to compile and
# link against zlib
@@ -452,7 +434,6 @@ fi
export GIF_LIBS
# IcedTea defaults; use system libraries
-export USE_SYSTEM_LCMS=true
export USE_SYSTEM_ZLIB=true
export USE_SYSTEM_JPEG=true
export USE_SYSTEM_PNG=true