|
 |
cdbd41 |
diff -ruN openjdk/common/autoconf/libraries.m4 openjdk/common/autoconf/libraries.m4
|
|
|
cdbd41 |
--- openjdk/common/autoconf/libraries.m4 2013-11-14 22:04:38.039440136 -0500
|
|
|
cdbd41 |
+++ openjdk/common/autoconf/libraries.m4 2013-11-14 22:05:11.474356424 -0500
|
|
|
cdbd41 |
@@ -676,6 +676,46 @@
|
|
|
cdbd41 |
|
|
|
cdbd41 |
###############################################################################
|
|
|
cdbd41 |
#
|
|
|
cdbd41 |
+ # Check for the lcms2 library
|
|
|
cdbd41 |
+ #
|
|
|
cdbd41 |
+
|
|
|
cdbd41 |
+ AC_ARG_WITH(lcms, [AS_HELP_STRING([--with-lcms],
|
|
|
cdbd41 |
+ [use lcms2 from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
|
|
|
cdbd41 |
+
|
|
|
cdbd41 |
+ AC_CHECK_LIB(lcms2, cmsOpenProfileFromFile,
|
|
|
cdbd41 |
+ [ LCMS_FOUND=yes ],
|
|
|
cdbd41 |
+ [ LCMS_FOUND=no ])
|
|
|
cdbd41 |
+
|
|
|
cdbd41 |
+ AC_MSG_CHECKING([for which lcms to use])
|
|
|
cdbd41 |
+
|
|
|
cdbd41 |
+ DEFAULT_LCMS=bundled
|
|
|
cdbd41 |
+
|
|
|
cdbd41 |
+ #
|
|
|
cdbd41 |
+ # If user didn't specify, use DEFAULT_LCMS
|
|
|
cdbd41 |
+ #
|
|
|
cdbd41 |
+ if test "x${with_lcms}" = "x"; then
|
|
|
cdbd41 |
+ with_lcms=${DEFAULT_LCMS}
|
|
|
cdbd41 |
+ fi
|
|
|
cdbd41 |
+
|
|
|
cdbd41 |
+ if test "x${with_lcms}" = "xbundled"; then
|
|
|
cdbd41 |
+ USE_EXTERNAL_LCMS=false
|
|
|
cdbd41 |
+ AC_MSG_RESULT([bundled])
|
|
|
cdbd41 |
+ elif test "x${with_lcms}" = "xsystem"; then
|
|
|
cdbd41 |
+ if test "x${LCMS_FOUND}" = "xyes"; then
|
|
|
cdbd41 |
+ USE_EXTERNAL_LCMS=true
|
|
|
cdbd41 |
+ AC_MSG_RESULT([system])
|
|
|
cdbd41 |
+ else
|
|
|
cdbd41 |
+ AC_MSG_RESULT([system not found])
|
|
|
cdbd41 |
+ AC_MSG_ERROR([--with-lcms=system specified, but no lcms found!])
|
|
|
cdbd41 |
+ fi
|
|
|
cdbd41 |
+ else
|
|
|
cdbd41 |
+ AC_MSG_ERROR([Invalid value for --with-lcms: ${with_lcms}, use 'system' or 'bundled'])
|
|
|
cdbd41 |
+ fi
|
|
|
cdbd41 |
+
|
|
|
cdbd41 |
+ AC_SUBST(USE_EXTERNAL_LCMS)
|
|
|
cdbd41 |
+
|
|
|
cdbd41 |
+ ###############################################################################
|
|
|
cdbd41 |
+ #
|
|
|
cdbd41 |
# Check for the png library
|
|
|
cdbd41 |
#
|
|
|
cdbd41 |
|