jdk8-mips64-public: comparison common/autoconf/generated-configure.sh

-:e64f2cb57d05
+:e3182741ade2
 JDK_UPDATE_VERSION
 JDK_MICRO_VERSION
 JDK_MINOR_VERSION
 JDK_MAJOR_VERSION
 COMPRESS_JARS
+UNLIMITED_CRYPTO
 CACERTS_FILE
 TEST_IN_BUILD
 BUILD_HEADLESS
 SUPPORT_HEADFUL
 SUPPORT_HEADLESS
 with_builddeps_group
 enable_openjdk_only
 enable_headful
 enable_hotspot_test_in_build
 with_cacerts_file
+enable_unlimited_crypto
 with_boot_jdk
 with_boot_jdk_jvmargs
 with_add_source_root
 with_override_source_root
 with_adds_and_overrides
 [disabled]
 --disable-headful       disable building headful support (graphical UI
 support) [enabled]
 --enable-hotspot-test-in-build
 run the Queens test after Hotspot build [disabled]
+--enable-unlimited-crypto
+Enable unlimited crypto policy [disabled]
 --disable-debug-symbols disable generation of debug symbols [enabled]
 --disable-zip-debug-info
 disable zipping of debug-info files [enabled]
 --disable-macosx-runtime-support
 disable the use of MacOSX Java runtime support
 # definitions. It is replaced with custom functionality when building
 # custom sources.
 #CUSTOM_AUTOCONF_INCLUDE
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1351257228
+DATE_WHEN_GENERATED=1351539315
 ###############################################################################
 #
 # Initialization / Boot-strapping
 #
 if test "x$READLINK" != x; then
 SCRIPT=`$READLINK -f $SCRIPT`
 else
 STARTDIR=$PWD
 COUNTER=0
-DIR=`$DIRNAME $SCRIPT`
+sym_link_dir=`$DIRNAME $SCRIPT`
-FILE=`$BASENAME $SCRIPT`
+sym_link_file=`$BASENAME $SCRIPT`
 while test $COUNTER -lt 20; do
-ISLINK=`$LS -l $DIR/$FILE | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
+ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
 if test "x$ISLINK" == x; then
 # This is not a symbolic link! We are done!
 break
 fi
 # The link might be relative! We have to use cd to travel safely.
-cd $DIR
+cd $sym_link_dir
 # ... and we must get the to the absolute path, not one using symbolic links.
 cd `pwd -P`
 cd `$DIRNAME $ISLINK`
-DIR=`$THEPWDCMD`
+sym_link_dir=`$THEPWDCMD`
-FILE=`$BASENAME $ISLINK`
+sym_link_file=`$BASENAME $ISLINK`
 let COUNTER=COUNTER+1
 done
 cd $STARTDIR
-SCRIPT=$DIR/$FILE
+SCRIPT=$sym_link_dir/$sym_link_file
 fi
 fi
 AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD`
 # To properly create a configuration name, we need to have the OpenJDK target
 # and options (variants and debug level) parsed.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what configuration name to use" >&5
-$as_echo_n "checking what configuration name to use... " >&6; }
 # Check whether --with-conf-name was given.
 if test "${with_conf_name+set}" = set; then :
 withval=$with_conf_name;  CONF_NAME=${with_conf_name}
 fi
 # directory name as configuration name, otherwise use the complete path.
 if test "x${CONF_NAME}" = x; then
 CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"`
 fi
 OUTPUT_ROOT="$CURDIR"
-fi
+# WARNING: This might be a bad thing to do. You need to be sure you want to
+# have a configuration in this directory. Do some sanity checks!
+if test ! -e "$OUTPUT_ROOT/spec.gmk"; then
+# If we have a spec.gmk, we have run here before and we are OK. Otherwise, check for
+# other files
+files_present=`$LS $OUTPUT_ROOT`
+if test "x$files_present" != x; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Current directory is $CURDIR." >&5
+$as_echo "$as_me: Current directory is $CURDIR." >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Since this is not the source root, configure will output the configuration here" >&5
+$as_echo "$as_me: Since this is not the source root, configure will output the configuration here" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: (as opposed to creating a configuration in <src_root>/build/<conf-name>)." >&5
+$as_echo "$as_me: (as opposed to creating a configuration in <src_root>/build/<conf-name>)." >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: However, this directory is not empty. This is not allowed, since it could" >&5
+$as_echo "$as_me: However, this directory is not empty. This is not allowed, since it could" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: seriously mess up just about everything." >&5
+$as_echo "$as_me: seriously mess up just about everything." >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Try 'cd $SRC_ROOT' and restart configure" >&5
+$as_echo "$as_me: Try 'cd $SRC_ROOT' and restart configure" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: (or create a new empty directory and cd to it)." >&5
+$as_echo "$as_me: (or create a new empty directory and cd to it)." >&6;}
+as_fn_error $? "Will not continue creating configuration in $CURDIR" "$LINENO" 5
+fi
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what configuration name to use" >&5
+$as_echo_n "checking what configuration name to use... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONF_NAME" >&5
 $as_echo "$CONF_NAME" >&6; }
 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
 fi
 ###############################################################################
 #
