diff options
| author | omajid <none@none> | 2013-03-18 10:47:37 -0400 |
|---|---|---|
| committer | omajid <none@none> | 2013-03-18 10:47:37 -0400 |
| commit | c19cf40b8482149799b7a53b1d04a4fda6ac55b8 (patch) | |
| tree | ae1d7587ba8dc9bba8c70eb471a88d37d759e1ab | |
| parent | 8ee188fdf21f0ed28fba9ef1a25eb992f0ed17b9 (diff) | |
8010030: Allow configure to detect if EC implementation is present
Reviewed-by: andrew, dholmes
| -rw-r--r-- | common/autoconf/configure.ac | 1 | ||||
| -rw-r--r-- | common/autoconf/generated-configure.sh | 25 | ||||
| -rw-r--r-- | common/autoconf/jdk-options.m4 | 19 | ||||
| -rw-r--r-- | common/autoconf/spec.gmk.in | 1 |
4 files changed, 45 insertions, 1 deletions
diff --git a/common/autoconf/configure.ac b/common/autoconf/configure.ac index da9996f..5e632c4 100644 --- a/common/autoconf/configure.ac +++ b/common/autoconf/configure.ac @@ -194,6 +194,7 @@ BASIC_COMPILE_FIXPATH ############################################################################### JDKOPT_SETUP_BUILD_TWEAKS +JDKOPT_DETECT_INTREE_EC ############################################################################### # diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index bb61656..85a453c 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -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 ############################################################################### # @@ -10786,6 +10787,12 @@ fi ############################################################################### # +# Enable or disable the elliptic curve crypto implementation +# + + +############################################################################### +# # Compress jars # COMPRESS_JARS=false @@ -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, diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4 index 48eb3f8..d3d55e5 100644 --- a/common/autoconf/jdk-options.m4 +++ b/common/autoconf/jdk-options.m4 @@ -366,6 +366,25 @@ 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 # COMPRESS_JARS=false diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in index 92c6d9c..bfba636 100644 --- a/common/autoconf/spec.gmk.in +++ b/common/autoconf/spec.gmk.in @@ -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@ |