8010030: Allow configure to detect if EC implementation is present

Reviewed-by: andrew, dholmes
This commit is contained in:
Omair Majid 2013-03-18 10:47:37 -04:00
parent c088a428f4
commit 7b22402218
4 changed files with 45 additions and 1 deletions

View File

@ -194,6 +194,7 @@ BASIC_COMPILE_FIXPATH
###############################################################################
JDKOPT_SETUP_BUILD_TWEAKS
JDKOPT_DETECT_INTREE_EC
###############################################################################
#

View File

@ -612,6 +612,7 @@ SJAVAC_SERVER_JAVA
JOBS
MEMORY_SIZE
NUM_CORES
ENABLE_INTREE_EC
SALIB_NAME
HOTSPOT_MAKE_ARGS
FIXPATH
@ -3752,7 +3753,7 @@ fi
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1363150186
DATE_WHEN_GENERATED=1363617192
###############################################################################
#
@ -10784,6 +10785,12 @@ else
fi
###############################################################################
#
# Enable or disable the elliptic curve crypto implementation
#
###############################################################################
#
# Compress jars
@ -31694,6 +31701,22 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if elliptic curve crypto implementation is present" >&5
$as_echo_n "checking if elliptic curve crypto implementation is present... " >&6; }
if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
ENABLE_INTREE_EC=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
ENABLE_INTREE_EC=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
###############################################################################
#
# Configure parts of the build that only affect the build performance,

View File

@ -364,6 +364,25 @@ else
fi
AC_SUBST(UNLIMITED_CRYPTO)
###############################################################################
#
# Enable or disable the elliptic curve crypto implementation
#
AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
[
AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
ENABLE_INTREE_EC=yes
AC_MSG_RESULT([yes])
else
ENABLE_INTREE_EC=no
AC_MSG_RESULT([no])
fi
AC_SUBST(ENABLE_INTREE_EC)
])
###############################################################################
#
# Compress jars

View File

@ -539,6 +539,7 @@ endif
# Build setup
ENABLE_JFR=@ENABLE_JFR@
ENABLE_INTREE_EC=@ENABLE_INTREE_EC@
USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@