+# Enable or disable unlimited crypto
+#
+# Check whether --enable-unlimited-crypto was given.
+if test "${enable_unlimited_crypto+set}" = set; then :
+enableval=$enable_unlimited_crypto;
+else
+enable_unlimited_crypto=no
+fi
+if test "x$enable_unlimited_crypto" = "xyes"; then
+UNLIMITED_CRYPTO=true
+else
+UNLIMITED_CRYPTO=false
+fi
+###############################################################################
+#
 # Compress jars
 #
 COMPRESS_JARS=false
 if test "x$READLINK" != x; then
 BINARY=`$READLINK -f $BINARY`
 else
 STARTDIR=$PWD
 COUNTER=0
-DIR=`$DIRNAME $BINARY`
+sym_link_dir=`$DIRNAME $BINARY`
-FILE=`$BASENAME $BINARY`
+sym_link_file=`$BASENAME $BINARY`
 while test $COUNTER -lt 20; do
-ISLINK=`$LS -l $DIR/$FILE | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
+ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
 if test "x$ISLINK" == x; then
 # This is not a symbolic link! We are done!
 break
 fi
 # The link might be relative! We have to use cd to travel safely.
-cd $DIR
+cd $sym_link_dir
 # ... and we must get the to the absolute path, not one using symbolic links.
 cd `pwd -P`
 cd `$DIRNAME $ISLINK`
-DIR=`$THEPWDCMD`
+sym_link_dir=`$THEPWDCMD`
-FILE=`$BASENAME $ISLINK`
+sym_link_file=`$BASENAME $ISLINK`
 let COUNTER=COUNTER+1
 done
 cd $STARTDIR
-BINARY=$DIR/$FILE
+BINARY=$sym_link_dir/$sym_link_file
 fi
 fi
 BOOT_JDK=`dirname "$BINARY"`
 BOOT_JDK=`cd "$BOOT_JDK/.."; pwd`
 if test "x$READLINK" != x; then
 TEST_COMPILER=`$READLINK -f $TEST_COMPILER`
 else
 STARTDIR=$PWD
 COUNTER=0
-DIR=`$DIRNAME $TEST_COMPILER`
+sym_link_dir=`$DIRNAME $TEST_COMPILER`
-FILE=`$BASENAME $TEST_COMPILER`
+sym_link_file=`$BASENAME $TEST_COMPILER`
 while test $COUNTER -lt 20; do
-ISLINK=`$LS -l $DIR/$FILE | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
+ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
 if test "x$ISLINK" == x; then
 # This is not a symbolic link! We are done!
 break
 fi
 # The link might be relative! We have to use cd to travel safely.
-cd $DIR
+cd $sym_link_dir
 # ... and we must get the to the absolute path, not one using symbolic links.
 cd `pwd -P`
 cd `$DIRNAME $ISLINK`
-DIR=`$THEPWDCMD`
+sym_link_dir=`$THEPWDCMD`
-FILE=`$BASENAME $ISLINK`
+sym_link_file=`$BASENAME $ISLINK`
 let COUNTER=COUNTER+1
 done
 cd $STARTDIR
-TEST_COMPILER=$DIR/$FILE
+TEST_COMPILER=$sym_link_dir/$sym_link_file
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_COMPILER" >&5
 $as_echo "$TEST_COMPILER" >&6; }
 if test "x$READLINK" != x; then
 PROPER_COMPILER_CC=`$READLINK -f $PROPER_COMPILER_CC`
 else
 STARTDIR=$PWD
 COUNTER=0
-DIR=`$DIRNAME $PROPER_COMPILER_CC`
+sym_link_dir=`$DIRNAME $PROPER_COMPILER_CC`
-FILE=`$BASENAME $PROPER_COMPILER_CC`
+sym_link_file=`$BASENAME $PROPER_COMPILER_CC`
 while test $COUNTER -lt 20; do
