Mercurial > hg > openjdk > jigsaw
changeset 706:e2057191f6da
8010030: Allow configure to detect if EC implementation is present
Reviewed-by: andrew, dholmes
| author | omajid |
|---|---|
| date | Mon, 18 Mar 2013 10:47:37 -0400 |
| parents | a69761ae281b |
| children | 29153d0df68f |
| files | common/autoconf/configure.ac common/autoconf/generated-configure.sh common/autoconf/jdk-options.m4 common/autoconf/spec.gmk.in |
| diffstat | 4 files changed, 45 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/configure.ac Thu Mar 14 19:33:24 2013 -0700 +++ b/common/autoconf/configure.ac Mon Mar 18 10:47:37 2013 -0400 @@ -194,6 +194,7 @@ ############################################################################### JDKOPT_SETUP_BUILD_TWEAKS +JDKOPT_DETECT_INTREE_EC ############################################################################### #
--- a/common/autoconf/generated-configure.sh Thu Mar 14 19:33:24 2013 -0700 +++ b/common/autoconf/generated-configure.sh Mon Mar 18 10:47:37 2013 -0400 @@ -612,6 +612,7 @@ JOBS MEMORY_SIZE NUM_CORES +ENABLE_INTREE_EC SALIB_NAME HOTSPOT_MAKE_ARGS FIXPATH @@ -3752,7 +3753,7 @@ #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 @@ ############################################################################### # +# Enable or disable the elliptic curve crypto implementation +# + + +############################################################################### +# # Compress jars # COMPRESS_JARS=false @@ -31694,6 +31701,22 @@ +{ $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,
--- a/common/autoconf/jdk-options.m4 Thu Mar 14 19:33:24 2013 -0700 +++ b/common/autoconf/jdk-options.m4 Mon Mar 18 10:47:37 2013 -0400 @@ -366,6 +366,25 @@ ############################################################################### # +# 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
--- a/common/autoconf/spec.gmk.in Thu Mar 14 19:33:24 2013 -0700 +++ b/common/autoconf/spec.gmk.in Mon Mar 18 10:47:37 2013 -0400 @@ -539,6 +539,7 @@ # 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@