Mon, 18 Mar 2013 10:47:37 -0400
8010030: Allow configure to detect if EC implementation is present
Reviewed-by: andrew, dholmes
1.1 --- a/common/autoconf/configure.ac Thu Mar 14 19:33:24 2013 -0700 1.2 +++ b/common/autoconf/configure.ac Mon Mar 18 10:47:37 2013 -0400 1.3 @@ -194,6 +194,7 @@ 1.4 ############################################################################### 1.5 1.6 JDKOPT_SETUP_BUILD_TWEAKS 1.7 +JDKOPT_DETECT_INTREE_EC 1.8 1.9 ############################################################################### 1.10 #
2.1 --- a/common/autoconf/generated-configure.sh Thu Mar 14 19:33:24 2013 -0700 2.2 +++ b/common/autoconf/generated-configure.sh Mon Mar 18 10:47:37 2013 -0400 2.3 @@ -612,6 +612,7 @@ 2.4 JOBS 2.5 MEMORY_SIZE 2.6 NUM_CORES 2.7 +ENABLE_INTREE_EC 2.8 SALIB_NAME 2.9 HOTSPOT_MAKE_ARGS 2.10 FIXPATH 2.11 @@ -3752,7 +3753,7 @@ 2.12 #CUSTOM_AUTOCONF_INCLUDE 2.13 2.14 # Do not change or remove the following line, it is needed for consistency checks: 2.15 -DATE_WHEN_GENERATED=1363150186 2.16 +DATE_WHEN_GENERATED=1363617192 2.17 2.18 ############################################################################### 2.19 # 2.20 @@ -10786,6 +10787,12 @@ 2.21 2.22 ############################################################################### 2.23 # 2.24 +# Enable or disable the elliptic curve crypto implementation 2.25 +# 2.26 + 2.27 + 2.28 +############################################################################### 2.29 +# 2.30 # Compress jars 2.31 # 2.32 COMPRESS_JARS=false 2.33 @@ -31694,6 +31701,22 @@ 2.34 2.35 2.36 2.37 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if elliptic curve crypto implementation is present" >&5 2.38 +$as_echo_n "checking if elliptic curve crypto implementation is present... " >&6; } 2.39 + 2.40 +if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then 2.41 + ENABLE_INTREE_EC=yes 2.42 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 2.43 +$as_echo "yes" >&6; } 2.44 +else 2.45 + ENABLE_INTREE_EC=no 2.46 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2.47 +$as_echo "no" >&6; } 2.48 +fi 2.49 + 2.50 + 2.51 + 2.52 + 2.53 ############################################################################### 2.54 # 2.55 # Configure parts of the build that only affect the build performance,
3.1 --- a/common/autoconf/jdk-options.m4 Thu Mar 14 19:33:24 2013 -0700 3.2 +++ b/common/autoconf/jdk-options.m4 Mon Mar 18 10:47:37 2013 -0400 3.3 @@ -366,6 +366,25 @@ 3.4 3.5 ############################################################################### 3.6 # 3.7 +# Enable or disable the elliptic curve crypto implementation 3.8 +# 3.9 +AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC], 3.10 +[ 3.11 +AC_MSG_CHECKING([if elliptic curve crypto implementation is present]) 3.12 + 3.13 +if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then 3.14 + ENABLE_INTREE_EC=yes 3.15 + AC_MSG_RESULT([yes]) 3.16 +else 3.17 + ENABLE_INTREE_EC=no 3.18 + AC_MSG_RESULT([no]) 3.19 +fi 3.20 + 3.21 +AC_SUBST(ENABLE_INTREE_EC) 3.22 +]) 3.23 + 3.24 +############################################################################### 3.25 +# 3.26 # Compress jars 3.27 # 3.28 COMPRESS_JARS=false
4.1 --- a/common/autoconf/spec.gmk.in Thu Mar 14 19:33:24 2013 -0700 4.2 +++ b/common/autoconf/spec.gmk.in Mon Mar 18 10:47:37 2013 -0400 4.3 @@ -539,6 +539,7 @@ 4.4 4.5 # Build setup 4.6 ENABLE_JFR=@ENABLE_JFR@ 4.7 +ENABLE_INTREE_EC=@ENABLE_INTREE_EC@ 4.8 USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@ 4.9 USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@ 4.10 USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@