-ISLINK=`$LS -l $DIR/$FILE | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
+ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
 if test "x$ISLINK" == x; then
 # This is not a symbolic link! We are done!
 break
 fi
 # The link might be relative! We have to use cd to travel safely.
-cd $DIR
+cd $sym_link_dir
 # ... and we must get the to the absolute path, not one using symbolic links.
 cd `pwd -P`
 cd `$DIRNAME $ISLINK`
-DIR=`$THEPWDCMD`
+sym_link_dir=`$THEPWDCMD`
-FILE=`$BASENAME $ISLINK`
+sym_link_file=`$BASENAME $ISLINK`
 let COUNTER=COUNTER+1
 done
 cd $STARTDIR
-PROPER_COMPILER_CC=$DIR/$FILE
+PROPER_COMPILER_CC=$sym_link_dir/$sym_link_file
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROPER_COMPILER_CC" >&5
 $as_echo "$PROPER_COMPILER_CC" >&6; }
 if test "x$READLINK" != x; then
 TEST_COMPILER=`$READLINK -f $TEST_COMPILER`
 else
 STARTDIR=$PWD
 COUNTER=0
-DIR=`$DIRNAME $TEST_COMPILER`
+sym_link_dir=`$DIRNAME $TEST_COMPILER`
-FILE=`$BASENAME $TEST_COMPILER`
+sym_link_file=`$BASENAME $TEST_COMPILER`
 while test $COUNTER -lt 20; do
-ISLINK=`$LS -l $DIR/$FILE | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
+ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
 if test "x$ISLINK" == x; then
 # This is not a symbolic link! We are done!
 break
 fi
 # The link might be relative! We have to use cd to travel safely.
-cd $DIR
+cd $sym_link_dir
 # ... and we must get the to the absolute path, not one using symbolic links.
 cd `pwd -P`
 cd `$DIRNAME $ISLINK`
-DIR=`$THEPWDCMD`
+sym_link_dir=`$THEPWDCMD`
-FILE=`$BASENAME $ISLINK`
+sym_link_file=`$BASENAME $ISLINK`
 let COUNTER=COUNTER+1
 done
 cd $STARTDIR
-TEST_COMPILER=$DIR/$FILE
+TEST_COMPILER=$sym_link_dir/$sym_link_file
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_COMPILER" >&5
 $as_echo "$TEST_COMPILER" >&6; }
 if test "x$READLINK" != x; then
 PROPER_COMPILER_CXX=`$READLINK -f $PROPER_COMPILER_CXX`
 else
 STARTDIR=$PWD
 COUNTER=0
-DIR=`$DIRNAME $PROPER_COMPILER_CXX`
+sym_link_dir=`$DIRNAME $PROPER_COMPILER_CXX`
-FILE=`$BASENAME $PROPER_COMPILER_CXX`
+sym_link_file=`$BASENAME $PROPER_COMPILER_CXX`
 while test $COUNTER -lt 20; do
-ISLINK=`$LS -l $DIR/$FILE | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
+ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
 if test "x$ISLINK" == x; then
 # This is not a symbolic link! We are done!
 break
 fi
 # The link might be relative! We have to use cd to travel safely.
-cd $DIR
+cd $sym_link_dir
 # ... and we must get the to the absolute path, not one using symbolic links.
 cd `pwd -P`
 cd `$DIRNAME $ISLINK`
-DIR=`$THEPWDCMD`
+sym_link_dir=`$THEPWDCMD`
-FILE=`$BASENAME $ISLINK`
+sym_link_file=`$BASENAME $ISLINK`
 let COUNTER=COUNTER+1
 done
 cd $STARTDIR
-PROPER_COMPILER_CXX=$DIR/$FILE
+PROPER_COMPILER_CXX=$sym_link_dir/$sym_link_file
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROPER_COMPILER_CXX" >&5
 $as_echo "$PROPER_COMPILER_CXX" >&6; }
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ### Locate other tools
-if test "x$OPENJDK_TARGET_OS" != xwindows; then
+if test "x$OPENJDK_TARGET_OS" = xmacosx; then
 ac_ext=m
 ac_cpp='$OBJCPP $CPPFLAGS'
 ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_objc_compiler_gnu

Mercurial > jdk8-mips64-public / file comparison

comparison: common/autoconf/generated-configure.sh

common/autoconf/generated-configure.sh