changeset 1334:efcdaab49c6c

Regenerated configure from autoconf changes.
author kurt
date Thu, 21 May 2015 08:31:55 -0400
parents 8a788d97978b
children 2e05b030e814
files common/autoconf/generated-configure.sh
diffstat 1 files changed, 22 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Thu May 21 08:30:48 2015 -0400
+++ b/common/autoconf/generated-configure.sh	Thu May 21 08:31:55 2015 -0400
@@ -814,6 +814,7 @@
 JDK_MAJOR_VERSION
 USER_RELEASE_SUFFIX
 COMPRESS_JARS
+BSD_STATIC_LIBJLI
 UNLIMITED_CRYPTO
 CACERTS_FILE
 TEST_IN_BUILD
@@ -1023,6 +1024,7 @@
 enable_hotspot_test_in_build
 with_cacerts_file
 enable_unlimited_crypto
+enable_static_libjli
 with_milestone
 with_update_version
 with_user_release_suffix
@@ -1726,6 +1728,7 @@
                           run the Queens test after Hotspot build [disabled]
   --enable-unlimited-crypto
                           Enable unlimited crypto policy [disabled]
+  --enable-static-libjli  Enable staticly linking libjli on bsd [disabled]
   --disable-debug-symbols disable generation of debug symbols [enabled]
   --disable-zip-debug-info
                           disable zipping of debug-info files [enabled]
@@ -3876,7 +3879,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1431789661
+DATE_WHEN_GENERATED=1432211455
 
 ###############################################################################
 #
@@ -11222,6 +11225,24 @@
 
   ###############################################################################
   #
+  # Enable or disable static linking of libjli on bsd only
+  #
+  # Check whether --enable-static-libjli was given.
+if test "${enable_static_libjli+set}" = set; then :
+  enableval=$enable_static_libjli;
+else
+  enable_static_libjli=no
+fi
+
+  if test "x$OPENJDK_TARGET_OS" = "xbsd" && test "x$enable_static_libjli" = "xyes"; then
+    BSD_STATIC_LIBJLI=bsd
+  else
+    BSD_STATIC_LIBJLI=
+  fi
+
+
+  ###############################################################################
+  #
   # Enable or disable the elliptic curve crypto implementation
   #