1.1 --- a/common/autoconf/generated-configure.sh Fri Oct 26 14:29:57 2012 -0700
1.2 +++ b/common/autoconf/generated-configure.sh Mon Oct 29 14:06:57 2012 -0700
1.3 @@ -767,6 +767,7 @@
1.4 JDK_MINOR_VERSION
1.5 JDK_MAJOR_VERSION
1.6 COMPRESS_JARS
1.7 +UNLIMITED_CRYPTO
1.8 CACERTS_FILE
1.9 TEST_IN_BUILD
1.10 BUILD_HEADLESS
1.11 @@ -962,6 +963,7 @@
1.12 enable_headful
1.13 enable_hotspot_test_in_build
1.14 with_cacerts_file
1.15 +enable_unlimited_crypto
1.16 with_boot_jdk
1.17 with_boot_jdk_jvmargs
1.18 with_add_source_root
1.19 @@ -1647,6 +1649,8 @@
1.20 support) [enabled]
1.21 --enable-hotspot-test-in-build
1.22 run the Queens test after Hotspot build [disabled]
1.23 + --enable-unlimited-crypto
1.24 + Enable unlimited crypto policy [disabled]
1.25 --disable-debug-symbols disable generation of debug symbols [enabled]
1.26 --disable-zip-debug-info
1.27 disable zipping of debug-info files [enabled]
1.28 @@ -3661,7 +3665,7 @@
1.29 #CUSTOM_AUTOCONF_INCLUDE
1.30
1.31 # Do not change or remove the following line, it is needed for consistency checks:
1.32 -DATE_WHEN_GENERATED=1351257228
1.33 +DATE_WHEN_GENERATED=1351539315
1.34
1.35 ###############################################################################
1.36 #
1.37 @@ -6906,25 +6910,25 @@
1.38 else
1.39 STARTDIR=$PWD
1.40 COUNTER=0
1.41 - DIR=`$DIRNAME $SCRIPT`
1.42 - FILE=`$BASENAME $SCRIPT`
1.43 + sym_link_dir=`$DIRNAME $SCRIPT`
1.44 + sym_link_file=`$BASENAME $SCRIPT`
1.45 while test $COUNTER -lt 20; do
1.46 - ISLINK=`$LS -l $DIR/$FILE | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.47 + ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.48 if test "x$ISLINK" == x; then
1.49 # This is not a symbolic link! We are done!
1.50 break
1.51 fi
1.52 # The link might be relative! We have to use cd to travel safely.
1.53 - cd $DIR
1.54 + cd $sym_link_dir
1.55 # ... and we must get the to the absolute path, not one using symbolic links.
1.56 cd `pwd -P`
1.57 cd `$DIRNAME $ISLINK`
1.58 - DIR=`$THEPWDCMD`
1.59 - FILE=`$BASENAME $ISLINK`
1.60 + sym_link_dir=`$THEPWDCMD`
1.61 + sym_link_file=`$BASENAME $ISLINK`
1.62 let COUNTER=COUNTER+1
1.63 done
1.64 cd $STARTDIR
1.65 - SCRIPT=$DIR/$FILE
1.66 + SCRIPT=$sym_link_dir/$sym_link_file
1.67 fi
1.68 fi
1.69
1.70 @@ -7563,8 +7567,6 @@
1.71 # and options (variants and debug level) parsed.
1.72
1.73
1.74 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what configuration name to use" >&5
1.75 -$as_echo_n "checking what configuration name to use... " >&6; }
1.76
1.77 # Check whether --with-conf-name was given.
1.78 if test "${with_conf_name+set}" = set; then :
1.79 @@ -7593,7 +7595,35 @@
1.80 CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"`
1.81 fi
1.82 OUTPUT_ROOT="$CURDIR"
1.83 -fi
1.84 +
1.85 + # WARNING: This might be a bad thing to do. You need to be sure you want to
1.86 + # have a configuration in this directory. Do some sanity checks!
1.87 +
1.88 + if test ! -e "$OUTPUT_ROOT/spec.gmk"; then
1.89 + # If we have a spec.gmk, we have run here before and we are OK. Otherwise, check for
1.90 + # other files
1.91 + files_present=`$LS $OUTPUT_ROOT`
1.92 + if test "x$files_present" != x; then
1.93 + { $as_echo "$as_me:${as_lineno-$LINENO}: Current directory is $CURDIR." >&5
1.94 +$as_echo "$as_me: Current directory is $CURDIR." >&6;}
1.95 + { $as_echo "$as_me:${as_lineno-$LINENO}: Since this is not the source root, configure will output the configuration here" >&5
1.96 +$as_echo "$as_me: Since this is not the source root, configure will output the configuration here" >&6;}
1.97 + { $as_echo "$as_me:${as_lineno-$LINENO}: (as opposed to creating a configuration in <src_root>/build/<conf-name>)." >&5
1.98 +$as_echo "$as_me: (as opposed to creating a configuration in <src_root>/build/<conf-name>)." >&6;}
1.99 + { $as_echo "$as_me:${as_lineno-$LINENO}: However, this directory is not empty. This is not allowed, since it could" >&5
1.100 +$as_echo "$as_me: However, this directory is not empty. This is not allowed, since it could" >&6;}
1.101 + { $as_echo "$as_me:${as_lineno-$LINENO}: seriously mess up just about everything." >&5
1.102 +$as_echo "$as_me: seriously mess up just about everything." >&6;}
1.103 + { $as_echo "$as_me:${as_lineno-$LINENO}: Try 'cd $SRC_ROOT' and restart configure" >&5
1.104 +$as_echo "$as_me: Try 'cd $SRC_ROOT' and restart configure" >&6;}
1.105 + { $as_echo "$as_me:${as_lineno-$LINENO}: (or create a new empty directory and cd to it)." >&5
1.106 +$as_echo "$as_me: (or create a new empty directory and cd to it)." >&6;}
1.107 + as_fn_error $? "Will not continue creating configuration in $CURDIR" "$LINENO" 5
1.108 + fi
1.109 + fi
1.110 +fi
1.111 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what configuration name to use" >&5
1.112 +$as_echo_n "checking what configuration name to use... " >&6; }
1.113 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONF_NAME" >&5
1.114 $as_echo "$CONF_NAME" >&6; }
1.115
1.116 @@ -10334,6 +10364,24 @@
1.117
1.118 ###############################################################################
1.119 #
1.120 +# Enable or disable unlimited crypto
1.121 +#
1.122 +# Check whether --enable-unlimited-crypto was given.
1.123 +if test "${enable_unlimited_crypto+set}" = set; then :
1.124 + enableval=$enable_unlimited_crypto;
1.125 +else
1.126 + enable_unlimited_crypto=no
1.127 +fi
1.128 +
1.129 +if test "x$enable_unlimited_crypto" = "xyes"; then
1.130 + UNLIMITED_CRYPTO=true
1.131 +else
1.132 + UNLIMITED_CRYPTO=false
1.133 +fi
1.134 +
1.135 +
1.136 +###############################################################################
1.137 +#
1.138 # Compress jars
1.139 #
1.140 COMPRESS_JARS=false
1.141 @@ -11543,25 +11591,25 @@
1.142 else
1.143 STARTDIR=$PWD
1.144 COUNTER=0
1.145 - DIR=`$DIRNAME $BINARY`
1.146 - FILE=`$BASENAME $BINARY`
1.147 + sym_link_dir=`$DIRNAME $BINARY`
1.148 + sym_link_file=`$BASENAME $BINARY`
1.149 while test $COUNTER -lt 20; do
1.150 - ISLINK=`$LS -l $DIR/$FILE | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.151 + ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.152 if test "x$ISLINK" == x; then
1.153 # This is not a symbolic link! We are done!
1.154 break
1.155 fi
1.156 # The link might be relative! We have to use cd to travel safely.
1.157 - cd $DIR
1.158 + cd $sym_link_dir
1.159 # ... and we must get the to the absolute path, not one using symbolic links.
1.160 cd `pwd -P`
1.161 cd `$DIRNAME $ISLINK`
1.162 - DIR=`$THEPWDCMD`
1.163 - FILE=`$BASENAME $ISLINK`
1.164 + sym_link_dir=`$THEPWDCMD`
1.165 + sym_link_file=`$BASENAME $ISLINK`
1.166 let COUNTER=COUNTER+1
1.167 done
1.168 cd $STARTDIR
1.169 - BINARY=$DIR/$FILE
1.170 + BINARY=$sym_link_dir/$sym_link_file
1.171 fi
1.172 fi
1.173
1.174 @@ -17823,25 +17871,25 @@
1.175 else
1.176 STARTDIR=$PWD
1.177 COUNTER=0
1.178 - DIR=`$DIRNAME $TEST_COMPILER`
1.179 - FILE=`$BASENAME $TEST_COMPILER`
1.180 + sym_link_dir=`$DIRNAME $TEST_COMPILER`
1.181 + sym_link_file=`$BASENAME $TEST_COMPILER`
1.182 while test $COUNTER -lt 20; do
1.183 - ISLINK=`$LS -l $DIR/$FILE | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.184 + ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.185 if test "x$ISLINK" == x; then
1.186 # This is not a symbolic link! We are done!
1.187 break
1.188 fi
1.189 # The link might be relative! We have to use cd to travel safely.
1.190 - cd $DIR
1.191 + cd $sym_link_dir
1.192 # ... and we must get the to the absolute path, not one using symbolic links.
1.193 cd `pwd -P`
1.194 cd `$DIRNAME $ISLINK`
1.195 - DIR=`$THEPWDCMD`
1.196 - FILE=`$BASENAME $ISLINK`
1.197 + sym_link_dir=`$THEPWDCMD`
1.198 + sym_link_file=`$BASENAME $ISLINK`
1.199 let COUNTER=COUNTER+1
1.200 done
1.201 cd $STARTDIR
1.202 - TEST_COMPILER=$DIR/$FILE
1.203 + TEST_COMPILER=$sym_link_dir/$sym_link_file
1.204 fi
1.205 fi
1.206
1.207 @@ -18231,25 +18279,25 @@
1.208 else
1.209 STARTDIR=$PWD
1.210 COUNTER=0
1.211 - DIR=`$DIRNAME $PROPER_COMPILER_CC`
1.212 - FILE=`$BASENAME $PROPER_COMPILER_CC`
1.213 + sym_link_dir=`$DIRNAME $PROPER_COMPILER_CC`
1.214 + sym_link_file=`$BASENAME $PROPER_COMPILER_CC`
1.215 while test $COUNTER -lt 20; do
1.216 - ISLINK=`$LS -l $DIR/$FILE | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.217 + ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.218 if test "x$ISLINK" == x; then
1.219 # This is not a symbolic link! We are done!
1.220 break
1.221 fi
1.222 # The link might be relative! We have to use cd to travel safely.
1.223 - cd $DIR
1.224 + cd $sym_link_dir
1.225 # ... and we must get the to the absolute path, not one using symbolic links.
1.226 cd `pwd -P`
1.227 cd `$DIRNAME $ISLINK`
1.228 - DIR=`$THEPWDCMD`
1.229 - FILE=`$BASENAME $ISLINK`
1.230 + sym_link_dir=`$THEPWDCMD`
1.231 + sym_link_file=`$BASENAME $ISLINK`
1.232 let COUNTER=COUNTER+1
1.233 done
1.234 cd $STARTDIR
1.235 - PROPER_COMPILER_CC=$DIR/$FILE
1.236 + PROPER_COMPILER_CC=$sym_link_dir/$sym_link_file
1.237 fi
1.238 fi
1.239
1.240 @@ -19278,25 +19326,25 @@
1.241 else
1.242 STARTDIR=$PWD
1.243 COUNTER=0
1.244 - DIR=`$DIRNAME $TEST_COMPILER`
1.245 - FILE=`$BASENAME $TEST_COMPILER`
1.246 + sym_link_dir=`$DIRNAME $TEST_COMPILER`
1.247 + sym_link_file=`$BASENAME $TEST_COMPILER`
1.248 while test $COUNTER -lt 20; do
1.249 - ISLINK=`$LS -l $DIR/$FILE | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.250 + ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.251 if test "x$ISLINK" == x; then
1.252 # This is not a symbolic link! We are done!
1.253 break
1.254 fi
1.255 # The link might be relative! We have to use cd to travel safely.
1.256 - cd $DIR
1.257 + cd $sym_link_dir
1.258 # ... and we must get the to the absolute path, not one using symbolic links.
1.259 cd `pwd -P`
1.260 cd `$DIRNAME $ISLINK`
1.261 - DIR=`$THEPWDCMD`
1.262 - FILE=`$BASENAME $ISLINK`
1.263 + sym_link_dir=`$THEPWDCMD`
1.264 + sym_link_file=`$BASENAME $ISLINK`
1.265 let COUNTER=COUNTER+1
1.266 done
1.267 cd $STARTDIR
1.268 - TEST_COMPILER=$DIR/$FILE
1.269 + TEST_COMPILER=$sym_link_dir/$sym_link_file
1.270 fi
1.271 fi
1.272
1.273 @@ -19686,25 +19734,25 @@
1.274 else
1.275 STARTDIR=$PWD
1.276 COUNTER=0
1.277 - DIR=`$DIRNAME $PROPER_COMPILER_CXX`
1.278 - FILE=`$BASENAME $PROPER_COMPILER_CXX`
1.279 + sym_link_dir=`$DIRNAME $PROPER_COMPILER_CXX`
1.280 + sym_link_file=`$BASENAME $PROPER_COMPILER_CXX`
1.281 while test $COUNTER -lt 20; do
1.282 - ISLINK=`$LS -l $DIR/$FILE | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.283 + ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.284 if test "x$ISLINK" == x; then
1.285 # This is not a symbolic link! We are done!
1.286 break
1.287 fi
1.288 # The link might be relative! We have to use cd to travel safely.
1.289 - cd $DIR
1.290 + cd $sym_link_dir
1.291 # ... and we must get the to the absolute path, not one using symbolic links.
1.292 cd `pwd -P`
1.293 cd `$DIRNAME $ISLINK`
1.294 - DIR=`$THEPWDCMD`
1.295 - FILE=`$BASENAME $ISLINK`
1.296 + sym_link_dir=`$THEPWDCMD`
1.297 + sym_link_file=`$BASENAME $ISLINK`
1.298 let COUNTER=COUNTER+1
1.299 done
1.300 cd $STARTDIR
1.301 - PROPER_COMPILER_CXX=$DIR/$FILE
1.302 + PROPER_COMPILER_CXX=$sym_link_dir/$sym_link_file
1.303 fi
1.304 fi
1.305
1.306 @@ -20039,7 +20087,7 @@
1.307
1.308 ### Locate other tools
1.309
1.310 -if test "x$OPENJDK_TARGET_OS" != xwindows; then
1.311 +if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.312 ac_ext=m
1.313 ac_cpp='$OBJCPP $CPPFLAGS'
1.314 ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5'
