jdk8-mips64-public: changeset 821:d081bdbf904d

     1.1 --- a/.hgtags	Thu May 30 16:00:16 2013 -0400
     1.2 +++ b/.hgtags	Mon Jun 10 16:15:16 2013 -0400
     1.3 @@ -213,3 +213,5 @@
     1.4  892a0196d10c67f3a12f0eefb0bb536e423d8868 jdk8-b89
     1.5  69b773a221b956a3386933ecdbfeccee0edeac47 jdk8-b90
     1.6  cb51fb4789ac0b8be4056482077ddfb8f3bd3805 jdk8-b91
     1.7 +3a36c926a7aafa9d4a892a45ef3678e87ad8359b jdk8-b92
     1.8 +27c51c6e31c1ef36afa0e6efb031f9b13f26c12b jdk8-b93

     2.1 --- a/common/autoconf/basics.m4	Thu May 30 16:00:16 2013 -0400
     2.2 +++ b/common/autoconf/basics.m4	Mon Jun 10 16:15:16 2013 -0400
     2.3 @@ -72,7 +72,7 @@
     2.4        AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.])
     2.5      fi
     2.6  
     2.7 -    $1="`cd "$path"; $THEPWDCMD`" 
     2.8 +    $1="`cd "$path"; $THEPWDCMD -L`" 
     2.9    fi
    2.10  ])
    2.11  
    2.12 @@ -169,10 +169,10 @@
    2.13              COUNTER=0
    2.14              sym_link_dir=`$DIRNAME [$]$1`
    2.15              sym_link_file=`$BASENAME [$]$1`
    2.16 -            # Use the system pwd and not the shell builtin to resolve directory symlinks
    2.17              cd $sym_link_dir
    2.18 -            cd `$THEPWDCMD`
    2.19 -            sym_link_dir=`$THEPWDCMD`
    2.20 +            # Use -P flag to resolve symlinks in directories.
    2.21 +            cd `$THEPWDCMD -P`
    2.22 +            sym_link_dir=`$THEPWDCMD -P`
    2.23              # Resolve file symlinks
    2.24              while test $COUNTER -lt 20; do
    2.25                  ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
    2.26 @@ -183,7 +183,7 @@
    2.27                  # Again resolve directory symlinks since the target of the just found
    2.28                  # link could be in a different directory
    2.29                  cd `$DIRNAME $ISLINK`
    2.30 -                sym_link_dir=`$THEPWDCMD`
    2.31 +                sym_link_dir=`$THEPWDCMD -P`
    2.32                  sym_link_file=`$BASENAME $ISLINK`
    2.33                  let COUNTER=COUNTER+1
    2.34              done
    2.35 @@ -264,7 +264,6 @@
    2.36  BASIC_REQUIRE_PROG(MKTEMP, mktemp)
    2.37  BASIC_REQUIRE_PROG(MV, mv)
    2.38  BASIC_REQUIRE_PROG(PRINTF, printf)
    2.39 -BASIC_REQUIRE_PROG(THEPWDCMD, pwd)
    2.40  BASIC_REQUIRE_PROG(RM, rm)
    2.41  BASIC_REQUIRE_PROG(SH, sh)
    2.42  BASIC_REQUIRE_PROG(SORT, sort)
    2.43 @@ -297,6 +296,10 @@
    2.44  # Always force rm.
    2.45  RM="$RM -f"
    2.46  
    2.47 +# pwd behaves differently on various platforms and some don't support the -L flag.
    2.48 +# Always use the bash builtin pwd to get uniform behavior.
    2.49 +THEPWDCMD=pwd
    2.50 +
    2.51  # These are not required on all platforms
    2.52  AC_PATH_PROG(CYGPATH, cygpath)
    2.53  AC_PATH_PROG(READLINK, readlink)
    2.54 @@ -309,13 +312,12 @@
    2.55  [
    2.56  # Locate the directory of this script.
    2.57  SCRIPT="[$]0"
    2.58 -BASIC_REMOVE_SYMBOLIC_LINKS(SCRIPT)
    2.59 -AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD`
    2.60 +AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L`
    2.61  
    2.62  # Where is the source? It is located two levels above the configure script.
    2.63  CURDIR="$PWD"
    2.64  cd "$AUTOCONF_DIR/../.."
    2.65 -SRC_ROOT="`$THEPWDCMD`"
    2.66 +SRC_ROOT="`$THEPWDCMD -L`"
    2.67  
    2.68  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
    2.69    PATH_SEP=";"
    2.70 @@ -374,13 +376,9 @@
    2.71          [ CONF_NAME=${with_conf_name} ])
    2.72  
    2.73  # Test from where we are running configure, in or outside of src root.
    2.74 -# To enable comparison of directories, CURDIR needs to be symlink free
    2.75 -# just like SRC_ROOT already is
    2.76 -NOSYM_CURDIR="$CURDIR"
    2.77 -BASIC_REMOVE_SYMBOLIC_LINKS(NOSYM_CURDIR)
    2.78 -if test "x$NOSYM_CURDIR" = "x$SRC_ROOT" || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common" \
    2.79 -        || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/autoconf" \
    2.80 -        || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
    2.81 +if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
    2.82 +        || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
    2.83 +        || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
    2.84      # We are running configure from the src root.
    2.85      # Create a default ./build/target-variant-debuglevel output root.
    2.86      if test "x${CONF_NAME}" = x; then
    2.87 @@ -617,6 +615,20 @@
    2.88  
    2.89  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
    2.90    BASIC_REQUIRE_PROG(XATTR, xattr)
    2.91 +  AC_PATH_PROG(CODESIGN, codesign)
    2.92 +  if test "x$CODESIGN" != "x"; then
    2.93 +    # Verify that the openjdk_codesign certificate is present
    2.94 +    AC_MSG_CHECKING([if openjdk_codesign certificate is present])
    2.95 +    rm -f codesign-testfile
    2.96 +    touch codesign-testfile
    2.97 +    codesign -s openjdk_codesign codesign-testfile 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD || CODESIGN=
    2.98 +    rm -f codesign-testfile
    2.99 +    if test "x$CODESIGN" = x; then
   2.100 +      AC_MSG_RESULT([no])
   2.101 +    else
   2.102 +      AC_MSG_RESULT([yes])
   2.103 +    fi
   2.104 +  fi
   2.105  fi
   2.106  ])
   2.107

     3.1 --- a/common/autoconf/basics_windows.m4	Thu May 30 16:00:16 2013 -0400
     3.2 +++ b/common/autoconf/basics_windows.m4	Mon Jun 10 16:15:16 2013 -0400
     3.3 @@ -300,7 +300,7 @@
     3.4  # Setup basic configuration paths, and platform-specific stuff related to PATHs.
     3.5  AC_DEFUN([BASIC_CHECK_PATHS_WINDOWS],
     3.6  [
     3.7 -  SRC_ROOT_LENGTH=`$THEPWDCMD|$WC -m`
     3.8 +  SRC_ROOT_LENGTH=`$THEPWDCMD -L|$WC -m`
     3.9    if test $SRC_ROOT_LENGTH -gt 100; then
    3.10        AC_MSG_ERROR([Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported])
    3.11    fi

     4.1 --- a/common/autoconf/build-performance.m4	Thu May 30 16:00:16 2013 -0400
     4.2 +++ b/common/autoconf/build-performance.m4	Mon Jun 10 16:15:16 2013 -0400
     4.3 @@ -145,6 +145,9 @@
     4.4      if test "$JOBS" -gt "16"; then
     4.5        JOBS=16
     4.6      fi
     4.7 +    if test "$JOBS" -eq "0"; then
     4.8 +      JOBS=1
     4.9 +    fi
    4.10      AC_MSG_RESULT([$JOBS])
    4.11    else
    4.12      JOBS=$with_jobs

     5.1 --- a/common/autoconf/generated-configure.sh	Thu May 30 16:00:16 2013 -0400
     5.2 +++ b/common/autoconf/generated-configure.sh	Mon Jun 10 16:15:16 2013 -0400
     5.3 @@ -1,6 +1,6 @@
     5.4  #! /bin/sh
     5.5  # Guess values for system-dependent variables and create Makefiles.
     5.6 -# Generated by GNU Autoconf 2.67 for OpenJDK jdk8.
     5.7 +# Generated by GNU Autoconf 2.68 for OpenJDK jdk8.
     5.8  #
     5.9  # Report bugs to <build-dev@openjdk.java.net>.
    5.10  #
    5.11 @@ -91,6 +91,7 @@
    5.12  IFS=" ""	$as_nl"
    5.13  
    5.14  # Find who we are.  Look in the path if we contain no directory separator.
    5.15 +as_myself=
    5.16  case $0 in #((
    5.17    *[\\/]* ) as_myself=$0 ;;
    5.18    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    5.19 @@ -216,11 +217,18 @@
    5.20    # We cannot yet assume a decent shell, so we have to provide a
    5.21  	# neutralization value for shells without unset; and this also
    5.22  	# works around shells that cannot unset nonexistent variables.
    5.23 +	# Preserve -v and -x to the replacement shell.
    5.24  	BASH_ENV=/dev/null
    5.25  	ENV=/dev/null
    5.26  	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
    5.27  	export CONFIG_SHELL
    5.28 -	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
    5.29 +	case $- in # ((((
    5.30 +	  *v*x* | *x*v* ) as_opts=-vx ;;
    5.31 +	  *v* ) as_opts=-v ;;
    5.32 +	  *x* ) as_opts=-x ;;
    5.33 +	  * ) as_opts= ;;
    5.34 +	esac
    5.35 +	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
    5.36  fi
    5.37  
    5.38      if test x$as_have_required = xno; then :
    5.39 @@ -681,8 +689,8 @@
    5.40  SHARED_LIBRARY
    5.41  OBJ_SUFFIX
    5.42  COMPILER_NAME
    5.43 +JT_HOME
    5.44  JTREGEXE
    5.45 -JT_HOME
    5.46  LIPO
    5.47  ac_ct_OBJDUMP
    5.48  OBJDUMP
    5.49 @@ -797,6 +805,7 @@
    5.50  OS_VERSION_MINOR
    5.51  OS_VERSION_MAJOR
    5.52  PKG_CONFIG
    5.53 +CODESIGN
    5.54  XATTR
    5.55  TIME
    5.56  STAT
    5.57 @@ -900,7 +909,6 @@
    5.58  SORT
    5.59  SH
    5.60  RM
    5.61 -THEPWDCMD
    5.62  PRINTF
    5.63  MV
    5.64  MKTEMP
    5.65 @@ -988,6 +996,7 @@
    5.66  with_cacerts_file
    5.67  enable_unlimited_crypto
    5.68  with_milestone
    5.69 +with_update_version
    5.70  with_build_number
    5.71  with_user_release_suffix
    5.72  with_boot_jdk
    5.73 @@ -1459,7 +1468,7 @@
    5.74      $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
    5.75      expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
    5.76        $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
    5.77 -    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
    5.78 +    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
    5.79      ;;
    5.80  
    5.81    esac
    5.82 @@ -1727,6 +1736,7 @@
    5.83                            group
    5.84    --with-cacerts-file     specify alternative cacerts file
    5.85    --with-milestone        Set milestone value for build [internal]
    5.86 +  --with-update-version   Set update version value for build [b00]
    5.87    --with-build-number     Set build number value for build [b00]
    5.88    --with-user-release-suffix
    5.89                            Add a custom string to the version string if build
    5.90 @@ -1894,7 +1904,7 @@
    5.91  if $ac_init_version; then
    5.92    cat <<\_ACEOF
    5.93  OpenJDK configure jdk8
    5.94 -generated by GNU Autoconf 2.67
    5.95 +generated by GNU Autoconf 2.68
    5.96  
    5.97  Copyright (C) 2010 Free Software Foundation, Inc.
    5.98  This configure script is free software; the Free Software Foundation
    5.99 @@ -1940,7 +1950,7 @@
   5.100  
   5.101  	ac_retval=1
   5.102  fi
   5.103 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   5.104 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   5.105    as_fn_set_status $ac_retval
   5.106  
   5.107  } # ac_fn_c_try_compile
   5.108 @@ -1978,7 +1988,7 @@
   5.109  
   5.110  	ac_retval=1
   5.111  fi
   5.112 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   5.113 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   5.114    as_fn_set_status $ac_retval
   5.115  
   5.116  } # ac_fn_cxx_try_compile
   5.117 @@ -2016,7 +2026,7 @@
   5.118  
   5.119  	ac_retval=1
   5.120  fi
   5.121 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   5.122 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   5.123    as_fn_set_status $ac_retval
   5.124  
   5.125  } # ac_fn_objc_try_compile
   5.126 @@ -2053,7 +2063,7 @@
   5.127  
   5.128      ac_retval=1
   5.129  fi
   5.130 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   5.131 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   5.132    as_fn_set_status $ac_retval
   5.133  
   5.134  } # ac_fn_c_try_cpp
   5.135 @@ -2090,7 +2100,7 @@
   5.136  
   5.137      ac_retval=1
   5.138  fi
   5.139 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   5.140 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   5.141    as_fn_set_status $ac_retval
   5.142  
   5.143  } # ac_fn_cxx_try_cpp
   5.144 @@ -2103,10 +2113,10 @@
   5.145  ac_fn_cxx_check_header_mongrel ()
   5.146  {
   5.147    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   5.148 -  if eval "test \"\${$3+set}\"" = set; then :
   5.149 +  if eval \${$3+:} false; then :
   5.150    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   5.151  $as_echo_n "checking for $2... " >&6; }
   5.152 -if eval "test \"\${$3+set}\"" = set; then :
   5.153 +if eval \${$3+:} false; then :
   5.154    $as_echo_n "(cached) " >&6
   5.155  fi
   5.156  eval ac_res=\$$3
   5.157 @@ -2173,7 +2183,7 @@
   5.158  esac
   5.159    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   5.160  $as_echo_n "checking for $2... " >&6; }
   5.161 -if eval "test \"\${$3+set}\"" = set; then :
   5.162 +if eval \${$3+:} false; then :
   5.163    $as_echo_n "(cached) " >&6
   5.164  else
   5.165    eval "$3=\$ac_header_compiler"
   5.166 @@ -2182,7 +2192,7 @@
   5.167  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   5.168  $as_echo "$ac_res" >&6; }
   5.169  fi
   5.170 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   5.171 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   5.172  
   5.173  } # ac_fn_cxx_check_header_mongrel
   5.174  
   5.175 @@ -2223,7 +2233,7 @@
   5.176         ac_retval=$ac_status
   5.177  fi
   5.178    rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   5.179 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   5.180 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   5.181    as_fn_set_status $ac_retval
   5.182  
   5.183  } # ac_fn_cxx_try_run
   5.184 @@ -2237,7 +2247,7 @@
   5.185    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   5.186    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   5.187  $as_echo_n "checking for $2... " >&6; }
   5.188 -if eval "test \"\${$3+set}\"" = set; then :
   5.189 +if eval \${$3+:} false; then :
   5.190    $as_echo_n "(cached) " >&6
   5.191  else
   5.192    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   5.193 @@ -2255,7 +2265,7 @@
   5.194  eval ac_res=\$$3
   5.195  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   5.196  $as_echo "$ac_res" >&6; }
   5.197 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   5.198 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   5.199  
   5.200  } # ac_fn_cxx_check_header_compile
   5.201  
   5.202 @@ -2432,7 +2442,7 @@
   5.203  rm -f conftest.val
   5.204  
   5.205    fi
   5.206 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   5.207 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   5.208    as_fn_set_status $ac_retval
   5.209  
   5.210  } # ac_fn_cxx_compute_int
   5.211 @@ -2478,7 +2488,7 @@
   5.212    # interfere with the next link command; also delete a directory that is
   5.213    # left behind by Apple's compiler.  We do this before executing the actions.
   5.214    rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   5.215 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   5.216 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   5.217    as_fn_set_status $ac_retval
   5.218  
   5.219  } # ac_fn_cxx_try_link
   5.220 @@ -2491,7 +2501,7 @@
   5.221    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   5.222    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   5.223  $as_echo_n "checking for $2... " >&6; }
   5.224 -if eval "test \"\${$3+set}\"" = set; then :
   5.225 +if eval \${$3+:} false; then :
   5.226    $as_echo_n "(cached) " >&6
   5.227  else
   5.228    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   5.229 @@ -2546,7 +2556,7 @@
   5.230  eval ac_res=\$$3
   5.231  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   5.232  $as_echo "$ac_res" >&6; }
   5.233 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   5.234 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   5.235  
   5.236  } # ac_fn_cxx_check_func
   5.237  
   5.238 @@ -2559,7 +2569,7 @@
   5.239    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   5.240    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   5.241  $as_echo_n "checking for $2... " >&6; }
   5.242 -if eval "test \"\${$3+set}\"" = set; then :
   5.243 +if eval \${$3+:} false; then :
   5.244    $as_echo_n "(cached) " >&6
   5.245  else
   5.246    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   5.247 @@ -2577,7 +2587,7 @@
   5.248  eval ac_res=\$$3
   5.249  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   5.250  $as_echo "$ac_res" >&6; }
   5.251 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   5.252 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   5.253  
   5.254  } # ac_fn_c_check_header_compile
   5.255  cat >config.log <<_ACEOF
   5.256 @@ -2585,7 +2595,7 @@
   5.257  running configure, to aid debugging if configure makes a mistake.
   5.258  
   5.259  It was created by OpenJDK $as_me jdk8, which was
   5.260 -generated by GNU Autoconf 2.67.  Invocation command line was
   5.261 +generated by GNU Autoconf 2.68.  Invocation command line was
   5.262  
   5.263    $ $0 $@
   5.264  
   5.265 @@ -3780,7 +3790,7 @@
   5.266  #CUSTOM_AUTOCONF_INCLUDE
   5.267  
   5.268  # Do not change or remove the following line, it is needed for consistency checks:
   5.269 -DATE_WHEN_GENERATED=1369723814
   5.270 +DATE_WHEN_GENERATED=1370470729
   5.271  
   5.272  ###############################################################################
   5.273  #
   5.274 @@ -3818,7 +3828,7 @@
   5.275  set dummy $ac_prog; ac_word=$2
   5.276  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.277  $as_echo_n "checking for $ac_word... " >&6; }
   5.278 -if test "${ac_cv_path_BASENAME+set}" = set; then :
   5.279 +if ${ac_cv_path_BASENAME+:} false; then :
   5.280    $as_echo_n "(cached) " >&6
   5.281  else
   5.282    case $BASENAME in
   5.283 @@ -3877,7 +3887,7 @@
   5.284  set dummy $ac_prog; ac_word=$2
   5.285  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.286  $as_echo_n "checking for $ac_word... " >&6; }
   5.287 -if test "${ac_cv_path_BASH+set}" = set; then :
   5.288 +if ${ac_cv_path_BASH+:} false; then :
   5.289    $as_echo_n "(cached) " >&6
   5.290  else
   5.291    case $BASH in
   5.292 @@ -3936,7 +3946,7 @@
   5.293  set dummy $ac_prog; ac_word=$2
   5.294  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.295  $as_echo_n "checking for $ac_word... " >&6; }
   5.296 -if test "${ac_cv_path_CAT+set}" = set; then :
   5.297 +if ${ac_cv_path_CAT+:} false; then :
   5.298    $as_echo_n "(cached) " >&6
   5.299  else
   5.300    case $CAT in
   5.301 @@ -3995,7 +4005,7 @@
   5.302  set dummy $ac_prog; ac_word=$2
   5.303  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.304  $as_echo_n "checking for $ac_word... " >&6; }
   5.305 -if test "${ac_cv_path_CHMOD+set}" = set; then :
   5.306 +if ${ac_cv_path_CHMOD+:} false; then :
   5.307    $as_echo_n "(cached) " >&6
   5.308  else
   5.309    case $CHMOD in
   5.310 @@ -4054,7 +4064,7 @@
   5.311  set dummy $ac_prog; ac_word=$2
   5.312  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.313  $as_echo_n "checking for $ac_word... " >&6; }
   5.314 -if test "${ac_cv_path_CMP+set}" = set; then :
   5.315 +if ${ac_cv_path_CMP+:} false; then :
   5.316    $as_echo_n "(cached) " >&6
   5.317  else
   5.318    case $CMP in
   5.319 @@ -4113,7 +4123,7 @@
   5.320  set dummy $ac_prog; ac_word=$2
   5.321  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.322  $as_echo_n "checking for $ac_word... " >&6; }
   5.323 -if test "${ac_cv_path_COMM+set}" = set; then :
   5.324 +if ${ac_cv_path_COMM+:} false; then :
   5.325    $as_echo_n "(cached) " >&6
   5.326  else
   5.327    case $COMM in
   5.328 @@ -4172,7 +4182,7 @@
   5.329  set dummy $ac_prog; ac_word=$2
   5.330  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.331  $as_echo_n "checking for $ac_word... " >&6; }
   5.332 -if test "${ac_cv_path_CP+set}" = set; then :
   5.333 +if ${ac_cv_path_CP+:} false; then :
   5.334    $as_echo_n "(cached) " >&6
   5.335  else
   5.336    case $CP in
   5.337 @@ -4231,7 +4241,7 @@
   5.338  set dummy $ac_prog; ac_word=$2
   5.339  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.340  $as_echo_n "checking for $ac_word... " >&6; }
   5.341 -if test "${ac_cv_path_CPIO+set}" = set; then :
   5.342 +if ${ac_cv_path_CPIO+:} false; then :
   5.343    $as_echo_n "(cached) " >&6
   5.344  else
   5.345    case $CPIO in
   5.346 @@ -4290,7 +4300,7 @@
   5.347  set dummy $ac_prog; ac_word=$2
   5.348  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.349  $as_echo_n "checking for $ac_word... " >&6; }
   5.350 -if test "${ac_cv_path_CUT+set}" = set; then :
   5.351 +if ${ac_cv_path_CUT+:} false; then :
   5.352    $as_echo_n "(cached) " >&6
   5.353  else
   5.354    case $CUT in
   5.355 @@ -4349,7 +4359,7 @@
   5.356  set dummy $ac_prog; ac_word=$2
   5.357  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.358  $as_echo_n "checking for $ac_word... " >&6; }
   5.359 -if test "${ac_cv_path_DATE+set}" = set; then :
   5.360 +if ${ac_cv_path_DATE+:} false; then :
   5.361    $as_echo_n "(cached) " >&6
   5.362  else
   5.363    case $DATE in
   5.364 @@ -4408,7 +4418,7 @@
   5.365  set dummy $ac_prog; ac_word=$2
   5.366  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.367  $as_echo_n "checking for $ac_word... " >&6; }
   5.368 -if test "${ac_cv_path_DIFF+set}" = set; then :
   5.369 +if ${ac_cv_path_DIFF+:} false; then :
   5.370    $as_echo_n "(cached) " >&6
   5.371  else
   5.372    case $DIFF in
   5.373 @@ -4467,7 +4477,7 @@
   5.374  set dummy $ac_prog; ac_word=$2
   5.375  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.376  $as_echo_n "checking for $ac_word... " >&6; }
   5.377 -if test "${ac_cv_path_DIRNAME+set}" = set; then :
   5.378 +if ${ac_cv_path_DIRNAME+:} false; then :
   5.379    $as_echo_n "(cached) " >&6
   5.380  else
   5.381    case $DIRNAME in
   5.382 @@ -4526,7 +4536,7 @@
   5.383  set dummy $ac_prog; ac_word=$2
   5.384  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.385  $as_echo_n "checking for $ac_word... " >&6; }
   5.386 -if test "${ac_cv_path_ECHO+set}" = set; then :
   5.387 +if ${ac_cv_path_ECHO+:} false; then :
   5.388    $as_echo_n "(cached) " >&6
   5.389  else
   5.390    case $ECHO in
   5.391 @@ -4585,7 +4595,7 @@
   5.392  set dummy $ac_prog; ac_word=$2
   5.393  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.394  $as_echo_n "checking for $ac_word... " >&6; }
   5.395 -if test "${ac_cv_path_EXPR+set}" = set; then :
   5.396 +if ${ac_cv_path_EXPR+:} false; then :
   5.397    $as_echo_n "(cached) " >&6
   5.398  else
   5.399    case $EXPR in
   5.400 @@ -4644,7 +4654,7 @@
   5.401  set dummy $ac_prog; ac_word=$2
   5.402  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.403  $as_echo_n "checking for $ac_word... " >&6; }
   5.404 -if test "${ac_cv_path_FILE+set}" = set; then :
   5.405 +if ${ac_cv_path_FILE+:} false; then :
   5.406    $as_echo_n "(cached) " >&6
   5.407  else
   5.408    case $FILE in
   5.409 @@ -4703,7 +4713,7 @@
   5.410  set dummy $ac_prog; ac_word=$2
   5.411  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.412  $as_echo_n "checking for $ac_word... " >&6; }
   5.413 -if test "${ac_cv_path_FIND+set}" = set; then :
   5.414 +if ${ac_cv_path_FIND+:} false; then :
   5.415    $as_echo_n "(cached) " >&6
   5.416  else
   5.417    case $FIND in
   5.418 @@ -4762,7 +4772,7 @@
   5.419  set dummy $ac_prog; ac_word=$2
   5.420  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.421  $as_echo_n "checking for $ac_word... " >&6; }
   5.422 -if test "${ac_cv_path_HEAD+set}" = set; then :
   5.423 +if ${ac_cv_path_HEAD+:} false; then :
   5.424    $as_echo_n "(cached) " >&6
   5.425  else
   5.426    case $HEAD in
   5.427 @@ -4821,7 +4831,7 @@
   5.428  set dummy $ac_prog; ac_word=$2
   5.429  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.430  $as_echo_n "checking for $ac_word... " >&6; }
   5.431 -if test "${ac_cv_path_LN+set}" = set; then :
   5.432 +if ${ac_cv_path_LN+:} false; then :
   5.433    $as_echo_n "(cached) " >&6
   5.434  else
   5.435    case $LN in
   5.436 @@ -4880,7 +4890,7 @@
   5.437  set dummy $ac_prog; ac_word=$2
   5.438  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.439  $as_echo_n "checking for $ac_word... " >&6; }
   5.440 -if test "${ac_cv_path_LS+set}" = set; then :
   5.441 +if ${ac_cv_path_LS+:} false; then :
   5.442    $as_echo_n "(cached) " >&6
   5.443  else
   5.444    case $LS in
   5.445 @@ -4939,7 +4949,7 @@
   5.446  set dummy $ac_prog; ac_word=$2
   5.447  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.448  $as_echo_n "checking for $ac_word... " >&6; }
   5.449 -if test "${ac_cv_path_MKDIR+set}" = set; then :
   5.450 +if ${ac_cv_path_MKDIR+:} false; then :
   5.451    $as_echo_n "(cached) " >&6
   5.452  else
   5.453    case $MKDIR in
   5.454 @@ -4998,7 +5008,7 @@
   5.455  set dummy $ac_prog; ac_word=$2
   5.456  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.457  $as_echo_n "checking for $ac_word... " >&6; }
   5.458 -if test "${ac_cv_path_MKTEMP+set}" = set; then :
   5.459 +if ${ac_cv_path_MKTEMP+:} false; then :
   5.460    $as_echo_n "(cached) " >&6
   5.461  else
   5.462    case $MKTEMP in
   5.463 @@ -5057,7 +5067,7 @@
   5.464  set dummy $ac_prog; ac_word=$2
   5.465  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.466  $as_echo_n "checking for $ac_word... " >&6; }
   5.467 -if test "${ac_cv_path_MV+set}" = set; then :
   5.468 +if ${ac_cv_path_MV+:} false; then :
   5.469    $as_echo_n "(cached) " >&6
   5.470  else
   5.471    case $MV in
   5.472 @@ -5116,7 +5126,7 @@
   5.473  set dummy $ac_prog; ac_word=$2
   5.474  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.475  $as_echo_n "checking for $ac_word... " >&6; }
   5.476 -if test "${ac_cv_path_PRINTF+set}" = set; then :
   5.477 +if ${ac_cv_path_PRINTF+:} false; then :
   5.478    $as_echo_n "(cached) " >&6
   5.479  else
   5.480    case $PRINTF in
   5.481 @@ -5169,72 +5179,13 @@
   5.482  
   5.483  
   5.484  
   5.485 -    for ac_prog in pwd
   5.486 -do
   5.487 -  # Extract the first word of "$ac_prog", so it can be a program name with args.
   5.488 -set dummy $ac_prog; ac_word=$2
   5.489 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.490 -$as_echo_n "checking for $ac_word... " >&6; }
   5.491 -if test "${ac_cv_path_THEPWDCMD+set}" = set; then :
   5.492 -  $as_echo_n "(cached) " >&6
   5.493 -else
   5.494 -  case $THEPWDCMD in
   5.495 -  [\\/]* | ?:[\\/]*)
   5.496 -  ac_cv_path_THEPWDCMD="$THEPWDCMD" # Let the user override the test with a path.
   5.497 -  ;;
   5.498 -  *)
   5.499 -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   5.500 -for as_dir in $PATH
   5.501 -do
   5.502 -  IFS=$as_save_IFS
   5.503 -  test -z "$as_dir" && as_dir=.
   5.504 -    for ac_exec_ext in '' $ac_executable_extensions; do
   5.505 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   5.506 -    ac_cv_path_THEPWDCMD="$as_dir/$ac_word$ac_exec_ext"
   5.507 -    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   5.508 -    break 2
   5.509 -  fi
   5.510 -done
   5.511 -  done
   5.512 -IFS=$as_save_IFS
   5.513 -
   5.514 -  ;;
   5.515 -esac
   5.516 -fi
   5.517 -THEPWDCMD=$ac_cv_path_THEPWDCMD
   5.518 -if test -n "$THEPWDCMD"; then
   5.519 -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THEPWDCMD" >&5
   5.520 -$as_echo "$THEPWDCMD" >&6; }
   5.521 -else
   5.522 -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   5.523 -$as_echo "no" >&6; }
   5.524 -fi
   5.525 -
   5.526 -
   5.527 -  test -n "$THEPWDCMD" && break
   5.528 -done
   5.529 -
   5.530 -
   5.531 -    if test "x$THEPWDCMD" = x; then
   5.532 -        if test "xpwd" = x; then
   5.533 -          PROG_NAME=thepwdcmd
   5.534 -        else
   5.535 -          PROG_NAME=pwd
   5.536 -        fi
   5.537 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
   5.538 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
   5.539 -        as_fn_error $? "Cannot continue" "$LINENO" 5
   5.540 -    fi
   5.541 -
   5.542 -
   5.543 -
   5.544      for ac_prog in rm
   5.545  do
   5.546    # Extract the first word of "$ac_prog", so it can be a program name with args.
   5.547  set dummy $ac_prog; ac_word=$2
   5.548  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.549  $as_echo_n "checking for $ac_word... " >&6; }
   5.550 -if test "${ac_cv_path_RM+set}" = set; then :
   5.551 +if ${ac_cv_path_RM+:} false; then :
   5.552    $as_echo_n "(cached) " >&6
   5.553  else
   5.554    case $RM in
   5.555 @@ -5293,7 +5244,7 @@
   5.556  set dummy $ac_prog; ac_word=$2
   5.557  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.558  $as_echo_n "checking for $ac_word... " >&6; }
   5.559 -if test "${ac_cv_path_SH+set}" = set; then :
   5.560 +if ${ac_cv_path_SH+:} false; then :
   5.561    $as_echo_n "(cached) " >&6
   5.562  else
   5.563    case $SH in
   5.564 @@ -5352,7 +5303,7 @@
   5.565  set dummy $ac_prog; ac_word=$2
   5.566  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.567  $as_echo_n "checking for $ac_word... " >&6; }
   5.568 -if test "${ac_cv_path_SORT+set}" = set; then :
   5.569 +if ${ac_cv_path_SORT+:} false; then :
   5.570    $as_echo_n "(cached) " >&6
   5.571  else
   5.572    case $SORT in
   5.573 @@ -5411,7 +5362,7 @@
   5.574  set dummy $ac_prog; ac_word=$2
   5.575  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.576  $as_echo_n "checking for $ac_word... " >&6; }
   5.577 -if test "${ac_cv_path_TAIL+set}" = set; then :
   5.578 +if ${ac_cv_path_TAIL+:} false; then :
   5.579    $as_echo_n "(cached) " >&6
   5.580  else
   5.581    case $TAIL in
   5.582 @@ -5470,7 +5421,7 @@
   5.583  set dummy $ac_prog; ac_word=$2
   5.584  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.585  $as_echo_n "checking for $ac_word... " >&6; }
   5.586 -if test "${ac_cv_path_TAR+set}" = set; then :
   5.587 +if ${ac_cv_path_TAR+:} false; then :
   5.588    $as_echo_n "(cached) " >&6
   5.589  else
   5.590    case $TAR in
   5.591 @@ -5529,7 +5480,7 @@
   5.592  set dummy $ac_prog; ac_word=$2
   5.593  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.594  $as_echo_n "checking for $ac_word... " >&6; }
   5.595 -if test "${ac_cv_path_TEE+set}" = set; then :
   5.596 +if ${ac_cv_path_TEE+:} false; then :
   5.597    $as_echo_n "(cached) " >&6
   5.598  else
   5.599    case $TEE in
   5.600 @@ -5588,7 +5539,7 @@
   5.601  set dummy $ac_prog; ac_word=$2
   5.602  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.603  $as_echo_n "checking for $ac_word... " >&6; }
   5.604 -if test "${ac_cv_path_TOUCH+set}" = set; then :
   5.605 +if ${ac_cv_path_TOUCH+:} false; then :
   5.606    $as_echo_n "(cached) " >&6
   5.607  else
   5.608    case $TOUCH in
   5.609 @@ -5647,7 +5598,7 @@
   5.610  set dummy $ac_prog; ac_word=$2
   5.611  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.612  $as_echo_n "checking for $ac_word... " >&6; }
   5.613 -if test "${ac_cv_path_TR+set}" = set; then :
   5.614 +if ${ac_cv_path_TR+:} false; then :
   5.615    $as_echo_n "(cached) " >&6
   5.616  else
   5.617    case $TR in
   5.618 @@ -5706,7 +5657,7 @@
   5.619  set dummy $ac_prog; ac_word=$2
   5.620  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.621  $as_echo_n "checking for $ac_word... " >&6; }
   5.622 -if test "${ac_cv_path_UNAME+set}" = set; then :
   5.623 +if ${ac_cv_path_UNAME+:} false; then :
   5.624    $as_echo_n "(cached) " >&6
   5.625  else
   5.626    case $UNAME in
   5.627 @@ -5765,7 +5716,7 @@
   5.628  set dummy $ac_prog; ac_word=$2
   5.629  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.630  $as_echo_n "checking for $ac_word... " >&6; }
   5.631 -if test "${ac_cv_path_UNIQ+set}" = set; then :
   5.632 +if ${ac_cv_path_UNIQ+:} false; then :
   5.633    $as_echo_n "(cached) " >&6
   5.634  else
   5.635    case $UNIQ in
   5.636 @@ -5824,7 +5775,7 @@
   5.637  set dummy $ac_prog; ac_word=$2
   5.638  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.639  $as_echo_n "checking for $ac_word... " >&6; }
   5.640 -if test "${ac_cv_path_WC+set}" = set; then :
   5.641 +if ${ac_cv_path_WC+:} false; then :
   5.642    $as_echo_n "(cached) " >&6
   5.643  else
   5.644    case $WC in
   5.645 @@ -5883,7 +5834,7 @@
   5.646  set dummy $ac_prog; ac_word=$2
   5.647  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.648  $as_echo_n "checking for $ac_word... " >&6; }
   5.649 -if test "${ac_cv_path_WHICH+set}" = set; then :
   5.650 +if ${ac_cv_path_WHICH+:} false; then :
   5.651    $as_echo_n "(cached) " >&6
   5.652  else
   5.653    case $WHICH in
   5.654 @@ -5942,7 +5893,7 @@
   5.655  set dummy $ac_prog; ac_word=$2
   5.656  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.657  $as_echo_n "checking for $ac_word... " >&6; }
   5.658 -if test "${ac_cv_path_XARGS+set}" = set; then :
   5.659 +if ${ac_cv_path_XARGS+:} false; then :
   5.660    $as_echo_n "(cached) " >&6
   5.661  else
   5.662    case $XARGS in
   5.663 @@ -6002,7 +5953,7 @@
   5.664  set dummy $ac_prog; ac_word=$2
   5.665  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.666  $as_echo_n "checking for $ac_word... " >&6; }
   5.667 -if test "${ac_cv_prog_AWK+set}" = set; then :
   5.668 +if ${ac_cv_prog_AWK+:} false; then :
   5.669    $as_echo_n "(cached) " >&6
   5.670  else
   5.671    if test -n "$AWK"; then
   5.672 @@ -6052,7 +6003,7 @@
   5.673  
   5.674  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
   5.675  $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
   5.676 -if test "${ac_cv_path_GREP+set}" = set; then :
   5.677 +if ${ac_cv_path_GREP+:} false; then :
   5.678    $as_echo_n "(cached) " >&6
   5.679  else
   5.680    if test -z "$GREP"; then
   5.681 @@ -6127,7 +6078,7 @@
   5.682  
   5.683  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
   5.684  $as_echo_n "checking for egrep... " >&6; }
   5.685 -if test "${ac_cv_path_EGREP+set}" = set; then :
   5.686 +if ${ac_cv_path_EGREP+:} false; then :
   5.687    $as_echo_n "(cached) " >&6
   5.688  else
   5.689    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
   5.690 @@ -6206,7 +6157,7 @@
   5.691  
   5.692  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
   5.693  $as_echo_n "checking for fgrep... " >&6; }
   5.694 -if test "${ac_cv_path_FGREP+set}" = set; then :
   5.695 +if ${ac_cv_path_FGREP+:} false; then :
   5.696    $as_echo_n "(cached) " >&6
   5.697  else
   5.698    if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
   5.699 @@ -6285,7 +6236,7 @@
   5.700  
   5.701  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
   5.702  $as_echo_n "checking for a sed that does not truncate output... " >&6; }
   5.703 -if test "${ac_cv_path_SED+set}" = set; then :
   5.704 +if ${ac_cv_path_SED+:} false; then :
   5.705    $as_echo_n "(cached) " >&6
   5.706  else
   5.707              ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
   5.708 @@ -6371,7 +6322,7 @@
   5.709  set dummy $ac_prog; ac_word=$2
   5.710  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.711  $as_echo_n "checking for $ac_word... " >&6; }
   5.712 -if test "${ac_cv_path_NAWK+set}" = set; then :
   5.713 +if ${ac_cv_path_NAWK+:} false; then :
   5.714    $as_echo_n "(cached) " >&6
   5.715  else
   5.716    case $NAWK in
   5.717 @@ -6426,12 +6377,16 @@
   5.718  # Always force rm.
   5.719  RM="$RM -f"
   5.720  
   5.721 +# pwd behaves differently on various platforms and some don't support the -L flag.
   5.722 +# Always use the bash builtin pwd to get uniform behavior.
   5.723 +THEPWDCMD=pwd
   5.724 +
   5.725  # These are not required on all platforms
   5.726  # Extract the first word of "cygpath", so it can be a program name with args.
   5.727  set dummy cygpath; ac_word=$2
   5.728  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.729  $as_echo_n "checking for $ac_word... " >&6; }
   5.730 -if test "${ac_cv_path_CYGPATH+set}" = set; then :
   5.731 +if ${ac_cv_path_CYGPATH+:} false; then :
   5.732    $as_echo_n "(cached) " >&6
   5.733  else
   5.734    case $CYGPATH in
   5.735 @@ -6471,7 +6426,7 @@
   5.736  set dummy readlink; ac_word=$2
   5.737  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.738  $as_echo_n "checking for $ac_word... " >&6; }
   5.739 -if test "${ac_cv_path_READLINK+set}" = set; then :
   5.740 +if ${ac_cv_path_READLINK+:} false; then :
   5.741    $as_echo_n "(cached) " >&6
   5.742  else
   5.743    case $READLINK in
   5.744 @@ -6511,7 +6466,7 @@
   5.745  set dummy df; ac_word=$2
   5.746  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.747  $as_echo_n "checking for $ac_word... " >&6; }
   5.748 -if test "${ac_cv_path_DF+set}" = set; then :
   5.749 +if ${ac_cv_path_DF+:} false; then :
   5.750    $as_echo_n "(cached) " >&6
   5.751  else
   5.752    case $DF in
   5.753 @@ -6551,7 +6506,7 @@
   5.754  set dummy SetFile; ac_word=$2
   5.755  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.756  $as_echo_n "checking for $ac_word... " >&6; }
   5.757 -if test "${ac_cv_path_SETFILE+set}" = set; then :
   5.758 +if ${ac_cv_path_SETFILE+:} false; then :
   5.759    $as_echo_n "(cached) " >&6
   5.760  else
   5.761    case $SETFILE in
   5.762 @@ -6597,7 +6552,7 @@
   5.763  
   5.764  { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
   5.765  $as_echo_n "checking build system type... " >&6; }
   5.766 -if test "${ac_cv_build+set}" = set; then :
   5.767 +if ${ac_cv_build+:} false; then :
   5.768    $as_echo_n "(cached) " >&6
   5.769  else
   5.770    ac_build_alias=$build_alias
   5.771 @@ -6631,7 +6586,7 @@
   5.772  
   5.773  { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
   5.774  $as_echo_n "checking host system type... " >&6; }
   5.775 -if test "${ac_cv_host+set}" = set; then :
   5.776 +if ${ac_cv_host+:} false; then :
   5.777    $as_echo_n "(cached) " >&6
   5.778  else
   5.779    if test "x$host_alias" = x; then
   5.780 @@ -6664,7 +6619,7 @@
   5.781  
   5.782  { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
   5.783  $as_echo_n "checking target system type... " >&6; }
   5.784 -if test "${ac_cv_target+set}" = set; then :
   5.785 +if ${ac_cv_target+:} false; then :
   5.786    $as_echo_n "(cached) " >&6
   5.787  else
   5.788    if test "x$target_alias" = x; then
   5.789 @@ -7133,65 +7088,17 @@
   5.790  
   5.791  # Locate the directory of this script.
   5.792  SCRIPT="$0"
   5.793 -
   5.794 -    if test "x$OPENJDK_BUILD_OS" != xwindows; then
   5.795 -        # Follow a chain of symbolic links. Use readlink
   5.796 -        # where it exists, else fall back to horribly
   5.797 -        # complicated shell code.
   5.798 -        if test "x$READLINK_TESTED" != yes; then
   5.799 -            # On MacOSX there is a readlink tool with a different
   5.800 -            # purpose than the GNU readlink tool. Check the found readlink.
   5.801 -            ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
   5.802 -            if test "x$ISGNU" = x; then
   5.803 -                 # A readlink that we do not know how to use.
   5.804 -                 # Are there other non-GNU readlinks out there?
   5.805 -                 READLINK_TESTED=yes
   5.806 -                 READLINK=
   5.807 -            fi
   5.808 -        fi
   5.809 -
   5.810 -        if test "x$READLINK" != x; then
   5.811 -            SCRIPT=`$READLINK -f $SCRIPT`
   5.812 -        else
   5.813 -            # Save the current directory for restoring afterwards
   5.814 -            STARTDIR=$PWD
   5.815 -            COUNTER=0
   5.816 -            sym_link_dir=`$DIRNAME $SCRIPT`
   5.817 -            sym_link_file=`$BASENAME $SCRIPT`
   5.818 -            # Use the system pwd and not the shell builtin to resolve directory symlinks
   5.819 -            cd $sym_link_dir
   5.820 -            cd `$THEPWDCMD`
   5.821 -            sym_link_dir=`$THEPWDCMD`
   5.822 -            # Resolve file symlinks
   5.823 -            while test $COUNTER -lt 20; do
   5.824 -                ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
   5.825 -                if test "x$ISLINK" == x; then
   5.826 -                    # This is not a symbolic link! We are done!
   5.827 -                    break
   5.828 -                fi
   5.829 -                # Again resolve directory symlinks since the target of the just found
   5.830 -                # link could be in a different directory
   5.831 -                cd `$DIRNAME $ISLINK`
   5.832 -                sym_link_dir=`$THEPWDCMD`
   5.833 -                sym_link_file=`$BASENAME $ISLINK`
   5.834 -                let COUNTER=COUNTER+1
   5.835 -            done
   5.836 -            cd $STARTDIR
   5.837 -            SCRIPT=$sym_link_dir/$sym_link_file
   5.838 -        fi
   5.839 -    fi
   5.840 -
   5.841 -AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD`
   5.842 +AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L`
   5.843  
   5.844  # Where is the source? It is located two levels above the configure script.
   5.845  CURDIR="$PWD"
   5.846  cd "$AUTOCONF_DIR/../.."
   5.847 -SRC_ROOT="`$THEPWDCMD`"
   5.848 +SRC_ROOT="`$THEPWDCMD -L`"
   5.849  
   5.850  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
   5.851    PATH_SEP=";"
   5.852  
   5.853 -  SRC_ROOT_LENGTH=`$THEPWDCMD|$WC -m`
   5.854 +  SRC_ROOT_LENGTH=`$THEPWDCMD -L|$WC -m`
   5.855    if test $SRC_ROOT_LENGTH -gt 100; then
   5.856        as_fn_error $? "Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported" "$LINENO" 5
   5.857    fi
   5.858 @@ -7407,7 +7314,7 @@
   5.859        as_fn_error $? "The path of SRC_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5
   5.860      fi
   5.861  
   5.862 -    SRC_ROOT="`cd "$path"; $THEPWDCMD`"
   5.863 +    SRC_ROOT="`cd "$path"; $THEPWDCMD -L`"
   5.864    fi
   5.865  
   5.866  
   5.867 @@ -7529,7 +7436,7 @@
   5.868        as_fn_error $? "The path of CURDIR, which resolves as \"$path\", is not found." "$LINENO" 5
   5.869      fi
   5.870  
   5.871 -    CURDIR="`cd "$path"; $THEPWDCMD`"
   5.872 +    CURDIR="`cd "$path"; $THEPWDCMD -L`"
   5.873    fi
   5.874  
   5.875  
   5.876 @@ -7900,60 +7807,9 @@
   5.877  
   5.878  
   5.879  # Test from where we are running configure, in or outside of src root.
   5.880 -# To enable comparison of directories, CURDIR needs to be symlink free
   5.881 -# just like SRC_ROOT already is
   5.882 -NOSYM_CURDIR="$CURDIR"
   5.883 -
   5.884 -    if test "x$OPENJDK_BUILD_OS" != xwindows; then
   5.885 -        # Follow a chain of symbolic links. Use readlink
   5.886 -        # where it exists, else fall back to horribly
   5.887 -        # complicated shell code.
   5.888 -        if test "x$READLINK_TESTED" != yes; then
   5.889 -            # On MacOSX there is a readlink tool with a different
   5.890 -            # purpose than the GNU readlink tool. Check the found readlink.
   5.891 -            ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
   5.892 -            if test "x$ISGNU" = x; then
   5.893 -                 # A readlink that we do not know how to use.
   5.894 -                 # Are there other non-GNU readlinks out there?
   5.895 -                 READLINK_TESTED=yes
   5.896 -                 READLINK=
   5.897 -            fi
   5.898 -        fi
   5.899 -
   5.900 -        if test "x$READLINK" != x; then
   5.901 -            NOSYM_CURDIR=`$READLINK -f $NOSYM_CURDIR`
   5.902 -        else
   5.903 -            # Save the current directory for restoring afterwards
   5.904 -            STARTDIR=$PWD
   5.905 -            COUNTER=0
   5.906 -            sym_link_dir=`$DIRNAME $NOSYM_CURDIR`
   5.907 -            sym_link_file=`$BASENAME $NOSYM_CURDIR`
   5.908 -            # Use the system pwd and not the shell builtin to resolve directory symlinks
   5.909 -            cd $sym_link_dir
   5.910 -            cd `$THEPWDCMD`
   5.911 -            sym_link_dir=`$THEPWDCMD`
   5.912 -            # Resolve file symlinks
   5.913 -            while test $COUNTER -lt 20; do
   5.914 -                ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
   5.915 -                if test "x$ISLINK" == x; then
   5.916 -                    # This is not a symbolic link! We are done!
   5.917 -                    break
   5.918 -                fi
   5.919 -                # Again resolve directory symlinks since the target of the just found
   5.920 -                # link could be in a different directory
   5.921 -                cd `$DIRNAME $ISLINK`
   5.922 -                sym_link_dir=`$THEPWDCMD`
   5.923 -                sym_link_file=`$BASENAME $ISLINK`
   5.924 -                let COUNTER=COUNTER+1
   5.925 -            done
   5.926 -            cd $STARTDIR
   5.927 -            NOSYM_CURDIR=$sym_link_dir/$sym_link_file
   5.928 -        fi
   5.929 -    fi
   5.930 -
   5.931 -if test "x$NOSYM_CURDIR" = "x$SRC_ROOT" || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common" \
   5.932 -        || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/autoconf" \
   5.933 -        || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
   5.934 +if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
   5.935 +        || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
   5.936 +        || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
   5.937      # We are running configure from the src root.
   5.938      # Create a default ./build/target-variant-debuglevel output root.
   5.939      if test "x${CONF_NAME}" = x; then
   5.940 @@ -8128,7 +7984,7 @@
   5.941        as_fn_error $? "The path of OUTPUT_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5
   5.942      fi
   5.943  
   5.944 -    OUTPUT_ROOT="`cd "$path"; $THEPWDCMD`"
   5.945 +    OUTPUT_ROOT="`cd "$path"; $THEPWDCMD -L`"
   5.946    fi
   5.947  
   5.948  
   5.949 @@ -8175,7 +8031,7 @@
   5.950  set dummy $ac_prog; ac_word=$2
   5.951  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.952  $as_echo_n "checking for $ac_word... " >&6; }
   5.953 -if test "${ac_cv_prog_PKGHANDLER+set}" = set; then :
   5.954 +if ${ac_cv_prog_PKGHANDLER+:} false; then :
   5.955    $as_echo_n "(cached) " >&6
   5.956  else
   5.957    if test -n "$PKGHANDLER"; then
   5.958 @@ -8540,7 +8396,7 @@
   5.959  set dummy $ac_prog; ac_word=$2
   5.960  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.961  $as_echo_n "checking for $ac_word... " >&6; }
   5.962 -if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then :
   5.963 +if ${ac_cv_path_CHECK_GMAKE+:} false; then :
   5.964    $as_echo_n "(cached) " >&6
   5.965  else
   5.966    case $CHECK_GMAKE in
   5.967 @@ -8894,7 +8750,7 @@
   5.968  set dummy $ac_prog; ac_word=$2
   5.969  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.970  $as_echo_n "checking for $ac_word... " >&6; }
   5.971 -if test "${ac_cv_path_CHECK_MAKE+set}" = set; then :
   5.972 +if ${ac_cv_path_CHECK_MAKE+:} false; then :
   5.973    $as_echo_n "(cached) " >&6
   5.974  else
   5.975    case $CHECK_MAKE in
   5.976 @@ -9253,7 +9109,7 @@
   5.977  set dummy $ac_prog; ac_word=$2
   5.978  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.979  $as_echo_n "checking for $ac_word... " >&6; }
   5.980 -if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then :
   5.981 +if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then :
   5.982    $as_echo_n "(cached) " >&6
   5.983  else
   5.984    case $CHECK_TOOLSDIR_GMAKE in
   5.985 @@ -9606,7 +9462,7 @@
   5.986  set dummy $ac_prog; ac_word=$2
   5.987  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.988  $as_echo_n "checking for $ac_word... " >&6; }
   5.989 -if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then :
   5.990 +if ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then :
   5.991    $as_echo_n "(cached) " >&6
   5.992  else
   5.993    case $CHECK_TOOLSDIR_MAKE in
   5.994 @@ -10002,7 +9858,7 @@
   5.995  set dummy $ac_prog; ac_word=$2
   5.996  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   5.997  $as_echo_n "checking for $ac_word... " >&6; }
   5.998 -if test "${ac_cv_path_UNZIP+set}" = set; then :
   5.999 +if ${ac_cv_path_UNZIP+:} false; then :
  5.1000    $as_echo_n "(cached) " >&6
  5.1001  else
  5.1002    case $UNZIP in
  5.1003 @@ -10061,7 +9917,7 @@
  5.1004  set dummy $ac_prog; ac_word=$2
  5.1005  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1006  $as_echo_n "checking for $ac_word... " >&6; }
  5.1007 -if test "${ac_cv_path_ZIP+set}" = set; then :
  5.1008 +if ${ac_cv_path_ZIP+:} false; then :
  5.1009    $as_echo_n "(cached) " >&6
  5.1010  else
  5.1011    case $ZIP in
  5.1012 @@ -10120,7 +9976,7 @@
  5.1013  set dummy ldd; ac_word=$2
  5.1014  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1015  $as_echo_n "checking for $ac_word... " >&6; }
  5.1016 -if test "${ac_cv_path_LDD+set}" = set; then :
  5.1017 +if ${ac_cv_path_LDD+:} false; then :
  5.1018    $as_echo_n "(cached) " >&6
  5.1019  else
  5.1020    case $LDD in
  5.1021 @@ -10166,7 +10022,7 @@
  5.1022  set dummy otool; ac_word=$2
  5.1023  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1024  $as_echo_n "checking for $ac_word... " >&6; }
  5.1025 -if test "${ac_cv_path_OTOOL+set}" = set; then :
  5.1026 +if ${ac_cv_path_OTOOL+:} false; then :
  5.1027    $as_echo_n "(cached) " >&6
  5.1028  else
  5.1029    case $OTOOL in
  5.1030 @@ -10211,7 +10067,7 @@
  5.1031  set dummy $ac_prog; ac_word=$2
  5.1032  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1033  $as_echo_n "checking for $ac_word... " >&6; }
  5.1034 -if test "${ac_cv_path_READELF+set}" = set; then :
  5.1035 +if ${ac_cv_path_READELF+:} false; then :
  5.1036    $as_echo_n "(cached) " >&6
  5.1037  else
  5.1038    case $READELF in
  5.1039 @@ -10254,7 +10110,7 @@
  5.1040  set dummy hg; ac_word=$2
  5.1041  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1042  $as_echo_n "checking for $ac_word... " >&6; }
  5.1043 -if test "${ac_cv_path_HG+set}" = set; then :
  5.1044 +if ${ac_cv_path_HG+:} false; then :
  5.1045    $as_echo_n "(cached) " >&6
  5.1046  else
  5.1047    case $HG in
  5.1048 @@ -10294,7 +10150,7 @@
  5.1049  set dummy stat; ac_word=$2
  5.1050  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1051  $as_echo_n "checking for $ac_word... " >&6; }
  5.1052 -if test "${ac_cv_path_STAT+set}" = set; then :
  5.1053 +if ${ac_cv_path_STAT+:} false; then :
  5.1054    $as_echo_n "(cached) " >&6
  5.1055  else
  5.1056    case $STAT in
  5.1057 @@ -10334,7 +10190,7 @@
  5.1058  set dummy time; ac_word=$2
  5.1059  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1060  $as_echo_n "checking for $ac_word... " >&6; }
  5.1061 -if test "${ac_cv_path_TIME+set}" = set; then :
  5.1062 +if ${ac_cv_path_TIME+:} false; then :
  5.1063    $as_echo_n "(cached) " >&6
  5.1064  else
  5.1065    case $TIME in
  5.1066 @@ -10379,7 +10235,7 @@
  5.1067  set dummy $ac_prog; ac_word=$2
  5.1068  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1069  $as_echo_n "checking for $ac_word... " >&6; }
  5.1070 -if test "${ac_cv_path_COMM+set}" = set; then :
  5.1071 +if ${ac_cv_path_COMM+:} false; then :
  5.1072    $as_echo_n "(cached) " >&6
  5.1073  else
  5.1074    case $COMM in
  5.1075 @@ -10441,7 +10297,7 @@
  5.1076  set dummy $ac_prog; ac_word=$2
  5.1077  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1078  $as_echo_n "checking for $ac_word... " >&6; }
  5.1079 -if test "${ac_cv_path_XATTR+set}" = set; then :
  5.1080 +if ${ac_cv_path_XATTR+:} false; then :
  5.1081    $as_echo_n "(cached) " >&6
  5.1082  else
  5.1083    case $XATTR in
  5.1084 @@ -10493,6 +10349,62 @@
  5.1085      fi
  5.1086  
  5.1087  
  5.1088 +  # Extract the first word of "codesign", so it can be a program name with args.
  5.1089 +set dummy codesign; ac_word=$2
  5.1090 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1091 +$as_echo_n "checking for $ac_word... " >&6; }
  5.1092 +if ${ac_cv_path_CODESIGN+:} false; then :
  5.1093 +  $as_echo_n "(cached) " >&6
  5.1094 +else
  5.1095 +  case $CODESIGN in
  5.1096 +  [\\/]* | ?:[\\/]*)
  5.1097 +  ac_cv_path_CODESIGN="$CODESIGN" # Let the user override the test with a path.
  5.1098 +  ;;
  5.1099 +  *)
  5.1100 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  5.1101 +for as_dir in $PATH
  5.1102 +do
  5.1103 +  IFS=$as_save_IFS
  5.1104 +  test -z "$as_dir" && as_dir=.
  5.1105 +    for ac_exec_ext in '' $ac_executable_extensions; do
  5.1106 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  5.1107 +    ac_cv_path_CODESIGN="$as_dir/$ac_word$ac_exec_ext"
  5.1108 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  5.1109 +    break 2
  5.1110 +  fi
  5.1111 +done
  5.1112 +  done
  5.1113 +IFS=$as_save_IFS
  5.1114 +
  5.1115 +  ;;
  5.1116 +esac
  5.1117 +fi
  5.1118 +CODESIGN=$ac_cv_path_CODESIGN
  5.1119 +if test -n "$CODESIGN"; then
  5.1120 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CODESIGN" >&5
  5.1121 +$as_echo "$CODESIGN" >&6; }
  5.1122 +else
  5.1123 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  5.1124 +$as_echo "no" >&6; }
  5.1125 +fi
  5.1126 +
  5.1127 +
  5.1128 +  if test "x$CODESIGN" != "x"; then
  5.1129 +    # Verify that the openjdk_codesign certificate is present
  5.1130 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if openjdk_codesign certificate is present" >&5
  5.1131 +$as_echo_n "checking if openjdk_codesign certificate is present... " >&6; }
  5.1132 +    rm -f codesign-testfile
  5.1133 +    touch codesign-testfile
  5.1134 +    codesign -s openjdk_codesign codesign-testfile 2>&5 >&5 || CODESIGN=
  5.1135 +    rm -f codesign-testfile
  5.1136 +    if test "x$CODESIGN" = x; then
  5.1137 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  5.1138 +$as_echo "no" >&6; }
  5.1139 +    else
  5.1140 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  5.1141 +$as_echo "yes" >&6; }
  5.1142 +    fi
  5.1143 +  fi
  5.1144  fi
  5.1145  
  5.1146  
  5.1147 @@ -10505,7 +10417,7 @@
  5.1148  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
  5.1149  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1150  $as_echo_n "checking for $ac_word... " >&6; }
  5.1151 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
  5.1152 +if ${ac_cv_path_PKG_CONFIG+:} false; then :
  5.1153    $as_echo_n "(cached) " >&6
  5.1154  else
  5.1155    case $PKG_CONFIG in
  5.1156 @@ -10548,7 +10460,7 @@
  5.1157  set dummy pkg-config; ac_word=$2
  5.1158  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1159  $as_echo_n "checking for $ac_word... " >&6; }
  5.1160 -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
  5.1161 +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
  5.1162    $as_echo_n "(cached) " >&6
  5.1163  else
  5.1164    case $ac_pt_PKG_CONFIG in
  5.1165 @@ -10721,7 +10633,7 @@
  5.1166  set dummy $ac_prog; ac_word=$2
  5.1167  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1168  $as_echo_n "checking for $ac_word... " >&6; }
  5.1169 -if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then :
  5.1170 +if ${ac_cv_prog_BDEPS_UNZIP+:} false; then :
  5.1171    $as_echo_n "(cached) " >&6
  5.1172  else
  5.1173    if test -n "$BDEPS_UNZIP"; then
  5.1174 @@ -10767,7 +10679,7 @@
  5.1175  set dummy $ac_prog; ac_word=$2
  5.1176  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1177  $as_echo_n "checking for $ac_word... " >&6; }
  5.1178 -if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then :
  5.1179 +if ${ac_cv_prog_BDEPS_FTP+:} false; then :
  5.1180    $as_echo_n "(cached) " >&6
  5.1181  else
  5.1182    if test -n "$BDEPS_FTP"; then
  5.1183 @@ -10939,6 +10851,18 @@
  5.1184  fi
  5.1185  
  5.1186  
  5.1187 +# Check whether --with-update-version was given.
  5.1188 +if test "${with_update_version+set}" = set; then :
  5.1189 +  withval=$with_update_version;
  5.1190 +fi
  5.1191 +
  5.1192 +if test "x$with_update_version" = xyes; then
  5.1193 +  as_fn_error $? "Update version must have a value" "$LINENO" 5
  5.1194 +elif test "x$with_update_version" != x; then
  5.1195 +  JDK_UPDATE_VERSION="$with_update_version"
  5.1196 +fi
  5.1197 +
  5.1198 +
  5.1199  # Check whether --with-build-number was given.
  5.1200  if test "${with_build_number+set}" = set; then :
  5.1201    withval=$with_build_number;
  5.1202 @@ -11188,7 +11112,7 @@
  5.1203        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1204      fi
  5.1205  
  5.1206 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1207 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1208    fi
  5.1209  
  5.1210                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1211 @@ -11520,7 +11444,7 @@
  5.1212        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1213      fi
  5.1214  
  5.1215 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1216 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1217    fi
  5.1218  
  5.1219                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1220 @@ -11666,7 +11590,7 @@
  5.1221        as_fn_error $? "The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1222      fi
  5.1223  
  5.1224 -    JAVA_HOME_PROCESSED="`cd "$path"; $THEPWDCMD`"
  5.1225 +    JAVA_HOME_PROCESSED="`cd "$path"; $THEPWDCMD -L`"
  5.1226    fi
  5.1227  
  5.1228          if test ! -d "$JAVA_HOME_PROCESSED"; then
  5.1229 @@ -11838,7 +11762,7 @@
  5.1230        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1231      fi
  5.1232  
  5.1233 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1234 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1235    fi
  5.1236  
  5.1237                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1238 @@ -12026,7 +11950,7 @@
  5.1239        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1240      fi
  5.1241  
  5.1242 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1243 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1244    fi
  5.1245  
  5.1246                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1247 @@ -12055,7 +11979,7 @@
  5.1248  set dummy javac; ac_word=$2
  5.1249  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1250  $as_echo_n "checking for $ac_word... " >&6; }
  5.1251 -if test "${ac_cv_path_JAVAC_CHECK+set}" = set; then :
  5.1252 +if ${ac_cv_path_JAVAC_CHECK+:} false; then :
  5.1253    $as_echo_n "(cached) " >&6
  5.1254  else
  5.1255    case $JAVAC_CHECK in
  5.1256 @@ -12095,7 +12019,7 @@
  5.1257  set dummy java; ac_word=$2
  5.1258  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1259  $as_echo_n "checking for $ac_word... " >&6; }
  5.1260 -if test "${ac_cv_path_JAVA_CHECK+set}" = set; then :
  5.1261 +if ${ac_cv_path_JAVA_CHECK+:} false; then :
  5.1262    $as_echo_n "(cached) " >&6
  5.1263  else
  5.1264    case $JAVA_CHECK in
  5.1265 @@ -12165,10 +12089,10 @@
  5.1266              COUNTER=0
  5.1267              sym_link_dir=`$DIRNAME $BINARY`
  5.1268              sym_link_file=`$BASENAME $BINARY`
  5.1269 -            # Use the system pwd and not the shell builtin to resolve directory symlinks
  5.1270              cd $sym_link_dir
  5.1271 -            cd `$THEPWDCMD`
  5.1272 -            sym_link_dir=`$THEPWDCMD`
  5.1273 +            # Use -P flag to resolve symlinks in directories.
  5.1274 +            cd `$THEPWDCMD -P`
  5.1275 +            sym_link_dir=`$THEPWDCMD -P`
  5.1276              # Resolve file symlinks
  5.1277              while test $COUNTER -lt 20; do
  5.1278                  ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
  5.1279 @@ -12179,7 +12103,7 @@
  5.1280                  # Again resolve directory symlinks since the target of the just found
  5.1281                  # link could be in a different directory
  5.1282                  cd `$DIRNAME $ISLINK`
  5.1283 -                sym_link_dir=`$THEPWDCMD`
  5.1284 +                sym_link_dir=`$THEPWDCMD -P`
  5.1285                  sym_link_file=`$BASENAME $ISLINK`
  5.1286                  let COUNTER=COUNTER+1
  5.1287              done
  5.1288 @@ -12354,7 +12278,7 @@
  5.1289        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1290      fi
  5.1291  
  5.1292 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1293 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1294    fi
  5.1295  
  5.1296                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1297 @@ -12569,7 +12493,7 @@
  5.1298        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1299      fi
  5.1300  
  5.1301 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1302 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1303    fi
  5.1304  
  5.1305                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1306 @@ -12749,7 +12673,7 @@
  5.1307        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1308      fi
  5.1309  
  5.1310 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1311 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1312    fi
  5.1313  
  5.1314                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1315 @@ -12957,7 +12881,7 @@
  5.1316        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1317      fi
  5.1318  
  5.1319 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1320 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1321    fi
  5.1322  
  5.1323                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1324 @@ -13137,7 +13061,7 @@
  5.1325        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1326      fi
  5.1327  
  5.1328 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1329 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1330    fi
  5.1331  
  5.1332                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1333 @@ -13345,7 +13269,7 @@
  5.1334        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1335      fi
  5.1336  
  5.1337 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1338 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1339    fi
  5.1340  
  5.1341                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1342 @@ -13525,7 +13449,7 @@
  5.1343        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1344      fi
  5.1345  
  5.1346 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1347 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1348    fi
  5.1349  
  5.1350                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1351 @@ -13733,7 +13657,7 @@
  5.1352        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1353      fi
  5.1354  
  5.1355 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1356 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1357    fi
  5.1358  
  5.1359                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1360 @@ -13913,7 +13837,7 @@
  5.1361        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1362      fi
  5.1363  
  5.1364 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1365 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1366    fi
  5.1367  
  5.1368                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1369 @@ -14108,7 +14032,7 @@
  5.1370        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1371      fi
  5.1372  
  5.1373 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1374 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1375    fi
  5.1376  
  5.1377                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1378 @@ -14286,7 +14210,7 @@
  5.1379        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1380      fi
  5.1381  
  5.1382 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1383 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1384    fi
  5.1385  
  5.1386                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1387 @@ -14482,7 +14406,7 @@
  5.1388        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1389      fi
  5.1390  
  5.1391 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1392 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1393    fi
  5.1394  
  5.1395                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1396 @@ -14660,7 +14584,7 @@
  5.1397        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1398      fi
  5.1399  
  5.1400 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1401 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1402    fi
  5.1403  
  5.1404                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1405 @@ -14855,7 +14779,7 @@
  5.1406        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1407      fi
  5.1408  
  5.1409 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1410 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1411    fi
  5.1412  
  5.1413                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1414 @@ -15033,7 +14957,7 @@
  5.1415        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1416      fi
  5.1417  
  5.1418 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1419 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1420    fi
  5.1421  
  5.1422                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1423 @@ -15229,7 +15153,7 @@
  5.1424        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1425      fi
  5.1426  
  5.1427 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1428 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1429    fi
  5.1430  
  5.1431                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1432 @@ -15407,7 +15331,7 @@
  5.1433        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1434      fi
  5.1435  
  5.1436 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1437 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1438    fi
  5.1439  
  5.1440                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1441 @@ -15584,7 +15508,7 @@
  5.1442        as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1443      fi
  5.1444  
  5.1445 -    BOOT_JDK="`cd "$path"; $THEPWDCMD`"
  5.1446 +    BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
  5.1447    fi
  5.1448  
  5.1449                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
  5.1450 @@ -16261,14 +16185,28 @@
  5.1451  # Check whether --with-jtreg was given.
  5.1452  if test "${with_jtreg+set}" = set; then :
  5.1453    withval=$with_jtreg;
  5.1454 -fi
  5.1455 -
  5.1456 -
  5.1457 -  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JTReg Regression Test Harness" >&5
  5.1458 -$as_echo_n "checking for JTReg Regression Test Harness... " >&6; }
  5.1459 -
  5.1460 -  if test "x$with_jtreg" != x; then
  5.1461 -    JT_HOME="$with_jtreg"
  5.1462 +else
  5.1463 +  with_jtreg=no
  5.1464 +fi
  5.1465 +
  5.1466 +
  5.1467 +  if test "x$with_jtreg" = xno; then
  5.1468 +    # jtreg disabled
  5.1469 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jtreg" >&5
  5.1470 +$as_echo_n "checking for jtreg... " >&6; }
  5.1471 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  5.1472 +$as_echo "no" >&6; }
  5.1473 +  else
  5.1474 +    if test "x$with_jtreg" != xyes; then
  5.1475 +      # with path specified.
  5.1476 +      JT_HOME="$with_jtreg"
  5.1477 +    fi
  5.1478 +
  5.1479 +    if test "x$JT_HOME" != x; then
  5.1480 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jtreg" >&5
  5.1481 +$as_echo_n "checking for jtreg... " >&6; }
  5.1482 +
  5.1483 +      # use JT_HOME enviroment var.
  5.1484  
  5.1485    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
  5.1486  
  5.1487 @@ -16388,20 +16326,82 @@
  5.1488        as_fn_error $? "The path of JT_HOME, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1489      fi
  5.1490  
  5.1491 -    JT_HOME="`cd "$path"; $THEPWDCMD`"
  5.1492 -  fi
  5.1493 -
  5.1494 -    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JT_HOME" >&5
  5.1495 -$as_echo "$JT_HOME" >&6; }
  5.1496 -
  5.1497 -    # jtreg win32 script works for everybody
  5.1498 -    JTREGEXE="$JT_HOME/win32/bin/jtreg"
  5.1499 -    if test ! -f "$JTREGEXE"; then
  5.1500 -      as_fn_error $? "JTReg executable does not exist: $JTREGEXE" "$LINENO" 5
  5.1501 -    fi
  5.1502 -  else
  5.1503 -    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  5.1504 -$as_echo "no" >&6; }
  5.1505 +    JT_HOME="`cd "$path"; $THEPWDCMD -L`"
  5.1506 +  fi
  5.1507 +
  5.1508 +
  5.1509 +      # jtreg win32 script works for everybody
  5.1510 +      JTREGEXE="$JT_HOME/win32/bin/jtreg"
  5.1511 +
  5.1512 +      if test ! -f "$JTREGEXE"; then
  5.1513 +        as_fn_error $? "JTReg executable does not exist: $JTREGEXE" "$LINENO" 5
  5.1514 +      fi
  5.1515 +
  5.1516 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JTREGEXE" >&5
  5.1517 +$as_echo "$JTREGEXE" >&6; }
  5.1518 +    else
  5.1519 +      # try to find jtreg on path
  5.1520 +
  5.1521 +    for ac_prog in jtreg
  5.1522 +do
  5.1523 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  5.1524 +set dummy $ac_prog; ac_word=$2
  5.1525 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1526 +$as_echo_n "checking for $ac_word... " >&6; }
  5.1527 +if ${ac_cv_path_JTREGEXE+:} false; then :
  5.1528 +  $as_echo_n "(cached) " >&6
  5.1529 +else
  5.1530 +  case $JTREGEXE in
  5.1531 +  [\\/]* | ?:[\\/]*)
  5.1532 +  ac_cv_path_JTREGEXE="$JTREGEXE" # Let the user override the test with a path.
  5.1533 +  ;;
  5.1534 +  *)
  5.1535 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  5.1536 +for as_dir in $PATH
  5.1537 +do
  5.1538 +  IFS=$as_save_IFS
  5.1539 +  test -z "$as_dir" && as_dir=.
  5.1540 +    for ac_exec_ext in '' $ac_executable_extensions; do
  5.1541 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  5.1542 +    ac_cv_path_JTREGEXE="$as_dir/$ac_word$ac_exec_ext"
  5.1543 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  5.1544 +    break 2
  5.1545 +  fi
  5.1546 +done
  5.1547 +  done
  5.1548 +IFS=$as_save_IFS
  5.1549 +
  5.1550 +  ;;
  5.1551 +esac
  5.1552 +fi
  5.1553 +JTREGEXE=$ac_cv_path_JTREGEXE
  5.1554 +if test -n "$JTREGEXE"; then
  5.1555 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JTREGEXE" >&5
  5.1556 +$as_echo "$JTREGEXE" >&6; }
  5.1557 +else
  5.1558 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  5.1559 +$as_echo "no" >&6; }
  5.1560 +fi
  5.1561 +
  5.1562 +
  5.1563 +  test -n "$JTREGEXE" && break
  5.1564 +done
  5.1565 +
  5.1566 +
  5.1567 +    if test "x$JTREGEXE" = x; then
  5.1568 +        if test "xjtreg" = x; then
  5.1569 +          PROG_NAME=jtregexe
  5.1570 +        else
  5.1571 +          PROG_NAME=jtreg
  5.1572 +        fi
  5.1573 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  5.1574 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  5.1575 +        as_fn_error $? "Cannot continue" "$LINENO" 5
  5.1576 +    fi
  5.1577 +
  5.1578 +
  5.1579 +      JT_HOME="`$DIRNAME $JTREGEXE`"
  5.1580 +    fi
  5.1581    fi
  5.1582  
  5.1583  
  5.1584 @@ -16416,7 +16416,7 @@
  5.1585  set dummy link; ac_word=$2
  5.1586  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1587  $as_echo_n "checking for $ac_word... " >&6; }
  5.1588 -if test "${ac_cv_path_CYGWIN_LINK+set}" = set; then :
  5.1589 +if ${ac_cv_path_CYGWIN_LINK+:} false; then :
  5.1590    $as_echo_n "(cached) " >&6
  5.1591  else
  5.1592    case $CYGWIN_LINK in
  5.1593 @@ -17377,7 +17377,7 @@
  5.1594        as_fn_error $? "The path of MSVCR_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1595      fi
  5.1596  
  5.1597 -    MSVCR_DLL="`cd "$path"; $THEPWDCMD`"
  5.1598 +    MSVCR_DLL="`cd "$path"; $THEPWDCMD -L`"
  5.1599    fi
  5.1600  
  5.1601  
  5.1602 @@ -17534,7 +17534,7 @@
  5.1603        as_fn_error $? "The path of dxsdk_path, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1604      fi
  5.1605  
  5.1606 -    dxsdk_path="`cd "$path"; $THEPWDCMD`"
  5.1607 +    dxsdk_path="`cd "$path"; $THEPWDCMD -L`"
  5.1608    fi
  5.1609  
  5.1610  
  5.1611 @@ -17672,7 +17672,7 @@
  5.1612        as_fn_error $? "The path of DXSDK_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1613      fi
  5.1614  
  5.1615 -    DXSDK_LIB_PATH="`cd "$path"; $THEPWDCMD`"
  5.1616 +    DXSDK_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
  5.1617    fi
  5.1618  
  5.1619  
  5.1620 @@ -17808,7 +17808,7 @@
  5.1621        as_fn_error $? "The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
  5.1622      fi
  5.1623  
  5.1624 -    DXSDK_INCLUDE_PATH="`cd "$path"; $THEPWDCMD`"
  5.1625 +    DXSDK_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
  5.1626    fi
  5.1627  
  5.1628  
  5.1629 @@ -17843,7 +17843,7 @@
  5.1630  set dummy $ac_prog; ac_word=$2
  5.1631  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1632  $as_echo_n "checking for $ac_word... " >&6; }
  5.1633 -if test "${ac_cv_path_BUILD_CC+set}" = set; then :
  5.1634 +if ${ac_cv_path_BUILD_CC+:} false; then :
  5.1635    $as_echo_n "(cached) " >&6
  5.1636  else
  5.1637    case $BUILD_CC in
  5.1638 @@ -18154,7 +18154,7 @@
  5.1639  set dummy $ac_prog; ac_word=$2
  5.1640  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1641  $as_echo_n "checking for $ac_word... " >&6; }
  5.1642 -if test "${ac_cv_path_BUILD_CXX+set}" = set; then :
  5.1643 +if ${ac_cv_path_BUILD_CXX+:} false; then :
  5.1644    $as_echo_n "(cached) " >&6
  5.1645  else
  5.1646    case $BUILD_CXX in
  5.1647 @@ -18463,7 +18463,7 @@
  5.1648  set dummy ld; ac_word=$2
  5.1649  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1650  $as_echo_n "checking for $ac_word... " >&6; }
  5.1651 -if test "${ac_cv_path_BUILD_LD+set}" = set; then :
  5.1652 +if ${ac_cv_path_BUILD_LD+:} false; then :
  5.1653    $as_echo_n "(cached) " >&6
  5.1654  else
  5.1655    case $BUILD_LD in
  5.1656 @@ -18979,7 +18979,7 @@
  5.1657  set dummy $ac_prog; ac_word=$2
  5.1658  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1659  $as_echo_n "checking for $ac_word... " >&6; }
  5.1660 -if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then :
  5.1661 +if ${ac_cv_path_TOOLS_DIR_CC+:} false; then :
  5.1662    $as_echo_n "(cached) " >&6
  5.1663  else
  5.1664    case $TOOLS_DIR_CC in
  5.1665 @@ -19031,7 +19031,7 @@
  5.1666  set dummy $ac_prog; ac_word=$2
  5.1667  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1668  $as_echo_n "checking for $ac_word... " >&6; }
  5.1669 -if test "${ac_cv_path_POTENTIAL_CC+set}" = set; then :
  5.1670 +if ${ac_cv_path_POTENTIAL_CC+:} false; then :
  5.1671    $as_echo_n "(cached) " >&6
  5.1672  else
  5.1673    case $POTENTIAL_CC in
  5.1674 @@ -19395,10 +19395,10 @@
  5.1675              COUNTER=0
  5.1676              sym_link_dir=`$DIRNAME $TEST_COMPILER`
  5.1677              sym_link_file=`$BASENAME $TEST_COMPILER`
  5.1678 -            # Use the system pwd and not the shell builtin to resolve directory symlinks
  5.1679              cd $sym_link_dir
  5.1680 -            cd `$THEPWDCMD`
  5.1681 -            sym_link_dir=`$THEPWDCMD`
  5.1682 +            # Use -P flag to resolve symlinks in directories.
  5.1683 +            cd `$THEPWDCMD -P`
  5.1684 +            sym_link_dir=`$THEPWDCMD -P`
  5.1685              # Resolve file symlinks
  5.1686              while test $COUNTER -lt 20; do
  5.1687                  ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
  5.1688 @@ -19409,7 +19409,7 @@
  5.1689                  # Again resolve directory symlinks since the target of the just found
  5.1690                  # link could be in a different directory
  5.1691                  cd `$DIRNAME $ISLINK`
  5.1692 -                sym_link_dir=`$THEPWDCMD`
  5.1693 +                sym_link_dir=`$THEPWDCMD -P`
  5.1694                  sym_link_file=`$BASENAME $ISLINK`
  5.1695                  let COUNTER=COUNTER+1
  5.1696              done
  5.1697 @@ -19444,7 +19444,7 @@
  5.1698  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  5.1699  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1700  $as_echo_n "checking for $ac_word... " >&6; }
  5.1701 -if test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then :
  5.1702 +if ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then :
  5.1703    $as_echo_n "(cached) " >&6
  5.1704  else
  5.1705    if test -n "$PROPER_COMPILER_CC"; then
  5.1706 @@ -19488,7 +19488,7 @@
  5.1707  set dummy $ac_prog; ac_word=$2
  5.1708  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1709  $as_echo_n "checking for $ac_word... " >&6; }
  5.1710 -if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then :
  5.1711 +if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then :
  5.1712    $as_echo_n "(cached) " >&6
  5.1713  else
  5.1714    if test -n "$ac_ct_PROPER_COMPILER_CC"; then
  5.1715 @@ -19832,10 +19832,10 @@
  5.1716              COUNTER=0
  5.1717              sym_link_dir=`$DIRNAME $PROPER_COMPILER_CC`
  5.1718              sym_link_file=`$BASENAME $PROPER_COMPILER_CC`
  5.1719 -            # Use the system pwd and not the shell builtin to resolve directory symlinks
  5.1720              cd $sym_link_dir
  5.1721 -            cd `$THEPWDCMD`
  5.1722 -            sym_link_dir=`$THEPWDCMD`
  5.1723 +            # Use -P flag to resolve symlinks in directories.
  5.1724 +            cd `$THEPWDCMD -P`
  5.1725 +            sym_link_dir=`$THEPWDCMD -P`
  5.1726              # Resolve file symlinks
  5.1727              while test $COUNTER -lt 20; do
  5.1728                  ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
  5.1729 @@ -19846,7 +19846,7 @@
  5.1730                  # Again resolve directory symlinks since the target of the just found
  5.1731                  # link could be in a different directory
  5.1732                  cd `$DIRNAME $ISLINK`
  5.1733 -                sym_link_dir=`$THEPWDCMD`
  5.1734 +                sym_link_dir=`$THEPWDCMD -P`
  5.1735                  sym_link_file=`$BASENAME $ISLINK`
  5.1736                  let COUNTER=COUNTER+1
  5.1737              done
  5.1738 @@ -19938,7 +19938,7 @@
  5.1739  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  5.1740  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1741  $as_echo_n "checking for $ac_word... " >&6; }
  5.1742 -if test "${ac_cv_prog_CC+set}" = set; then :
  5.1743 +if ${ac_cv_prog_CC+:} false; then :
  5.1744    $as_echo_n "(cached) " >&6
  5.1745  else
  5.1746    if test -n "$CC"; then
  5.1747 @@ -19982,7 +19982,7 @@
  5.1748  set dummy $ac_prog; ac_word=$2
  5.1749  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1750  $as_echo_n "checking for $ac_word... " >&6; }
  5.1751 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
  5.1752 +if ${ac_cv_prog_ac_ct_CC+:} false; then :
  5.1753    $as_echo_n "(cached) " >&6
  5.1754  else
  5.1755    if test -n "$ac_ct_CC"; then
  5.1756 @@ -20263,7 +20263,7 @@
  5.1757  ac_clean_files=$ac_clean_files_save
  5.1758  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
  5.1759  $as_echo_n "checking for suffix of object files... " >&6; }
  5.1760 -if test "${ac_cv_objext+set}" = set; then :
  5.1761 +if ${ac_cv_objext+:} false; then :
  5.1762    $as_echo_n "(cached) " >&6
  5.1763  else
  5.1764    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  5.1765 @@ -20314,7 +20314,7 @@
  5.1766  ac_objext=$OBJEXT
  5.1767  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
  5.1768  $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
  5.1769 -if test "${ac_cv_c_compiler_gnu+set}" = set; then :
  5.1770 +if ${ac_cv_c_compiler_gnu+:} false; then :
  5.1771    $as_echo_n "(cached) " >&6
  5.1772  else
  5.1773    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  5.1774 @@ -20351,7 +20351,7 @@
  5.1775  ac_save_CFLAGS=$CFLAGS
  5.1776  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
  5.1777  $as_echo_n "checking whether $CC accepts -g... " >&6; }
  5.1778 -if test "${ac_cv_prog_cc_g+set}" = set; then :
  5.1779 +if ${ac_cv_prog_cc_g+:} false; then :
  5.1780    $as_echo_n "(cached) " >&6
  5.1781  else
  5.1782    ac_save_c_werror_flag=$ac_c_werror_flag
  5.1783 @@ -20429,7 +20429,7 @@
  5.1784  fi
  5.1785  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
  5.1786  $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
  5.1787 -if test "${ac_cv_prog_cc_c89+set}" = set; then :
  5.1788 +if ${ac_cv_prog_cc_c89+:} false; then :
  5.1789    $as_echo_n "(cached) " >&6
  5.1790  else
  5.1791    ac_cv_prog_cc_c89=no
  5.1792 @@ -20552,7 +20552,7 @@
  5.1793  set dummy $ac_prog; ac_word=$2
  5.1794  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1795  $as_echo_n "checking for $ac_word... " >&6; }
  5.1796 -if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then :
  5.1797 +if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then :
  5.1798    $as_echo_n "(cached) " >&6
  5.1799  else
  5.1800    case $TOOLS_DIR_CXX in
  5.1801 @@ -20604,7 +20604,7 @@
  5.1802  set dummy $ac_prog; ac_word=$2
  5.1803  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1804  $as_echo_n "checking for $ac_word... " >&6; }
  5.1805 -if test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then :
  5.1806 +if ${ac_cv_path_POTENTIAL_CXX+:} false; then :
  5.1807    $as_echo_n "(cached) " >&6
  5.1808  else
  5.1809    case $POTENTIAL_CXX in
  5.1810 @@ -20968,10 +20968,10 @@
  5.1811              COUNTER=0
  5.1812              sym_link_dir=`$DIRNAME $TEST_COMPILER`
  5.1813              sym_link_file=`$BASENAME $TEST_COMPILER`
  5.1814 -            # Use the system pwd and not the shell builtin to resolve directory symlinks
  5.1815              cd $sym_link_dir
  5.1816 -            cd `$THEPWDCMD`
  5.1817 -            sym_link_dir=`$THEPWDCMD`
  5.1818 +            # Use -P flag to resolve symlinks in directories.
  5.1819 +            cd `$THEPWDCMD -P`
  5.1820 +            sym_link_dir=`$THEPWDCMD -P`
  5.1821              # Resolve file symlinks
  5.1822              while test $COUNTER -lt 20; do
  5.1823                  ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
  5.1824 @@ -20982,7 +20982,7 @@
  5.1825                  # Again resolve directory symlinks since the target of the just found
  5.1826                  # link could be in a different directory
  5.1827                  cd `$DIRNAME $ISLINK`
  5.1828 -                sym_link_dir=`$THEPWDCMD`
  5.1829 +                sym_link_dir=`$THEPWDCMD -P`
  5.1830                  sym_link_file=`$BASENAME $ISLINK`
  5.1831                  let COUNTER=COUNTER+1
  5.1832              done
  5.1833 @@ -21017,7 +21017,7 @@
  5.1834  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  5.1835  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1836  $as_echo_n "checking for $ac_word... " >&6; }
  5.1837 -if test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then :
  5.1838 +if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then :
  5.1839    $as_echo_n "(cached) " >&6
  5.1840  else
  5.1841    if test -n "$PROPER_COMPILER_CXX"; then
  5.1842 @@ -21061,7 +21061,7 @@
  5.1843  set dummy $ac_prog; ac_word=$2
  5.1844  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1845  $as_echo_n "checking for $ac_word... " >&6; }
  5.1846 -if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then :
  5.1847 +if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then :
  5.1848    $as_echo_n "(cached) " >&6
  5.1849  else
  5.1850    if test -n "$ac_ct_PROPER_COMPILER_CXX"; then
  5.1851 @@ -21405,10 +21405,10 @@
  5.1852              COUNTER=0
  5.1853              sym_link_dir=`$DIRNAME $PROPER_COMPILER_CXX`
  5.1854              sym_link_file=`$BASENAME $PROPER_COMPILER_CXX`
  5.1855 -            # Use the system pwd and not the shell builtin to resolve directory symlinks
  5.1856              cd $sym_link_dir
  5.1857 -            cd `$THEPWDCMD`
  5.1858 -            sym_link_dir=`$THEPWDCMD`
  5.1859 +            # Use -P flag to resolve symlinks in directories.
  5.1860 +            cd `$THEPWDCMD -P`
  5.1861 +            sym_link_dir=`$THEPWDCMD -P`
  5.1862              # Resolve file symlinks
  5.1863              while test $COUNTER -lt 20; do
  5.1864                  ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
  5.1865 @@ -21419,7 +21419,7 @@
  5.1866                  # Again resolve directory symlinks since the target of the just found
  5.1867                  # link could be in a different directory
  5.1868                  cd `$DIRNAME $ISLINK`
  5.1869 -                sym_link_dir=`$THEPWDCMD`
  5.1870 +                sym_link_dir=`$THEPWDCMD -P`
  5.1871                  sym_link_file=`$BASENAME $ISLINK`
  5.1872                  let COUNTER=COUNTER+1
  5.1873              done
  5.1874 @@ -21515,7 +21515,7 @@
  5.1875  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  5.1876  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1877  $as_echo_n "checking for $ac_word... " >&6; }
  5.1878 -if test "${ac_cv_prog_CXX+set}" = set; then :
  5.1879 +if ${ac_cv_prog_CXX+:} false; then :
  5.1880    $as_echo_n "(cached) " >&6
  5.1881  else
  5.1882    if test -n "$CXX"; then
  5.1883 @@ -21559,7 +21559,7 @@
  5.1884  set dummy $ac_prog; ac_word=$2
  5.1885  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1886  $as_echo_n "checking for $ac_word... " >&6; }
  5.1887 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
  5.1888 +if ${ac_cv_prog_ac_ct_CXX+:} false; then :
  5.1889    $as_echo_n "(cached) " >&6
  5.1890  else
  5.1891    if test -n "$ac_ct_CXX"; then
  5.1892 @@ -21637,7 +21637,7 @@
  5.1893  
  5.1894  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
  5.1895  $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
  5.1896 -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
  5.1897 +if ${ac_cv_cxx_compiler_gnu+:} false; then :
  5.1898    $as_echo_n "(cached) " >&6
  5.1899  else
  5.1900    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  5.1901 @@ -21674,7 +21674,7 @@
  5.1902  ac_save_CXXFLAGS=$CXXFLAGS
  5.1903  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
  5.1904  $as_echo_n "checking whether $CXX accepts -g... " >&6; }
  5.1905 -if test "${ac_cv_prog_cxx_g+set}" = set; then :
  5.1906 +if ${ac_cv_prog_cxx_g+:} false; then :
  5.1907    $as_echo_n "(cached) " >&6
  5.1908  else
  5.1909    ac_save_cxx_werror_flag=$ac_cxx_werror_flag
  5.1910 @@ -21772,7 +21772,7 @@
  5.1911  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  5.1912  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1913  $as_echo_n "checking for $ac_word... " >&6; }
  5.1914 -if test "${ac_cv_prog_OBJC+set}" = set; then :
  5.1915 +if ${ac_cv_prog_OBJC+:} false; then :
  5.1916    $as_echo_n "(cached) " >&6
  5.1917  else
  5.1918    if test -n "$OBJC"; then
  5.1919 @@ -21816,7 +21816,7 @@
  5.1920  set dummy $ac_prog; ac_word=$2
  5.1921  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1922  $as_echo_n "checking for $ac_word... " >&6; }
  5.1923 -if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then :
  5.1924 +if ${ac_cv_prog_ac_ct_OBJC+:} false; then :
  5.1925    $as_echo_n "(cached) " >&6
  5.1926  else
  5.1927    if test -n "$ac_ct_OBJC"; then
  5.1928 @@ -21892,7 +21892,7 @@
  5.1929  
  5.1930  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5
  5.1931  $as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; }
  5.1932 -if test "${ac_cv_objc_compiler_gnu+set}" = set; then :
  5.1933 +if ${ac_cv_objc_compiler_gnu+:} false; then :
  5.1934    $as_echo_n "(cached) " >&6
  5.1935  else
  5.1936    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  5.1937 @@ -21929,7 +21929,7 @@
  5.1938  ac_save_OBJCFLAGS=$OBJCFLAGS
  5.1939  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5
  5.1940  $as_echo_n "checking whether $OBJC accepts -g... " >&6; }
  5.1941 -if test "${ac_cv_prog_objc_g+set}" = set; then :
  5.1942 +if ${ac_cv_prog_objc_g+:} false; then :
  5.1943    $as_echo_n "(cached) " >&6
  5.1944  else
  5.1945    ac_save_objc_werror_flag=$ac_objc_werror_flag
  5.1946 @@ -22305,7 +22305,7 @@
  5.1947  set dummy ${ac_tool_prefix}ar; ac_word=$2
  5.1948  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1949  $as_echo_n "checking for $ac_word... " >&6; }
  5.1950 -if test "${ac_cv_prog_AR+set}" = set; then :
  5.1951 +if ${ac_cv_prog_AR+:} false; then :
  5.1952    $as_echo_n "(cached) " >&6
  5.1953  else
  5.1954    if test -n "$AR"; then
  5.1955 @@ -22345,7 +22345,7 @@
  5.1956  set dummy ar; ac_word=$2
  5.1957  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1958  $as_echo_n "checking for $ac_word... " >&6; }
  5.1959 -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
  5.1960 +if ${ac_cv_prog_ac_ct_AR+:} false; then :
  5.1961    $as_echo_n "(cached) " >&6
  5.1962  else
  5.1963    if test -n "$ac_ct_AR"; then
  5.1964 @@ -22687,7 +22687,7 @@
  5.1965  set dummy link; ac_word=$2
  5.1966  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1967  $as_echo_n "checking for $ac_word... " >&6; }
  5.1968 -if test "${ac_cv_prog_WINLD+set}" = set; then :
  5.1969 +if ${ac_cv_prog_WINLD+:} false; then :
  5.1970    $as_echo_n "(cached) " >&6
  5.1971  else
  5.1972    if test -n "$WINLD"; then
  5.1973 @@ -23026,7 +23026,7 @@
  5.1974  set dummy mt; ac_word=$2
  5.1975  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1976  $as_echo_n "checking for $ac_word... " >&6; }
  5.1977 -if test "${ac_cv_prog_MT+set}" = set; then :
  5.1978 +if ${ac_cv_prog_MT+:} false; then :
  5.1979    $as_echo_n "(cached) " >&6
  5.1980  else
  5.1981    if test -n "$MT"; then
  5.1982 @@ -23347,7 +23347,7 @@
  5.1983  set dummy rc; ac_word=$2
  5.1984  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1985  $as_echo_n "checking for $ac_word... " >&6; }
  5.1986 -if test "${ac_cv_prog_RC+set}" = set; then :
  5.1987 +if ${ac_cv_prog_RC+:} false; then :
  5.1988    $as_echo_n "(cached) " >&6
  5.1989  else
  5.1990    if test -n "$RC"; then
  5.1991 @@ -23738,7 +23738,7 @@
  5.1992  set dummy lib; ac_word=$2
  5.1993  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.1994  $as_echo_n "checking for $ac_word... " >&6; }
  5.1995 -if test "${ac_cv_prog_WINAR+set}" = set; then :
  5.1996 +if ${ac_cv_prog_WINAR+:} false; then :
  5.1997    $as_echo_n "(cached) " >&6
  5.1998  else
  5.1999    if test -n "$WINAR"; then
  5.2000 @@ -24044,7 +24044,7 @@
  5.2001  set dummy dumpbin; ac_word=$2
  5.2002  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.2003  $as_echo_n "checking for $ac_word... " >&6; }
  5.2004 -if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
  5.2005 +if ${ac_cv_prog_DUMPBIN+:} false; then :
  5.2006    $as_echo_n "(cached) " >&6
  5.2007  else
  5.2008    if test -n "$DUMPBIN"; then
  5.2009 @@ -24363,7 +24363,7 @@
  5.2010    CPP=
  5.2011  fi
  5.2012  if test -z "$CPP"; then
  5.2013 -  if test "${ac_cv_prog_CPP+set}" = set; then :
  5.2014 +  if ${ac_cv_prog_CPP+:} false; then :
  5.2015    $as_echo_n "(cached) " >&6
  5.2016  else
  5.2017        # Double quotes because CPP needs to be expanded
  5.2018 @@ -24763,7 +24763,7 @@
  5.2019  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
  5.2020  $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
  5.2021  if test -z "$CXXCPP"; then
  5.2022 -  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
  5.2023 +  if ${ac_cv_prog_CXXCPP+:} false; then :
  5.2024    $as_echo_n "(cached) " >&6
  5.2025  else
  5.2026        # Double quotes because CXXCPP needs to be expanded
  5.2027 @@ -25181,7 +25181,7 @@
  5.2028  set dummy as; ac_word=$2
  5.2029  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.2030  $as_echo_n "checking for $ac_word... " >&6; }
  5.2031 -if test "${ac_cv_path_AS+set}" = set; then :
  5.2032 +if ${ac_cv_path_AS+:} false; then :
  5.2033    $as_echo_n "(cached) " >&6
  5.2034  else
  5.2035    case $AS in
  5.2036 @@ -25493,7 +25493,7 @@
  5.2037  set dummy nm; ac_word=$2
  5.2038  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.2039  $as_echo_n "checking for $ac_word... " >&6; }
  5.2040 -if test "${ac_cv_path_NM+set}" = set; then :
  5.2041 +if ${ac_cv_path_NM+:} false; then :
  5.2042    $as_echo_n "(cached) " >&6
  5.2043  else
  5.2044    case $NM in
  5.2045 @@ -25799,7 +25799,7 @@
  5.2046  set dummy gnm; ac_word=$2
  5.2047  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.2048  $as_echo_n "checking for $ac_word... " >&6; }
  5.2049 -if test "${ac_cv_path_GNM+set}" = set; then :
  5.2050 +if ${ac_cv_path_GNM+:} false; then :
  5.2051    $as_echo_n "(cached) " >&6
  5.2052  else
  5.2053    case $GNM in
  5.2054 @@ -26105,7 +26105,7 @@
  5.2055  set dummy strip; ac_word=$2
  5.2056  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.2057  $as_echo_n "checking for $ac_word... " >&6; }
  5.2058 -if test "${ac_cv_path_STRIP+set}" = set; then :
  5.2059 +if ${ac_cv_path_STRIP+:} false; then :
  5.2060    $as_echo_n "(cached) " >&6
  5.2061  else
  5.2062    case $STRIP in
  5.2063 @@ -26411,7 +26411,7 @@
  5.2064  set dummy mcs; ac_word=$2
  5.2065  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.2066  $as_echo_n "checking for $ac_word... " >&6; }
  5.2067 -if test "${ac_cv_path_MCS+set}" = set; then :
  5.2068 +if ${ac_cv_path_MCS+:} false; then :
  5.2069    $as_echo_n "(cached) " >&6
  5.2070  else
  5.2071    case $MCS in
  5.2072 @@ -26719,7 +26719,7 @@
  5.2073  set dummy ${ac_tool_prefix}nm; ac_word=$2
  5.2074  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.2075  $as_echo_n "checking for $ac_word... " >&6; }
  5.2076 -if test "${ac_cv_prog_NM+set}" = set; then :
  5.2077 +if ${ac_cv_prog_NM+:} false; then :
  5.2078    $as_echo_n "(cached) " >&6
  5.2079  else
  5.2080    if test -n "$NM"; then
  5.2081 @@ -26759,7 +26759,7 @@
  5.2082  set dummy nm; ac_word=$2
  5.2083  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.2084  $as_echo_n "checking for $ac_word... " >&6; }
  5.2085 -if test "${ac_cv_prog_ac_ct_NM+set}" = set; then :
  5.2086 +if ${ac_cv_prog_ac_ct_NM+:} false; then :
  5.2087    $as_echo_n "(cached) " >&6
  5.2088  else
  5.2089    if test -n "$ac_ct_NM"; then
  5.2090 @@ -27079,7 +27079,7 @@
  5.2091  set dummy ${ac_tool_prefix}strip; ac_word=$2
  5.2092  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.2093  $as_echo_n "checking for $ac_word... " >&6; }
  5.2094 -if test "${ac_cv_prog_STRIP+set}" = set; then :
  5.2095 +if ${ac_cv_prog_STRIP+:} false; then :
  5.2096    $as_echo_n "(cached) " >&6
  5.2097  else
  5.2098    if test -n "$STRIP"; then
  5.2099 @@ -27119,7 +27119,7 @@
  5.2100  set dummy strip; ac_word=$2
  5.2101  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.2102  $as_echo_n "checking for $ac_word... " >&6; }
  5.2103 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
  5.2104 +if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
  5.2105    $as_echo_n "(cached) " >&6
  5.2106  else
  5.2107    if test -n "$ac_ct_STRIP"; then
  5.2108 @@ -27444,7 +27444,7 @@
  5.2109  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  5.2110  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.2111  $as_echo_n "checking for $ac_word... " >&6; }
  5.2112 -if test "${ac_cv_prog_OBJCOPY+set}" = set; then :
  5.2113 +if ${ac_cv_prog_OBJCOPY+:} false; then :
  5.2114    $as_echo_n "(cached) " >&6
  5.2115  else
  5.2116    if test -n "$OBJCOPY"; then
  5.2117 @@ -27488,7 +27488,7 @@
  5.2118  set dummy $ac_prog; ac_word=$2
  5.2119  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.2120  $as_echo_n "checking for $ac_word... " >&6; }
  5.2121 -if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then :
  5.2122 +if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then :
  5.2123    $as_echo_n "(cached) " >&6
  5.2124  else
  5.2125    if test -n "$ac_ct_OBJCOPY"; then
  5.2126 @@ -27815,7 +27815,7 @@
  5.2127  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  5.2128  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.2129  $as_echo_n "checking for $ac_word... " >&6; }
  5.2130 -if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
  5.2131 +if ${ac_cv_prog_OBJDUMP+:} false; then :
  5.2132    $as_echo_n "(cached) " >&6
  5.2133  else
  5.2134    if test -n "$OBJDUMP"; then
  5.2135 @@ -27859,7 +27859,7 @@
  5.2136  set dummy $ac_prog; ac_word=$2
  5.2137  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.2138  $as_echo_n "checking for $ac_word... " >&6; }
  5.2139 -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
  5.2140 +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
  5.2141    $as_echo_n "(cached) " >&6
  5.2142  else
  5.2143    if test -n "$ac_ct_OBJDUMP"; then
  5.2144 @@ -28183,7 +28183,7 @@
  5.2145  set dummy lipo; ac_word=$2
  5.2146  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.2147  $as_echo_n "checking for $ac_word... " >&6; }
  5.2148 -if test "${ac_cv_path_LIPO+set}" = set; then :
  5.2149 +if ${ac_cv_path_LIPO+:} false; then :
  5.2150    $as_echo_n "(cached) " >&6
  5.2151  else
  5.2152    case $LIPO in
  5.2153 @@ -28500,7 +28500,7 @@
  5.2154  
  5.2155  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
  5.2156  $as_echo_n "checking for ANSI C header files... " >&6; }
  5.2157 -if test "${ac_cv_header_stdc+set}" = set; then :
  5.2158 +if ${ac_cv_header_stdc+:} false; then :
  5.2159    $as_echo_n "(cached) " >&6
  5.2160  else
  5.2161    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  5.2162 @@ -28677,7 +28677,7 @@
  5.2163  for ac_header in stdio.h
  5.2164  do :
  5.2165    ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default"
  5.2166 -if test "x$ac_cv_header_stdio_h" = x""yes; then :
  5.2167 +if test "x$ac_cv_header_stdio_h" = xyes; then :
  5.2168    cat >>confdefs.h <<_ACEOF
  5.2169  #define HAVE_STDIO_H 1
  5.2170  _ACEOF
  5.2171 @@ -28706,7 +28706,7 @@
  5.2172  # This bug is HP SR number 8606223364.
  5.2173  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5
  5.2174  $as_echo_n "checking size of int *... " >&6; }
  5.2175 -if test "${ac_cv_sizeof_int_p+set}" = set; then :
  5.2176 +if ${ac_cv_sizeof_int_p+:} false; then :
  5.2177    $as_echo_n "(cached) " >&6
  5.2178  else
  5.2179    if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p"        "$ac_includes_default"; then :
  5.2180 @@ -28763,7 +28763,7 @@
  5.2181  #
  5.2182   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
  5.2183  $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
  5.2184 -if test "${ac_cv_c_bigendian+set}" = set; then :
  5.2185 +if ${ac_cv_c_bigendian+:} false; then :
  5.2186    $as_echo_n "(cached) " >&6
  5.2187  else
  5.2188    ac_cv_c_bigendian=unknown
  5.2189 @@ -29931,7 +29931,7 @@
  5.2190  else
  5.2191    case $x_includes,$x_libraries in #(
  5.2192      *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
  5.2193 -    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
  5.2194 +    *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
  5.2195    $as_echo_n "(cached) " >&6
  5.2196  else
  5.2197    # One or both of the vars are not set, and there is no cached value.
  5.2198 @@ -30208,7 +30208,7 @@
  5.2199  else
  5.2200    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
  5.2201  $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
  5.2202 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
  5.2203 +if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
  5.2204    $as_echo_n "(cached) " >&6
  5.2205  else
  5.2206    ac_check_lib_save_LIBS=$LIBS
  5.2207 @@ -30242,14 +30242,14 @@
  5.2208  fi
  5.2209  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
  5.2210  $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
  5.2211 -if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
  5.2212 +if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
  5.2213    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
  5.2214  fi
  5.2215  
  5.2216      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
  5.2217        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
  5.2218  $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
  5.2219 -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
  5.2220 +if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
  5.2221    $as_echo_n "(cached) " >&6
  5.2222  else
  5.2223    ac_check_lib_save_LIBS=$LIBS
  5.2224 @@ -30283,7 +30283,7 @@
  5.2225  fi
  5.2226  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
  5.2227  $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
  5.2228 -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
  5.2229 +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
  5.2230    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
  5.2231  fi
  5.2232  
  5.2233 @@ -30302,14 +30302,14 @@
  5.2234      # The functions gethostbyname, getservbyname, and inet_addr are
  5.2235      # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
  5.2236      ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
  5.2237 -if test "x$ac_cv_func_gethostbyname" = x""yes; then :
  5.2238 +if test "x$ac_cv_func_gethostbyname" = xyes; then :
  5.2239  
  5.2240  fi
  5.2241  
  5.2242      if test $ac_cv_func_gethostbyname = no; then
  5.2243        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
  5.2244  $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
  5.2245 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
  5.2246 +if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
  5.2247    $as_echo_n "(cached) " >&6
  5.2248  else
  5.2249    ac_check_lib_save_LIBS=$LIBS
  5.2250 @@ -30343,14 +30343,14 @@
  5.2251  fi
  5.2252  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
  5.2253  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
  5.2254 -if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
  5.2255 +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
  5.2256    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
  5.2257  fi
  5.2258  
  5.2259        if test $ac_cv_lib_nsl_gethostbyname = no; then
  5.2260  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
  5.2261  $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
  5.2262 -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
  5.2263 +if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
  5.2264    $as_echo_n "(cached) " >&6
  5.2265  else
  5.2266    ac_check_lib_save_LIBS=$LIBS
  5.2267 @@ -30384,7 +30384,7 @@
  5.2268  fi
  5.2269  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
  5.2270  $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
  5.2271 -if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
  5.2272 +if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
  5.2273    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  5.2274  fi
  5.2275  
  5.2276 @@ -30399,14 +30399,14 @@
  5.2277      # must be given before -lnsl if both are needed.  We assume that
  5.2278      # if connect needs -lnsl, so does gethostbyname.
  5.2279      ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect"
  5.2280 -if test "x$ac_cv_func_connect" = x""yes; then :
  5.2281 +if test "x$ac_cv_func_connect" = xyes; then :
  5.2282  
  5.2283  fi
  5.2284  
  5.2285      if test $ac_cv_func_connect = no; then
  5.2286        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
  5.2287  $as_echo_n "checking for connect in -lsocket... " >&6; }
  5.2288 -if test "${ac_cv_lib_socket_connect+set}" = set; then :
  5.2289 +if ${ac_cv_lib_socket_connect+:} false; then :
  5.2290    $as_echo_n "(cached) " >&6
  5.2291  else
  5.2292    ac_check_lib_save_LIBS=$LIBS
  5.2293 @@ -30440,7 +30440,7 @@
  5.2294  fi
  5.2295  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
  5.2296  $as_echo "$ac_cv_lib_socket_connect" >&6; }
  5.2297 -if test "x$ac_cv_lib_socket_connect" = x""yes; then :
  5.2298 +if test "x$ac_cv_lib_socket_connect" = xyes; then :
  5.2299    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
  5.2300  fi
  5.2301  
  5.2302 @@ -30448,14 +30448,14 @@
  5.2303  
  5.2304      # Guillermo Gomez says -lposix is necessary on A/UX.
  5.2305      ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove"
  5.2306 -if test "x$ac_cv_func_remove" = x""yes; then :
  5.2307 +if test "x$ac_cv_func_remove" = xyes; then :
  5.2308  
  5.2309  fi
  5.2310  
  5.2311      if test $ac_cv_func_remove = no; then
  5.2312        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
  5.2313  $as_echo_n "checking for remove in -lposix... " >&6; }
  5.2314 -if test "${ac_cv_lib_posix_remove+set}" = set; then :
  5.2315 +if ${ac_cv_lib_posix_remove+:} false; then :
  5.2316    $as_echo_n "(cached) " >&6
  5.2317  else
  5.2318    ac_check_lib_save_LIBS=$LIBS
  5.2319 @@ -30489,7 +30489,7 @@
  5.2320  fi
  5.2321  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
  5.2322  $as_echo "$ac_cv_lib_posix_remove" >&6; }
  5.2323 -if test "x$ac_cv_lib_posix_remove" = x""yes; then :
  5.2324 +if test "x$ac_cv_lib_posix_remove" = xyes; then :
  5.2325    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  5.2326  fi
  5.2327  
  5.2328 @@ -30497,14 +30497,14 @@
  5.2329  
  5.2330      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
  5.2331      ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
  5.2332 -if test "x$ac_cv_func_shmat" = x""yes; then :
  5.2333 +if test "x$ac_cv_func_shmat" = xyes; then :
  5.2334  
  5.2335  fi
  5.2336  
  5.2337      if test $ac_cv_func_shmat = no; then
  5.2338        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
  5.2339  $as_echo_n "checking for shmat in -lipc... " >&6; }
  5.2340 -if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
  5.2341 +if ${ac_cv_lib_ipc_shmat+:} false; then :
  5.2342    $as_echo_n "(cached) " >&6
  5.2343  else
  5.2344    ac_check_lib_save_LIBS=$LIBS
  5.2345 @@ -30538,7 +30538,7 @@
  5.2346  fi
  5.2347  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
  5.2348  $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
  5.2349 -if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
  5.2350 +if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
  5.2351    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  5.2352  fi
  5.2353  
  5.2354 @@ -30556,7 +30556,7 @@
  5.2355    # John Interrante, Karl Berry
  5.2356    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
  5.2357  $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
  5.2358 -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
  5.2359 +if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
  5.2360    $as_echo_n "(cached) " >&6
  5.2361  else
  5.2362    ac_check_lib_save_LIBS=$LIBS
  5.2363 @@ -30590,7 +30590,7 @@
  5.2364  fi
  5.2365  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
  5.2366  $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
  5.2367 -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
  5.2368 +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
  5.2369    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  5.2370  fi
  5.2371  
  5.2372 @@ -31131,7 +31131,7 @@
  5.2373        as_fn_error $? "The path of with_freetype, which resolves as \"$path\", is not found." "$LINENO" 5
  5.2374      fi
  5.2375  
  5.2376 -    with_freetype="`cd "$path"; $THEPWDCMD`"
  5.2377 +    with_freetype="`cd "$path"; $THEPWDCMD -L`"
  5.2378    fi
  5.2379  
  5.2380  	    FREETYPE2_LIBS="-L$with_freetype/lib -lfreetype"
  5.2381 @@ -31433,7 +31433,7 @@
  5.2382        as_fn_error $? "The path of FREETYPELOCATION, which resolves as \"$path\", is not found." "$LINENO" 5
  5.2383      fi
  5.2384  
  5.2385 -    FREETYPELOCATION="`cd "$path"; $THEPWDCMD`"
  5.2386 +    FREETYPELOCATION="`cd "$path"; $THEPWDCMD -L`"
  5.2387    fi
  5.2388  
  5.2389  	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype in some standard windows locations" >&5
  5.2390 @@ -31609,7 +31609,7 @@
  5.2391              LDFLAGS="$FREETYPE2_LIBS"
  5.2392              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5
  5.2393  $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; }
  5.2394 -if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then :
  5.2395 +if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then :
  5.2396    $as_echo_n "(cached) " >&6
  5.2397  else
  5.2398    ac_check_lib_save_LIBS=$LIBS
  5.2399 @@ -31643,7 +31643,7 @@
  5.2400  fi
  5.2401  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5
  5.2402  $as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; }
  5.2403 -if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then :
  5.2404 +if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then :
  5.2405    FREETYPE2_FOUND=true
  5.2406  else
  5.2407    as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5
  5.2408 @@ -31931,7 +31931,7 @@
  5.2409  	    for ac_header in alsa/asoundlib.h
  5.2410  do :
  5.2411    ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default"
  5.2412 -if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then :
  5.2413 +if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then :
  5.2414    cat >>confdefs.h <<_ACEOF
  5.2415  #define HAVE_ALSA_ASOUNDLIB_H 1
  5.2416  _ACEOF
  5.2417 @@ -31990,7 +31990,7 @@
  5.2418  USE_EXTERNAL_LIBJPEG=true
  5.2419  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5
  5.2420  $as_echo_n "checking for main in -ljpeg... " >&6; }
  5.2421 -if test "${ac_cv_lib_jpeg_main+set}" = set; then :
  5.2422 +if ${ac_cv_lib_jpeg_main+:} false; then :
  5.2423    $as_echo_n "(cached) " >&6
  5.2424  else
  5.2425    ac_check_lib_save_LIBS=$LIBS
  5.2426 @@ -32018,7 +32018,7 @@
  5.2427  fi
  5.2428  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5
  5.2429  $as_echo "$ac_cv_lib_jpeg_main" >&6; }
  5.2430 -if test "x$ac_cv_lib_jpeg_main" = x""yes; then :
  5.2431 +if test "x$ac_cv_lib_jpeg_main" = xyes; then :
  5.2432    cat >>confdefs.h <<_ACEOF
  5.2433  #define HAVE_LIBJPEG 1
  5.2434  _ACEOF
  5.2435 @@ -32067,7 +32067,7 @@
  5.2436      USE_EXTERNAL_LIBGIF=false
  5.2437  elif test "x${with_giflib}" = "xsystem"; then
  5.2438      ac_fn_cxx_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
  5.2439 -if test "x$ac_cv_header_gif_lib_h" = x""yes; then :
  5.2440 +if test "x$ac_cv_header_gif_lib_h" = xyes; then :
  5.2441  
  5.2442  else
  5.2443     as_fn_error $? "--with-giflib=system specified, but gif_lib.h not found!" "$LINENO" 5
  5.2444 @@ -32076,7 +32076,7 @@
  5.2445  
  5.2446      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGifGetCode in -lgif" >&5
  5.2447  $as_echo_n "checking for DGifGetCode in -lgif... " >&6; }
  5.2448 -if test "${ac_cv_lib_gif_DGifGetCode+set}" = set; then :
  5.2449 +if ${ac_cv_lib_gif_DGifGetCode+:} false; then :
  5.2450    $as_echo_n "(cached) " >&6
  5.2451  else
  5.2452    ac_check_lib_save_LIBS=$LIBS
  5.2453 @@ -32110,7 +32110,7 @@
  5.2454  fi
  5.2455  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_DGifGetCode" >&5
  5.2456  $as_echo "$ac_cv_lib_gif_DGifGetCode" >&6; }
  5.2457 -if test "x$ac_cv_lib_gif_DGifGetCode" = x""yes; then :
  5.2458 +if test "x$ac_cv_lib_gif_DGifGetCode" = xyes; then :
  5.2459    cat >>confdefs.h <<_ACEOF
  5.2460  #define HAVE_LIBGIF 1
  5.2461  _ACEOF
  5.2462 @@ -32142,7 +32142,7 @@
  5.2463  
  5.2464  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
  5.2465  $as_echo_n "checking for compress in -lz... " >&6; }
  5.2466 -if test "${ac_cv_lib_z_compress+set}" = set; then :
  5.2467 +if ${ac_cv_lib_z_compress+:} false; then :
  5.2468    $as_echo_n "(cached) " >&6
  5.2469  else
  5.2470    ac_check_lib_save_LIBS=$LIBS
  5.2471 @@ -32176,7 +32176,7 @@
  5.2472  fi
  5.2473  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
  5.2474  $as_echo "$ac_cv_lib_z_compress" >&6; }
  5.2475 -if test "x$ac_cv_lib_z_compress" = x""yes; then :
  5.2476 +if test "x$ac_cv_lib_z_compress" = xyes; then :
  5.2477     ZLIB_FOUND=yes
  5.2478  else
  5.2479     ZLIB_FOUND=no
  5.2480 @@ -32269,7 +32269,7 @@
  5.2481  
  5.2482  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
  5.2483  $as_echo_n "checking for cos in -lm... " >&6; }
  5.2484 -if test "${ac_cv_lib_m_cos+set}" = set; then :
  5.2485 +if ${ac_cv_lib_m_cos+:} false; then :
  5.2486    $as_echo_n "(cached) " >&6
  5.2487  else
  5.2488    ac_check_lib_save_LIBS=$LIBS
  5.2489 @@ -32303,7 +32303,7 @@
  5.2490  fi
  5.2491  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
  5.2492  $as_echo "$ac_cv_lib_m_cos" >&6; }
  5.2493 -if test "x$ac_cv_lib_m_cos" = x""yes; then :
  5.2494 +if test "x$ac_cv_lib_m_cos" = xyes; then :
  5.2495    cat >>confdefs.h <<_ACEOF
  5.2496  #define HAVE_LIBM 1
  5.2497  _ACEOF
  5.2498 @@ -32327,7 +32327,7 @@
  5.2499  LIBS=""
  5.2500  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
  5.2501  $as_echo_n "checking for dlopen in -ldl... " >&6; }
  5.2502 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
  5.2503 +if ${ac_cv_lib_dl_dlopen+:} false; then :
  5.2504    $as_echo_n "(cached) " >&6
  5.2505  else
  5.2506    ac_check_lib_save_LIBS=$LIBS
  5.2507 @@ -32361,7 +32361,7 @@
  5.2508  fi
  5.2509  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
  5.2510  $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
  5.2511 -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
  5.2512 +if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
  5.2513    cat >>confdefs.h <<_ACEOF
  5.2514  #define HAVE_LIBDL 1
  5.2515  _ACEOF
  5.2516 @@ -32607,7 +32607,7 @@
  5.2517  set dummy llvm-config; ac_word=$2
  5.2518  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.2519  $as_echo_n "checking for $ac_word... " >&6; }
  5.2520 -if test "${ac_cv_prog_LLVM_CONFIG+set}" = set; then :
  5.2521 +if ${ac_cv_prog_LLVM_CONFIG+:} false; then :
  5.2522    $as_echo_n "(cached) " >&6
  5.2523  else
  5.2524    if test -n "$LLVM_CONFIG"; then
  5.2525 @@ -32933,6 +32933,9 @@
  5.2526      if test "$JOBS" -gt "16"; then
  5.2527        JOBS=16
  5.2528      fi
  5.2529 +    if test "$JOBS" -eq "0"; then
  5.2530 +      JOBS=1
  5.2531 +    fi
  5.2532      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JOBS" >&5
  5.2533  $as_echo "$JOBS" >&6; }
  5.2534    else
  5.2535 @@ -33216,7 +33219,7 @@
  5.2536  set dummy ccache; ac_word=$2
  5.2537  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5.2538  $as_echo_n "checking for $ac_word... " >&6; }
  5.2539 -if test "${ac_cv_path_CCACHE+set}" = set; then :
  5.2540 +if ${ac_cv_path_CCACHE+:} false; then :
  5.2541    $as_echo_n "(cached) " >&6
  5.2542  else
  5.2543    case $CCACHE in
  5.2544 @@ -33477,10 +33480,21 @@
  5.2545       :end' >>confcache
  5.2546  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
  5.2547    if test -w "$cache_file"; then
  5.2548 -    test "x$cache_file" != "x/dev/null" &&
  5.2549 +    if test "x$cache_file" != "x/dev/null"; then
  5.2550        { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
  5.2551  $as_echo "$as_me: updating cache $cache_file" >&6;}
  5.2552 -    cat confcache >$cache_file
  5.2553 +      if test ! -f "$cache_file" || test -h "$cache_file"; then
  5.2554 +	cat confcache >"$cache_file"
  5.2555 +      else
  5.2556 +        case $cache_file in #(
  5.2557 +        */* | ?:*)
  5.2558 +	  mv -f confcache "$cache_file"$$ &&
  5.2559 +	  mv -f "$cache_file"$$ "$cache_file" ;; #(
  5.2560 +        *)
  5.2561 +	  mv -f confcache "$cache_file" ;;
  5.2562 +	esac
  5.2563 +      fi
  5.2564 +    fi
  5.2565    else
  5.2566      { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
  5.2567  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
  5.2568 @@ -33512,7 +33526,7 @@
  5.2569  
  5.2570  
  5.2571  
  5.2572 -: ${CONFIG_STATUS=./config.status}
  5.2573 +: "${CONFIG_STATUS=./config.status}"
  5.2574  ac_write_fail=0
  5.2575  ac_clean_files_save=$ac_clean_files
  5.2576  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
  5.2577 @@ -33613,6 +33627,7 @@
  5.2578  IFS=" ""	$as_nl"
  5.2579  
  5.2580  # Find who we are.  Look in the path if we contain no directory separator.
  5.2581 +as_myself=
  5.2582  case $0 in #((
  5.2583    *[\\/]* ) as_myself=$0 ;;
  5.2584    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  5.2585 @@ -33920,7 +33935,7 @@
  5.2586  # values after options handling.
  5.2587  ac_log="
  5.2588  This file was extended by OpenJDK $as_me jdk8, which was
  5.2589 -generated by GNU Autoconf 2.67.  Invocation command line was
  5.2590 +generated by GNU Autoconf 2.68.  Invocation command line was
  5.2591  
  5.2592    CONFIG_FILES    = $CONFIG_FILES
  5.2593    CONFIG_HEADERS  = $CONFIG_HEADERS
  5.2594 @@ -33983,7 +33998,7 @@
  5.2595  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  5.2596  ac_cs_version="\\
  5.2597  OpenJDK config.status jdk8
  5.2598 -configured by $0, generated by GNU Autoconf 2.67,
  5.2599 +configured by $0, generated by GNU Autoconf 2.68,
  5.2600    with options \\"\$ac_cs_config\\"
  5.2601  
  5.2602  Copyright (C) 2010 Free Software Foundation, Inc.
  5.2603 @@ -34134,9 +34149,10 @@
  5.2604  # after its creation but before its name has been assigned to `$tmp'.
  5.2605  $debug ||
  5.2606  {
  5.2607 -  tmp=
  5.2608 +  tmp= ac_tmp=
  5.2609    trap 'exit_status=$?
  5.2610 -  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  5.2611 +  : "${ac_tmp:=$tmp}"
  5.2612 +  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
  5.2613  ' 0
  5.2614    trap 'as_fn_exit 1' 1 2 13 15
  5.2615  }
  5.2616 @@ -34144,12 +34160,13 @@
  5.2617  
  5.2618  {
  5.2619    tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
  5.2620 -  test -n "$tmp" && test -d "$tmp"
  5.2621 +  test -d "$tmp"
  5.2622  }  ||
  5.2623  {
  5.2624    tmp=./conf$$-$RANDOM
  5.2625    (umask 077 && mkdir "$tmp")
  5.2626  } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
  5.2627 +ac_tmp=$tmp
  5.2628  
  5.2629  # Set up the scripts for CONFIG_FILES section.
  5.2630  # No need to generate them if there are no CONFIG_FILES.
  5.2631 @@ -34171,7 +34188,7 @@
  5.2632    ac_cs_awk_cr=$ac_cr
  5.2633  fi
  5.2634  
  5.2635 -echo 'BEGIN {' >"$tmp/subs1.awk" &&
  5.2636 +echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
  5.2637  _ACEOF
  5.2638  
  5.2639  
  5.2640 @@ -34199,7 +34216,7 @@
  5.2641  rm -f conf$$subs.sh
  5.2642  
  5.2643  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  5.2644 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
  5.2645 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
  5.2646  _ACEOF
  5.2647  sed -n '
  5.2648  h
  5.2649 @@ -34247,7 +34264,7 @@
  5.2650  rm -f conf$$subs.awk
  5.2651  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  5.2652  _ACAWK
  5.2653 -cat >>"\$tmp/subs1.awk" <<_ACAWK &&
  5.2654 +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
  5.2655    for (key in S) S_is_set[key] = 1
  5.2656    FS = ""
  5.2657  
  5.2658 @@ -34279,7 +34296,7 @@
  5.2659    sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
  5.2660  else
  5.2661    cat
  5.2662 -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
  5.2663 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
  5.2664    || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
  5.2665  _ACEOF
  5.2666  
  5.2667 @@ -34313,7 +34330,7 @@
  5.2668  # No need to generate them if there are no CONFIG_HEADERS.
  5.2669  # This happens for instance with `./config.status Makefile'.
  5.2670  if test -n "$CONFIG_HEADERS"; then
  5.2671 -cat >"$tmp/defines.awk" <<\_ACAWK ||
  5.2672 +cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
  5.2673  BEGIN {
  5.2674  _ACEOF
  5.2675  
  5.2676 @@ -34325,8 +34342,8 @@
  5.2677  # handling of long lines.
  5.2678  ac_delim='%!_!# '
  5.2679  for ac_last_try in false false :; do
  5.2680 -  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
  5.2681 -  if test -z "$ac_t"; then
  5.2682 +  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
  5.2683 +  if test -z "$ac_tt"; then
  5.2684      break
  5.2685    elif $ac_last_try; then
  5.2686      as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
  5.2687 @@ -34446,7 +34463,7 @@
  5.2688      for ac_f
  5.2689      do
  5.2690        case $ac_f in
  5.2691 -      -) ac_f="$tmp/stdin";;
  5.2692 +      -) ac_f="$ac_tmp/stdin";;
  5.2693        *) # Look for the file first in the build tree, then in the source tree
  5.2694  	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
  5.2695  	 # because $ac_f cannot contain `:'.
  5.2696 @@ -34481,7 +34498,7 @@
  5.2697      esac
  5.2698  
  5.2699      case $ac_tag in
  5.2700 -    *:-:* | *:-) cat >"$tmp/stdin" \
  5.2701 +    *:-:* | *:-) cat >"$ac_tmp/stdin" \
  5.2702        || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
  5.2703      esac
  5.2704      ;;
  5.2705 @@ -34607,21 +34624,22 @@
  5.2706  s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
  5.2707  $ac_datarootdir_hack
  5.2708  "
  5.2709 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
  5.2710 -  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  5.2711 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
  5.2712 +  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  5.2713  
  5.2714  test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
  5.2715 -  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
  5.2716 -  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
  5.2717 +  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
  5.2718 +  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
  5.2719 +      "$ac_tmp/out"`; test -z "$ac_out"; } &&
  5.2720    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  5.2721  which seems to be undefined.  Please make sure it is defined" >&5
  5.2722  $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  5.2723  which seems to be undefined.  Please make sure it is defined" >&2;}
  5.2724  
  5.2725 -  rm -f "$tmp/stdin"
  5.2726 +  rm -f "$ac_tmp/stdin"
  5.2727    case $ac_file in
  5.2728 -  -) cat "$tmp/out" && rm -f "$tmp/out";;
  5.2729 -  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
  5.2730 +  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
  5.2731 +  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
  5.2732    esac \
  5.2733    || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  5.2734   ;;
  5.2735 @@ -34632,20 +34650,20 @@
  5.2736    if test x"$ac_file" != x-; then
  5.2737      {
  5.2738        $as_echo "/* $configure_input  */" \
  5.2739 -      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
  5.2740 -    } >"$tmp/config.h" \
  5.2741 +      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
  5.2742 +    } >"$ac_tmp/config.h" \
  5.2743        || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  5.2744 -    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
  5.2745 +    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
  5.2746        { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
  5.2747  $as_echo "$as_me: $ac_file is unchanged" >&6;}
  5.2748      else
  5.2749        rm -f "$ac_file"
  5.2750 -      mv "$tmp/config.h" "$ac_file" \
  5.2751 +      mv "$ac_tmp/config.h" "$ac_file" \
  5.2752  	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
  5.2753      fi
  5.2754    else
  5.2755      $as_echo "/* $configure_input  */" \
  5.2756 -      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
  5.2757 +      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
  5.2758        || as_fn_error $? "could not create -" "$LINENO" 5
  5.2759    fi
  5.2760   ;;

     6.1 --- a/common/autoconf/jdk-options.m4	Thu May 30 16:00:16 2013 -0400
     6.2 +++ b/common/autoconf/jdk-options.m4	Mon Jun 10 16:15:16 2013 -0400
     6.3 @@ -422,6 +422,14 @@
     6.4    MILESTONE=internal
     6.5  fi
     6.6  
     6.7 +AC_ARG_WITH(update-version, [AS_HELP_STRING([--with-update-version], 
     6.8 +                          [Set update version value for build @<:@b00@:>@])])
     6.9 +if test "x$with_update_version" = xyes; then
    6.10 +  AC_MSG_ERROR([Update version must have a value])
    6.11 +elif test "x$with_update_version" != x; then
    6.12 +  JDK_UPDATE_VERSION="$with_update_version"
    6.13 +fi
    6.14 +
    6.15  AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number], 
    6.16                            [Set build number value for build @<:@b00@:>@])])
    6.17  if test "x$with_build_number" = xyes; then

     7.1 --- a/common/autoconf/spec.gmk.in	Thu May 30 16:00:16 2013 -0400
     7.2 +++ b/common/autoconf/spec.gmk.in	Mon Jun 10 16:15:16 2013 -0400
     7.3 @@ -478,6 +478,7 @@
     7.4  # CD is going away, but remains to cater for legacy makefiles.
     7.5  CD:=cd
     7.6  CHMOD:=@CHMOD@
     7.7 +CODESIGN:=@CODESIGN@
     7.8  COMM:=@COMM@
     7.9  CP:=@CP@
    7.10  CPIO:=@CPIO@

     8.1 --- a/common/autoconf/toolchain.m4	Thu May 30 16:00:16 2013 -0400
     8.2 +++ b/common/autoconf/toolchain.m4	Mon Jun 10 16:15:16 2013 -0400
     8.3 @@ -36,7 +36,7 @@
     8.4      $ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
     8.5      if test $? -ne 0; then
     8.6        GCC_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
     8.7 -      
     8.8 +
     8.9        AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required Sun Studio compiler.])
    8.10        AC_MSG_NOTICE([The result from running with -V was: "$COMPILER_VERSION_TEST" and with --version: "$GCC_VERSION_TEST"])
    8.11        AC_MSG_ERROR([Sun Studio compiler is required. Try setting --with-tools-dir.])
    8.12 @@ -69,7 +69,7 @@
    8.13        AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION_TEST"])
    8.14        AC_MSG_ERROR([GCC compiler is required. Try setting --with-tools-dir.])
    8.15      fi
    8.16 -    
    8.17 +
    8.18      # First line typically looks something like:
    8.19      # gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2
    8.20      COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* \(@<:@1-9@:>@@<:@0-9.@:>@*\)/\1/p"`
    8.21 @@ -142,7 +142,7 @@
    8.22    BASIC_REMOVE_SYMBOLIC_LINKS(TEST_COMPILER)
    8.23    AC_MSG_RESULT([$TEST_COMPILER])
    8.24    AC_MSG_CHECKING([if $1 is disguised ccache])
    8.25 -  
    8.26 +
    8.27    COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"`
    8.28    if test "x$COMPILER_BASENAME" = "xccache"; then
    8.29      AC_MSG_RESULT([yes, trying to find proper $COMPILER_NAME compiler])
    8.30 @@ -226,11 +226,11 @@
    8.31                      ],
    8.32                      [])
    8.33  
    8.34 -if test "x$SYS_ROOT" != "x/" ; then                    
    8.35 +if test "x$SYS_ROOT" != "x/" ; then
    8.36      CFLAGS="--sysroot=$SYS_ROOT $CFLAGS"
    8.37      CXXFLAGS="--sysroot=$SYS_ROOT $CXXFLAGS"
    8.38 -    OBJCFLAGS="--sysroot=$SYS_ROOT $OBJCFLAGS" 
    8.39 -    OBJCXXFLAGS="--sysroot=$SYS_ROOT $OBJCFLAGS" 
    8.40 +    OBJCFLAGS="--sysroot=$SYS_ROOT $OBJCFLAGS"
    8.41 +    OBJCXXFLAGS="--sysroot=$SYS_ROOT $OBJCFLAGS"
    8.42      CPPFLAGS="--sysroot=$SYS_ROOT $CPPFLAGS"
    8.43      LDFLAGS="--sysroot=$SYS_ROOT $LDFLAGS"
    8.44  fi
    8.45 @@ -330,7 +330,7 @@
    8.46  COMPILER_NAME=gcc
    8.47  COMPILER_TYPE=CC
    8.48  AS_IF([test "x$OPENJDK_TARGET_OS" = xwindows], [
    8.49 -    # For now, assume that we are always compiling using cl.exe. 
    8.50 +    # For now, assume that we are always compiling using cl.exe.
    8.51      CC_OUT_OPTION=-Fo
    8.52      EXE_OUT_OPTION=-out:
    8.53      LD_OUT_OPTION=-out:
    8.54 @@ -491,7 +491,7 @@
    8.55  
    8.56  ###############################################################################
    8.57  #
    8.58 -# How to compile shared libraries. 
    8.59 +# How to compile shared libraries.
    8.60  #
    8.61  
    8.62  if test "x$GCC" = xyes; then
    8.63 @@ -525,7 +525,7 @@
    8.64          SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG"
    8.65          SHARED_LIBRARY_SUFFIX='.dylib'
    8.66          EXE_SUFFIX=''
    8.67 -        SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/[$]1' 
    8.68 +        SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/[$]1'
    8.69          SET_SHARED_LIBRARY_MAPFILE=''
    8.70          SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
    8.71          SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
    8.72 @@ -676,7 +676,7 @@
    8.73          # Use single precision floating point with 'float'
    8.74          CC_HIGHEST="$CC_HIGHEST -fsingle"
    8.75          # Assume memory references via basic pointer types do not alias
    8.76 -        #   (Source with excessing pointer casting and data access with mixed 
    8.77 +        #   (Source with excessing pointer casting and data access with mixed
    8.78          #    pointer types are not recommended)
    8.79          CC_HIGHEST="$CC_HIGHEST -xalias_level=basic"
    8.80          # Use intrinsic or inline versions for math/std functions
    8.81 @@ -892,7 +892,7 @@
    8.82  fi
    8.83  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
    8.84      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE"
    8.85 -    # Setting these parameters makes it an error to link to macosx APIs that are 
    8.86 +    # Setting these parameters makes it an error to link to macosx APIs that are
    8.87      # newer than the given OS version and makes the linked binaries compatible even
    8.88      # if built on a newer version of the OS.
    8.89      # The expected format is X.Y.Z
    8.90 @@ -940,12 +940,12 @@
    8.91  # Which should we link to? Are we lucky enough that the binary api to the libjvm.so library
    8.92  # is identical for client and server? Yes. Which is picked at runtime (client or server)?
    8.93  # Neither, since the chosen libjvm.so has already been loaded by the launcher, all the following
    8.94 -# libraries will link to whatever is in memory. Yuck. 
    8.95 +# libraries will link to whatever is in memory. Yuck.
    8.96  #
    8.97  # Thus we offer the compiler to find libjvm.so first in server then in client. It works. Ugh.
    8.98  if test "x$COMPILER_NAME" = xcl; then
    8.99      LDFLAGS_JDK="$LDFLAGS_JDK -nologo -opt:ref -incremental:no"
   8.100 -    if test "x$OPENJDK_TARGET_CPU" = xx86; then 
   8.101 +    if test "x$OPENJDK_TARGET_CPU" = xx86; then
   8.102          LDFLAGS_JDK="$LDFLAGS_JDK -safeseh"
   8.103      fi
   8.104      # TODO: make -debug optional "--disable-full-debug-symbols"
   8.105 @@ -965,7 +965,7 @@
   8.106          if test -n "$HAS_GNU_HASH"; then
   8.107              LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker --hash-style=both "
   8.108          fi
   8.109 -        if test "x$OPENJDK_TARGET_OS" = xlinux; then 
   8.110 +        if test "x$OPENJDK_TARGET_OS" = xlinux; then
   8.111            # And since we now know that the linker is gnu, then add -z defs, to forbid
   8.112            # undefined symbols in object files.
   8.113            LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs"
   8.114 @@ -1006,7 +1006,7 @@
   8.115  
   8.116  # Adjust flags according to debug level.
   8.117  case $DEBUG_LEVEL in
   8.118 -      fastdebug ) 
   8.119 +      fastdebug )
   8.120                CFLAGS="$CFLAGS $D_FLAG"
   8.121                JAVAC_FLAGS="$JAVAC_FLAGS -g"
   8.122                ;;
   8.123 @@ -1018,9 +1018,9 @@
   8.124  	      CXX_O_FLAG_NORM="$CXX_O_FLAG_NONE"
   8.125                JAVAC_FLAGS="$JAVAC_FLAGS -g"
   8.126                ;;
   8.127 -esac              
   8.128 +esac
   8.129  
   8.130 -                
   8.131 +
   8.132  AC_SUBST(CFLAGS_JDKLIB)
   8.133  AC_SUBST(CFLAGS_JDKEXE)
   8.134  
   8.135 @@ -1092,28 +1092,45 @@
   8.136    AC_SUBST(COMPILER_SUPPORTS_TARGET_BITS_FLAG)
   8.137  ])
   8.138  
   8.139 -# Setup the JTREG paths 
   8.140 -AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG], 
   8.141 -[ 
   8.142 -  AC_ARG_WITH(jtreg, [AS_HELP_STRING([--with-jtreg], 
   8.143 -  [Regression Test Harness @<:@probed@:>@])]) 
   8.144 - 
   8.145 -  AC_MSG_CHECKING([for JTReg Regression Test Harness]) 
   8.146 - 
   8.147 -  if test "x$with_jtreg" != x; then 
   8.148 -    JT_HOME="$with_jtreg"
   8.149 -    BASIC_FIXUP_PATH([JT_HOME])
   8.150 -    AC_MSG_RESULT($JT_HOME)
   8.151 - 
   8.152 -    # jtreg win32 script works for everybody 
   8.153 -    JTREGEXE="$JT_HOME/win32/bin/jtreg"
   8.154 -    if test ! -f "$JTREGEXE"; then
   8.155 -      AC_MSG_ERROR([JTReg executable does not exist: $JTREGEXE])
   8.156 +# Setup the JTREG paths
   8.157 +AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG],
   8.158 +[
   8.159 +  AC_ARG_WITH(jtreg, [AS_HELP_STRING([--with-jtreg],
   8.160 +  [Regression Test Harness @<:@probed@:>@])],
   8.161 +  [],
   8.162 +  [with_jtreg=no])
   8.163 +
   8.164 +  if test "x$with_jtreg" = xno; then
   8.165 +    # jtreg disabled
   8.166 +    AC_MSG_CHECKING([for jtreg])
   8.167 +    AC_MSG_RESULT(no)
   8.168 +  else
   8.169 +    if test "x$with_jtreg" != xyes; then
   8.170 +      # with path specified.
   8.171 +      JT_HOME="$with_jtreg"
   8.172      fi
   8.173 -  else 
   8.174 -    AC_MSG_RESULT(no)
   8.175 -  fi 
   8.176 - 
   8.177 -  AC_SUBST(JT_HOME) 
   8.178 -  AC_SUBST(JTREGEXE) 
   8.179 +
   8.180 +    if test "x$JT_HOME" != x; then
   8.181 +      AC_MSG_CHECKING([for jtreg])
   8.182 +
   8.183 +      # use JT_HOME enviroment var.
   8.184 +      BASIC_FIXUP_PATH([JT_HOME])
   8.185 +
   8.186 +      # jtreg win32 script works for everybody
   8.187 +      JTREGEXE="$JT_HOME/win32/bin/jtreg"
   8.188 +
   8.189 +      if test ! -f "$JTREGEXE"; then
   8.190 +        AC_MSG_ERROR([JTReg executable does not exist: $JTREGEXE])
   8.191 +      fi
   8.192 +
   8.193 +      AC_MSG_RESULT($JTREGEXE)
   8.194 +    else
   8.195 +      # try to find jtreg on path
   8.196 +      BASIC_REQUIRE_PROG(JTREGEXE, jtreg)
   8.197 +      JT_HOME="`$DIRNAME $JTREGEXE`"
   8.198 +    fi
   8.199 +  fi
   8.200 +
   8.201 +  AC_SUBST(JT_HOME)
   8.202 +  AC_SUBST(JTREGEXE)
   8.203  ])

     9.1 --- a/common/makefiles/Jprt.gmk	Thu May 30 16:00:16 2013 -0400
     9.2 +++ b/common/makefiles/Jprt.gmk	Mon Jun 10 16:15:16 2013 -0400
     9.3 @@ -133,6 +133,15 @@
     9.4    ifdef ALT_WIXDIR
     9.5  	@$(ECHO) " --with-wix=$(call UnixPath,$(ALT_WIXDIR)) " >> $@.tmp
     9.6    endif
     9.7 +  ifdef ALT_INSTALL_LZMA_PATH
     9.8 +	@$(ECHO) " --with-lzma-path=$(call UnixPath,$(ALT_INSTALL_LZMA_PATH)) " >> $@.tmp
     9.9 +  endif
    9.10 +  ifdef ALT_INSTALL_UPX_PATH
    9.11 +	@$(ECHO) " --with-upx-path=$(call UnixPath,$(ALT_INSTALL_UPX_PATH)) " >> $@.tmp
    9.12 +  endif
    9.13 +  ifdef ALT_INSTALL_UPX_FILENAME
    9.14 +	@$(ECHO) " --with-upx-filename=$(call UnixPath,$(ALT_INSTALL_UPX_FILENAME)) " >> $@.tmp
    9.15 +  endif
    9.16    ifdef ALT_CCSS_SIGNING_DIR
    9.17  	@$(ECHO) " --with-ccss-signing=$(call UnixPath,$(ALT_CCSS_SIGNING_DIR)) " >> $@.tmp
    9.18    endif

    10.1 --- a/common/makefiles/Main.gmk	Thu May 30 16:00:16 2013 -0400
    10.2 +++ b/common/makefiles/Main.gmk	Mon Jun 10 16:15:16 2013 -0400
    10.3 @@ -183,7 +183,7 @@
    10.4  test: images test-only
    10.5  test-only: start-make
    10.6  	@$(call TargetEnter)
    10.7 -	@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= PRODUCT_HOME=$(JDK_IMAGE_DIR) JPRT_JAVA_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true
    10.8 +	@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k JT_HOME=$(JT_HOME) MAKEFLAGS= PRODUCT_HOME=$(JDK_IMAGE_DIR) JPRT_JAVA_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true
    10.9  	@$(call TargetExit)
   10.10  
   10.11  # Stores the tips for each repository. This file is be used when constructing the jdk image and can be

    11.1 --- a/common/makefiles/MakeBase.gmk	Thu May 30 16:00:16 2013 -0400
    11.2 +++ b/common/makefiles/MakeBase.gmk	Mon Jun 10 16:15:16 2013 -0400
    11.3 @@ -361,8 +361,8 @@
    11.4  
    11.5  # This is to be called by all SetupFoo macros
    11.6  define LogSetupMacroEntry
    11.7 -    $(if $(26),$(error Internal makefile error: Too many arguments to LogSetupMacroEntry, please update MakeBase.gmk))
    11.8 -    $(if $(findstring $(LOG_LEVEL),debug trace), $(info $1 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25,$(if $($i),$(NEWLINE) $(strip [$i] $($i))))))
    11.9 +    $(if $(27),$(error Internal makefile error: Too many arguments to LogSetupMacroEntry, please update MakeBase.gmk))
   11.10 +    $(if $(findstring $(LOG_LEVEL),debug trace), $(info $1 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26,$(if $($i),$(NEWLINE) $(strip [$i] $($i))))))
   11.11  endef
   11.12  
   11.13  # Make directory without forking mkdir if not needed

    12.1 --- a/common/makefiles/NativeCompilation.gmk	Thu May 30 16:00:16 2013 -0400
    12.2 +++ b/common/makefiles/NativeCompilation.gmk	Mon Jun 10 16:15:16 2013 -0400
    12.3 @@ -147,9 +147,9 @@
    12.4      #    CC the compiler to use, default is $(CC)
    12.5      #    LDEXE the linker to use for linking executables, default is $(LDEXE)
    12.6      #    OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST
    12.7 -    $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
    12.8 -    $(call LogSetupMacroEntry,SetupNativeCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15),$(16),$(17),$(18),$(19),$(20),$(21),$(22),$(23),$(24),$(25))
    12.9 -    $(if $(26),$(error Internal makefile error: Too many arguments to SetupNativeCompilation, please update NativeCompilation.gmk))
   12.10 +    $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
   12.11 +    $(call LogSetupMacroEntry,SetupNativeCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15),$(16),$(17),$(18),$(19),$(20),$(21),$(22),$(23),$(24),$(25),$(26))
   12.12 +    $(if $(27),$(error Internal makefile error: Too many arguments to SetupNativeCompilation, please update NativeCompilation.gmk))
   12.13  
   12.14      ifneq (,$$($1_BIN))
   12.15          $$(error BIN has been replaced with OBJECT_DIR)
   12.16 @@ -567,6 +567,12 @@
   12.17          ifneq (,$$($1_GEN_MANIFEST))
   12.18  		$(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1
   12.19          endif
   12.20 -
   12.21 +        # This only works if the openjdk_codesign identity is present on the system. Let
   12.22 +        # silently fail otherwise.
   12.23 +        ifneq (,$(CODESIGN))
   12.24 +            ifneq (,$$($1_CODESIGN))
   12.25 +		$(CODESIGN) -s openjdk_codesign $$@
   12.26 +            endif
   12.27 +        endif
   12.28      endif
   12.29  endef

    13.1 --- a/make/deploy-rules.gmk	Thu May 30 16:00:16 2013 -0400
    13.2 +++ b/make/deploy-rules.gmk	Mon Jun 10 16:15:16 2013 -0400
    13.3 @@ -1,5 +1,5 @@
    13.4  #
    13.5 -# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
    13.6 +# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
    13.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    13.8  #
    13.9  # This code is free software; you can redistribute it and/or modify it
   13.10 @@ -42,20 +42,6 @@
   13.11  endif
   13.12  
   13.13  DEPLOY_BUILD_TARGETS = sanity deploy 
   13.14 -# Only build 7-Zip LZMA file compression if it is available
   13.15 -# Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available
   13.16 -ifeq ($(ARCH_DATA_MODEL), 32)
   13.17 -  ifeq ($(PLATFORM), windows)
   13.18 -      EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \
   13.19 -        $(ECHO) true ; \
   13.20 -      else \
   13.21 -  $(ECHO) false ; \
   13.22 -      fi )
   13.23 -  ifeq ($(EC_TMP), true)
   13.24 -        DEPLOY_BUILD_TARGETS += extra-comp-all
   13.25 -      endif
   13.26 -  endif
   13.27 -endif
   13.28  
   13.29  ifneq ($(JQS), off)
   13.30    ifeq ($(ARCH_DATA_MODEL), 32)
   13.31 @@ -65,22 +51,6 @@
   13.32    endif
   13.33  endif
   13.34  
   13.35 -ifeq ($(ARCH_DATA_MODEL), 32)
   13.36 -  ifeq ($(PLATFORM), windows)
   13.37 -    # Only set up to use UPX compression if it is available
   13.38 -    UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \
   13.39 -      $(ECHO) true ; \
   13.40 -    else \
   13.41 -      $(ECHO) false ; \
   13.42 -    fi )
   13.43 -    ifeq ($(UP_TMP), true)
   13.44 -      DEPLOY_BUILD_TARGETS += cmd-comp-all
   13.45 -    endif
   13.46 -  endif
   13.47 -endif
   13.48 -
   13.49 -
   13.50 -
   13.51  ifndef DEV_ONLY
   13.52    DEPLOY_BUILD_TARGETS += images
   13.53  else

Mercurial > jdk8-mips64-public / changeset

changeset

Merge