8020411: lin32 - JDK 8 build for Linux-i586 on Oracle Linux 6.4 64-bit machines does not generate the bundles directory in the build directory

Thu, 15 Aug 2013 17:14:53 +0200

author
erikj
date
Thu, 15 Aug 2013 17:14:53 +0200
changeset 766
4fb877dfe5c4
parent 764
b7e64be81c8a
child 767
f10f673d9b17

8020411: lin32 - JDK 8 build for Linux-i586 on Oracle Linux 6.4 64-bit machines does not generate the bundles directory in the build directory
Reviewed-by: tbell

common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/autoconf/platform.m4 file | annotate | diff | comparison | revisions
common/autoconf/spec.gmk.in file | annotate | diff | comparison | revisions
     1.1 --- a/common/autoconf/generated-configure.sh	Thu Aug 08 10:10:24 2013 -0700
     1.2 +++ b/common/autoconf/generated-configure.sh	Thu Aug 15 17:14:53 2013 +0200
     1.3 @@ -1,6 +1,6 @@
     1.4  #! /bin/sh
     1.5  # Guess values for system-dependent variables and create Makefiles.
     1.6 -# Generated by GNU Autoconf 2.68 for OpenJDK jdk8.
     1.7 +# Generated by GNU Autoconf 2.67 for OpenJDK jdk8.
     1.8  #
     1.9  # Report bugs to <build-dev@openjdk.java.net>.
    1.10  #
    1.11 @@ -91,7 +91,6 @@
    1.12  IFS=" ""	$as_nl"
    1.13  
    1.14  # Find who we are.  Look in the path if we contain no directory separator.
    1.15 -as_myself=
    1.16  case $0 in #((
    1.17    *[\\/]* ) as_myself=$0 ;;
    1.18    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    1.19 @@ -217,18 +216,11 @@
    1.20    # We cannot yet assume a decent shell, so we have to provide a
    1.21  	# neutralization value for shells without unset; and this also
    1.22  	# works around shells that cannot unset nonexistent variables.
    1.23 -	# Preserve -v and -x to the replacement shell.
    1.24  	BASH_ENV=/dev/null
    1.25  	ENV=/dev/null
    1.26  	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
    1.27  	export CONFIG_SHELL
    1.28 -	case $- in # ((((
    1.29 -	  *v*x* | *x*v* ) as_opts=-vx ;;
    1.30 -	  *v* ) as_opts=-v ;;
    1.31 -	  *x* ) as_opts=-x ;;
    1.32 -	  * ) as_opts= ;;
    1.33 -	esac
    1.34 -	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
    1.35 +	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
    1.36  fi
    1.37  
    1.38      if test x$as_have_required = xno; then :
    1.39 @@ -689,6 +681,7 @@
    1.40  SHARED_LIBRARY
    1.41  OBJ_SUFFIX
    1.42  COMPILER_NAME
    1.43 +TARGET_BITS_FLAG
    1.44  JT_HOME
    1.45  JTREGEXE
    1.46  LIPO
    1.47 @@ -1469,7 +1462,7 @@
    1.48      $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
    1.49      expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
    1.50        $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
    1.51 -    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
    1.52 +    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
    1.53      ;;
    1.54  
    1.55    esac
    1.56 @@ -1905,7 +1898,7 @@
    1.57  if $ac_init_version; then
    1.58    cat <<\_ACEOF
    1.59  OpenJDK configure jdk8
    1.60 -generated by GNU Autoconf 2.68
    1.61 +generated by GNU Autoconf 2.67
    1.62  
    1.63  Copyright (C) 2010 Free Software Foundation, Inc.
    1.64  This configure script is free software; the Free Software Foundation
    1.65 @@ -1951,7 +1944,7 @@
    1.66  
    1.67  	ac_retval=1
    1.68  fi
    1.69 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    1.70 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    1.71    as_fn_set_status $ac_retval
    1.72  
    1.73  } # ac_fn_c_try_compile
    1.74 @@ -1989,7 +1982,7 @@
    1.75  
    1.76  	ac_retval=1
    1.77  fi
    1.78 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    1.79 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    1.80    as_fn_set_status $ac_retval
    1.81  
    1.82  } # ac_fn_cxx_try_compile
    1.83 @@ -2027,7 +2020,7 @@
    1.84  
    1.85  	ac_retval=1
    1.86  fi
    1.87 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    1.88 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    1.89    as_fn_set_status $ac_retval
    1.90  
    1.91  } # ac_fn_objc_try_compile
    1.92 @@ -2064,7 +2057,7 @@
    1.93  
    1.94      ac_retval=1
    1.95  fi
    1.96 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    1.97 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    1.98    as_fn_set_status $ac_retval
    1.99  
   1.100  } # ac_fn_c_try_cpp
   1.101 @@ -2101,7 +2094,7 @@
   1.102  
   1.103      ac_retval=1
   1.104  fi
   1.105 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   1.106 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   1.107    as_fn_set_status $ac_retval
   1.108  
   1.109  } # ac_fn_cxx_try_cpp
   1.110 @@ -2114,10 +2107,10 @@
   1.111  ac_fn_cxx_check_header_mongrel ()
   1.112  {
   1.113    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   1.114 -  if eval \${$3+:} false; then :
   1.115 +  if eval "test \"\${$3+set}\"" = set; then :
   1.116    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   1.117  $as_echo_n "checking for $2... " >&6; }
   1.118 -if eval \${$3+:} false; then :
   1.119 +if eval "test \"\${$3+set}\"" = set; then :
   1.120    $as_echo_n "(cached) " >&6
   1.121  fi
   1.122  eval ac_res=\$$3
   1.123 @@ -2184,7 +2177,7 @@
   1.124  esac
   1.125    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   1.126  $as_echo_n "checking for $2... " >&6; }
   1.127 -if eval \${$3+:} false; then :
   1.128 +if eval "test \"\${$3+set}\"" = set; then :
   1.129    $as_echo_n "(cached) " >&6
   1.130  else
   1.131    eval "$3=\$ac_header_compiler"
   1.132 @@ -2193,7 +2186,7 @@
   1.133  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   1.134  $as_echo "$ac_res" >&6; }
   1.135  fi
   1.136 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   1.137 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   1.138  
   1.139  } # ac_fn_cxx_check_header_mongrel
   1.140  
   1.141 @@ -2234,7 +2227,7 @@
   1.142         ac_retval=$ac_status
   1.143  fi
   1.144    rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   1.145 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   1.146 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   1.147    as_fn_set_status $ac_retval
   1.148  
   1.149  } # ac_fn_cxx_try_run
   1.150 @@ -2248,7 +2241,7 @@
   1.151    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   1.152    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   1.153  $as_echo_n "checking for $2... " >&6; }
   1.154 -if eval \${$3+:} false; then :
   1.155 +if eval "test \"\${$3+set}\"" = set; then :
   1.156    $as_echo_n "(cached) " >&6
   1.157  else
   1.158    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   1.159 @@ -2266,7 +2259,7 @@
   1.160  eval ac_res=\$$3
   1.161  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   1.162  $as_echo "$ac_res" >&6; }
   1.163 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   1.164 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   1.165  
   1.166  } # ac_fn_cxx_check_header_compile
   1.167  
   1.168 @@ -2443,7 +2436,7 @@
   1.169  rm -f conftest.val
   1.170  
   1.171    fi
   1.172 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   1.173 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   1.174    as_fn_set_status $ac_retval
   1.175  
   1.176  } # ac_fn_cxx_compute_int
   1.177 @@ -2489,7 +2482,7 @@
   1.178    # interfere with the next link command; also delete a directory that is
   1.179    # left behind by Apple's compiler.  We do this before executing the actions.
   1.180    rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   1.181 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   1.182 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   1.183    as_fn_set_status $ac_retval
   1.184  
   1.185  } # ac_fn_cxx_try_link
   1.186 @@ -2502,7 +2495,7 @@
   1.187    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   1.188    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   1.189  $as_echo_n "checking for $2... " >&6; }
   1.190 -if eval \${$3+:} false; then :
   1.191 +if eval "test \"\${$3+set}\"" = set; then :
   1.192    $as_echo_n "(cached) " >&6
   1.193  else
   1.194    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   1.195 @@ -2557,7 +2550,7 @@
   1.196  eval ac_res=\$$3
   1.197  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   1.198  $as_echo "$ac_res" >&6; }
   1.199 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   1.200 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   1.201  
   1.202  } # ac_fn_cxx_check_func
   1.203  
   1.204 @@ -2570,7 +2563,7 @@
   1.205    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   1.206    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   1.207  $as_echo_n "checking for $2... " >&6; }
   1.208 -if eval \${$3+:} false; then :
   1.209 +if eval "test \"\${$3+set}\"" = set; then :
   1.210    $as_echo_n "(cached) " >&6
   1.211  else
   1.212    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   1.213 @@ -2588,7 +2581,7 @@
   1.214  eval ac_res=\$$3
   1.215  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   1.216  $as_echo "$ac_res" >&6; }
   1.217 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   1.218 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   1.219  
   1.220  } # ac_fn_c_check_header_compile
   1.221  cat >config.log <<_ACEOF
   1.222 @@ -2596,7 +2589,7 @@
   1.223  running configure, to aid debugging if configure makes a mistake.
   1.224  
   1.225  It was created by OpenJDK $as_me jdk8, which was
   1.226 -generated by GNU Autoconf 2.68.  Invocation command line was
   1.227 +generated by GNU Autoconf 2.67.  Invocation command line was
   1.228  
   1.229    $ $0 $@
   1.230  
   1.231 @@ -2854,7 +2847,7 @@
   1.232        || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
   1.233  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   1.234  as_fn_error $? "failed to load site script $ac_site_file
   1.235 -See \`config.log' for more details" "$LINENO" 5; }
   1.236 +See \`config.log' for more details" "$LINENO" 5 ; }
   1.237    fi
   1.238  done
   1.239  
   1.240 @@ -3794,7 +3787,7 @@
   1.241  #CUSTOM_AUTOCONF_INCLUDE
   1.242  
   1.243  # Do not change or remove the following line, it is needed for consistency checks:
   1.244 -DATE_WHEN_GENERATED=1373384053
   1.245 +DATE_WHEN_GENERATED=1376579640
   1.246  
   1.247  ###############################################################################
   1.248  #
   1.249 @@ -3832,7 +3825,7 @@
   1.250  set dummy $ac_prog; ac_word=$2
   1.251  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.252  $as_echo_n "checking for $ac_word... " >&6; }
   1.253 -if ${ac_cv_path_BASENAME+:} false; then :
   1.254 +if test "${ac_cv_path_BASENAME+set}" = set; then :
   1.255    $as_echo_n "(cached) " >&6
   1.256  else
   1.257    case $BASENAME in
   1.258 @@ -3891,7 +3884,7 @@
   1.259  set dummy $ac_prog; ac_word=$2
   1.260  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.261  $as_echo_n "checking for $ac_word... " >&6; }
   1.262 -if ${ac_cv_path_BASH+:} false; then :
   1.263 +if test "${ac_cv_path_BASH+set}" = set; then :
   1.264    $as_echo_n "(cached) " >&6
   1.265  else
   1.266    case $BASH in
   1.267 @@ -3950,7 +3943,7 @@
   1.268  set dummy $ac_prog; ac_word=$2
   1.269  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.270  $as_echo_n "checking for $ac_word... " >&6; }
   1.271 -if ${ac_cv_path_CAT+:} false; then :
   1.272 +if test "${ac_cv_path_CAT+set}" = set; then :
   1.273    $as_echo_n "(cached) " >&6
   1.274  else
   1.275    case $CAT in
   1.276 @@ -4009,7 +4002,7 @@
   1.277  set dummy $ac_prog; ac_word=$2
   1.278  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.279  $as_echo_n "checking for $ac_word... " >&6; }
   1.280 -if ${ac_cv_path_CHMOD+:} false; then :
   1.281 +if test "${ac_cv_path_CHMOD+set}" = set; then :
   1.282    $as_echo_n "(cached) " >&6
   1.283  else
   1.284    case $CHMOD in
   1.285 @@ -4068,7 +4061,7 @@
   1.286  set dummy $ac_prog; ac_word=$2
   1.287  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.288  $as_echo_n "checking for $ac_word... " >&6; }
   1.289 -if ${ac_cv_path_CMP+:} false; then :
   1.290 +if test "${ac_cv_path_CMP+set}" = set; then :
   1.291    $as_echo_n "(cached) " >&6
   1.292  else
   1.293    case $CMP in
   1.294 @@ -4127,7 +4120,7 @@
   1.295  set dummy $ac_prog; ac_word=$2
   1.296  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.297  $as_echo_n "checking for $ac_word... " >&6; }
   1.298 -if ${ac_cv_path_COMM+:} false; then :
   1.299 +if test "${ac_cv_path_COMM+set}" = set; then :
   1.300    $as_echo_n "(cached) " >&6
   1.301  else
   1.302    case $COMM in
   1.303 @@ -4186,7 +4179,7 @@
   1.304  set dummy $ac_prog; ac_word=$2
   1.305  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.306  $as_echo_n "checking for $ac_word... " >&6; }
   1.307 -if ${ac_cv_path_CP+:} false; then :
   1.308 +if test "${ac_cv_path_CP+set}" = set; then :
   1.309    $as_echo_n "(cached) " >&6
   1.310  else
   1.311    case $CP in
   1.312 @@ -4245,7 +4238,7 @@
   1.313  set dummy $ac_prog; ac_word=$2
   1.314  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.315  $as_echo_n "checking for $ac_word... " >&6; }
   1.316 -if ${ac_cv_path_CPIO+:} false; then :
   1.317 +if test "${ac_cv_path_CPIO+set}" = set; then :
   1.318    $as_echo_n "(cached) " >&6
   1.319  else
   1.320    case $CPIO in
   1.321 @@ -4304,7 +4297,7 @@
   1.322  set dummy $ac_prog; ac_word=$2
   1.323  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.324  $as_echo_n "checking for $ac_word... " >&6; }
   1.325 -if ${ac_cv_path_CUT+:} false; then :
   1.326 +if test "${ac_cv_path_CUT+set}" = set; then :
   1.327    $as_echo_n "(cached) " >&6
   1.328  else
   1.329    case $CUT in
   1.330 @@ -4363,7 +4356,7 @@
   1.331  set dummy $ac_prog; ac_word=$2
   1.332  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.333  $as_echo_n "checking for $ac_word... " >&6; }
   1.334 -if ${ac_cv_path_DATE+:} false; then :
   1.335 +if test "${ac_cv_path_DATE+set}" = set; then :
   1.336    $as_echo_n "(cached) " >&6
   1.337  else
   1.338    case $DATE in
   1.339 @@ -4422,7 +4415,7 @@
   1.340  set dummy $ac_prog; ac_word=$2
   1.341  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.342  $as_echo_n "checking for $ac_word... " >&6; }
   1.343 -if ${ac_cv_path_DIFF+:} false; then :
   1.344 +if test "${ac_cv_path_DIFF+set}" = set; then :
   1.345    $as_echo_n "(cached) " >&6
   1.346  else
   1.347    case $DIFF in
   1.348 @@ -4481,7 +4474,7 @@
   1.349  set dummy $ac_prog; ac_word=$2
   1.350  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.351  $as_echo_n "checking for $ac_word... " >&6; }
   1.352 -if ${ac_cv_path_DIRNAME+:} false; then :
   1.353 +if test "${ac_cv_path_DIRNAME+set}" = set; then :
   1.354    $as_echo_n "(cached) " >&6
   1.355  else
   1.356    case $DIRNAME in
   1.357 @@ -4540,7 +4533,7 @@
   1.358  set dummy $ac_prog; ac_word=$2
   1.359  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.360  $as_echo_n "checking for $ac_word... " >&6; }
   1.361 -if ${ac_cv_path_ECHO+:} false; then :
   1.362 +if test "${ac_cv_path_ECHO+set}" = set; then :
   1.363    $as_echo_n "(cached) " >&6
   1.364  else
   1.365    case $ECHO in
   1.366 @@ -4599,7 +4592,7 @@
   1.367  set dummy $ac_prog; ac_word=$2
   1.368  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.369  $as_echo_n "checking for $ac_word... " >&6; }
   1.370 -if ${ac_cv_path_EXPR+:} false; then :
   1.371 +if test "${ac_cv_path_EXPR+set}" = set; then :
   1.372    $as_echo_n "(cached) " >&6
   1.373  else
   1.374    case $EXPR in
   1.375 @@ -4658,7 +4651,7 @@
   1.376  set dummy $ac_prog; ac_word=$2
   1.377  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.378  $as_echo_n "checking for $ac_word... " >&6; }
   1.379 -if ${ac_cv_path_FILE+:} false; then :
   1.380 +if test "${ac_cv_path_FILE+set}" = set; then :
   1.381    $as_echo_n "(cached) " >&6
   1.382  else
   1.383    case $FILE in
   1.384 @@ -4717,7 +4710,7 @@
   1.385  set dummy $ac_prog; ac_word=$2
   1.386  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.387  $as_echo_n "checking for $ac_word... " >&6; }
   1.388 -if ${ac_cv_path_FIND+:} false; then :
   1.389 +if test "${ac_cv_path_FIND+set}" = set; then :
   1.390    $as_echo_n "(cached) " >&6
   1.391  else
   1.392    case $FIND in
   1.393 @@ -4776,7 +4769,7 @@
   1.394  set dummy $ac_prog; ac_word=$2
   1.395  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.396  $as_echo_n "checking for $ac_word... " >&6; }
   1.397 -if ${ac_cv_path_HEAD+:} false; then :
   1.398 +if test "${ac_cv_path_HEAD+set}" = set; then :
   1.399    $as_echo_n "(cached) " >&6
   1.400  else
   1.401    case $HEAD in
   1.402 @@ -4835,7 +4828,7 @@
   1.403  set dummy $ac_prog; ac_word=$2
   1.404  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.405  $as_echo_n "checking for $ac_word... " >&6; }
   1.406 -if ${ac_cv_path_LN+:} false; then :
   1.407 +if test "${ac_cv_path_LN+set}" = set; then :
   1.408    $as_echo_n "(cached) " >&6
   1.409  else
   1.410    case $LN in
   1.411 @@ -4894,7 +4887,7 @@
   1.412  set dummy $ac_prog; ac_word=$2
   1.413  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.414  $as_echo_n "checking for $ac_word... " >&6; }
   1.415 -if ${ac_cv_path_LS+:} false; then :
   1.416 +if test "${ac_cv_path_LS+set}" = set; then :
   1.417    $as_echo_n "(cached) " >&6
   1.418  else
   1.419    case $LS in
   1.420 @@ -4953,7 +4946,7 @@
   1.421  set dummy $ac_prog; ac_word=$2
   1.422  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.423  $as_echo_n "checking for $ac_word... " >&6; }
   1.424 -if ${ac_cv_path_MKDIR+:} false; then :
   1.425 +if test "${ac_cv_path_MKDIR+set}" = set; then :
   1.426    $as_echo_n "(cached) " >&6
   1.427  else
   1.428    case $MKDIR in
   1.429 @@ -5012,7 +5005,7 @@
   1.430  set dummy $ac_prog; ac_word=$2
   1.431  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.432  $as_echo_n "checking for $ac_word... " >&6; }
   1.433 -if ${ac_cv_path_MKTEMP+:} false; then :
   1.434 +if test "${ac_cv_path_MKTEMP+set}" = set; then :
   1.435    $as_echo_n "(cached) " >&6
   1.436  else
   1.437    case $MKTEMP in
   1.438 @@ -5071,7 +5064,7 @@
   1.439  set dummy $ac_prog; ac_word=$2
   1.440  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.441  $as_echo_n "checking for $ac_word... " >&6; }
   1.442 -if ${ac_cv_path_MV+:} false; then :
   1.443 +if test "${ac_cv_path_MV+set}" = set; then :
   1.444    $as_echo_n "(cached) " >&6
   1.445  else
   1.446    case $MV in
   1.447 @@ -5130,7 +5123,7 @@
   1.448  set dummy $ac_prog; ac_word=$2
   1.449  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.450  $as_echo_n "checking for $ac_word... " >&6; }
   1.451 -if ${ac_cv_path_PRINTF+:} false; then :
   1.452 +if test "${ac_cv_path_PRINTF+set}" = set; then :
   1.453    $as_echo_n "(cached) " >&6
   1.454  else
   1.455    case $PRINTF in
   1.456 @@ -5189,7 +5182,7 @@
   1.457  set dummy $ac_prog; ac_word=$2
   1.458  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.459  $as_echo_n "checking for $ac_word... " >&6; }
   1.460 -if ${ac_cv_path_RM+:} false; then :
   1.461 +if test "${ac_cv_path_RM+set}" = set; then :
   1.462    $as_echo_n "(cached) " >&6
   1.463  else
   1.464    case $RM in
   1.465 @@ -5248,7 +5241,7 @@
   1.466  set dummy $ac_prog; ac_word=$2
   1.467  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.468  $as_echo_n "checking for $ac_word... " >&6; }
   1.469 -if ${ac_cv_path_SH+:} false; then :
   1.470 +if test "${ac_cv_path_SH+set}" = set; then :
   1.471    $as_echo_n "(cached) " >&6
   1.472  else
   1.473    case $SH in
   1.474 @@ -5307,7 +5300,7 @@
   1.475  set dummy $ac_prog; ac_word=$2
   1.476  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.477  $as_echo_n "checking for $ac_word... " >&6; }
   1.478 -if ${ac_cv_path_SORT+:} false; then :
   1.479 +if test "${ac_cv_path_SORT+set}" = set; then :
   1.480    $as_echo_n "(cached) " >&6
   1.481  else
   1.482    case $SORT in
   1.483 @@ -5366,7 +5359,7 @@
   1.484  set dummy $ac_prog; ac_word=$2
   1.485  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.486  $as_echo_n "checking for $ac_word... " >&6; }
   1.487 -if ${ac_cv_path_TAIL+:} false; then :
   1.488 +if test "${ac_cv_path_TAIL+set}" = set; then :
   1.489    $as_echo_n "(cached) " >&6
   1.490  else
   1.491    case $TAIL in
   1.492 @@ -5425,7 +5418,7 @@
   1.493  set dummy $ac_prog; ac_word=$2
   1.494  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.495  $as_echo_n "checking for $ac_word... " >&6; }
   1.496 -if ${ac_cv_path_TAR+:} false; then :
   1.497 +if test "${ac_cv_path_TAR+set}" = set; then :
   1.498    $as_echo_n "(cached) " >&6
   1.499  else
   1.500    case $TAR in
   1.501 @@ -5484,7 +5477,7 @@
   1.502  set dummy $ac_prog; ac_word=$2
   1.503  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.504  $as_echo_n "checking for $ac_word... " >&6; }
   1.505 -if ${ac_cv_path_TEE+:} false; then :
   1.506 +if test "${ac_cv_path_TEE+set}" = set; then :
   1.507    $as_echo_n "(cached) " >&6
   1.508  else
   1.509    case $TEE in
   1.510 @@ -5543,7 +5536,7 @@
   1.511  set dummy $ac_prog; ac_word=$2
   1.512  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.513  $as_echo_n "checking for $ac_word... " >&6; }
   1.514 -if ${ac_cv_path_TOUCH+:} false; then :
   1.515 +if test "${ac_cv_path_TOUCH+set}" = set; then :
   1.516    $as_echo_n "(cached) " >&6
   1.517  else
   1.518    case $TOUCH in
   1.519 @@ -5602,7 +5595,7 @@
   1.520  set dummy $ac_prog; ac_word=$2
   1.521  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.522  $as_echo_n "checking for $ac_word... " >&6; }
   1.523 -if ${ac_cv_path_TR+:} false; then :
   1.524 +if test "${ac_cv_path_TR+set}" = set; then :
   1.525    $as_echo_n "(cached) " >&6
   1.526  else
   1.527    case $TR in
   1.528 @@ -5661,7 +5654,7 @@
   1.529  set dummy $ac_prog; ac_word=$2
   1.530  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.531  $as_echo_n "checking for $ac_word... " >&6; }
   1.532 -if ${ac_cv_path_UNAME+:} false; then :
   1.533 +if test "${ac_cv_path_UNAME+set}" = set; then :
   1.534    $as_echo_n "(cached) " >&6
   1.535  else
   1.536    case $UNAME in
   1.537 @@ -5720,7 +5713,7 @@
   1.538  set dummy $ac_prog; ac_word=$2
   1.539  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.540  $as_echo_n "checking for $ac_word... " >&6; }
   1.541 -if ${ac_cv_path_UNIQ+:} false; then :
   1.542 +if test "${ac_cv_path_UNIQ+set}" = set; then :
   1.543    $as_echo_n "(cached) " >&6
   1.544  else
   1.545    case $UNIQ in
   1.546 @@ -5779,7 +5772,7 @@
   1.547  set dummy $ac_prog; ac_word=$2
   1.548  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.549  $as_echo_n "checking for $ac_word... " >&6; }
   1.550 -if ${ac_cv_path_WC+:} false; then :
   1.551 +if test "${ac_cv_path_WC+set}" = set; then :
   1.552    $as_echo_n "(cached) " >&6
   1.553  else
   1.554    case $WC in
   1.555 @@ -5838,7 +5831,7 @@
   1.556  set dummy $ac_prog; ac_word=$2
   1.557  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.558  $as_echo_n "checking for $ac_word... " >&6; }
   1.559 -if ${ac_cv_path_WHICH+:} false; then :
   1.560 +if test "${ac_cv_path_WHICH+set}" = set; then :
   1.561    $as_echo_n "(cached) " >&6
   1.562  else
   1.563    case $WHICH in
   1.564 @@ -5897,7 +5890,7 @@
   1.565  set dummy $ac_prog; ac_word=$2
   1.566  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.567  $as_echo_n "checking for $ac_word... " >&6; }
   1.568 -if ${ac_cv_path_XARGS+:} false; then :
   1.569 +if test "${ac_cv_path_XARGS+set}" = set; then :
   1.570    $as_echo_n "(cached) " >&6
   1.571  else
   1.572    case $XARGS in
   1.573 @@ -5957,7 +5950,7 @@
   1.574  set dummy $ac_prog; ac_word=$2
   1.575  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.576  $as_echo_n "checking for $ac_word... " >&6; }
   1.577 -if ${ac_cv_prog_AWK+:} false; then :
   1.578 +if test "${ac_cv_prog_AWK+set}" = set; then :
   1.579    $as_echo_n "(cached) " >&6
   1.580  else
   1.581    if test -n "$AWK"; then
   1.582 @@ -6007,7 +6000,7 @@
   1.583  
   1.584  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
   1.585  $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
   1.586 -if ${ac_cv_path_GREP+:} false; then :
   1.587 +if test "${ac_cv_path_GREP+set}" = set; then :
   1.588    $as_echo_n "(cached) " >&6
   1.589  else
   1.590    if test -z "$GREP"; then
   1.591 @@ -6082,7 +6075,7 @@
   1.592  
   1.593  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
   1.594  $as_echo_n "checking for egrep... " >&6; }
   1.595 -if ${ac_cv_path_EGREP+:} false; then :
   1.596 +if test "${ac_cv_path_EGREP+set}" = set; then :
   1.597    $as_echo_n "(cached) " >&6
   1.598  else
   1.599    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
   1.600 @@ -6161,7 +6154,7 @@
   1.601  
   1.602  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
   1.603  $as_echo_n "checking for fgrep... " >&6; }
   1.604 -if ${ac_cv_path_FGREP+:} false; then :
   1.605 +if test "${ac_cv_path_FGREP+set}" = set; then :
   1.606    $as_echo_n "(cached) " >&6
   1.607  else
   1.608    if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
   1.609 @@ -6240,7 +6233,7 @@
   1.610  
   1.611  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
   1.612  $as_echo_n "checking for a sed that does not truncate output... " >&6; }
   1.613 -if ${ac_cv_path_SED+:} false; then :
   1.614 +if test "${ac_cv_path_SED+set}" = set; then :
   1.615    $as_echo_n "(cached) " >&6
   1.616  else
   1.617              ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
   1.618 @@ -6326,7 +6319,7 @@
   1.619  set dummy $ac_prog; ac_word=$2
   1.620  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.621  $as_echo_n "checking for $ac_word... " >&6; }
   1.622 -if ${ac_cv_path_NAWK+:} false; then :
   1.623 +if test "${ac_cv_path_NAWK+set}" = set; then :
   1.624    $as_echo_n "(cached) " >&6
   1.625  else
   1.626    case $NAWK in
   1.627 @@ -6390,7 +6383,7 @@
   1.628  set dummy cygpath; ac_word=$2
   1.629  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.630  $as_echo_n "checking for $ac_word... " >&6; }
   1.631 -if ${ac_cv_path_CYGPATH+:} false; then :
   1.632 +if test "${ac_cv_path_CYGPATH+set}" = set; then :
   1.633    $as_echo_n "(cached) " >&6
   1.634  else
   1.635    case $CYGPATH in
   1.636 @@ -6430,7 +6423,7 @@
   1.637  set dummy readlink; ac_word=$2
   1.638  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.639  $as_echo_n "checking for $ac_word... " >&6; }
   1.640 -if ${ac_cv_path_READLINK+:} false; then :
   1.641 +if test "${ac_cv_path_READLINK+set}" = set; then :
   1.642    $as_echo_n "(cached) " >&6
   1.643  else
   1.644    case $READLINK in
   1.645 @@ -6470,7 +6463,7 @@
   1.646  set dummy df; ac_word=$2
   1.647  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.648  $as_echo_n "checking for $ac_word... " >&6; }
   1.649 -if ${ac_cv_path_DF+:} false; then :
   1.650 +if test "${ac_cv_path_DF+set}" = set; then :
   1.651    $as_echo_n "(cached) " >&6
   1.652  else
   1.653    case $DF in
   1.654 @@ -6510,7 +6503,7 @@
   1.655  set dummy SetFile; ac_word=$2
   1.656  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.657  $as_echo_n "checking for $ac_word... " >&6; }
   1.658 -if ${ac_cv_path_SETFILE+:} false; then :
   1.659 +if test "${ac_cv_path_SETFILE+set}" = set; then :
   1.660    $as_echo_n "(cached) " >&6
   1.661  else
   1.662    case $SETFILE in
   1.663 @@ -6556,7 +6549,7 @@
   1.664  
   1.665  { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
   1.666  $as_echo_n "checking build system type... " >&6; }
   1.667 -if ${ac_cv_build+:} false; then :
   1.668 +if test "${ac_cv_build+set}" = set; then :
   1.669    $as_echo_n "(cached) " >&6
   1.670  else
   1.671    ac_build_alias=$build_alias
   1.672 @@ -6572,7 +6565,7 @@
   1.673  $as_echo "$ac_cv_build" >&6; }
   1.674  case $ac_cv_build in
   1.675  *-*-*) ;;
   1.676 -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
   1.677 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
   1.678  esac
   1.679  build=$ac_cv_build
   1.680  ac_save_IFS=$IFS; IFS='-'
   1.681 @@ -6590,7 +6583,7 @@
   1.682  
   1.683  { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
   1.684  $as_echo_n "checking host system type... " >&6; }
   1.685 -if ${ac_cv_host+:} false; then :
   1.686 +if test "${ac_cv_host+set}" = set; then :
   1.687    $as_echo_n "(cached) " >&6
   1.688  else
   1.689    if test "x$host_alias" = x; then
   1.690 @@ -6605,7 +6598,7 @@
   1.691  $as_echo "$ac_cv_host" >&6; }
   1.692  case $ac_cv_host in
   1.693  *-*-*) ;;
   1.694 -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
   1.695 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
   1.696  esac
   1.697  host=$ac_cv_host
   1.698  ac_save_IFS=$IFS; IFS='-'
   1.699 @@ -6623,7 +6616,7 @@
   1.700  
   1.701  { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
   1.702  $as_echo_n "checking target system type... " >&6; }
   1.703 -if ${ac_cv_target+:} false; then :
   1.704 +if test "${ac_cv_target+set}" = set; then :
   1.705    $as_echo_n "(cached) " >&6
   1.706  else
   1.707    if test "x$target_alias" = x; then
   1.708 @@ -6638,7 +6631,7 @@
   1.709  $as_echo "$ac_cv_target" >&6; }
   1.710  case $ac_cv_target in
   1.711  *-*-*) ;;
   1.712 -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
   1.713 +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
   1.714  esac
   1.715  target=$ac_cv_target
   1.716  ac_save_IFS=$IFS; IFS='-'
   1.717 @@ -8164,7 +8157,7 @@
   1.718  set dummy $ac_prog; ac_word=$2
   1.719  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.720  $as_echo_n "checking for $ac_word... " >&6; }
   1.721 -if ${ac_cv_prog_PKGHANDLER+:} false; then :
   1.722 +if test "${ac_cv_prog_PKGHANDLER+set}" = set; then :
   1.723    $as_echo_n "(cached) " >&6
   1.724  else
   1.725    if test -n "$PKGHANDLER"; then
   1.726 @@ -8529,7 +8522,7 @@
   1.727  set dummy $ac_prog; ac_word=$2
   1.728  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.729  $as_echo_n "checking for $ac_word... " >&6; }
   1.730 -if ${ac_cv_path_CHECK_GMAKE+:} false; then :
   1.731 +if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then :
   1.732    $as_echo_n "(cached) " >&6
   1.733  else
   1.734    case $CHECK_GMAKE in
   1.735 @@ -8883,7 +8876,7 @@
   1.736  set dummy $ac_prog; ac_word=$2
   1.737  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.738  $as_echo_n "checking for $ac_word... " >&6; }
   1.739 -if ${ac_cv_path_CHECK_MAKE+:} false; then :
   1.740 +if test "${ac_cv_path_CHECK_MAKE+set}" = set; then :
   1.741    $as_echo_n "(cached) " >&6
   1.742  else
   1.743    case $CHECK_MAKE in
   1.744 @@ -9242,7 +9235,7 @@
   1.745  set dummy $ac_prog; ac_word=$2
   1.746  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.747  $as_echo_n "checking for $ac_word... " >&6; }
   1.748 -if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then :
   1.749 +if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then :
   1.750    $as_echo_n "(cached) " >&6
   1.751  else
   1.752    case $CHECK_TOOLSDIR_GMAKE in
   1.753 @@ -9595,7 +9588,7 @@
   1.754  set dummy $ac_prog; ac_word=$2
   1.755  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.756  $as_echo_n "checking for $ac_word... " >&6; }
   1.757 -if ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then :
   1.758 +if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then :
   1.759    $as_echo_n "(cached) " >&6
   1.760  else
   1.761    case $CHECK_TOOLSDIR_MAKE in
   1.762 @@ -9991,7 +9984,7 @@
   1.763  set dummy $ac_prog; ac_word=$2
   1.764  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.765  $as_echo_n "checking for $ac_word... " >&6; }
   1.766 -if ${ac_cv_path_UNZIP+:} false; then :
   1.767 +if test "${ac_cv_path_UNZIP+set}" = set; then :
   1.768    $as_echo_n "(cached) " >&6
   1.769  else
   1.770    case $UNZIP in
   1.771 @@ -10050,7 +10043,7 @@
   1.772  set dummy $ac_prog; ac_word=$2
   1.773  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.774  $as_echo_n "checking for $ac_word... " >&6; }
   1.775 -if ${ac_cv_path_ZIP+:} false; then :
   1.776 +if test "${ac_cv_path_ZIP+set}" = set; then :
   1.777    $as_echo_n "(cached) " >&6
   1.778  else
   1.779    case $ZIP in
   1.780 @@ -10109,7 +10102,7 @@
   1.781  set dummy ldd; ac_word=$2
   1.782  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.783  $as_echo_n "checking for $ac_word... " >&6; }
   1.784 -if ${ac_cv_path_LDD+:} false; then :
   1.785 +if test "${ac_cv_path_LDD+set}" = set; then :
   1.786    $as_echo_n "(cached) " >&6
   1.787  else
   1.788    case $LDD in
   1.789 @@ -10155,7 +10148,7 @@
   1.790  set dummy otool; ac_word=$2
   1.791  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.792  $as_echo_n "checking for $ac_word... " >&6; }
   1.793 -if ${ac_cv_path_OTOOL+:} false; then :
   1.794 +if test "${ac_cv_path_OTOOL+set}" = set; then :
   1.795    $as_echo_n "(cached) " >&6
   1.796  else
   1.797    case $OTOOL in
   1.798 @@ -10200,7 +10193,7 @@
   1.799  set dummy $ac_prog; ac_word=$2
   1.800  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.801  $as_echo_n "checking for $ac_word... " >&6; }
   1.802 -if ${ac_cv_path_READELF+:} false; then :
   1.803 +if test "${ac_cv_path_READELF+set}" = set; then :
   1.804    $as_echo_n "(cached) " >&6
   1.805  else
   1.806    case $READELF in
   1.807 @@ -10243,7 +10236,7 @@
   1.808  set dummy hg; ac_word=$2
   1.809  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.810  $as_echo_n "checking for $ac_word... " >&6; }
   1.811 -if ${ac_cv_path_HG+:} false; then :
   1.812 +if test "${ac_cv_path_HG+set}" = set; then :
   1.813    $as_echo_n "(cached) " >&6
   1.814  else
   1.815    case $HG in
   1.816 @@ -10283,7 +10276,7 @@
   1.817  set dummy stat; ac_word=$2
   1.818  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.819  $as_echo_n "checking for $ac_word... " >&6; }
   1.820 -if ${ac_cv_path_STAT+:} false; then :
   1.821 +if test "${ac_cv_path_STAT+set}" = set; then :
   1.822    $as_echo_n "(cached) " >&6
   1.823  else
   1.824    case $STAT in
   1.825 @@ -10323,7 +10316,7 @@
   1.826  set dummy time; ac_word=$2
   1.827  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.828  $as_echo_n "checking for $ac_word... " >&6; }
   1.829 -if ${ac_cv_path_TIME+:} false; then :
   1.830 +if test "${ac_cv_path_TIME+set}" = set; then :
   1.831    $as_echo_n "(cached) " >&6
   1.832  else
   1.833    case $TIME in
   1.834 @@ -10376,7 +10369,7 @@
   1.835  set dummy $ac_prog; ac_word=$2
   1.836  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.837  $as_echo_n "checking for $ac_word... " >&6; }
   1.838 -if ${ac_cv_path_COMM+:} false; then :
   1.839 +if test "${ac_cv_path_COMM+set}" = set; then :
   1.840    $as_echo_n "(cached) " >&6
   1.841  else
   1.842    case $COMM in
   1.843 @@ -10438,7 +10431,7 @@
   1.844  set dummy $ac_prog; ac_word=$2
   1.845  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.846  $as_echo_n "checking for $ac_word... " >&6; }
   1.847 -if ${ac_cv_path_XATTR+:} false; then :
   1.848 +if test "${ac_cv_path_XATTR+set}" = set; then :
   1.849    $as_echo_n "(cached) " >&6
   1.850  else
   1.851    case $XATTR in
   1.852 @@ -10494,7 +10487,7 @@
   1.853  set dummy codesign; ac_word=$2
   1.854  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.855  $as_echo_n "checking for $ac_word... " >&6; }
   1.856 -if ${ac_cv_path_CODESIGN+:} false; then :
   1.857 +if test "${ac_cv_path_CODESIGN+set}" = set; then :
   1.858    $as_echo_n "(cached) " >&6
   1.859  else
   1.860    case $CODESIGN in
   1.861 @@ -10558,7 +10551,7 @@
   1.862  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
   1.863  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.864  $as_echo_n "checking for $ac_word... " >&6; }
   1.865 -if ${ac_cv_path_PKG_CONFIG+:} false; then :
   1.866 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
   1.867    $as_echo_n "(cached) " >&6
   1.868  else
   1.869    case $PKG_CONFIG in
   1.870 @@ -10601,7 +10594,7 @@
   1.871  set dummy pkg-config; ac_word=$2
   1.872  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.873  $as_echo_n "checking for $ac_word... " >&6; }
   1.874 -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
   1.875 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
   1.876    $as_echo_n "(cached) " >&6
   1.877  else
   1.878    case $ac_pt_PKG_CONFIG in
   1.879 @@ -10774,7 +10767,7 @@
   1.880  set dummy $ac_prog; ac_word=$2
   1.881  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.882  $as_echo_n "checking for $ac_word... " >&6; }
   1.883 -if ${ac_cv_prog_BDEPS_UNZIP+:} false; then :
   1.884 +if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then :
   1.885    $as_echo_n "(cached) " >&6
   1.886  else
   1.887    if test -n "$BDEPS_UNZIP"; then
   1.888 @@ -10820,7 +10813,7 @@
   1.889  set dummy $ac_prog; ac_word=$2
   1.890  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.891  $as_echo_n "checking for $ac_word... " >&6; }
   1.892 -if ${ac_cv_prog_BDEPS_FTP+:} false; then :
   1.893 +if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then :
   1.894    $as_echo_n "(cached) " >&6
   1.895  else
   1.896    if test -n "$BDEPS_FTP"; then
   1.897 @@ -12116,7 +12109,7 @@
   1.898  set dummy javac; ac_word=$2
   1.899  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.900  $as_echo_n "checking for $ac_word... " >&6; }
   1.901 -if ${ac_cv_path_JAVAC_CHECK+:} false; then :
   1.902 +if test "${ac_cv_path_JAVAC_CHECK+set}" = set; then :
   1.903    $as_echo_n "(cached) " >&6
   1.904  else
   1.905    case $JAVAC_CHECK in
   1.906 @@ -12156,7 +12149,7 @@
   1.907  set dummy java; ac_word=$2
   1.908  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.909  $as_echo_n "checking for $ac_word... " >&6; }
   1.910 -if ${ac_cv_path_JAVA_CHECK+:} false; then :
   1.911 +if test "${ac_cv_path_JAVA_CHECK+set}" = set; then :
   1.912    $as_echo_n "(cached) " >&6
   1.913  else
   1.914    case $JAVA_CHECK in
   1.915 @@ -16485,7 +16478,7 @@
   1.916  set dummy $ac_prog; ac_word=$2
   1.917  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.918  $as_echo_n "checking for $ac_word... " >&6; }
   1.919 -if ${ac_cv_path_JTREGEXE+:} false; then :
   1.920 +if test "${ac_cv_path_JTREGEXE+set}" = set; then :
   1.921    $as_echo_n "(cached) " >&6
   1.922  else
   1.923    case $JTREGEXE in
   1.924 @@ -16553,7 +16546,7 @@
   1.925  set dummy link; ac_word=$2
   1.926  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.927  $as_echo_n "checking for $ac_word... " >&6; }
   1.928 -if ${ac_cv_path_CYGWIN_LINK+:} false; then :
   1.929 +if test "${ac_cv_path_CYGWIN_LINK+set}" = set; then :
   1.930    $as_echo_n "(cached) " >&6
   1.931  else
   1.932    case $CYGWIN_LINK in
   1.933 @@ -17996,7 +17989,7 @@
   1.934  set dummy $ac_prog; ac_word=$2
   1.935  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.936  $as_echo_n "checking for $ac_word... " >&6; }
   1.937 -if ${ac_cv_path_BUILD_CC+:} false; then :
   1.938 +if test "${ac_cv_path_BUILD_CC+set}" = set; then :
   1.939    $as_echo_n "(cached) " >&6
   1.940  else
   1.941    case $BUILD_CC in
   1.942 @@ -18307,7 +18300,7 @@
   1.943  set dummy $ac_prog; ac_word=$2
   1.944  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.945  $as_echo_n "checking for $ac_word... " >&6; }
   1.946 -if ${ac_cv_path_BUILD_CXX+:} false; then :
   1.947 +if test "${ac_cv_path_BUILD_CXX+set}" = set; then :
   1.948    $as_echo_n "(cached) " >&6
   1.949  else
   1.950    case $BUILD_CXX in
   1.951 @@ -18616,7 +18609,7 @@
   1.952  set dummy ld; ac_word=$2
   1.953  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.954  $as_echo_n "checking for $ac_word... " >&6; }
   1.955 -if ${ac_cv_path_BUILD_LD+:} false; then :
   1.956 +if test "${ac_cv_path_BUILD_LD+set}" = set; then :
   1.957    $as_echo_n "(cached) " >&6
   1.958  else
   1.959    case $BUILD_LD in
   1.960 @@ -19123,7 +19116,7 @@
   1.961  set dummy $ac_prog; ac_word=$2
   1.962  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.963  $as_echo_n "checking for $ac_word... " >&6; }
   1.964 -if ${ac_cv_path_TOOLS_DIR_CC+:} false; then :
   1.965 +if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then :
   1.966    $as_echo_n "(cached) " >&6
   1.967  else
   1.968    case $TOOLS_DIR_CC in
   1.969 @@ -19175,7 +19168,7 @@
   1.970  set dummy $ac_prog; ac_word=$2
   1.971  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.972  $as_echo_n "checking for $ac_word... " >&6; }
   1.973 -if ${ac_cv_path_POTENTIAL_CC+:} false; then :
   1.974 +if test "${ac_cv_path_POTENTIAL_CC+set}" = set; then :
   1.975    $as_echo_n "(cached) " >&6
   1.976  else
   1.977    case $POTENTIAL_CC in
   1.978 @@ -19588,7 +19581,7 @@
   1.979  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
   1.980  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.981  $as_echo_n "checking for $ac_word... " >&6; }
   1.982 -if ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then :
   1.983 +if test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then :
   1.984    $as_echo_n "(cached) " >&6
   1.985  else
   1.986    if test -n "$PROPER_COMPILER_CC"; then
   1.987 @@ -19632,7 +19625,7 @@
   1.988  set dummy $ac_prog; ac_word=$2
   1.989  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.990  $as_echo_n "checking for $ac_word... " >&6; }
   1.991 -if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then :
   1.992 +if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then :
   1.993    $as_echo_n "(cached) " >&6
   1.994  else
   1.995    if test -n "$ac_ct_PROPER_COMPILER_CC"; then
   1.996 @@ -20082,7 +20075,7 @@
   1.997  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
   1.998  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.999  $as_echo_n "checking for $ac_word... " >&6; }
  1.1000 -if ${ac_cv_prog_CC+:} false; then :
  1.1001 +if test "${ac_cv_prog_CC+set}" = set; then :
  1.1002    $as_echo_n "(cached) " >&6
  1.1003  else
  1.1004    if test -n "$CC"; then
  1.1005 @@ -20126,7 +20119,7 @@
  1.1006  set dummy $ac_prog; ac_word=$2
  1.1007  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1008  $as_echo_n "checking for $ac_word... " >&6; }
  1.1009 -if ${ac_cv_prog_ac_ct_CC+:} false; then :
  1.1010 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
  1.1011    $as_echo_n "(cached) " >&6
  1.1012  else
  1.1013    if test -n "$ac_ct_CC"; then
  1.1014 @@ -20179,7 +20172,7 @@
  1.1015  test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.1016  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.1017  as_fn_error $? "no acceptable C compiler found in \$PATH
  1.1018 -See \`config.log' for more details" "$LINENO" 5; }
  1.1019 +See \`config.log' for more details" "$LINENO" 5 ; }
  1.1020  
  1.1021  # Provide some information about the compiler.
  1.1022  $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
  1.1023 @@ -20294,7 +20287,7 @@
  1.1024  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.1025  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.1026  as_fn_error 77 "C compiler cannot create executables
  1.1027 -See \`config.log' for more details" "$LINENO" 5; }
  1.1028 +See \`config.log' for more details" "$LINENO" 5 ; }
  1.1029  else
  1.1030    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  1.1031  $as_echo "yes" >&6; }
  1.1032 @@ -20337,7 +20330,7 @@
  1.1033    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.1034  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.1035  as_fn_error $? "cannot compute suffix of executables: cannot compile and link
  1.1036 -See \`config.log' for more details" "$LINENO" 5; }
  1.1037 +See \`config.log' for more details" "$LINENO" 5 ; }
  1.1038  fi
  1.1039  rm -f conftest conftest$ac_cv_exeext
  1.1040  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
  1.1041 @@ -20396,7 +20389,7 @@
  1.1042  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.1043  as_fn_error $? "cannot run C compiled programs.
  1.1044  If you meant to cross compile, use \`--host'.
  1.1045 -See \`config.log' for more details" "$LINENO" 5; }
  1.1046 +See \`config.log' for more details" "$LINENO" 5 ; }
  1.1047      fi
  1.1048    fi
  1.1049  fi
  1.1050 @@ -20407,7 +20400,7 @@
  1.1051  ac_clean_files=$ac_clean_files_save
  1.1052  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
  1.1053  $as_echo_n "checking for suffix of object files... " >&6; }
  1.1054 -if ${ac_cv_objext+:} false; then :
  1.1055 +if test "${ac_cv_objext+set}" = set; then :
  1.1056    $as_echo_n "(cached) " >&6
  1.1057  else
  1.1058    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.1059 @@ -20448,7 +20441,7 @@
  1.1060  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.1061  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.1062  as_fn_error $? "cannot compute suffix of object files: cannot compile
  1.1063 -See \`config.log' for more details" "$LINENO" 5; }
  1.1064 +See \`config.log' for more details" "$LINENO" 5 ; }
  1.1065  fi
  1.1066  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  1.1067  fi
  1.1068 @@ -20458,7 +20451,7 @@
  1.1069  ac_objext=$OBJEXT
  1.1070  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
  1.1071  $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
  1.1072 -if ${ac_cv_c_compiler_gnu+:} false; then :
  1.1073 +if test "${ac_cv_c_compiler_gnu+set}" = set; then :
  1.1074    $as_echo_n "(cached) " >&6
  1.1075  else
  1.1076    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.1077 @@ -20495,7 +20488,7 @@
  1.1078  ac_save_CFLAGS=$CFLAGS
  1.1079  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
  1.1080  $as_echo_n "checking whether $CC accepts -g... " >&6; }
  1.1081 -if ${ac_cv_prog_cc_g+:} false; then :
  1.1082 +if test "${ac_cv_prog_cc_g+set}" = set; then :
  1.1083    $as_echo_n "(cached) " >&6
  1.1084  else
  1.1085    ac_save_c_werror_flag=$ac_c_werror_flag
  1.1086 @@ -20573,7 +20566,7 @@
  1.1087  fi
  1.1088  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
  1.1089  $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
  1.1090 -if ${ac_cv_prog_cc_c89+:} false; then :
  1.1091 +if test "${ac_cv_prog_cc_c89+set}" = set; then :
  1.1092    $as_echo_n "(cached) " >&6
  1.1093  else
  1.1094    ac_cv_prog_cc_c89=no
  1.1095 @@ -20696,7 +20689,7 @@
  1.1096  set dummy $ac_prog; ac_word=$2
  1.1097  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1098  $as_echo_n "checking for $ac_word... " >&6; }
  1.1099 -if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then :
  1.1100 +if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then :
  1.1101    $as_echo_n "(cached) " >&6
  1.1102  else
  1.1103    case $TOOLS_DIR_CXX in
  1.1104 @@ -20748,7 +20741,7 @@
  1.1105  set dummy $ac_prog; ac_word=$2
  1.1106  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1107  $as_echo_n "checking for $ac_word... " >&6; }
  1.1108 -if ${ac_cv_path_POTENTIAL_CXX+:} false; then :
  1.1109 +if test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then :
  1.1110    $as_echo_n "(cached) " >&6
  1.1111  else
  1.1112    case $POTENTIAL_CXX in
  1.1113 @@ -21161,7 +21154,7 @@
  1.1114  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  1.1115  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1116  $as_echo_n "checking for $ac_word... " >&6; }
  1.1117 -if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then :
  1.1118 +if test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then :
  1.1119    $as_echo_n "(cached) " >&6
  1.1120  else
  1.1121    if test -n "$PROPER_COMPILER_CXX"; then
  1.1122 @@ -21205,7 +21198,7 @@
  1.1123  set dummy $ac_prog; ac_word=$2
  1.1124  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1125  $as_echo_n "checking for $ac_word... " >&6; }
  1.1126 -if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then :
  1.1127 +if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then :
  1.1128    $as_echo_n "(cached) " >&6
  1.1129  else
  1.1130    if test -n "$ac_ct_PROPER_COMPILER_CXX"; then
  1.1131 @@ -21659,7 +21652,7 @@
  1.1132  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  1.1133  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1134  $as_echo_n "checking for $ac_word... " >&6; }
  1.1135 -if ${ac_cv_prog_CXX+:} false; then :
  1.1136 +if test "${ac_cv_prog_CXX+set}" = set; then :
  1.1137    $as_echo_n "(cached) " >&6
  1.1138  else
  1.1139    if test -n "$CXX"; then
  1.1140 @@ -21703,7 +21696,7 @@
  1.1141  set dummy $ac_prog; ac_word=$2
  1.1142  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1143  $as_echo_n "checking for $ac_word... " >&6; }
  1.1144 -if ${ac_cv_prog_ac_ct_CXX+:} false; then :
  1.1145 +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
  1.1146    $as_echo_n "(cached) " >&6
  1.1147  else
  1.1148    if test -n "$ac_ct_CXX"; then
  1.1149 @@ -21781,7 +21774,7 @@
  1.1150  
  1.1151  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
  1.1152  $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
  1.1153 -if ${ac_cv_cxx_compiler_gnu+:} false; then :
  1.1154 +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
  1.1155    $as_echo_n "(cached) " >&6
  1.1156  else
  1.1157    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.1158 @@ -21818,7 +21811,7 @@
  1.1159  ac_save_CXXFLAGS=$CXXFLAGS
  1.1160  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
  1.1161  $as_echo_n "checking whether $CXX accepts -g... " >&6; }
  1.1162 -if ${ac_cv_prog_cxx_g+:} false; then :
  1.1163 +if test "${ac_cv_prog_cxx_g+set}" = set; then :
  1.1164    $as_echo_n "(cached) " >&6
  1.1165  else
  1.1166    ac_save_cxx_werror_flag=$ac_cxx_werror_flag
  1.1167 @@ -21916,7 +21909,7 @@
  1.1168  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  1.1169  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1170  $as_echo_n "checking for $ac_word... " >&6; }
  1.1171 -if ${ac_cv_prog_OBJC+:} false; then :
  1.1172 +if test "${ac_cv_prog_OBJC+set}" = set; then :
  1.1173    $as_echo_n "(cached) " >&6
  1.1174  else
  1.1175    if test -n "$OBJC"; then
  1.1176 @@ -21960,7 +21953,7 @@
  1.1177  set dummy $ac_prog; ac_word=$2
  1.1178  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1179  $as_echo_n "checking for $ac_word... " >&6; }
  1.1180 -if ${ac_cv_prog_ac_ct_OBJC+:} false; then :
  1.1181 +if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then :
  1.1182    $as_echo_n "(cached) " >&6
  1.1183  else
  1.1184    if test -n "$ac_ct_OBJC"; then
  1.1185 @@ -22036,7 +22029,7 @@
  1.1186  
  1.1187  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5
  1.1188  $as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; }
  1.1189 -if ${ac_cv_objc_compiler_gnu+:} false; then :
  1.1190 +if test "${ac_cv_objc_compiler_gnu+set}" = set; then :
  1.1191    $as_echo_n "(cached) " >&6
  1.1192  else
  1.1193    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.1194 @@ -22073,7 +22066,7 @@
  1.1195  ac_save_OBJCFLAGS=$OBJCFLAGS
  1.1196  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5
  1.1197  $as_echo_n "checking whether $OBJC accepts -g... " >&6; }
  1.1198 -if ${ac_cv_prog_objc_g+:} false; then :
  1.1199 +if test "${ac_cv_prog_objc_g+set}" = set; then :
  1.1200    $as_echo_n "(cached) " >&6
  1.1201  else
  1.1202    ac_save_objc_werror_flag=$ac_objc_werror_flag
  1.1203 @@ -22449,7 +22442,7 @@
  1.1204  set dummy ${ac_tool_prefix}ar; ac_word=$2
  1.1205  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1206  $as_echo_n "checking for $ac_word... " >&6; }
  1.1207 -if ${ac_cv_prog_AR+:} false; then :
  1.1208 +if test "${ac_cv_prog_AR+set}" = set; then :
  1.1209    $as_echo_n "(cached) " >&6
  1.1210  else
  1.1211    if test -n "$AR"; then
  1.1212 @@ -22489,7 +22482,7 @@
  1.1213  set dummy ar; ac_word=$2
  1.1214  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1215  $as_echo_n "checking for $ac_word... " >&6; }
  1.1216 -if ${ac_cv_prog_ac_ct_AR+:} false; then :
  1.1217 +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
  1.1218    $as_echo_n "(cached) " >&6
  1.1219  else
  1.1220    if test -n "$ac_ct_AR"; then
  1.1221 @@ -22831,7 +22824,7 @@
  1.1222  set dummy link; ac_word=$2
  1.1223  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1224  $as_echo_n "checking for $ac_word... " >&6; }
  1.1225 -if ${ac_cv_prog_WINLD+:} false; then :
  1.1226 +if test "${ac_cv_prog_WINLD+set}" = set; then :
  1.1227    $as_echo_n "(cached) " >&6
  1.1228  else
  1.1229    if test -n "$WINLD"; then
  1.1230 @@ -23170,7 +23163,7 @@
  1.1231  set dummy mt; ac_word=$2
  1.1232  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1233  $as_echo_n "checking for $ac_word... " >&6; }
  1.1234 -if ${ac_cv_prog_MT+:} false; then :
  1.1235 +if test "${ac_cv_prog_MT+set}" = set; then :
  1.1236    $as_echo_n "(cached) " >&6
  1.1237  else
  1.1238    if test -n "$MT"; then
  1.1239 @@ -23491,7 +23484,7 @@
  1.1240  set dummy rc; ac_word=$2
  1.1241  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1242  $as_echo_n "checking for $ac_word... " >&6; }
  1.1243 -if ${ac_cv_prog_RC+:} false; then :
  1.1244 +if test "${ac_cv_prog_RC+set}" = set; then :
  1.1245    $as_echo_n "(cached) " >&6
  1.1246  else
  1.1247    if test -n "$RC"; then
  1.1248 @@ -23883,7 +23876,7 @@
  1.1249  set dummy lib; ac_word=$2
  1.1250  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1251  $as_echo_n "checking for $ac_word... " >&6; }
  1.1252 -if ${ac_cv_prog_WINAR+:} false; then :
  1.1253 +if test "${ac_cv_prog_WINAR+set}" = set; then :
  1.1254    $as_echo_n "(cached) " >&6
  1.1255  else
  1.1256    if test -n "$WINAR"; then
  1.1257 @@ -24189,7 +24182,7 @@
  1.1258  set dummy dumpbin; ac_word=$2
  1.1259  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1260  $as_echo_n "checking for $ac_word... " >&6; }
  1.1261 -if ${ac_cv_prog_DUMPBIN+:} false; then :
  1.1262 +if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
  1.1263    $as_echo_n "(cached) " >&6
  1.1264  else
  1.1265    if test -n "$DUMPBIN"; then
  1.1266 @@ -24508,7 +24501,7 @@
  1.1267    CPP=
  1.1268  fi
  1.1269  if test -z "$CPP"; then
  1.1270 -  if ${ac_cv_prog_CPP+:} false; then :
  1.1271 +  if test "${ac_cv_prog_CPP+set}" = set; then :
  1.1272    $as_echo_n "(cached) " >&6
  1.1273  else
  1.1274        # Double quotes because CPP needs to be expanded
  1.1275 @@ -24624,7 +24617,7 @@
  1.1276    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.1277  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.1278  as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
  1.1279 -See \`config.log' for more details" "$LINENO" 5; }
  1.1280 +See \`config.log' for more details" "$LINENO" 5 ; }
  1.1281  fi
  1.1282  
  1.1283  ac_ext=cpp
  1.1284 @@ -24908,7 +24901,7 @@
  1.1285  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
  1.1286  $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
  1.1287  if test -z "$CXXCPP"; then
  1.1288 -  if ${ac_cv_prog_CXXCPP+:} false; then :
  1.1289 +  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
  1.1290    $as_echo_n "(cached) " >&6
  1.1291  else
  1.1292        # Double quotes because CXXCPP needs to be expanded
  1.1293 @@ -25024,7 +25017,7 @@
  1.1294    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.1295  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.1296  as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
  1.1297 -See \`config.log' for more details" "$LINENO" 5; }
  1.1298 +See \`config.log' for more details" "$LINENO" 5 ; }
  1.1299  fi
  1.1300  
  1.1301  ac_ext=cpp
  1.1302 @@ -25326,7 +25319,7 @@
  1.1303  set dummy as; ac_word=$2
  1.1304  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1305  $as_echo_n "checking for $ac_word... " >&6; }
  1.1306 -if ${ac_cv_path_AS+:} false; then :
  1.1307 +if test "${ac_cv_path_AS+set}" = set; then :
  1.1308    $as_echo_n "(cached) " >&6
  1.1309  else
  1.1310    case $AS in
  1.1311 @@ -25638,7 +25631,7 @@
  1.1312  set dummy nm; ac_word=$2
  1.1313  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1314  $as_echo_n "checking for $ac_word... " >&6; }
  1.1315 -if ${ac_cv_path_NM+:} false; then :
  1.1316 +if test "${ac_cv_path_NM+set}" = set; then :
  1.1317    $as_echo_n "(cached) " >&6
  1.1318  else
  1.1319    case $NM in
  1.1320 @@ -25944,7 +25937,7 @@
  1.1321  set dummy gnm; ac_word=$2
  1.1322  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1323  $as_echo_n "checking for $ac_word... " >&6; }
  1.1324 -if ${ac_cv_path_GNM+:} false; then :
  1.1325 +if test "${ac_cv_path_GNM+set}" = set; then :
  1.1326    $as_echo_n "(cached) " >&6
  1.1327  else
  1.1328    case $GNM in
  1.1329 @@ -26250,7 +26243,7 @@
  1.1330  set dummy strip; ac_word=$2
  1.1331  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1332  $as_echo_n "checking for $ac_word... " >&6; }
  1.1333 -if ${ac_cv_path_STRIP+:} false; then :
  1.1334 +if test "${ac_cv_path_STRIP+set}" = set; then :
  1.1335    $as_echo_n "(cached) " >&6
  1.1336  else
  1.1337    case $STRIP in
  1.1338 @@ -26556,7 +26549,7 @@
  1.1339  set dummy mcs; ac_word=$2
  1.1340  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1341  $as_echo_n "checking for $ac_word... " >&6; }
  1.1342 -if ${ac_cv_path_MCS+:} false; then :
  1.1343 +if test "${ac_cv_path_MCS+set}" = set; then :
  1.1344    $as_echo_n "(cached) " >&6
  1.1345  else
  1.1346    case $MCS in
  1.1347 @@ -26864,7 +26857,7 @@
  1.1348  set dummy ${ac_tool_prefix}nm; ac_word=$2
  1.1349  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1350  $as_echo_n "checking for $ac_word... " >&6; }
  1.1351 -if ${ac_cv_prog_NM+:} false; then :
  1.1352 +if test "${ac_cv_prog_NM+set}" = set; then :
  1.1353    $as_echo_n "(cached) " >&6
  1.1354  else
  1.1355    if test -n "$NM"; then
  1.1356 @@ -26904,7 +26897,7 @@
  1.1357  set dummy nm; ac_word=$2
  1.1358  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1359  $as_echo_n "checking for $ac_word... " >&6; }
  1.1360 -if ${ac_cv_prog_ac_ct_NM+:} false; then :
  1.1361 +if test "${ac_cv_prog_ac_ct_NM+set}" = set; then :
  1.1362    $as_echo_n "(cached) " >&6
  1.1363  else
  1.1364    if test -n "$ac_ct_NM"; then
  1.1365 @@ -27224,7 +27217,7 @@
  1.1366  set dummy ${ac_tool_prefix}strip; ac_word=$2
  1.1367  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1368  $as_echo_n "checking for $ac_word... " >&6; }
  1.1369 -if ${ac_cv_prog_STRIP+:} false; then :
  1.1370 +if test "${ac_cv_prog_STRIP+set}" = set; then :
  1.1371    $as_echo_n "(cached) " >&6
  1.1372  else
  1.1373    if test -n "$STRIP"; then
  1.1374 @@ -27264,7 +27257,7 @@
  1.1375  set dummy strip; ac_word=$2
  1.1376  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1377  $as_echo_n "checking for $ac_word... " >&6; }
  1.1378 -if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
  1.1379 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
  1.1380    $as_echo_n "(cached) " >&6
  1.1381  else
  1.1382    if test -n "$ac_ct_STRIP"; then
  1.1383 @@ -27589,7 +27582,7 @@
  1.1384  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  1.1385  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1386  $as_echo_n "checking for $ac_word... " >&6; }
  1.1387 -if ${ac_cv_prog_OBJCOPY+:} false; then :
  1.1388 +if test "${ac_cv_prog_OBJCOPY+set}" = set; then :
  1.1389    $as_echo_n "(cached) " >&6
  1.1390  else
  1.1391    if test -n "$OBJCOPY"; then
  1.1392 @@ -27633,7 +27626,7 @@
  1.1393  set dummy $ac_prog; ac_word=$2
  1.1394  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1395  $as_echo_n "checking for $ac_word... " >&6; }
  1.1396 -if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then :
  1.1397 +if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then :
  1.1398    $as_echo_n "(cached) " >&6
  1.1399  else
  1.1400    if test -n "$ac_ct_OBJCOPY"; then
  1.1401 @@ -27960,7 +27953,7 @@
  1.1402  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  1.1403  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1404  $as_echo_n "checking for $ac_word... " >&6; }
  1.1405 -if ${ac_cv_prog_OBJDUMP+:} false; then :
  1.1406 +if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
  1.1407    $as_echo_n "(cached) " >&6
  1.1408  else
  1.1409    if test -n "$OBJDUMP"; then
  1.1410 @@ -28004,7 +27997,7 @@
  1.1411  set dummy $ac_prog; ac_word=$2
  1.1412  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1413  $as_echo_n "checking for $ac_word... " >&6; }
  1.1414 -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
  1.1415 +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
  1.1416    $as_echo_n "(cached) " >&6
  1.1417  else
  1.1418    if test -n "$ac_ct_OBJDUMP"; then
  1.1419 @@ -28328,7 +28321,7 @@
  1.1420  set dummy lipo; ac_word=$2
  1.1421  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1422  $as_echo_n "checking for $ac_word... " >&6; }
  1.1423 -if ${ac_cv_path_LIPO+:} false; then :
  1.1424 +if test "${ac_cv_path_LIPO+set}" = set; then :
  1.1425    $as_echo_n "(cached) " >&6
  1.1426  else
  1.1427    case $LIPO in
  1.1428 @@ -28645,7 +28638,7 @@
  1.1429  
  1.1430  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
  1.1431  $as_echo_n "checking for ANSI C header files... " >&6; }
  1.1432 -if ${ac_cv_header_stdc+:} false; then :
  1.1433 +if test "${ac_cv_header_stdc+set}" = set; then :
  1.1434    $as_echo_n "(cached) " >&6
  1.1435  else
  1.1436    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.1437 @@ -28785,17 +28778,16 @@
  1.1438  
  1.1439    # keep track of c/cxx flags that we added outselves...
  1.1440    #   to prevent emitting warning...
  1.1441 -  ADDED_CFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
  1.1442 -  ADDED_CXXFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
  1.1443 -  ADDED_LDFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
  1.1444 -
  1.1445 -  CFLAGS="${CFLAGS}${ADDED_CFLAGS}"
  1.1446 -  CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}"
  1.1447 -  LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}"
  1.1448 -
  1.1449 -  CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}"
  1.1450 -  CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}"
  1.1451 -  LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}"
  1.1452 +  TARGET_BITS_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
  1.1453 +
  1.1454 +
  1.1455 +  CFLAGS="${CFLAGS} ${TARGET_BITS_FLAG}"
  1.1456 +  CXXFLAGS="${CXXFLAGS} ${TARGET_BITS_FLAG}"
  1.1457 +  LDFLAGS="${LDFLAGS} ${TARGET_BITS_FLAG}"
  1.1458 +
  1.1459 +  CFLAGS_JDK="${CFLAGS_JDK} ${TARGET_BITS_FLAG}"
  1.1460 +  CXXFLAGS_JDK="${CXXFLAGS_JDK} ${TARGET_BITS_FLAG}"
  1.1461 +  LDFLAGS_JDK="${LDFLAGS_JDK} ${TARGET_BITS_FLAG}"
  1.1462  
  1.1463  elif test "x$COMPILE_TYPE" = xreduced; then
  1.1464    if test "x$OPENJDK_TARGET_OS" != xwindows; then
  1.1465 @@ -28803,17 +28795,16 @@
  1.1466  
  1.1467    # keep track of c/cxx flags that we added outselves...
  1.1468    #   to prevent emitting warning...
  1.1469 -  ADDED_CFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
  1.1470 -  ADDED_CXXFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
  1.1471 -  ADDED_LDFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
  1.1472 -
  1.1473 -  CFLAGS="${CFLAGS}${ADDED_CFLAGS}"
  1.1474 -  CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}"
  1.1475 -  LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}"
  1.1476 -
  1.1477 -  CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}"
  1.1478 -  CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}"
  1.1479 -  LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}"
  1.1480 +  TARGET_BITS_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
  1.1481 +
  1.1482 +
  1.1483 +  CFLAGS="${CFLAGS} ${TARGET_BITS_FLAG}"
  1.1484 +  CXXFLAGS="${CXXFLAGS} ${TARGET_BITS_FLAG}"
  1.1485 +  LDFLAGS="${LDFLAGS} ${TARGET_BITS_FLAG}"
  1.1486 +
  1.1487 +  CFLAGS_JDK="${CFLAGS_JDK} ${TARGET_BITS_FLAG}"
  1.1488 +  CXXFLAGS_JDK="${CXXFLAGS_JDK} ${TARGET_BITS_FLAG}"
  1.1489 +  LDFLAGS_JDK="${LDFLAGS_JDK} ${TARGET_BITS_FLAG}"
  1.1490  
  1.1491    fi
  1.1492  fi
  1.1493 @@ -28822,7 +28813,7 @@
  1.1494  for ac_header in stdio.h
  1.1495  do :
  1.1496    ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default"
  1.1497 -if test "x$ac_cv_header_stdio_h" = xyes; then :
  1.1498 +if test "x$ac_cv_header_stdio_h" = x""yes; then :
  1.1499    cat >>confdefs.h <<_ACEOF
  1.1500  #define HAVE_STDIO_H 1
  1.1501  _ACEOF
  1.1502 @@ -28851,7 +28842,7 @@
  1.1503  # This bug is HP SR number 8606223364.
  1.1504  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5
  1.1505  $as_echo_n "checking size of int *... " >&6; }
  1.1506 -if ${ac_cv_sizeof_int_p+:} false; then :
  1.1507 +if test "${ac_cv_sizeof_int_p+set}" = set; then :
  1.1508    $as_echo_n "(cached) " >&6
  1.1509  else
  1.1510    if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p"        "$ac_includes_default"; then :
  1.1511 @@ -28861,7 +28852,7 @@
  1.1512       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.1513  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.1514  as_fn_error 77 "cannot compute sizeof (int *)
  1.1515 -See \`config.log' for more details" "$LINENO" 5; }
  1.1516 +See \`config.log' for more details" "$LINENO" 5 ; }
  1.1517     else
  1.1518       ac_cv_sizeof_int_p=0
  1.1519     fi
  1.1520 @@ -28908,7 +28899,7 @@
  1.1521  #
  1.1522   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
  1.1523  $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
  1.1524 -if ${ac_cv_c_bigendian+:} false; then :
  1.1525 +if test "${ac_cv_c_bigendian+set}" = set; then :
  1.1526    $as_echo_n "(cached) " >&6
  1.1527  else
  1.1528    ac_cv_c_bigendian=unknown
  1.1529 @@ -30084,8 +30075,8 @@
  1.1530    have_x=disabled
  1.1531  else
  1.1532    case $x_includes,$x_libraries in #(
  1.1533 -    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
  1.1534 -    *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
  1.1535 +    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
  1.1536 +    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
  1.1537    $as_echo_n "(cached) " >&6
  1.1538  else
  1.1539    # One or both of the vars are not set, and there is no cached value.
  1.1540 @@ -30362,7 +30353,7 @@
  1.1541  else
  1.1542    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
  1.1543  $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
  1.1544 -if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
  1.1545 +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
  1.1546    $as_echo_n "(cached) " >&6
  1.1547  else
  1.1548    ac_check_lib_save_LIBS=$LIBS
  1.1549 @@ -30396,14 +30387,14 @@
  1.1550  fi
  1.1551  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
  1.1552  $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
  1.1553 -if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
  1.1554 +if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
  1.1555    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
  1.1556  fi
  1.1557  
  1.1558      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
  1.1559        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
  1.1560  $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
  1.1561 -if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
  1.1562 +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
  1.1563    $as_echo_n "(cached) " >&6
  1.1564  else
  1.1565    ac_check_lib_save_LIBS=$LIBS
  1.1566 @@ -30437,7 +30428,7 @@
  1.1567  fi
  1.1568  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
  1.1569  $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
  1.1570 -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
  1.1571 +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
  1.1572    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
  1.1573  fi
  1.1574  
  1.1575 @@ -30456,14 +30447,14 @@
  1.1576      # The functions gethostbyname, getservbyname, and inet_addr are
  1.1577      # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
  1.1578      ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
  1.1579 -if test "x$ac_cv_func_gethostbyname" = xyes; then :
  1.1580 +if test "x$ac_cv_func_gethostbyname" = x""yes; then :
  1.1581  
  1.1582  fi
  1.1583  
  1.1584      if test $ac_cv_func_gethostbyname = no; then
  1.1585        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
  1.1586  $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
  1.1587 -if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
  1.1588 +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
  1.1589    $as_echo_n "(cached) " >&6
  1.1590  else
  1.1591    ac_check_lib_save_LIBS=$LIBS
  1.1592 @@ -30497,14 +30488,14 @@
  1.1593  fi
  1.1594  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
  1.1595  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
  1.1596 -if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
  1.1597 +if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
  1.1598    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
  1.1599  fi
  1.1600  
  1.1601        if test $ac_cv_lib_nsl_gethostbyname = no; then
  1.1602  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
  1.1603  $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
  1.1604 -if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
  1.1605 +if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
  1.1606    $as_echo_n "(cached) " >&6
  1.1607  else
  1.1608    ac_check_lib_save_LIBS=$LIBS
  1.1609 @@ -30538,7 +30529,7 @@
  1.1610  fi
  1.1611  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
  1.1612  $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
  1.1613 -if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
  1.1614 +if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
  1.1615    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  1.1616  fi
  1.1617  
  1.1618 @@ -30553,14 +30544,14 @@
  1.1619      # must be given before -lnsl if both are needed.  We assume that
  1.1620      # if connect needs -lnsl, so does gethostbyname.
  1.1621      ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect"
  1.1622 -if test "x$ac_cv_func_connect" = xyes; then :
  1.1623 +if test "x$ac_cv_func_connect" = x""yes; then :
  1.1624  
  1.1625  fi
  1.1626  
  1.1627      if test $ac_cv_func_connect = no; then
  1.1628        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
  1.1629  $as_echo_n "checking for connect in -lsocket... " >&6; }
  1.1630 -if ${ac_cv_lib_socket_connect+:} false; then :
  1.1631 +if test "${ac_cv_lib_socket_connect+set}" = set; then :
  1.1632    $as_echo_n "(cached) " >&6
  1.1633  else
  1.1634    ac_check_lib_save_LIBS=$LIBS
  1.1635 @@ -30594,7 +30585,7 @@
  1.1636  fi
  1.1637  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
  1.1638  $as_echo "$ac_cv_lib_socket_connect" >&6; }
  1.1639 -if test "x$ac_cv_lib_socket_connect" = xyes; then :
  1.1640 +if test "x$ac_cv_lib_socket_connect" = x""yes; then :
  1.1641    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
  1.1642  fi
  1.1643  
  1.1644 @@ -30602,14 +30593,14 @@
  1.1645  
  1.1646      # Guillermo Gomez says -lposix is necessary on A/UX.
  1.1647      ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove"
  1.1648 -if test "x$ac_cv_func_remove" = xyes; then :
  1.1649 +if test "x$ac_cv_func_remove" = x""yes; then :
  1.1650  
  1.1651  fi
  1.1652  
  1.1653      if test $ac_cv_func_remove = no; then
  1.1654        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
  1.1655  $as_echo_n "checking for remove in -lposix... " >&6; }
  1.1656 -if ${ac_cv_lib_posix_remove+:} false; then :
  1.1657 +if test "${ac_cv_lib_posix_remove+set}" = set; then :
  1.1658    $as_echo_n "(cached) " >&6
  1.1659  else
  1.1660    ac_check_lib_save_LIBS=$LIBS
  1.1661 @@ -30643,7 +30634,7 @@
  1.1662  fi
  1.1663  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
  1.1664  $as_echo "$ac_cv_lib_posix_remove" >&6; }
  1.1665 -if test "x$ac_cv_lib_posix_remove" = xyes; then :
  1.1666 +if test "x$ac_cv_lib_posix_remove" = x""yes; then :
  1.1667    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  1.1668  fi
  1.1669  
  1.1670 @@ -30651,14 +30642,14 @@
  1.1671  
  1.1672      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
  1.1673      ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
  1.1674 -if test "x$ac_cv_func_shmat" = xyes; then :
  1.1675 +if test "x$ac_cv_func_shmat" = x""yes; then :
  1.1676  
  1.1677  fi
  1.1678  
  1.1679      if test $ac_cv_func_shmat = no; then
  1.1680        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
  1.1681  $as_echo_n "checking for shmat in -lipc... " >&6; }
  1.1682 -if ${ac_cv_lib_ipc_shmat+:} false; then :
  1.1683 +if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
  1.1684    $as_echo_n "(cached) " >&6
  1.1685  else
  1.1686    ac_check_lib_save_LIBS=$LIBS
  1.1687 @@ -30692,7 +30683,7 @@
  1.1688  fi
  1.1689  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
  1.1690  $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
  1.1691 -if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
  1.1692 +if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
  1.1693    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  1.1694  fi
  1.1695  
  1.1696 @@ -30710,7 +30701,7 @@
  1.1697    # John Interrante, Karl Berry
  1.1698    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
  1.1699  $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
  1.1700 -if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
  1.1701 +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
  1.1702    $as_echo_n "(cached) " >&6
  1.1703  else
  1.1704    ac_check_lib_save_LIBS=$LIBS
  1.1705 @@ -30744,7 +30735,7 @@
  1.1706  fi
  1.1707  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
  1.1708  $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
  1.1709 -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
  1.1710 +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
  1.1711    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  1.1712  fi
  1.1713  
  1.1714 @@ -31762,7 +31753,7 @@
  1.1715              LDFLAGS="$FREETYPE2_LIBS"
  1.1716              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5
  1.1717  $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; }
  1.1718 -if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then :
  1.1719 +if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then :
  1.1720    $as_echo_n "(cached) " >&6
  1.1721  else
  1.1722    ac_check_lib_save_LIBS=$LIBS
  1.1723 @@ -31796,7 +31787,7 @@
  1.1724  fi
  1.1725  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5
  1.1726  $as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; }
  1.1727 -if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then :
  1.1728 +if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then :
  1.1729    FREETYPE2_FOUND=true
  1.1730  else
  1.1731    as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5
  1.1732 @@ -32084,7 +32075,7 @@
  1.1733  	    for ac_header in alsa/asoundlib.h
  1.1734  do :
  1.1735    ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default"
  1.1736 -if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then :
  1.1737 +if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then :
  1.1738    cat >>confdefs.h <<_ACEOF
  1.1739  #define HAVE_ALSA_ASOUNDLIB_H 1
  1.1740  _ACEOF
  1.1741 @@ -32143,7 +32134,7 @@
  1.1742  USE_EXTERNAL_LIBJPEG=true
  1.1743  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5
  1.1744  $as_echo_n "checking for main in -ljpeg... " >&6; }
  1.1745 -if ${ac_cv_lib_jpeg_main+:} false; then :
  1.1746 +if test "${ac_cv_lib_jpeg_main+set}" = set; then :
  1.1747    $as_echo_n "(cached) " >&6
  1.1748  else
  1.1749    ac_check_lib_save_LIBS=$LIBS
  1.1750 @@ -32171,7 +32162,7 @@
  1.1751  fi
  1.1752  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5
  1.1753  $as_echo "$ac_cv_lib_jpeg_main" >&6; }
  1.1754 -if test "x$ac_cv_lib_jpeg_main" = xyes; then :
  1.1755 +if test "x$ac_cv_lib_jpeg_main" = x""yes; then :
  1.1756    cat >>confdefs.h <<_ACEOF
  1.1757  #define HAVE_LIBJPEG 1
  1.1758  _ACEOF
  1.1759 @@ -32220,7 +32211,7 @@
  1.1760      USE_EXTERNAL_LIBGIF=false
  1.1761  elif test "x${with_giflib}" = "xsystem"; then
  1.1762      ac_fn_cxx_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
  1.1763 -if test "x$ac_cv_header_gif_lib_h" = xyes; then :
  1.1764 +if test "x$ac_cv_header_gif_lib_h" = x""yes; then :
  1.1765  
  1.1766  else
  1.1767     as_fn_error $? "--with-giflib=system specified, but gif_lib.h not found!" "$LINENO" 5
  1.1768 @@ -32229,7 +32220,7 @@
  1.1769  
  1.1770      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGifGetCode in -lgif" >&5
  1.1771  $as_echo_n "checking for DGifGetCode in -lgif... " >&6; }
  1.1772 -if ${ac_cv_lib_gif_DGifGetCode+:} false; then :
  1.1773 +if test "${ac_cv_lib_gif_DGifGetCode+set}" = set; then :
  1.1774    $as_echo_n "(cached) " >&6
  1.1775  else
  1.1776    ac_check_lib_save_LIBS=$LIBS
  1.1777 @@ -32263,7 +32254,7 @@
  1.1778  fi
  1.1779  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_DGifGetCode" >&5
  1.1780  $as_echo "$ac_cv_lib_gif_DGifGetCode" >&6; }
  1.1781 -if test "x$ac_cv_lib_gif_DGifGetCode" = xyes; then :
  1.1782 +if test "x$ac_cv_lib_gif_DGifGetCode" = x""yes; then :
  1.1783    cat >>confdefs.h <<_ACEOF
  1.1784  #define HAVE_LIBGIF 1
  1.1785  _ACEOF
  1.1786 @@ -32295,7 +32286,7 @@
  1.1787  
  1.1788  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
  1.1789  $as_echo_n "checking for compress in -lz... " >&6; }
  1.1790 -if ${ac_cv_lib_z_compress+:} false; then :
  1.1791 +if test "${ac_cv_lib_z_compress+set}" = set; then :
  1.1792    $as_echo_n "(cached) " >&6
  1.1793  else
  1.1794    ac_check_lib_save_LIBS=$LIBS
  1.1795 @@ -32329,7 +32320,7 @@
  1.1796  fi
  1.1797  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
  1.1798  $as_echo "$ac_cv_lib_z_compress" >&6; }
  1.1799 -if test "x$ac_cv_lib_z_compress" = xyes; then :
  1.1800 +if test "x$ac_cv_lib_z_compress" = x""yes; then :
  1.1801     ZLIB_FOUND=yes
  1.1802  else
  1.1803     ZLIB_FOUND=no
  1.1804 @@ -32422,7 +32413,7 @@
  1.1805  
  1.1806  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
  1.1807  $as_echo_n "checking for cos in -lm... " >&6; }
  1.1808 -if ${ac_cv_lib_m_cos+:} false; then :
  1.1809 +if test "${ac_cv_lib_m_cos+set}" = set; then :
  1.1810    $as_echo_n "(cached) " >&6
  1.1811  else
  1.1812    ac_check_lib_save_LIBS=$LIBS
  1.1813 @@ -32456,7 +32447,7 @@
  1.1814  fi
  1.1815  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
  1.1816  $as_echo "$ac_cv_lib_m_cos" >&6; }
  1.1817 -if test "x$ac_cv_lib_m_cos" = xyes; then :
  1.1818 +if test "x$ac_cv_lib_m_cos" = x""yes; then :
  1.1819    cat >>confdefs.h <<_ACEOF
  1.1820  #define HAVE_LIBM 1
  1.1821  _ACEOF
  1.1822 @@ -32480,7 +32471,7 @@
  1.1823  LIBS=""
  1.1824  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
  1.1825  $as_echo_n "checking for dlopen in -ldl... " >&6; }
  1.1826 -if ${ac_cv_lib_dl_dlopen+:} false; then :
  1.1827 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
  1.1828    $as_echo_n "(cached) " >&6
  1.1829  else
  1.1830    ac_check_lib_save_LIBS=$LIBS
  1.1831 @@ -32514,7 +32505,7 @@
  1.1832  fi
  1.1833  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
  1.1834  $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
  1.1835 -if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
  1.1836 +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
  1.1837    cat >>confdefs.h <<_ACEOF
  1.1838  #define HAVE_LIBDL 1
  1.1839  _ACEOF
  1.1840 @@ -32744,7 +32735,7 @@
  1.1841  See the pkg-config man page for more details.
  1.1842  
  1.1843  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
  1.1844 -See \`config.log' for more details" "$LINENO" 5; }
  1.1845 +See \`config.log' for more details" "$LINENO" 5 ; }
  1.1846  else
  1.1847  	LIBFFI_CFLAGS=$pkg_cv_LIBFFI_CFLAGS
  1.1848  	LIBFFI_LIBS=$pkg_cv_LIBFFI_LIBS
  1.1849 @@ -32760,7 +32751,7 @@
  1.1850  set dummy llvm-config; ac_word=$2
  1.1851  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1852  $as_echo_n "checking for $ac_word... " >&6; }
  1.1853 -if ${ac_cv_prog_LLVM_CONFIG+:} false; then :
  1.1854 +if test "${ac_cv_prog_LLVM_CONFIG+set}" = set; then :
  1.1855    $as_echo_n "(cached) " >&6
  1.1856  else
  1.1857    if test -n "$LLVM_CONFIG"; then
  1.1858 @@ -33376,7 +33367,7 @@
  1.1859  set dummy ccache; ac_word=$2
  1.1860  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1861  $as_echo_n "checking for $ac_word... " >&6; }
  1.1862 -if ${ac_cv_path_CCACHE+:} false; then :
  1.1863 +if test "${ac_cv_path_CCACHE+set}" = set; then :
  1.1864    $as_echo_n "(cached) " >&6
  1.1865  else
  1.1866    case $CCACHE in
  1.1867 @@ -33638,21 +33629,10 @@
  1.1868       :end' >>confcache
  1.1869  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
  1.1870    if test -w "$cache_file"; then
  1.1871 -    if test "x$cache_file" != "x/dev/null"; then
  1.1872 +    test "x$cache_file" != "x/dev/null" &&
  1.1873        { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
  1.1874  $as_echo "$as_me: updating cache $cache_file" >&6;}
  1.1875 -      if test ! -f "$cache_file" || test -h "$cache_file"; then
  1.1876 -	cat confcache >"$cache_file"
  1.1877 -      else
  1.1878 -        case $cache_file in #(
  1.1879 -        */* | ?:*)
  1.1880 -	  mv -f confcache "$cache_file"$$ &&
  1.1881 -	  mv -f "$cache_file"$$ "$cache_file" ;; #(
  1.1882 -        *)
  1.1883 -	  mv -f confcache "$cache_file" ;;
  1.1884 -	esac
  1.1885 -      fi
  1.1886 -    fi
  1.1887 +    cat confcache >$cache_file
  1.1888    else
  1.1889      { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
  1.1890  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
  1.1891 @@ -33684,7 +33664,7 @@
  1.1892  
  1.1893  
  1.1894  
  1.1895 -: "${CONFIG_STATUS=./config.status}"
  1.1896 +: ${CONFIG_STATUS=./config.status}
  1.1897  ac_write_fail=0
  1.1898  ac_clean_files_save=$ac_clean_files
  1.1899  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
  1.1900 @@ -33785,7 +33765,6 @@
  1.1901  IFS=" ""	$as_nl"
  1.1902  
  1.1903  # Find who we are.  Look in the path if we contain no directory separator.
  1.1904 -as_myself=
  1.1905  case $0 in #((
  1.1906    *[\\/]* ) as_myself=$0 ;;
  1.1907    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.1908 @@ -34093,7 +34072,7 @@
  1.1909  # values after options handling.
  1.1910  ac_log="
  1.1911  This file was extended by OpenJDK $as_me jdk8, which was
  1.1912 -generated by GNU Autoconf 2.68.  Invocation command line was
  1.1913 +generated by GNU Autoconf 2.67.  Invocation command line was
  1.1914  
  1.1915    CONFIG_FILES    = $CONFIG_FILES
  1.1916    CONFIG_HEADERS  = $CONFIG_HEADERS
  1.1917 @@ -34156,7 +34135,7 @@
  1.1918  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  1.1919  ac_cs_version="\\
  1.1920  OpenJDK config.status jdk8
  1.1921 -configured by $0, generated by GNU Autoconf 2.68,
  1.1922 +configured by $0, generated by GNU Autoconf 2.67,
  1.1923    with options \\"\$ac_cs_config\\"
  1.1924  
  1.1925  Copyright (C) 2010 Free Software Foundation, Inc.
  1.1926 @@ -34285,7 +34264,7 @@
  1.1927      "$OUTPUT_ROOT/spec.sh") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in" ;;
  1.1928      "$OUTPUT_ROOT/Makefile") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in" ;;
  1.1929  
  1.1930 -  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
  1.1931 +  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
  1.1932    esac
  1.1933  done
  1.1934  
  1.1935 @@ -34307,10 +34286,9 @@
  1.1936  # after its creation but before its name has been assigned to `$tmp'.
  1.1937  $debug ||
  1.1938  {
  1.1939 -  tmp= ac_tmp=
  1.1940 +  tmp=
  1.1941    trap 'exit_status=$?
  1.1942 -  : "${ac_tmp:=$tmp}"
  1.1943 -  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
  1.1944 +  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  1.1945  ' 0
  1.1946    trap 'as_fn_exit 1' 1 2 13 15
  1.1947  }
  1.1948 @@ -34318,13 +34296,12 @@
  1.1949  
  1.1950  {
  1.1951    tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
  1.1952 -  test -d "$tmp"
  1.1953 +  test -n "$tmp" && test -d "$tmp"
  1.1954  }  ||
  1.1955  {
  1.1956    tmp=./conf$$-$RANDOM
  1.1957    (umask 077 && mkdir "$tmp")
  1.1958  } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
  1.1959 -ac_tmp=$tmp
  1.1960  
  1.1961  # Set up the scripts for CONFIG_FILES section.
  1.1962  # No need to generate them if there are no CONFIG_FILES.
  1.1963 @@ -34346,7 +34323,7 @@
  1.1964    ac_cs_awk_cr=$ac_cr
  1.1965  fi
  1.1966  
  1.1967 -echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
  1.1968 +echo 'BEGIN {' >"$tmp/subs1.awk" &&
  1.1969  _ACEOF
  1.1970  
  1.1971  
  1.1972 @@ -34374,7 +34351,7 @@
  1.1973  rm -f conf$$subs.sh
  1.1974  
  1.1975  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  1.1976 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
  1.1977 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
  1.1978  _ACEOF
  1.1979  sed -n '
  1.1980  h
  1.1981 @@ -34422,7 +34399,7 @@
  1.1982  rm -f conf$$subs.awk
  1.1983  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  1.1984  _ACAWK
  1.1985 -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
  1.1986 +cat >>"\$tmp/subs1.awk" <<_ACAWK &&
  1.1987    for (key in S) S_is_set[key] = 1
  1.1988    FS = ""
  1.1989  
  1.1990 @@ -34454,7 +34431,7 @@
  1.1991    sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
  1.1992  else
  1.1993    cat
  1.1994 -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
  1.1995 +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
  1.1996    || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
  1.1997  _ACEOF
  1.1998  
  1.1999 @@ -34488,7 +34465,7 @@
  1.2000  # No need to generate them if there are no CONFIG_HEADERS.
  1.2001  # This happens for instance with `./config.status Makefile'.
  1.2002  if test -n "$CONFIG_HEADERS"; then
  1.2003 -cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
  1.2004 +cat >"$tmp/defines.awk" <<\_ACAWK ||
  1.2005  BEGIN {
  1.2006  _ACEOF
  1.2007  
  1.2008 @@ -34500,8 +34477,8 @@
  1.2009  # handling of long lines.
  1.2010  ac_delim='%!_!# '
  1.2011  for ac_last_try in false false :; do
  1.2012 -  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
  1.2013 -  if test -z "$ac_tt"; then
  1.2014 +  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
  1.2015 +  if test -z "$ac_t"; then
  1.2016      break
  1.2017    elif $ac_last_try; then
  1.2018      as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
  1.2019 @@ -34602,7 +34579,7 @@
  1.2020    esac
  1.2021    case $ac_mode$ac_tag in
  1.2022    :[FHL]*:*);;
  1.2023 -  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
  1.2024 +  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
  1.2025    :[FH]-) ac_tag=-:-;;
  1.2026    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
  1.2027    esac
  1.2028 @@ -34621,7 +34598,7 @@
  1.2029      for ac_f
  1.2030      do
  1.2031        case $ac_f in
  1.2032 -      -) ac_f="$ac_tmp/stdin";;
  1.2033 +      -) ac_f="$tmp/stdin";;
  1.2034        *) # Look for the file first in the build tree, then in the source tree
  1.2035  	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
  1.2036  	 # because $ac_f cannot contain `:'.
  1.2037 @@ -34630,7 +34607,7 @@
  1.2038  	   [\\/$]*) false;;
  1.2039  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  1.2040  	   esac ||
  1.2041 -	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
  1.2042 +	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
  1.2043        esac
  1.2044        case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
  1.2045        as_fn_append ac_file_inputs " '$ac_f'"
  1.2046 @@ -34656,8 +34633,8 @@
  1.2047      esac
  1.2048  
  1.2049      case $ac_tag in
  1.2050 -    *:-:* | *:-) cat >"$ac_tmp/stdin" \
  1.2051 -      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
  1.2052 +    *:-:* | *:-) cat >"$tmp/stdin" \
  1.2053 +      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
  1.2054      esac
  1.2055      ;;
  1.2056    esac
  1.2057 @@ -34782,22 +34759,21 @@
  1.2058  s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
  1.2059  $ac_datarootdir_hack
  1.2060  "
  1.2061 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
  1.2062 -  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  1.2063 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
  1.2064 +  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  1.2065  
  1.2066  test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
  1.2067 -  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
  1.2068 -  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
  1.2069 -      "$ac_tmp/out"`; test -z "$ac_out"; } &&
  1.2070 +  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
  1.2071 +  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
  1.2072    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  1.2073  which seems to be undefined.  Please make sure it is defined" >&5
  1.2074  $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  1.2075  which seems to be undefined.  Please make sure it is defined" >&2;}
  1.2076  
  1.2077 -  rm -f "$ac_tmp/stdin"
  1.2078 +  rm -f "$tmp/stdin"
  1.2079    case $ac_file in
  1.2080 -  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
  1.2081 -  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
  1.2082 +  -) cat "$tmp/out" && rm -f "$tmp/out";;
  1.2083 +  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
  1.2084    esac \
  1.2085    || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  1.2086   ;;
  1.2087 @@ -34808,20 +34784,20 @@
  1.2088    if test x"$ac_file" != x-; then
  1.2089      {
  1.2090        $as_echo "/* $configure_input  */" \
  1.2091 -      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
  1.2092 -    } >"$ac_tmp/config.h" \
  1.2093 +      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
  1.2094 +    } >"$tmp/config.h" \
  1.2095        || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  1.2096 -    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
  1.2097 +    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
  1.2098        { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
  1.2099  $as_echo "$as_me: $ac_file is unchanged" >&6;}
  1.2100      else
  1.2101        rm -f "$ac_file"
  1.2102 -      mv "$ac_tmp/config.h" "$ac_file" \
  1.2103 +      mv "$tmp/config.h" "$ac_file" \
  1.2104  	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
  1.2105      fi
  1.2106    else
  1.2107      $as_echo "/* $configure_input  */" \
  1.2108 -      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
  1.2109 +      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
  1.2110        || as_fn_error $? "could not create -" "$LINENO" 5
  1.2111    fi
  1.2112   ;;
     2.1 --- a/common/autoconf/platform.m4	Thu Aug 08 10:10:24 2013 -0700
     2.2 +++ b/common/autoconf/platform.m4	Thu Aug 15 17:14:53 2013 +0200
     2.3 @@ -412,17 +412,16 @@
     2.4  [
     2.5    # keep track of c/cxx flags that we added outselves...
     2.6    #   to prevent emitting warning...
     2.7 -  ADDED_CFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
     2.8 -  ADDED_CXXFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
     2.9 -  ADDED_LDFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
    2.10 +  TARGET_BITS_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
    2.11 +  AC_SUBST(TARGET_BITS_FLAG)
    2.12  
    2.13 -  CFLAGS="${CFLAGS}${ADDED_CFLAGS}"
    2.14 -  CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}"
    2.15 -  LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}"
    2.16 +  CFLAGS="${CFLAGS} ${TARGET_BITS_FLAG}"
    2.17 +  CXXFLAGS="${CXXFLAGS} ${TARGET_BITS_FLAG}"
    2.18 +  LDFLAGS="${LDFLAGS} ${TARGET_BITS_FLAG}"
    2.19  
    2.20 -  CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}"
    2.21 -  CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}"
    2.22 -  LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}"
    2.23 +  CFLAGS_JDK="${CFLAGS_JDK} ${TARGET_BITS_FLAG}"
    2.24 +  CXXFLAGS_JDK="${CXXFLAGS_JDK} ${TARGET_BITS_FLAG}"
    2.25 +  LDFLAGS_JDK="${LDFLAGS_JDK} ${TARGET_BITS_FLAG}"
    2.26  ])
    2.27  
    2.28  AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_TARGET_BITS],
     3.1 --- a/common/autoconf/spec.gmk.in	Thu Aug 08 10:10:24 2013 -0700
     3.2 +++ b/common/autoconf/spec.gmk.in	Thu Aug 15 17:14:53 2013 +0200
     3.3 @@ -304,6 +304,7 @@
     3.4  COMPILER_TYPE:=@COMPILER_TYPE@
     3.5  COMPILER_NAME:=@COMPILER_NAME@
     3.6  
     3.7 +TARGET_BITS_FLAG=@TARGET_BITS_FLAG@
     3.8  COMPILER_SUPPORTS_TARGET_BITS_FLAG=@COMPILER_SUPPORTS_TARGET_BITS_FLAG@
     3.9  
    3.10  CC_OUT_OPTION:=@CC_OUT_OPTION@

mercurial