8008451: Make mac builds on 10.8 work on 10.7

Thu, 21 Feb 2013 14:16:56 +0100

author
erikj
date
Thu, 21 Feb 2013 14:16:56 +0100
changeset 631
ab82853d3365
parent 628
fd1a5574cf68
child 632
d3e3d5b06f45

8008451: Make mac builds on 10.8 work on 10.7
Reviewed-by: ohair, ddehaven

common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/autoconf/spec.gmk.in file | annotate | diff | comparison | revisions
common/autoconf/toolchain.m4 file | annotate | diff | comparison | revisions
     1.1 --- a/common/autoconf/generated-configure.sh	Mon Feb 18 15:35:05 2013 -0500
     1.2 +++ b/common/autoconf/generated-configure.sh	Thu Feb 21 14:16:56 2013 +0100
     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 @@ -649,7 +641,7 @@
    1.40  CXXFLAGS_JDKLIB
    1.41  CFLAGS_JDKEXE
    1.42  CFLAGS_JDKLIB
    1.43 -MACOSX_REQUIRED_VERSION
    1.44 +MACOSX_VERSION_MIN
    1.45  PACKAGE_PATH
    1.46  LEGACY_EXTRA_LDFLAGS
    1.47  LEGACY_EXTRA_CXXFLAGS
    1.48 @@ -1442,7 +1434,7 @@
    1.49      $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
    1.50      expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
    1.51        $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
    1.52 -    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
    1.53 +    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
    1.54      ;;
    1.55  
    1.56    esac
    1.57 @@ -1867,7 +1859,7 @@
    1.58  if $ac_init_version; then
    1.59    cat <<\_ACEOF
    1.60  OpenJDK configure jdk8
    1.61 -generated by GNU Autoconf 2.68
    1.62 +generated by GNU Autoconf 2.67
    1.63  
    1.64  Copyright (C) 2010 Free Software Foundation, Inc.
    1.65  This configure script is free software; the Free Software Foundation
    1.66 @@ -1913,7 +1905,7 @@
    1.67  
    1.68  	ac_retval=1
    1.69  fi
    1.70 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    1.71 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    1.72    as_fn_set_status $ac_retval
    1.73  
    1.74  } # ac_fn_c_try_compile
    1.75 @@ -1951,7 +1943,7 @@
    1.76  
    1.77  	ac_retval=1
    1.78  fi
    1.79 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    1.80 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    1.81    as_fn_set_status $ac_retval
    1.82  
    1.83  } # ac_fn_cxx_try_compile
    1.84 @@ -1989,7 +1981,7 @@
    1.85  
    1.86  	ac_retval=1
    1.87  fi
    1.88 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    1.89 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    1.90    as_fn_set_status $ac_retval
    1.91  
    1.92  } # ac_fn_objc_try_compile
    1.93 @@ -2026,7 +2018,7 @@
    1.94  
    1.95      ac_retval=1
    1.96  fi
    1.97 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    1.98 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    1.99    as_fn_set_status $ac_retval
   1.100  
   1.101  } # ac_fn_c_try_cpp
   1.102 @@ -2063,7 +2055,7 @@
   1.103  
   1.104      ac_retval=1
   1.105  fi
   1.106 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   1.107 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   1.108    as_fn_set_status $ac_retval
   1.109  
   1.110  } # ac_fn_cxx_try_cpp
   1.111 @@ -2076,10 +2068,10 @@
   1.112  ac_fn_cxx_check_header_mongrel ()
   1.113  {
   1.114    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   1.115 -  if eval \${$3+:} false; then :
   1.116 +  if eval "test \"\${$3+set}\"" = set; then :
   1.117    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   1.118  $as_echo_n "checking for $2... " >&6; }
   1.119 -if eval \${$3+:} false; then :
   1.120 +if eval "test \"\${$3+set}\"" = set; then :
   1.121    $as_echo_n "(cached) " >&6
   1.122  fi
   1.123  eval ac_res=\$$3
   1.124 @@ -2146,7 +2138,7 @@
   1.125  esac
   1.126    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   1.127  $as_echo_n "checking for $2... " >&6; }
   1.128 -if eval \${$3+:} false; then :
   1.129 +if eval "test \"\${$3+set}\"" = set; then :
   1.130    $as_echo_n "(cached) " >&6
   1.131  else
   1.132    eval "$3=\$ac_header_compiler"
   1.133 @@ -2155,7 +2147,7 @@
   1.134  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   1.135  $as_echo "$ac_res" >&6; }
   1.136  fi
   1.137 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   1.138 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   1.139  
   1.140  } # ac_fn_cxx_check_header_mongrel
   1.141  
   1.142 @@ -2196,7 +2188,7 @@
   1.143         ac_retval=$ac_status
   1.144  fi
   1.145    rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   1.146 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   1.147 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   1.148    as_fn_set_status $ac_retval
   1.149  
   1.150  } # ac_fn_cxx_try_run
   1.151 @@ -2210,7 +2202,7 @@
   1.152    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   1.153    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   1.154  $as_echo_n "checking for $2... " >&6; }
   1.155 -if eval \${$3+:} false; then :
   1.156 +if eval "test \"\${$3+set}\"" = set; then :
   1.157    $as_echo_n "(cached) " >&6
   1.158  else
   1.159    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   1.160 @@ -2228,7 +2220,7 @@
   1.161  eval ac_res=\$$3
   1.162  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   1.163  $as_echo "$ac_res" >&6; }
   1.164 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   1.165 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   1.166  
   1.167  } # ac_fn_cxx_check_header_compile
   1.168  
   1.169 @@ -2405,7 +2397,7 @@
   1.170  rm -f conftest.val
   1.171  
   1.172    fi
   1.173 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   1.174 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   1.175    as_fn_set_status $ac_retval
   1.176  
   1.177  } # ac_fn_cxx_compute_int
   1.178 @@ -2451,7 +2443,7 @@
   1.179    # interfere with the next link command; also delete a directory that is
   1.180    # left behind by Apple's compiler.  We do this before executing the actions.
   1.181    rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   1.182 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   1.183 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   1.184    as_fn_set_status $ac_retval
   1.185  
   1.186  } # ac_fn_cxx_try_link
   1.187 @@ -2464,7 +2456,7 @@
   1.188    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   1.189    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   1.190  $as_echo_n "checking for $2... " >&6; }
   1.191 -if eval \${$3+:} false; then :
   1.192 +if eval "test \"\${$3+set}\"" = set; then :
   1.193    $as_echo_n "(cached) " >&6
   1.194  else
   1.195    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   1.196 @@ -2519,7 +2511,7 @@
   1.197  eval ac_res=\$$3
   1.198  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   1.199  $as_echo "$ac_res" >&6; }
   1.200 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   1.201 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   1.202  
   1.203  } # ac_fn_cxx_check_func
   1.204  
   1.205 @@ -2532,7 +2524,7 @@
   1.206    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   1.207    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   1.208  $as_echo_n "checking for $2... " >&6; }
   1.209 -if eval \${$3+:} false; then :
   1.210 +if eval "test \"\${$3+set}\"" = set; then :
   1.211    $as_echo_n "(cached) " >&6
   1.212  else
   1.213    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   1.214 @@ -2550,7 +2542,7 @@
   1.215  eval ac_res=\$$3
   1.216  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   1.217  $as_echo "$ac_res" >&6; }
   1.218 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   1.219 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   1.220  
   1.221  } # ac_fn_c_check_header_compile
   1.222  cat >config.log <<_ACEOF
   1.223 @@ -2558,7 +2550,7 @@
   1.224  running configure, to aid debugging if configure makes a mistake.
   1.225  
   1.226  It was created by OpenJDK $as_me jdk8, which was
   1.227 -generated by GNU Autoconf 2.68.  Invocation command line was
   1.228 +generated by GNU Autoconf 2.67.  Invocation command line was
   1.229  
   1.230    $ $0 $@
   1.231  
   1.232 @@ -2816,7 +2808,7 @@
   1.233        || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
   1.234  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   1.235  as_fn_error $? "failed to load site script $ac_site_file
   1.236 -See \`config.log' for more details" "$LINENO" 5; }
   1.237 +See \`config.log' for more details" "$LINENO" 5 ; }
   1.238    fi
   1.239  done
   1.240  
   1.241 @@ -3732,7 +3724,7 @@
   1.242  #CUSTOM_AUTOCONF_INCLUDE
   1.243  
   1.244  # Do not change or remove the following line, it is needed for consistency checks:
   1.245 -DATE_WHEN_GENERATED=1361218904
   1.246 +DATE_WHEN_GENERATED=1361452590
   1.247  
   1.248  ###############################################################################
   1.249  #
   1.250 @@ -3770,7 +3762,7 @@
   1.251  set dummy $ac_prog; ac_word=$2
   1.252  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.253  $as_echo_n "checking for $ac_word... " >&6; }
   1.254 -if ${ac_cv_path_BASENAME+:} false; then :
   1.255 +if test "${ac_cv_path_BASENAME+set}" = set; then :
   1.256    $as_echo_n "(cached) " >&6
   1.257  else
   1.258    case $BASENAME in
   1.259 @@ -3829,7 +3821,7 @@
   1.260  set dummy $ac_prog; ac_word=$2
   1.261  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.262  $as_echo_n "checking for $ac_word... " >&6; }
   1.263 -if ${ac_cv_path_BASH+:} false; then :
   1.264 +if test "${ac_cv_path_BASH+set}" = set; then :
   1.265    $as_echo_n "(cached) " >&6
   1.266  else
   1.267    case $BASH in
   1.268 @@ -3888,7 +3880,7 @@
   1.269  set dummy $ac_prog; ac_word=$2
   1.270  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.271  $as_echo_n "checking for $ac_word... " >&6; }
   1.272 -if ${ac_cv_path_CAT+:} false; then :
   1.273 +if test "${ac_cv_path_CAT+set}" = set; then :
   1.274    $as_echo_n "(cached) " >&6
   1.275  else
   1.276    case $CAT in
   1.277 @@ -3947,7 +3939,7 @@
   1.278  set dummy $ac_prog; ac_word=$2
   1.279  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.280  $as_echo_n "checking for $ac_word... " >&6; }
   1.281 -if ${ac_cv_path_CHMOD+:} false; then :
   1.282 +if test "${ac_cv_path_CHMOD+set}" = set; then :
   1.283    $as_echo_n "(cached) " >&6
   1.284  else
   1.285    case $CHMOD in
   1.286 @@ -4006,7 +3998,7 @@
   1.287  set dummy $ac_prog; ac_word=$2
   1.288  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.289  $as_echo_n "checking for $ac_word... " >&6; }
   1.290 -if ${ac_cv_path_CMP+:} false; then :
   1.291 +if test "${ac_cv_path_CMP+set}" = set; then :
   1.292    $as_echo_n "(cached) " >&6
   1.293  else
   1.294    case $CMP in
   1.295 @@ -4065,7 +4057,7 @@
   1.296  set dummy $ac_prog; ac_word=$2
   1.297  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.298  $as_echo_n "checking for $ac_word... " >&6; }
   1.299 -if ${ac_cv_path_COMM+:} false; then :
   1.300 +if test "${ac_cv_path_COMM+set}" = set; then :
   1.301    $as_echo_n "(cached) " >&6
   1.302  else
   1.303    case $COMM in
   1.304 @@ -4124,7 +4116,7 @@
   1.305  set dummy $ac_prog; ac_word=$2
   1.306  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.307  $as_echo_n "checking for $ac_word... " >&6; }
   1.308 -if ${ac_cv_path_CP+:} false; then :
   1.309 +if test "${ac_cv_path_CP+set}" = set; then :
   1.310    $as_echo_n "(cached) " >&6
   1.311  else
   1.312    case $CP in
   1.313 @@ -4183,7 +4175,7 @@
   1.314  set dummy $ac_prog; ac_word=$2
   1.315  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.316  $as_echo_n "checking for $ac_word... " >&6; }
   1.317 -if ${ac_cv_path_CPIO+:} false; then :
   1.318 +if test "${ac_cv_path_CPIO+set}" = set; then :
   1.319    $as_echo_n "(cached) " >&6
   1.320  else
   1.321    case $CPIO in
   1.322 @@ -4242,7 +4234,7 @@
   1.323  set dummy $ac_prog; ac_word=$2
   1.324  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.325  $as_echo_n "checking for $ac_word... " >&6; }
   1.326 -if ${ac_cv_path_CUT+:} false; then :
   1.327 +if test "${ac_cv_path_CUT+set}" = set; then :
   1.328    $as_echo_n "(cached) " >&6
   1.329  else
   1.330    case $CUT in
   1.331 @@ -4301,7 +4293,7 @@
   1.332  set dummy $ac_prog; ac_word=$2
   1.333  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.334  $as_echo_n "checking for $ac_word... " >&6; }
   1.335 -if ${ac_cv_path_DATE+:} false; then :
   1.336 +if test "${ac_cv_path_DATE+set}" = set; then :
   1.337    $as_echo_n "(cached) " >&6
   1.338  else
   1.339    case $DATE in
   1.340 @@ -4360,7 +4352,7 @@
   1.341  set dummy $ac_prog; ac_word=$2
   1.342  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.343  $as_echo_n "checking for $ac_word... " >&6; }
   1.344 -if ${ac_cv_path_DIFF+:} false; then :
   1.345 +if test "${ac_cv_path_DIFF+set}" = set; then :
   1.346    $as_echo_n "(cached) " >&6
   1.347  else
   1.348    case $DIFF in
   1.349 @@ -4419,7 +4411,7 @@
   1.350  set dummy $ac_prog; ac_word=$2
   1.351  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.352  $as_echo_n "checking for $ac_word... " >&6; }
   1.353 -if ${ac_cv_path_DIRNAME+:} false; then :
   1.354 +if test "${ac_cv_path_DIRNAME+set}" = set; then :
   1.355    $as_echo_n "(cached) " >&6
   1.356  else
   1.357    case $DIRNAME in
   1.358 @@ -4478,7 +4470,7 @@
   1.359  set dummy $ac_prog; ac_word=$2
   1.360  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.361  $as_echo_n "checking for $ac_word... " >&6; }
   1.362 -if ${ac_cv_path_ECHO+:} false; then :
   1.363 +if test "${ac_cv_path_ECHO+set}" = set; then :
   1.364    $as_echo_n "(cached) " >&6
   1.365  else
   1.366    case $ECHO in
   1.367 @@ -4537,7 +4529,7 @@
   1.368  set dummy $ac_prog; ac_word=$2
   1.369  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.370  $as_echo_n "checking for $ac_word... " >&6; }
   1.371 -if ${ac_cv_path_EXPR+:} false; then :
   1.372 +if test "${ac_cv_path_EXPR+set}" = set; then :
   1.373    $as_echo_n "(cached) " >&6
   1.374  else
   1.375    case $EXPR in
   1.376 @@ -4596,7 +4588,7 @@
   1.377  set dummy $ac_prog; ac_word=$2
   1.378  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.379  $as_echo_n "checking for $ac_word... " >&6; }
   1.380 -if ${ac_cv_path_FILE+:} false; then :
   1.381 +if test "${ac_cv_path_FILE+set}" = set; then :
   1.382    $as_echo_n "(cached) " >&6
   1.383  else
   1.384    case $FILE in
   1.385 @@ -4655,7 +4647,7 @@
   1.386  set dummy $ac_prog; ac_word=$2
   1.387  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.388  $as_echo_n "checking for $ac_word... " >&6; }
   1.389 -if ${ac_cv_path_FIND+:} false; then :
   1.390 +if test "${ac_cv_path_FIND+set}" = set; then :
   1.391    $as_echo_n "(cached) " >&6
   1.392  else
   1.393    case $FIND in
   1.394 @@ -4714,7 +4706,7 @@
   1.395  set dummy $ac_prog; ac_word=$2
   1.396  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.397  $as_echo_n "checking for $ac_word... " >&6; }
   1.398 -if ${ac_cv_path_HEAD+:} false; then :
   1.399 +if test "${ac_cv_path_HEAD+set}" = set; then :
   1.400    $as_echo_n "(cached) " >&6
   1.401  else
   1.402    case $HEAD in
   1.403 @@ -4773,7 +4765,7 @@
   1.404  set dummy $ac_prog; ac_word=$2
   1.405  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.406  $as_echo_n "checking for $ac_word... " >&6; }
   1.407 -if ${ac_cv_path_LN+:} false; then :
   1.408 +if test "${ac_cv_path_LN+set}" = set; then :
   1.409    $as_echo_n "(cached) " >&6
   1.410  else
   1.411    case $LN in
   1.412 @@ -4832,7 +4824,7 @@
   1.413  set dummy $ac_prog; ac_word=$2
   1.414  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.415  $as_echo_n "checking for $ac_word... " >&6; }
   1.416 -if ${ac_cv_path_LS+:} false; then :
   1.417 +if test "${ac_cv_path_LS+set}" = set; then :
   1.418    $as_echo_n "(cached) " >&6
   1.419  else
   1.420    case $LS in
   1.421 @@ -4891,7 +4883,7 @@
   1.422  set dummy $ac_prog; ac_word=$2
   1.423  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.424  $as_echo_n "checking for $ac_word... " >&6; }
   1.425 -if ${ac_cv_path_MKDIR+:} false; then :
   1.426 +if test "${ac_cv_path_MKDIR+set}" = set; then :
   1.427    $as_echo_n "(cached) " >&6
   1.428  else
   1.429    case $MKDIR in
   1.430 @@ -4950,7 +4942,7 @@
   1.431  set dummy $ac_prog; ac_word=$2
   1.432  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.433  $as_echo_n "checking for $ac_word... " >&6; }
   1.434 -if ${ac_cv_path_MKTEMP+:} false; then :
   1.435 +if test "${ac_cv_path_MKTEMP+set}" = set; then :
   1.436    $as_echo_n "(cached) " >&6
   1.437  else
   1.438    case $MKTEMP in
   1.439 @@ -5009,7 +5001,7 @@
   1.440  set dummy $ac_prog; ac_word=$2
   1.441  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.442  $as_echo_n "checking for $ac_word... " >&6; }
   1.443 -if ${ac_cv_path_MV+:} false; then :
   1.444 +if test "${ac_cv_path_MV+set}" = set; then :
   1.445    $as_echo_n "(cached) " >&6
   1.446  else
   1.447    case $MV in
   1.448 @@ -5068,7 +5060,7 @@
   1.449  set dummy $ac_prog; ac_word=$2
   1.450  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.451  $as_echo_n "checking for $ac_word... " >&6; }
   1.452 -if ${ac_cv_path_PRINTF+:} false; then :
   1.453 +if test "${ac_cv_path_PRINTF+set}" = set; then :
   1.454    $as_echo_n "(cached) " >&6
   1.455  else
   1.456    case $PRINTF in
   1.457 @@ -5127,7 +5119,7 @@
   1.458  set dummy $ac_prog; ac_word=$2
   1.459  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.460  $as_echo_n "checking for $ac_word... " >&6; }
   1.461 -if ${ac_cv_path_THEPWDCMD+:} false; then :
   1.462 +if test "${ac_cv_path_THEPWDCMD+set}" = set; then :
   1.463    $as_echo_n "(cached) " >&6
   1.464  else
   1.465    case $THEPWDCMD in
   1.466 @@ -5186,7 +5178,7 @@
   1.467  set dummy $ac_prog; ac_word=$2
   1.468  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.469  $as_echo_n "checking for $ac_word... " >&6; }
   1.470 -if ${ac_cv_path_RM+:} false; then :
   1.471 +if test "${ac_cv_path_RM+set}" = set; then :
   1.472    $as_echo_n "(cached) " >&6
   1.473  else
   1.474    case $RM in
   1.475 @@ -5245,7 +5237,7 @@
   1.476  set dummy $ac_prog; ac_word=$2
   1.477  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.478  $as_echo_n "checking for $ac_word... " >&6; }
   1.479 -if ${ac_cv_path_SH+:} false; then :
   1.480 +if test "${ac_cv_path_SH+set}" = set; then :
   1.481    $as_echo_n "(cached) " >&6
   1.482  else
   1.483    case $SH in
   1.484 @@ -5304,7 +5296,7 @@
   1.485  set dummy $ac_prog; ac_word=$2
   1.486  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.487  $as_echo_n "checking for $ac_word... " >&6; }
   1.488 -if ${ac_cv_path_SORT+:} false; then :
   1.489 +if test "${ac_cv_path_SORT+set}" = set; then :
   1.490    $as_echo_n "(cached) " >&6
   1.491  else
   1.492    case $SORT in
   1.493 @@ -5363,7 +5355,7 @@
   1.494  set dummy $ac_prog; ac_word=$2
   1.495  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.496  $as_echo_n "checking for $ac_word... " >&6; }
   1.497 -if ${ac_cv_path_TAIL+:} false; then :
   1.498 +if test "${ac_cv_path_TAIL+set}" = set; then :
   1.499    $as_echo_n "(cached) " >&6
   1.500  else
   1.501    case $TAIL in
   1.502 @@ -5422,7 +5414,7 @@
   1.503  set dummy $ac_prog; ac_word=$2
   1.504  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.505  $as_echo_n "checking for $ac_word... " >&6; }
   1.506 -if ${ac_cv_path_TAR+:} false; then :
   1.507 +if test "${ac_cv_path_TAR+set}" = set; then :
   1.508    $as_echo_n "(cached) " >&6
   1.509  else
   1.510    case $TAR in
   1.511 @@ -5481,7 +5473,7 @@
   1.512  set dummy $ac_prog; ac_word=$2
   1.513  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.514  $as_echo_n "checking for $ac_word... " >&6; }
   1.515 -if ${ac_cv_path_TEE+:} false; then :
   1.516 +if test "${ac_cv_path_TEE+set}" = set; then :
   1.517    $as_echo_n "(cached) " >&6
   1.518  else
   1.519    case $TEE in
   1.520 @@ -5540,7 +5532,7 @@
   1.521  set dummy $ac_prog; ac_word=$2
   1.522  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.523  $as_echo_n "checking for $ac_word... " >&6; }
   1.524 -if ${ac_cv_path_TOUCH+:} false; then :
   1.525 +if test "${ac_cv_path_TOUCH+set}" = set; then :
   1.526    $as_echo_n "(cached) " >&6
   1.527  else
   1.528    case $TOUCH in
   1.529 @@ -5599,7 +5591,7 @@
   1.530  set dummy $ac_prog; ac_word=$2
   1.531  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.532  $as_echo_n "checking for $ac_word... " >&6; }
   1.533 -if ${ac_cv_path_TR+:} false; then :
   1.534 +if test "${ac_cv_path_TR+set}" = set; then :
   1.535    $as_echo_n "(cached) " >&6
   1.536  else
   1.537    case $TR in
   1.538 @@ -5658,7 +5650,7 @@
   1.539  set dummy $ac_prog; ac_word=$2
   1.540  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.541  $as_echo_n "checking for $ac_word... " >&6; }
   1.542 -if ${ac_cv_path_UNAME+:} false; then :
   1.543 +if test "${ac_cv_path_UNAME+set}" = set; then :
   1.544    $as_echo_n "(cached) " >&6
   1.545  else
   1.546    case $UNAME in
   1.547 @@ -5717,7 +5709,7 @@
   1.548  set dummy $ac_prog; ac_word=$2
   1.549  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.550  $as_echo_n "checking for $ac_word... " >&6; }
   1.551 -if ${ac_cv_path_UNIQ+:} false; then :
   1.552 +if test "${ac_cv_path_UNIQ+set}" = set; then :
   1.553    $as_echo_n "(cached) " >&6
   1.554  else
   1.555    case $UNIQ in
   1.556 @@ -5776,7 +5768,7 @@
   1.557  set dummy $ac_prog; ac_word=$2
   1.558  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.559  $as_echo_n "checking for $ac_word... " >&6; }
   1.560 -if ${ac_cv_path_WC+:} false; then :
   1.561 +if test "${ac_cv_path_WC+set}" = set; then :
   1.562    $as_echo_n "(cached) " >&6
   1.563  else
   1.564    case $WC in
   1.565 @@ -5835,7 +5827,7 @@
   1.566  set dummy $ac_prog; ac_word=$2
   1.567  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.568  $as_echo_n "checking for $ac_word... " >&6; }
   1.569 -if ${ac_cv_path_WHICH+:} false; then :
   1.570 +if test "${ac_cv_path_WHICH+set}" = set; then :
   1.571    $as_echo_n "(cached) " >&6
   1.572  else
   1.573    case $WHICH in
   1.574 @@ -5894,7 +5886,7 @@
   1.575  set dummy $ac_prog; ac_word=$2
   1.576  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.577  $as_echo_n "checking for $ac_word... " >&6; }
   1.578 -if ${ac_cv_path_XARGS+:} false; then :
   1.579 +if test "${ac_cv_path_XARGS+set}" = set; then :
   1.580    $as_echo_n "(cached) " >&6
   1.581  else
   1.582    case $XARGS in
   1.583 @@ -5954,7 +5946,7 @@
   1.584  set dummy $ac_prog; ac_word=$2
   1.585  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.586  $as_echo_n "checking for $ac_word... " >&6; }
   1.587 -if ${ac_cv_prog_AWK+:} false; then :
   1.588 +if test "${ac_cv_prog_AWK+set}" = set; then :
   1.589    $as_echo_n "(cached) " >&6
   1.590  else
   1.591    if test -n "$AWK"; then
   1.592 @@ -6004,7 +5996,7 @@
   1.593  
   1.594  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
   1.595  $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
   1.596 -if ${ac_cv_path_GREP+:} false; then :
   1.597 +if test "${ac_cv_path_GREP+set}" = set; then :
   1.598    $as_echo_n "(cached) " >&6
   1.599  else
   1.600    if test -z "$GREP"; then
   1.601 @@ -6079,7 +6071,7 @@
   1.602  
   1.603  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
   1.604  $as_echo_n "checking for egrep... " >&6; }
   1.605 -if ${ac_cv_path_EGREP+:} false; then :
   1.606 +if test "${ac_cv_path_EGREP+set}" = set; then :
   1.607    $as_echo_n "(cached) " >&6
   1.608  else
   1.609    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
   1.610 @@ -6158,7 +6150,7 @@
   1.611  
   1.612  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
   1.613  $as_echo_n "checking for fgrep... " >&6; }
   1.614 -if ${ac_cv_path_FGREP+:} false; then :
   1.615 +if test "${ac_cv_path_FGREP+set}" = set; then :
   1.616    $as_echo_n "(cached) " >&6
   1.617  else
   1.618    if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
   1.619 @@ -6237,7 +6229,7 @@
   1.620  
   1.621  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
   1.622  $as_echo_n "checking for a sed that does not truncate output... " >&6; }
   1.623 -if ${ac_cv_path_SED+:} false; then :
   1.624 +if test "${ac_cv_path_SED+set}" = set; then :
   1.625    $as_echo_n "(cached) " >&6
   1.626  else
   1.627              ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
   1.628 @@ -6323,7 +6315,7 @@
   1.629  set dummy $ac_prog; ac_word=$2
   1.630  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.631  $as_echo_n "checking for $ac_word... " >&6; }
   1.632 -if ${ac_cv_path_NAWK+:} false; then :
   1.633 +if test "${ac_cv_path_NAWK+set}" = set; then :
   1.634    $as_echo_n "(cached) " >&6
   1.635  else
   1.636    case $NAWK in
   1.637 @@ -6383,7 +6375,7 @@
   1.638  set dummy cygpath; ac_word=$2
   1.639  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.640  $as_echo_n "checking for $ac_word... " >&6; }
   1.641 -if ${ac_cv_path_CYGPATH+:} false; then :
   1.642 +if test "${ac_cv_path_CYGPATH+set}" = set; then :
   1.643    $as_echo_n "(cached) " >&6
   1.644  else
   1.645    case $CYGPATH in
   1.646 @@ -6423,7 +6415,7 @@
   1.647  set dummy readlink; ac_word=$2
   1.648  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.649  $as_echo_n "checking for $ac_word... " >&6; }
   1.650 -if ${ac_cv_path_READLINK+:} false; then :
   1.651 +if test "${ac_cv_path_READLINK+set}" = set; then :
   1.652    $as_echo_n "(cached) " >&6
   1.653  else
   1.654    case $READLINK in
   1.655 @@ -6463,7 +6455,7 @@
   1.656  set dummy df; ac_word=$2
   1.657  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.658  $as_echo_n "checking for $ac_word... " >&6; }
   1.659 -if ${ac_cv_path_DF+:} false; then :
   1.660 +if test "${ac_cv_path_DF+set}" = set; then :
   1.661    $as_echo_n "(cached) " >&6
   1.662  else
   1.663    case $DF in
   1.664 @@ -6503,7 +6495,7 @@
   1.665  set dummy SetFile; ac_word=$2
   1.666  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.667  $as_echo_n "checking for $ac_word... " >&6; }
   1.668 -if ${ac_cv_path_SETFILE+:} false; then :
   1.669 +if test "${ac_cv_path_SETFILE+set}" = set; then :
   1.670    $as_echo_n "(cached) " >&6
   1.671  else
   1.672    case $SETFILE in
   1.673 @@ -6549,7 +6541,7 @@
   1.674  
   1.675  { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
   1.676  $as_echo_n "checking build system type... " >&6; }
   1.677 -if ${ac_cv_build+:} false; then :
   1.678 +if test "${ac_cv_build+set}" = set; then :
   1.679    $as_echo_n "(cached) " >&6
   1.680  else
   1.681    ac_build_alias=$build_alias
   1.682 @@ -6565,7 +6557,7 @@
   1.683  $as_echo "$ac_cv_build" >&6; }
   1.684  case $ac_cv_build in
   1.685  *-*-*) ;;
   1.686 -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
   1.687 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
   1.688  esac
   1.689  build=$ac_cv_build
   1.690  ac_save_IFS=$IFS; IFS='-'
   1.691 @@ -6583,7 +6575,7 @@
   1.692  
   1.693  { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
   1.694  $as_echo_n "checking host system type... " >&6; }
   1.695 -if ${ac_cv_host+:} false; then :
   1.696 +if test "${ac_cv_host+set}" = set; then :
   1.697    $as_echo_n "(cached) " >&6
   1.698  else
   1.699    if test "x$host_alias" = x; then
   1.700 @@ -6598,7 +6590,7 @@
   1.701  $as_echo "$ac_cv_host" >&6; }
   1.702  case $ac_cv_host in
   1.703  *-*-*) ;;
   1.704 -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
   1.705 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
   1.706  esac
   1.707  host=$ac_cv_host
   1.708  ac_save_IFS=$IFS; IFS='-'
   1.709 @@ -6616,7 +6608,7 @@
   1.710  
   1.711  { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
   1.712  $as_echo_n "checking target system type... " >&6; }
   1.713 -if ${ac_cv_target+:} false; then :
   1.714 +if test "${ac_cv_target+set}" = set; then :
   1.715    $as_echo_n "(cached) " >&6
   1.716  else
   1.717    if test "x$target_alias" = x; then
   1.718 @@ -6631,7 +6623,7 @@
   1.719  $as_echo "$ac_cv_target" >&6; }
   1.720  case $ac_cv_target in
   1.721  *-*-*) ;;
   1.722 -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
   1.723 +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
   1.724  esac
   1.725  target=$ac_cv_target
   1.726  ac_save_IFS=$IFS; IFS='-'
   1.727 @@ -8097,7 +8089,7 @@
   1.728  set dummy $ac_prog; ac_word=$2
   1.729  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.730  $as_echo_n "checking for $ac_word... " >&6; }
   1.731 -if ${ac_cv_prog_PKGHANDLER+:} false; then :
   1.732 +if test "${ac_cv_prog_PKGHANDLER+set}" = set; then :
   1.733    $as_echo_n "(cached) " >&6
   1.734  else
   1.735    if test -n "$PKGHANDLER"; then
   1.736 @@ -8462,7 +8454,7 @@
   1.737  set dummy $ac_prog; ac_word=$2
   1.738  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.739  $as_echo_n "checking for $ac_word... " >&6; }
   1.740 -if ${ac_cv_path_CHECK_GMAKE+:} false; then :
   1.741 +if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then :
   1.742    $as_echo_n "(cached) " >&6
   1.743  else
   1.744    case $CHECK_GMAKE in
   1.745 @@ -8816,7 +8808,7 @@
   1.746  set dummy $ac_prog; ac_word=$2
   1.747  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.748  $as_echo_n "checking for $ac_word... " >&6; }
   1.749 -if ${ac_cv_path_CHECK_MAKE+:} false; then :
   1.750 +if test "${ac_cv_path_CHECK_MAKE+set}" = set; then :
   1.751    $as_echo_n "(cached) " >&6
   1.752  else
   1.753    case $CHECK_MAKE in
   1.754 @@ -9175,7 +9167,7 @@
   1.755  set dummy $ac_prog; ac_word=$2
   1.756  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.757  $as_echo_n "checking for $ac_word... " >&6; }
   1.758 -if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then :
   1.759 +if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then :
   1.760    $as_echo_n "(cached) " >&6
   1.761  else
   1.762    case $CHECK_TOOLSDIR_GMAKE in
   1.763 @@ -9528,7 +9520,7 @@
   1.764  set dummy $ac_prog; ac_word=$2
   1.765  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.766  $as_echo_n "checking for $ac_word... " >&6; }
   1.767 -if ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then :
   1.768 +if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then :
   1.769    $as_echo_n "(cached) " >&6
   1.770  else
   1.771    case $CHECK_TOOLSDIR_MAKE in
   1.772 @@ -9924,7 +9916,7 @@
   1.773  set dummy $ac_prog; ac_word=$2
   1.774  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.775  $as_echo_n "checking for $ac_word... " >&6; }
   1.776 -if ${ac_cv_path_UNZIP+:} false; then :
   1.777 +if test "${ac_cv_path_UNZIP+set}" = set; then :
   1.778    $as_echo_n "(cached) " >&6
   1.779  else
   1.780    case $UNZIP in
   1.781 @@ -9983,7 +9975,7 @@
   1.782  set dummy $ac_prog; ac_word=$2
   1.783  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.784  $as_echo_n "checking for $ac_word... " >&6; }
   1.785 -if ${ac_cv_path_ZIP+:} false; then :
   1.786 +if test "${ac_cv_path_ZIP+set}" = set; then :
   1.787    $as_echo_n "(cached) " >&6
   1.788  else
   1.789    case $ZIP in
   1.790 @@ -10042,7 +10034,7 @@
   1.791  set dummy ldd; ac_word=$2
   1.792  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.793  $as_echo_n "checking for $ac_word... " >&6; }
   1.794 -if ${ac_cv_path_LDD+:} false; then :
   1.795 +if test "${ac_cv_path_LDD+set}" = set; then :
   1.796    $as_echo_n "(cached) " >&6
   1.797  else
   1.798    case $LDD in
   1.799 @@ -10088,7 +10080,7 @@
   1.800  set dummy otool; ac_word=$2
   1.801  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.802  $as_echo_n "checking for $ac_word... " >&6; }
   1.803 -if ${ac_cv_path_OTOOL+:} false; then :
   1.804 +if test "${ac_cv_path_OTOOL+set}" = set; then :
   1.805    $as_echo_n "(cached) " >&6
   1.806  else
   1.807    case $OTOOL in
   1.808 @@ -10133,7 +10125,7 @@
   1.809  set dummy $ac_prog; ac_word=$2
   1.810  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.811  $as_echo_n "checking for $ac_word... " >&6; }
   1.812 -if ${ac_cv_path_READELF+:} false; then :
   1.813 +if test "${ac_cv_path_READELF+set}" = set; then :
   1.814    $as_echo_n "(cached) " >&6
   1.815  else
   1.816    case $READELF in
   1.817 @@ -10176,7 +10168,7 @@
   1.818  set dummy hg; ac_word=$2
   1.819  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.820  $as_echo_n "checking for $ac_word... " >&6; }
   1.821 -if ${ac_cv_path_HG+:} false; then :
   1.822 +if test "${ac_cv_path_HG+set}" = set; then :
   1.823    $as_echo_n "(cached) " >&6
   1.824  else
   1.825    case $HG in
   1.826 @@ -10216,7 +10208,7 @@
   1.827  set dummy stat; ac_word=$2
   1.828  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.829  $as_echo_n "checking for $ac_word... " >&6; }
   1.830 -if ${ac_cv_path_STAT+:} false; then :
   1.831 +if test "${ac_cv_path_STAT+set}" = set; then :
   1.832    $as_echo_n "(cached) " >&6
   1.833  else
   1.834    case $STAT in
   1.835 @@ -10256,7 +10248,7 @@
   1.836  set dummy time; ac_word=$2
   1.837  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.838  $as_echo_n "checking for $ac_word... " >&6; }
   1.839 -if ${ac_cv_path_TIME+:} false; then :
   1.840 +if test "${ac_cv_path_TIME+set}" = set; then :
   1.841    $as_echo_n "(cached) " >&6
   1.842  else
   1.843    case $TIME in
   1.844 @@ -10301,7 +10293,7 @@
   1.845  set dummy $ac_prog; ac_word=$2
   1.846  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.847  $as_echo_n "checking for $ac_word... " >&6; }
   1.848 -if ${ac_cv_path_COMM+:} false; then :
   1.849 +if test "${ac_cv_path_COMM+set}" = set; then :
   1.850    $as_echo_n "(cached) " >&6
   1.851  else
   1.852    case $COMM in
   1.853 @@ -10365,7 +10357,7 @@
   1.854  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
   1.855  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.856  $as_echo_n "checking for $ac_word... " >&6; }
   1.857 -if ${ac_cv_path_PKG_CONFIG+:} false; then :
   1.858 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
   1.859    $as_echo_n "(cached) " >&6
   1.860  else
   1.861    case $PKG_CONFIG in
   1.862 @@ -10408,7 +10400,7 @@
   1.863  set dummy pkg-config; ac_word=$2
   1.864  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.865  $as_echo_n "checking for $ac_word... " >&6; }
   1.866 -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
   1.867 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
   1.868    $as_echo_n "(cached) " >&6
   1.869  else
   1.870    case $ac_pt_PKG_CONFIG in
   1.871 @@ -10581,7 +10573,7 @@
   1.872  set dummy $ac_prog; ac_word=$2
   1.873  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.874  $as_echo_n "checking for $ac_word... " >&6; }
   1.875 -if ${ac_cv_prog_BDEPS_UNZIP+:} false; then :
   1.876 +if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then :
   1.877    $as_echo_n "(cached) " >&6
   1.878  else
   1.879    if test -n "$BDEPS_UNZIP"; then
   1.880 @@ -10627,7 +10619,7 @@
   1.881  set dummy $ac_prog; ac_word=$2
   1.882  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.883  $as_echo_n "checking for $ac_word... " >&6; }
   1.884 -if ${ac_cv_prog_BDEPS_FTP+:} false; then :
   1.885 +if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then :
   1.886    $as_echo_n "(cached) " >&6
   1.887  else
   1.888    if test -n "$BDEPS_FTP"; then
   1.889 @@ -11894,7 +11886,7 @@
   1.890  set dummy javac; ac_word=$2
   1.891  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.892  $as_echo_n "checking for $ac_word... " >&6; }
   1.893 -if ${ac_cv_path_JAVAC_CHECK+:} false; then :
   1.894 +if test "${ac_cv_path_JAVAC_CHECK+set}" = set; then :
   1.895    $as_echo_n "(cached) " >&6
   1.896  else
   1.897    case $JAVAC_CHECK in
   1.898 @@ -11934,7 +11926,7 @@
   1.899  set dummy java; ac_word=$2
   1.900  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.901  $as_echo_n "checking for $ac_word... " >&6; }
   1.902 -if ${ac_cv_path_JAVA_CHECK+:} false; then :
   1.903 +if test "${ac_cv_path_JAVA_CHECK+set}" = set; then :
   1.904    $as_echo_n "(cached) " >&6
   1.905  else
   1.906    case $JAVA_CHECK in
   1.907 @@ -15993,7 +15985,7 @@
   1.908  set dummy link; ac_word=$2
   1.909  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.910  $as_echo_n "checking for $ac_word... " >&6; }
   1.911 -if ${ac_cv_path_CYGWIN_LINK+:} false; then :
   1.912 +if test "${ac_cv_path_CYGWIN_LINK+set}" = set; then :
   1.913    $as_echo_n "(cached) " >&6
   1.914  else
   1.915    case $CYGWIN_LINK in
   1.916 @@ -16982,7 +16974,7 @@
   1.917  set dummy $ac_prog; ac_word=$2
   1.918  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.919  $as_echo_n "checking for $ac_word... " >&6; }
   1.920 -if ${ac_cv_path_BUILD_CC+:} false; then :
   1.921 +if test "${ac_cv_path_BUILD_CC+set}" = set; then :
   1.922    $as_echo_n "(cached) " >&6
   1.923  else
   1.924    case $BUILD_CC in
   1.925 @@ -17293,7 +17285,7 @@
   1.926  set dummy $ac_prog; ac_word=$2
   1.927  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.928  $as_echo_n "checking for $ac_word... " >&6; }
   1.929 -if ${ac_cv_path_BUILD_CXX+:} false; then :
   1.930 +if test "${ac_cv_path_BUILD_CXX+set}" = set; then :
   1.931    $as_echo_n "(cached) " >&6
   1.932  else
   1.933    case $BUILD_CXX in
   1.934 @@ -17602,7 +17594,7 @@
   1.935  set dummy ld; ac_word=$2
   1.936  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.937  $as_echo_n "checking for $ac_word... " >&6; }
   1.938 -if ${ac_cv_path_BUILD_LD+:} false; then :
   1.939 +if test "${ac_cv_path_BUILD_LD+set}" = set; then :
   1.940    $as_echo_n "(cached) " >&6
   1.941  else
   1.942    case $BUILD_LD in
   1.943 @@ -18114,7 +18106,7 @@
   1.944  set dummy $ac_prog; ac_word=$2
   1.945  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.946  $as_echo_n "checking for $ac_word... " >&6; }
   1.947 -if ${ac_cv_path_TOOLS_DIR_CC+:} false; then :
   1.948 +if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then :
   1.949    $as_echo_n "(cached) " >&6
   1.950  else
   1.951    case $TOOLS_DIR_CC in
   1.952 @@ -18166,7 +18158,7 @@
   1.953  set dummy $ac_prog; ac_word=$2
   1.954  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.955  $as_echo_n "checking for $ac_word... " >&6; }
   1.956 -if ${ac_cv_path_POTENTIAL_CC+:} false; then :
   1.957 +if test "${ac_cv_path_POTENTIAL_CC+set}" = set; then :
   1.958    $as_echo_n "(cached) " >&6
   1.959  else
   1.960    case $POTENTIAL_CC in
   1.961 @@ -18579,7 +18571,7 @@
   1.962  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
   1.963  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.964  $as_echo_n "checking for $ac_word... " >&6; }
   1.965 -if ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then :
   1.966 +if test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then :
   1.967    $as_echo_n "(cached) " >&6
   1.968  else
   1.969    if test -n "$PROPER_COMPILER_CC"; then
   1.970 @@ -18623,7 +18615,7 @@
   1.971  set dummy $ac_prog; ac_word=$2
   1.972  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.973  $as_echo_n "checking for $ac_word... " >&6; }
   1.974 -if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then :
   1.975 +if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then :
   1.976    $as_echo_n "(cached) " >&6
   1.977  else
   1.978    if test -n "$ac_ct_PROPER_COMPILER_CC"; then
   1.979 @@ -19073,7 +19065,7 @@
   1.980  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
   1.981  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.982  $as_echo_n "checking for $ac_word... " >&6; }
   1.983 -if ${ac_cv_prog_CC+:} false; then :
   1.984 +if test "${ac_cv_prog_CC+set}" = set; then :
   1.985    $as_echo_n "(cached) " >&6
   1.986  else
   1.987    if test -n "$CC"; then
   1.988 @@ -19117,7 +19109,7 @@
   1.989  set dummy $ac_prog; ac_word=$2
   1.990  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   1.991  $as_echo_n "checking for $ac_word... " >&6; }
   1.992 -if ${ac_cv_prog_ac_ct_CC+:} false; then :
   1.993 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   1.994    $as_echo_n "(cached) " >&6
   1.995  else
   1.996    if test -n "$ac_ct_CC"; then
   1.997 @@ -19170,7 +19162,7 @@
   1.998  test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
   1.999  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.1000  as_fn_error $? "no acceptable C compiler found in \$PATH
  1.1001 -See \`config.log' for more details" "$LINENO" 5; }
  1.1002 +See \`config.log' for more details" "$LINENO" 5 ; }
  1.1003  
  1.1004  # Provide some information about the compiler.
  1.1005  $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
  1.1006 @@ -19285,7 +19277,7 @@
  1.1007  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.1008  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.1009  as_fn_error 77 "C compiler cannot create executables
  1.1010 -See \`config.log' for more details" "$LINENO" 5; }
  1.1011 +See \`config.log' for more details" "$LINENO" 5 ; }
  1.1012  else
  1.1013    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  1.1014  $as_echo "yes" >&6; }
  1.1015 @@ -19328,7 +19320,7 @@
  1.1016    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.1017  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.1018  as_fn_error $? "cannot compute suffix of executables: cannot compile and link
  1.1019 -See \`config.log' for more details" "$LINENO" 5; }
  1.1020 +See \`config.log' for more details" "$LINENO" 5 ; }
  1.1021  fi
  1.1022  rm -f conftest conftest$ac_cv_exeext
  1.1023  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
  1.1024 @@ -19387,7 +19379,7 @@
  1.1025  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.1026  as_fn_error $? "cannot run C compiled programs.
  1.1027  If you meant to cross compile, use \`--host'.
  1.1028 -See \`config.log' for more details" "$LINENO" 5; }
  1.1029 +See \`config.log' for more details" "$LINENO" 5 ; }
  1.1030      fi
  1.1031    fi
  1.1032  fi
  1.1033 @@ -19398,7 +19390,7 @@
  1.1034  ac_clean_files=$ac_clean_files_save
  1.1035  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
  1.1036  $as_echo_n "checking for suffix of object files... " >&6; }
  1.1037 -if ${ac_cv_objext+:} false; then :
  1.1038 +if test "${ac_cv_objext+set}" = set; then :
  1.1039    $as_echo_n "(cached) " >&6
  1.1040  else
  1.1041    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.1042 @@ -19439,7 +19431,7 @@
  1.1043  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.1044  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.1045  as_fn_error $? "cannot compute suffix of object files: cannot compile
  1.1046 -See \`config.log' for more details" "$LINENO" 5; }
  1.1047 +See \`config.log' for more details" "$LINENO" 5 ; }
  1.1048  fi
  1.1049  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  1.1050  fi
  1.1051 @@ -19449,7 +19441,7 @@
  1.1052  ac_objext=$OBJEXT
  1.1053  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
  1.1054  $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
  1.1055 -if ${ac_cv_c_compiler_gnu+:} false; then :
  1.1056 +if test "${ac_cv_c_compiler_gnu+set}" = set; then :
  1.1057    $as_echo_n "(cached) " >&6
  1.1058  else
  1.1059    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.1060 @@ -19486,7 +19478,7 @@
  1.1061  ac_save_CFLAGS=$CFLAGS
  1.1062  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
  1.1063  $as_echo_n "checking whether $CC accepts -g... " >&6; }
  1.1064 -if ${ac_cv_prog_cc_g+:} false; then :
  1.1065 +if test "${ac_cv_prog_cc_g+set}" = set; then :
  1.1066    $as_echo_n "(cached) " >&6
  1.1067  else
  1.1068    ac_save_c_werror_flag=$ac_c_werror_flag
  1.1069 @@ -19564,7 +19556,7 @@
  1.1070  fi
  1.1071  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
  1.1072  $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
  1.1073 -if ${ac_cv_prog_cc_c89+:} false; then :
  1.1074 +if test "${ac_cv_prog_cc_c89+set}" = set; then :
  1.1075    $as_echo_n "(cached) " >&6
  1.1076  else
  1.1077    ac_cv_prog_cc_c89=no
  1.1078 @@ -19683,7 +19675,7 @@
  1.1079  set dummy $ac_prog; ac_word=$2
  1.1080  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1081  $as_echo_n "checking for $ac_word... " >&6; }
  1.1082 -if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then :
  1.1083 +if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then :
  1.1084    $as_echo_n "(cached) " >&6
  1.1085  else
  1.1086    case $TOOLS_DIR_CXX in
  1.1087 @@ -19735,7 +19727,7 @@
  1.1088  set dummy $ac_prog; ac_word=$2
  1.1089  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1090  $as_echo_n "checking for $ac_word... " >&6; }
  1.1091 -if ${ac_cv_path_POTENTIAL_CXX+:} false; then :
  1.1092 +if test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then :
  1.1093    $as_echo_n "(cached) " >&6
  1.1094  else
  1.1095    case $POTENTIAL_CXX in
  1.1096 @@ -20148,7 +20140,7 @@
  1.1097  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  1.1098  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1099  $as_echo_n "checking for $ac_word... " >&6; }
  1.1100 -if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then :
  1.1101 +if test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then :
  1.1102    $as_echo_n "(cached) " >&6
  1.1103  else
  1.1104    if test -n "$PROPER_COMPILER_CXX"; then
  1.1105 @@ -20192,7 +20184,7 @@
  1.1106  set dummy $ac_prog; ac_word=$2
  1.1107  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1108  $as_echo_n "checking for $ac_word... " >&6; }
  1.1109 -if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then :
  1.1110 +if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then :
  1.1111    $as_echo_n "(cached) " >&6
  1.1112  else
  1.1113    if test -n "$ac_ct_PROPER_COMPILER_CXX"; then
  1.1114 @@ -20646,7 +20638,7 @@
  1.1115  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  1.1116  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1117  $as_echo_n "checking for $ac_word... " >&6; }
  1.1118 -if ${ac_cv_prog_CXX+:} false; then :
  1.1119 +if test "${ac_cv_prog_CXX+set}" = set; then :
  1.1120    $as_echo_n "(cached) " >&6
  1.1121  else
  1.1122    if test -n "$CXX"; then
  1.1123 @@ -20690,7 +20682,7 @@
  1.1124  set dummy $ac_prog; ac_word=$2
  1.1125  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1126  $as_echo_n "checking for $ac_word... " >&6; }
  1.1127 -if ${ac_cv_prog_ac_ct_CXX+:} false; then :
  1.1128 +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
  1.1129    $as_echo_n "(cached) " >&6
  1.1130  else
  1.1131    if test -n "$ac_ct_CXX"; then
  1.1132 @@ -20768,7 +20760,7 @@
  1.1133  
  1.1134  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
  1.1135  $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
  1.1136 -if ${ac_cv_cxx_compiler_gnu+:} false; then :
  1.1137 +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
  1.1138    $as_echo_n "(cached) " >&6
  1.1139  else
  1.1140    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.1141 @@ -20805,7 +20797,7 @@
  1.1142  ac_save_CXXFLAGS=$CXXFLAGS
  1.1143  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
  1.1144  $as_echo_n "checking whether $CXX accepts -g... " >&6; }
  1.1145 -if ${ac_cv_prog_cxx_g+:} false; then :
  1.1146 +if test "${ac_cv_prog_cxx_g+set}" = set; then :
  1.1147    $as_echo_n "(cached) " >&6
  1.1148  else
  1.1149    ac_save_cxx_werror_flag=$ac_cxx_werror_flag
  1.1150 @@ -20903,7 +20895,7 @@
  1.1151  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  1.1152  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1153  $as_echo_n "checking for $ac_word... " >&6; }
  1.1154 -if ${ac_cv_prog_OBJC+:} false; then :
  1.1155 +if test "${ac_cv_prog_OBJC+set}" = set; then :
  1.1156    $as_echo_n "(cached) " >&6
  1.1157  else
  1.1158    if test -n "$OBJC"; then
  1.1159 @@ -20947,7 +20939,7 @@
  1.1160  set dummy $ac_prog; ac_word=$2
  1.1161  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1162  $as_echo_n "checking for $ac_word... " >&6; }
  1.1163 -if ${ac_cv_prog_ac_ct_OBJC+:} false; then :
  1.1164 +if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then :
  1.1165    $as_echo_n "(cached) " >&6
  1.1166  else
  1.1167    if test -n "$ac_ct_OBJC"; then
  1.1168 @@ -21023,7 +21015,7 @@
  1.1169  
  1.1170  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5
  1.1171  $as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; }
  1.1172 -if ${ac_cv_objc_compiler_gnu+:} false; then :
  1.1173 +if test "${ac_cv_objc_compiler_gnu+set}" = set; then :
  1.1174    $as_echo_n "(cached) " >&6
  1.1175  else
  1.1176    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.1177 @@ -21060,7 +21052,7 @@
  1.1178  ac_save_OBJCFLAGS=$OBJCFLAGS
  1.1179  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5
  1.1180  $as_echo_n "checking whether $OBJC accepts -g... " >&6; }
  1.1181 -if ${ac_cv_prog_objc_g+:} false; then :
  1.1182 +if test "${ac_cv_prog_objc_g+set}" = set; then :
  1.1183    $as_echo_n "(cached) " >&6
  1.1184  else
  1.1185    ac_save_objc_werror_flag=$ac_objc_werror_flag
  1.1186 @@ -21436,7 +21428,7 @@
  1.1187  set dummy ${ac_tool_prefix}ar; ac_word=$2
  1.1188  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1189  $as_echo_n "checking for $ac_word... " >&6; }
  1.1190 -if ${ac_cv_prog_AR+:} false; then :
  1.1191 +if test "${ac_cv_prog_AR+set}" = set; then :
  1.1192    $as_echo_n "(cached) " >&6
  1.1193  else
  1.1194    if test -n "$AR"; then
  1.1195 @@ -21476,7 +21468,7 @@
  1.1196  set dummy ar; ac_word=$2
  1.1197  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1198  $as_echo_n "checking for $ac_word... " >&6; }
  1.1199 -if ${ac_cv_prog_ac_ct_AR+:} false; then :
  1.1200 +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
  1.1201    $as_echo_n "(cached) " >&6
  1.1202  else
  1.1203    if test -n "$ac_ct_AR"; then
  1.1204 @@ -21818,7 +21810,7 @@
  1.1205  set dummy link; ac_word=$2
  1.1206  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1207  $as_echo_n "checking for $ac_word... " >&6; }
  1.1208 -if ${ac_cv_prog_WINLD+:} false; then :
  1.1209 +if test "${ac_cv_prog_WINLD+set}" = set; then :
  1.1210    $as_echo_n "(cached) " >&6
  1.1211  else
  1.1212    if test -n "$WINLD"; then
  1.1213 @@ -22157,7 +22149,7 @@
  1.1214  set dummy mt; ac_word=$2
  1.1215  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1216  $as_echo_n "checking for $ac_word... " >&6; }
  1.1217 -if ${ac_cv_prog_MT+:} false; then :
  1.1218 +if test "${ac_cv_prog_MT+set}" = set; then :
  1.1219    $as_echo_n "(cached) " >&6
  1.1220  else
  1.1221    if test -n "$MT"; then
  1.1222 @@ -22478,7 +22470,7 @@
  1.1223  set dummy rc; ac_word=$2
  1.1224  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1225  $as_echo_n "checking for $ac_word... " >&6; }
  1.1226 -if ${ac_cv_prog_RC+:} false; then :
  1.1227 +if test "${ac_cv_prog_RC+set}" = set; then :
  1.1228    $as_echo_n "(cached) " >&6
  1.1229  else
  1.1230    if test -n "$RC"; then
  1.1231 @@ -22869,7 +22861,7 @@
  1.1232  set dummy lib; ac_word=$2
  1.1233  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1234  $as_echo_n "checking for $ac_word... " >&6; }
  1.1235 -if ${ac_cv_prog_WINAR+:} false; then :
  1.1236 +if test "${ac_cv_prog_WINAR+set}" = set; then :
  1.1237    $as_echo_n "(cached) " >&6
  1.1238  else
  1.1239    if test -n "$WINAR"; then
  1.1240 @@ -23175,7 +23167,7 @@
  1.1241  set dummy dumpbin; ac_word=$2
  1.1242  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1243  $as_echo_n "checking for $ac_word... " >&6; }
  1.1244 -if ${ac_cv_prog_DUMPBIN+:} false; then :
  1.1245 +if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
  1.1246    $as_echo_n "(cached) " >&6
  1.1247  else
  1.1248    if test -n "$DUMPBIN"; then
  1.1249 @@ -23494,7 +23486,7 @@
  1.1250    CPP=
  1.1251  fi
  1.1252  if test -z "$CPP"; then
  1.1253 -  if ${ac_cv_prog_CPP+:} false; then :
  1.1254 +  if test "${ac_cv_prog_CPP+set}" = set; then :
  1.1255    $as_echo_n "(cached) " >&6
  1.1256  else
  1.1257        # Double quotes because CPP needs to be expanded
  1.1258 @@ -23610,7 +23602,7 @@
  1.1259    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.1260  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.1261  as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
  1.1262 -See \`config.log' for more details" "$LINENO" 5; }
  1.1263 +See \`config.log' for more details" "$LINENO" 5 ; }
  1.1264  fi
  1.1265  
  1.1266  ac_ext=cpp
  1.1267 @@ -23894,7 +23886,7 @@
  1.1268  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
  1.1269  $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
  1.1270  if test -z "$CXXCPP"; then
  1.1271 -  if ${ac_cv_prog_CXXCPP+:} false; then :
  1.1272 +  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
  1.1273    $as_echo_n "(cached) " >&6
  1.1274  else
  1.1275        # Double quotes because CXXCPP needs to be expanded
  1.1276 @@ -24010,7 +24002,7 @@
  1.1277    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.1278  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.1279  as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
  1.1280 -See \`config.log' for more details" "$LINENO" 5; }
  1.1281 +See \`config.log' for more details" "$LINENO" 5 ; }
  1.1282  fi
  1.1283  
  1.1284  ac_ext=cpp
  1.1285 @@ -24312,7 +24304,7 @@
  1.1286  set dummy as; ac_word=$2
  1.1287  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1288  $as_echo_n "checking for $ac_word... " >&6; }
  1.1289 -if ${ac_cv_path_AS+:} false; then :
  1.1290 +if test "${ac_cv_path_AS+set}" = set; then :
  1.1291    $as_echo_n "(cached) " >&6
  1.1292  else
  1.1293    case $AS in
  1.1294 @@ -24626,7 +24618,7 @@
  1.1295  set dummy $ac_prog; ac_word=$2
  1.1296  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1297  $as_echo_n "checking for $ac_word... " >&6; }
  1.1298 -if ${ac_cv_path_NM+:} false; then :
  1.1299 +if test "${ac_cv_path_NM+set}" = set; then :
  1.1300    $as_echo_n "(cached) " >&6
  1.1301  else
  1.1302    case $NM in
  1.1303 @@ -24935,7 +24927,7 @@
  1.1304  set dummy strip; ac_word=$2
  1.1305  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1306  $as_echo_n "checking for $ac_word... " >&6; }
  1.1307 -if ${ac_cv_path_STRIP+:} false; then :
  1.1308 +if test "${ac_cv_path_STRIP+set}" = set; then :
  1.1309    $as_echo_n "(cached) " >&6
  1.1310  else
  1.1311    case $STRIP in
  1.1312 @@ -25241,7 +25233,7 @@
  1.1313  set dummy mcs; ac_word=$2
  1.1314  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1315  $as_echo_n "checking for $ac_word... " >&6; }
  1.1316 -if ${ac_cv_path_MCS+:} false; then :
  1.1317 +if test "${ac_cv_path_MCS+set}" = set; then :
  1.1318    $as_echo_n "(cached) " >&6
  1.1319  else
  1.1320    case $MCS in
  1.1321 @@ -25549,7 +25541,7 @@
  1.1322  set dummy ${ac_tool_prefix}nm; ac_word=$2
  1.1323  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1324  $as_echo_n "checking for $ac_word... " >&6; }
  1.1325 -if ${ac_cv_prog_NM+:} false; then :
  1.1326 +if test "${ac_cv_prog_NM+set}" = set; then :
  1.1327    $as_echo_n "(cached) " >&6
  1.1328  else
  1.1329    if test -n "$NM"; then
  1.1330 @@ -25589,7 +25581,7 @@
  1.1331  set dummy nm; ac_word=$2
  1.1332  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1333  $as_echo_n "checking for $ac_word... " >&6; }
  1.1334 -if ${ac_cv_prog_ac_ct_NM+:} false; then :
  1.1335 +if test "${ac_cv_prog_ac_ct_NM+set}" = set; then :
  1.1336    $as_echo_n "(cached) " >&6
  1.1337  else
  1.1338    if test -n "$ac_ct_NM"; then
  1.1339 @@ -25907,7 +25899,7 @@
  1.1340  set dummy ${ac_tool_prefix}strip; ac_word=$2
  1.1341  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1342  $as_echo_n "checking for $ac_word... " >&6; }
  1.1343 -if ${ac_cv_prog_STRIP+:} false; then :
  1.1344 +if test "${ac_cv_prog_STRIP+set}" = set; then :
  1.1345    $as_echo_n "(cached) " >&6
  1.1346  else
  1.1347    if test -n "$STRIP"; then
  1.1348 @@ -25947,7 +25939,7 @@
  1.1349  set dummy strip; ac_word=$2
  1.1350  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1351  $as_echo_n "checking for $ac_word... " >&6; }
  1.1352 -if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
  1.1353 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
  1.1354    $as_echo_n "(cached) " >&6
  1.1355  else
  1.1356    if test -n "$ac_ct_STRIP"; then
  1.1357 @@ -26272,7 +26264,7 @@
  1.1358  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  1.1359  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1360  $as_echo_n "checking for $ac_word... " >&6; }
  1.1361 -if ${ac_cv_prog_OBJCOPY+:} false; then :
  1.1362 +if test "${ac_cv_prog_OBJCOPY+set}" = set; then :
  1.1363    $as_echo_n "(cached) " >&6
  1.1364  else
  1.1365    if test -n "$OBJCOPY"; then
  1.1366 @@ -26316,7 +26308,7 @@
  1.1367  set dummy $ac_prog; ac_word=$2
  1.1368  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1369  $as_echo_n "checking for $ac_word... " >&6; }
  1.1370 -if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then :
  1.1371 +if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then :
  1.1372    $as_echo_n "(cached) " >&6
  1.1373  else
  1.1374    if test -n "$ac_ct_OBJCOPY"; then
  1.1375 @@ -26643,7 +26635,7 @@
  1.1376  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  1.1377  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1378  $as_echo_n "checking for $ac_word... " >&6; }
  1.1379 -if ${ac_cv_prog_OBJDUMP+:} false; then :
  1.1380 +if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
  1.1381    $as_echo_n "(cached) " >&6
  1.1382  else
  1.1383    if test -n "$OBJDUMP"; then
  1.1384 @@ -26687,7 +26679,7 @@
  1.1385  set dummy $ac_prog; ac_word=$2
  1.1386  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1387  $as_echo_n "checking for $ac_word... " >&6; }
  1.1388 -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
  1.1389 +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
  1.1390    $as_echo_n "(cached) " >&6
  1.1391  else
  1.1392    if test -n "$ac_ct_OBJDUMP"; then
  1.1393 @@ -27011,7 +27003,7 @@
  1.1394  set dummy lipo; ac_word=$2
  1.1395  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1396  $as_echo_n "checking for $ac_word... " >&6; }
  1.1397 -if ${ac_cv_path_LIPO+:} false; then :
  1.1398 +if test "${ac_cv_path_LIPO+set}" = set; then :
  1.1399    $as_echo_n "(cached) " >&6
  1.1400  else
  1.1401    case $LIPO in
  1.1402 @@ -27326,7 +27318,7 @@
  1.1403  
  1.1404  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
  1.1405  $as_echo_n "checking for ANSI C header files... " >&6; }
  1.1406 -if ${ac_cv_header_stdc+:} false; then :
  1.1407 +if test "${ac_cv_header_stdc+set}" = set; then :
  1.1408    $as_echo_n "(cached) " >&6
  1.1409  else
  1.1410    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1.1411 @@ -27502,7 +27494,7 @@
  1.1412  for ac_header in stdio.h
  1.1413  do :
  1.1414    ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default"
  1.1415 -if test "x$ac_cv_header_stdio_h" = xyes; then :
  1.1416 +if test "x$ac_cv_header_stdio_h" = x""yes; then :
  1.1417    cat >>confdefs.h <<_ACEOF
  1.1418  #define HAVE_STDIO_H 1
  1.1419  _ACEOF
  1.1420 @@ -27531,7 +27523,7 @@
  1.1421  # This bug is HP SR number 8606223364.
  1.1422  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5
  1.1423  $as_echo_n "checking size of int *... " >&6; }
  1.1424 -if ${ac_cv_sizeof_int_p+:} false; then :
  1.1425 +if test "${ac_cv_sizeof_int_p+set}" = set; then :
  1.1426    $as_echo_n "(cached) " >&6
  1.1427  else
  1.1428    if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p"        "$ac_includes_default"; then :
  1.1429 @@ -27541,7 +27533,7 @@
  1.1430       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  1.1431  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  1.1432  as_fn_error 77 "cannot compute sizeof (int *)
  1.1433 -See \`config.log' for more details" "$LINENO" 5; }
  1.1434 +See \`config.log' for more details" "$LINENO" 5 ; }
  1.1435     else
  1.1436       ac_cv_sizeof_int_p=0
  1.1437     fi
  1.1438 @@ -27588,7 +27580,7 @@
  1.1439  #
  1.1440   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
  1.1441  $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
  1.1442 -if ${ac_cv_c_bigendian+:} false; then :
  1.1443 +if test "${ac_cv_c_bigendian+set}" = set; then :
  1.1444    $as_echo_n "(cached) " >&6
  1.1445  else
  1.1446    ac_cv_c_bigendian=unknown
  1.1447 @@ -28242,10 +28234,17 @@
  1.1448  fi
  1.1449  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
  1.1450      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE"
  1.1451 -    # Adding these macros will make it an error to link to mac APIs newer than OS version 10.7
  1.1452 -    MACOSX_REQUIRED_VERSION=1070
  1.1453 -
  1.1454 -    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(MACOSX_REQUIRED_VERSION) -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(MACOSX_REQUIRED_VERSION)"
  1.1455 +    # Setting these parameters makes it an error to link to macosx APIs that are
  1.1456 +    # newer than the given OS version and makes the linked binaries compatible even
  1.1457 +    # if built on a newer version of the OS.
  1.1458 +    # The expected format is X.Y.Z
  1.1459 +    MACOSX_VERSION_MIN=10.7.0
  1.1460 +
  1.1461 +    # The macro takes the version with no dots, ex: 1070
  1.1462 +    # Let the flags variables get resolved in make for easier override on make
  1.1463 +    # command line.
  1.1464 +    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
  1.1465 +    LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
  1.1466  fi
  1.1467  if test "x$OPENJDK_TARGET_OS" = xbsd; then
  1.1468      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE"
  1.1469 @@ -28592,8 +28591,8 @@
  1.1470    have_x=disabled
  1.1471  else
  1.1472    case $x_includes,$x_libraries in #(
  1.1473 -    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
  1.1474 -    *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
  1.1475 +    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
  1.1476 +    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
  1.1477    $as_echo_n "(cached) " >&6
  1.1478  else
  1.1479    # One or both of the vars are not set, and there is no cached value.
  1.1480 @@ -28870,7 +28869,7 @@
  1.1481  else
  1.1482    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
  1.1483  $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
  1.1484 -if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
  1.1485 +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
  1.1486    $as_echo_n "(cached) " >&6
  1.1487  else
  1.1488    ac_check_lib_save_LIBS=$LIBS
  1.1489 @@ -28904,14 +28903,14 @@
  1.1490  fi
  1.1491  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
  1.1492  $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
  1.1493 -if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
  1.1494 +if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
  1.1495    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
  1.1496  fi
  1.1497  
  1.1498      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
  1.1499        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
  1.1500  $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
  1.1501 -if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
  1.1502 +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
  1.1503    $as_echo_n "(cached) " >&6
  1.1504  else
  1.1505    ac_check_lib_save_LIBS=$LIBS
  1.1506 @@ -28945,7 +28944,7 @@
  1.1507  fi
  1.1508  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
  1.1509  $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
  1.1510 -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
  1.1511 +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
  1.1512    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
  1.1513  fi
  1.1514  
  1.1515 @@ -28964,14 +28963,14 @@
  1.1516      # The functions gethostbyname, getservbyname, and inet_addr are
  1.1517      # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
  1.1518      ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
  1.1519 -if test "x$ac_cv_func_gethostbyname" = xyes; then :
  1.1520 +if test "x$ac_cv_func_gethostbyname" = x""yes; then :
  1.1521  
  1.1522  fi
  1.1523  
  1.1524      if test $ac_cv_func_gethostbyname = no; then
  1.1525        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
  1.1526  $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
  1.1527 -if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
  1.1528 +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
  1.1529    $as_echo_n "(cached) " >&6
  1.1530  else
  1.1531    ac_check_lib_save_LIBS=$LIBS
  1.1532 @@ -29005,14 +29004,14 @@
  1.1533  fi
  1.1534  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
  1.1535  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
  1.1536 -if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
  1.1537 +if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
  1.1538    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
  1.1539  fi
  1.1540  
  1.1541        if test $ac_cv_lib_nsl_gethostbyname = no; then
  1.1542  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
  1.1543  $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
  1.1544 -if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
  1.1545 +if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
  1.1546    $as_echo_n "(cached) " >&6
  1.1547  else
  1.1548    ac_check_lib_save_LIBS=$LIBS
  1.1549 @@ -29046,7 +29045,7 @@
  1.1550  fi
  1.1551  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
  1.1552  $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
  1.1553 -if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
  1.1554 +if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
  1.1555    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  1.1556  fi
  1.1557  
  1.1558 @@ -29061,14 +29060,14 @@
  1.1559      # must be given before -lnsl if both are needed.  We assume that
  1.1560      # if connect needs -lnsl, so does gethostbyname.
  1.1561      ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect"
  1.1562 -if test "x$ac_cv_func_connect" = xyes; then :
  1.1563 +if test "x$ac_cv_func_connect" = x""yes; then :
  1.1564  
  1.1565  fi
  1.1566  
  1.1567      if test $ac_cv_func_connect = no; then
  1.1568        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
  1.1569  $as_echo_n "checking for connect in -lsocket... " >&6; }
  1.1570 -if ${ac_cv_lib_socket_connect+:} false; then :
  1.1571 +if test "${ac_cv_lib_socket_connect+set}" = set; then :
  1.1572    $as_echo_n "(cached) " >&6
  1.1573  else
  1.1574    ac_check_lib_save_LIBS=$LIBS
  1.1575 @@ -29102,7 +29101,7 @@
  1.1576  fi
  1.1577  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
  1.1578  $as_echo "$ac_cv_lib_socket_connect" >&6; }
  1.1579 -if test "x$ac_cv_lib_socket_connect" = xyes; then :
  1.1580 +if test "x$ac_cv_lib_socket_connect" = x""yes; then :
  1.1581    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
  1.1582  fi
  1.1583  
  1.1584 @@ -29110,14 +29109,14 @@
  1.1585  
  1.1586      # Guillermo Gomez says -lposix is necessary on A/UX.
  1.1587      ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove"
  1.1588 -if test "x$ac_cv_func_remove" = xyes; then :
  1.1589 +if test "x$ac_cv_func_remove" = x""yes; then :
  1.1590  
  1.1591  fi
  1.1592  
  1.1593      if test $ac_cv_func_remove = no; then
  1.1594        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
  1.1595  $as_echo_n "checking for remove in -lposix... " >&6; }
  1.1596 -if ${ac_cv_lib_posix_remove+:} false; then :
  1.1597 +if test "${ac_cv_lib_posix_remove+set}" = set; then :
  1.1598    $as_echo_n "(cached) " >&6
  1.1599  else
  1.1600    ac_check_lib_save_LIBS=$LIBS
  1.1601 @@ -29151,7 +29150,7 @@
  1.1602  fi
  1.1603  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
  1.1604  $as_echo "$ac_cv_lib_posix_remove" >&6; }
  1.1605 -if test "x$ac_cv_lib_posix_remove" = xyes; then :
  1.1606 +if test "x$ac_cv_lib_posix_remove" = x""yes; then :
  1.1607    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  1.1608  fi
  1.1609  
  1.1610 @@ -29159,14 +29158,14 @@
  1.1611  
  1.1612      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
  1.1613      ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
  1.1614 -if test "x$ac_cv_func_shmat" = xyes; then :
  1.1615 +if test "x$ac_cv_func_shmat" = x""yes; then :
  1.1616  
  1.1617  fi
  1.1618  
  1.1619      if test $ac_cv_func_shmat = no; then
  1.1620        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
  1.1621  $as_echo_n "checking for shmat in -lipc... " >&6; }
  1.1622 -if ${ac_cv_lib_ipc_shmat+:} false; then :
  1.1623 +if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
  1.1624    $as_echo_n "(cached) " >&6
  1.1625  else
  1.1626    ac_check_lib_save_LIBS=$LIBS
  1.1627 @@ -29200,7 +29199,7 @@
  1.1628  fi
  1.1629  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
  1.1630  $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
  1.1631 -if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
  1.1632 +if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
  1.1633    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  1.1634  fi
  1.1635  
  1.1636 @@ -29218,7 +29217,7 @@
  1.1637    # John Interrante, Karl Berry
  1.1638    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
  1.1639  $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
  1.1640 -if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
  1.1641 +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
  1.1642    $as_echo_n "(cached) " >&6
  1.1643  else
  1.1644    ac_check_lib_save_LIBS=$LIBS
  1.1645 @@ -29252,7 +29251,7 @@
  1.1646  fi
  1.1647  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
  1.1648  $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
  1.1649 -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
  1.1650 +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
  1.1651    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  1.1652  fi
  1.1653  
  1.1654 @@ -30265,7 +30264,7 @@
  1.1655              LDFLAGS="$FREETYPE2_LIBS"
  1.1656              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5
  1.1657  $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; }
  1.1658 -if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then :
  1.1659 +if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then :
  1.1660    $as_echo_n "(cached) " >&6
  1.1661  else
  1.1662    ac_check_lib_save_LIBS=$LIBS
  1.1663 @@ -30299,7 +30298,7 @@
  1.1664  fi
  1.1665  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5
  1.1666  $as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; }
  1.1667 -if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then :
  1.1668 +if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then :
  1.1669    FREETYPE2_FOUND=true
  1.1670  else
  1.1671    as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5
  1.1672 @@ -30587,7 +30586,7 @@
  1.1673  	    for ac_header in alsa/asoundlib.h
  1.1674  do :
  1.1675    ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default"
  1.1676 -if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then :
  1.1677 +if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then :
  1.1678    cat >>confdefs.h <<_ACEOF
  1.1679  #define HAVE_ALSA_ASOUNDLIB_H 1
  1.1680  _ACEOF
  1.1681 @@ -30646,7 +30645,7 @@
  1.1682  USE_EXTERNAL_LIBJPEG=true
  1.1683  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5
  1.1684  $as_echo_n "checking for main in -ljpeg... " >&6; }
  1.1685 -if ${ac_cv_lib_jpeg_main+:} false; then :
  1.1686 +if test "${ac_cv_lib_jpeg_main+set}" = set; then :
  1.1687    $as_echo_n "(cached) " >&6
  1.1688  else
  1.1689    ac_check_lib_save_LIBS=$LIBS
  1.1690 @@ -30674,7 +30673,7 @@
  1.1691  fi
  1.1692  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5
  1.1693  $as_echo "$ac_cv_lib_jpeg_main" >&6; }
  1.1694 -if test "x$ac_cv_lib_jpeg_main" = xyes; then :
  1.1695 +if test "x$ac_cv_lib_jpeg_main" = x""yes; then :
  1.1696    cat >>confdefs.h <<_ACEOF
  1.1697  #define HAVE_LIBJPEG 1
  1.1698  _ACEOF
  1.1699 @@ -30698,7 +30697,7 @@
  1.1700  USE_EXTERNAL_LIBJPEG=true
  1.1701  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgif" >&5
  1.1702  $as_echo_n "checking for main in -lgif... " >&6; }
  1.1703 -if ${ac_cv_lib_gif_main+:} false; then :
  1.1704 +if test "${ac_cv_lib_gif_main+set}" = set; then :
  1.1705    $as_echo_n "(cached) " >&6
  1.1706  else
  1.1707    ac_check_lib_save_LIBS=$LIBS
  1.1708 @@ -30726,7 +30725,7 @@
  1.1709  fi
  1.1710  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_main" >&5
  1.1711  $as_echo "$ac_cv_lib_gif_main" >&6; }
  1.1712 -if test "x$ac_cv_lib_gif_main" = xyes; then :
  1.1713 +if test "x$ac_cv_lib_gif_main" = x""yes; then :
  1.1714    cat >>confdefs.h <<_ACEOF
  1.1715  #define HAVE_LIBGIF 1
  1.1716  _ACEOF
  1.1717 @@ -30756,7 +30755,7 @@
  1.1718  
  1.1719  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
  1.1720  $as_echo_n "checking for compress in -lz... " >&6; }
  1.1721 -if ${ac_cv_lib_z_compress+:} false; then :
  1.1722 +if test "${ac_cv_lib_z_compress+set}" = set; then :
  1.1723    $as_echo_n "(cached) " >&6
  1.1724  else
  1.1725    ac_check_lib_save_LIBS=$LIBS
  1.1726 @@ -30790,7 +30789,7 @@
  1.1727  fi
  1.1728  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
  1.1729  $as_echo "$ac_cv_lib_z_compress" >&6; }
  1.1730 -if test "x$ac_cv_lib_z_compress" = xyes; then :
  1.1731 +if test "x$ac_cv_lib_z_compress" = x""yes; then :
  1.1732     ZLIB_FOUND=yes
  1.1733  else
  1.1734     ZLIB_FOUND=no
  1.1735 @@ -30883,7 +30882,7 @@
  1.1736  
  1.1737  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
  1.1738  $as_echo_n "checking for cos in -lm... " >&6; }
  1.1739 -if ${ac_cv_lib_m_cos+:} false; then :
  1.1740 +if test "${ac_cv_lib_m_cos+set}" = set; then :
  1.1741    $as_echo_n "(cached) " >&6
  1.1742  else
  1.1743    ac_check_lib_save_LIBS=$LIBS
  1.1744 @@ -30917,7 +30916,7 @@
  1.1745  fi
  1.1746  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
  1.1747  $as_echo "$ac_cv_lib_m_cos" >&6; }
  1.1748 -if test "x$ac_cv_lib_m_cos" = xyes; then :
  1.1749 +if test "x$ac_cv_lib_m_cos" = x""yes; then :
  1.1750    cat >>confdefs.h <<_ACEOF
  1.1751  #define HAVE_LIBM 1
  1.1752  _ACEOF
  1.1753 @@ -30941,7 +30940,7 @@
  1.1754  LIBS=""
  1.1755  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
  1.1756  $as_echo_n "checking for dlopen in -ldl... " >&6; }
  1.1757 -if ${ac_cv_lib_dl_dlopen+:} false; then :
  1.1758 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
  1.1759    $as_echo_n "(cached) " >&6
  1.1760  else
  1.1761    ac_check_lib_save_LIBS=$LIBS
  1.1762 @@ -30975,7 +30974,7 @@
  1.1763  fi
  1.1764  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
  1.1765  $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
  1.1766 -if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
  1.1767 +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
  1.1768    cat >>confdefs.h <<_ACEOF
  1.1769  #define HAVE_LIBDL 1
  1.1770  _ACEOF
  1.1771 @@ -31619,7 +31618,7 @@
  1.1772  set dummy ccache; ac_word=$2
  1.1773  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  1.1774  $as_echo_n "checking for $ac_word... " >&6; }
  1.1775 -if ${ac_cv_path_CCACHE+:} false; then :
  1.1776 +if test "${ac_cv_path_CCACHE+set}" = set; then :
  1.1777    $as_echo_n "(cached) " >&6
  1.1778  else
  1.1779    case $CCACHE in
  1.1780 @@ -31880,21 +31879,10 @@
  1.1781       :end' >>confcache
  1.1782  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
  1.1783    if test -w "$cache_file"; then
  1.1784 -    if test "x$cache_file" != "x/dev/null"; then
  1.1785 +    test "x$cache_file" != "x/dev/null" &&
  1.1786        { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
  1.1787  $as_echo "$as_me: updating cache $cache_file" >&6;}
  1.1788 -      if test ! -f "$cache_file" || test -h "$cache_file"; then
  1.1789 -	cat confcache >"$cache_file"
  1.1790 -      else
  1.1791 -        case $cache_file in #(
  1.1792 -        */* | ?:*)
  1.1793 -	  mv -f confcache "$cache_file"$$ &&
  1.1794 -	  mv -f "$cache_file"$$ "$cache_file" ;; #(
  1.1795 -        *)
  1.1796 -	  mv -f confcache "$cache_file" ;;
  1.1797 -	esac
  1.1798 -      fi
  1.1799 -    fi
  1.1800 +    cat confcache >$cache_file
  1.1801    else
  1.1802      { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
  1.1803  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
  1.1804 @@ -31926,7 +31914,7 @@
  1.1805  
  1.1806  
  1.1807  
  1.1808 -: "${CONFIG_STATUS=./config.status}"
  1.1809 +: ${CONFIG_STATUS=./config.status}
  1.1810  ac_write_fail=0
  1.1811  ac_clean_files_save=$ac_clean_files
  1.1812  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
  1.1813 @@ -32027,7 +32015,6 @@
  1.1814  IFS=" ""	$as_nl"
  1.1815  
  1.1816  # Find who we are.  Look in the path if we contain no directory separator.
  1.1817 -as_myself=
  1.1818  case $0 in #((
  1.1819    *[\\/]* ) as_myself=$0 ;;
  1.1820    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  1.1821 @@ -32335,7 +32322,7 @@
  1.1822  # values after options handling.
  1.1823  ac_log="
  1.1824  This file was extended by OpenJDK $as_me jdk8, which was
  1.1825 -generated by GNU Autoconf 2.68.  Invocation command line was
  1.1826 +generated by GNU Autoconf 2.67.  Invocation command line was
  1.1827  
  1.1828    CONFIG_FILES    = $CONFIG_FILES
  1.1829    CONFIG_HEADERS  = $CONFIG_HEADERS
  1.1830 @@ -32398,7 +32385,7 @@
  1.1831  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  1.1832  ac_cs_version="\\
  1.1833  OpenJDK config.status jdk8
  1.1834 -configured by $0, generated by GNU Autoconf 2.68,
  1.1835 +configured by $0, generated by GNU Autoconf 2.67,
  1.1836    with options \\"\$ac_cs_config\\"
  1.1837  
  1.1838  Copyright (C) 2010 Free Software Foundation, Inc.
  1.1839 @@ -32527,7 +32514,7 @@
  1.1840      "$OUTPUT_ROOT/spec.sh") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in" ;;
  1.1841      "$OUTPUT_ROOT/Makefile") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in" ;;
  1.1842  
  1.1843 -  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
  1.1844 +  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
  1.1845    esac
  1.1846  done
  1.1847  
  1.1848 @@ -32549,10 +32536,9 @@
  1.1849  # after its creation but before its name has been assigned to `$tmp'.
  1.1850  $debug ||
  1.1851  {
  1.1852 -  tmp= ac_tmp=
  1.1853 +  tmp=
  1.1854    trap 'exit_status=$?
  1.1855 -  : "${ac_tmp:=$tmp}"
  1.1856 -  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
  1.1857 +  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  1.1858  ' 0
  1.1859    trap 'as_fn_exit 1' 1 2 13 15
  1.1860  }
  1.1861 @@ -32560,13 +32546,12 @@
  1.1862  
  1.1863  {
  1.1864    tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
  1.1865 -  test -d "$tmp"
  1.1866 +  test -n "$tmp" && test -d "$tmp"
  1.1867  }  ||
  1.1868  {
  1.1869    tmp=./conf$$-$RANDOM
  1.1870    (umask 077 && mkdir "$tmp")
  1.1871  } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
  1.1872 -ac_tmp=$tmp
  1.1873  
  1.1874  # Set up the scripts for CONFIG_FILES section.
  1.1875  # No need to generate them if there are no CONFIG_FILES.
  1.1876 @@ -32588,7 +32573,7 @@
  1.1877    ac_cs_awk_cr=$ac_cr
  1.1878  fi
  1.1879  
  1.1880 -echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
  1.1881 +echo 'BEGIN {' >"$tmp/subs1.awk" &&
  1.1882  _ACEOF
  1.1883  
  1.1884  
  1.1885 @@ -32616,7 +32601,7 @@
  1.1886  rm -f conf$$subs.sh
  1.1887  
  1.1888  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  1.1889 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
  1.1890 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
  1.1891  _ACEOF
  1.1892  sed -n '
  1.1893  h
  1.1894 @@ -32664,7 +32649,7 @@
  1.1895  rm -f conf$$subs.awk
  1.1896  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  1.1897  _ACAWK
  1.1898 -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
  1.1899 +cat >>"\$tmp/subs1.awk" <<_ACAWK &&
  1.1900    for (key in S) S_is_set[key] = 1
  1.1901    FS = ""
  1.1902  
  1.1903 @@ -32696,7 +32681,7 @@
  1.1904    sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
  1.1905  else
  1.1906    cat
  1.1907 -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
  1.1908 +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
  1.1909    || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
  1.1910  _ACEOF
  1.1911  
  1.1912 @@ -32730,7 +32715,7 @@
  1.1913  # No need to generate them if there are no CONFIG_HEADERS.
  1.1914  # This happens for instance with `./config.status Makefile'.
  1.1915  if test -n "$CONFIG_HEADERS"; then
  1.1916 -cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
  1.1917 +cat >"$tmp/defines.awk" <<\_ACAWK ||
  1.1918  BEGIN {
  1.1919  _ACEOF
  1.1920  
  1.1921 @@ -32742,8 +32727,8 @@
  1.1922  # handling of long lines.
  1.1923  ac_delim='%!_!# '
  1.1924  for ac_last_try in false false :; do
  1.1925 -  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
  1.1926 -  if test -z "$ac_tt"; then
  1.1927 +  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
  1.1928 +  if test -z "$ac_t"; then
  1.1929      break
  1.1930    elif $ac_last_try; then
  1.1931      as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
  1.1932 @@ -32844,7 +32829,7 @@
  1.1933    esac
  1.1934    case $ac_mode$ac_tag in
  1.1935    :[FHL]*:*);;
  1.1936 -  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
  1.1937 +  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
  1.1938    :[FH]-) ac_tag=-:-;;
  1.1939    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
  1.1940    esac
  1.1941 @@ -32863,7 +32848,7 @@
  1.1942      for ac_f
  1.1943      do
  1.1944        case $ac_f in
  1.1945 -      -) ac_f="$ac_tmp/stdin";;
  1.1946 +      -) ac_f="$tmp/stdin";;
  1.1947        *) # Look for the file first in the build tree, then in the source tree
  1.1948  	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
  1.1949  	 # because $ac_f cannot contain `:'.
  1.1950 @@ -32872,7 +32857,7 @@
  1.1951  	   [\\/$]*) false;;
  1.1952  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  1.1953  	   esac ||
  1.1954 -	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
  1.1955 +	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
  1.1956        esac
  1.1957        case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
  1.1958        as_fn_append ac_file_inputs " '$ac_f'"
  1.1959 @@ -32898,8 +32883,8 @@
  1.1960      esac
  1.1961  
  1.1962      case $ac_tag in
  1.1963 -    *:-:* | *:-) cat >"$ac_tmp/stdin" \
  1.1964 -      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
  1.1965 +    *:-:* | *:-) cat >"$tmp/stdin" \
  1.1966 +      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
  1.1967      esac
  1.1968      ;;
  1.1969    esac
  1.1970 @@ -33024,22 +33009,21 @@
  1.1971  s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
  1.1972  $ac_datarootdir_hack
  1.1973  "
  1.1974 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
  1.1975 -  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  1.1976 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
  1.1977 +  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  1.1978  
  1.1979  test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
  1.1980 -  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
  1.1981 -  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
  1.1982 -      "$ac_tmp/out"`; test -z "$ac_out"; } &&
  1.1983 +  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
  1.1984 +  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
  1.1985    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  1.1986  which seems to be undefined.  Please make sure it is defined" >&5
  1.1987  $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  1.1988  which seems to be undefined.  Please make sure it is defined" >&2;}
  1.1989  
  1.1990 -  rm -f "$ac_tmp/stdin"
  1.1991 +  rm -f "$tmp/stdin"
  1.1992    case $ac_file in
  1.1993 -  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
  1.1994 -  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
  1.1995 +  -) cat "$tmp/out" && rm -f "$tmp/out";;
  1.1996 +  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
  1.1997    esac \
  1.1998    || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  1.1999   ;;
  1.2000 @@ -33050,20 +33034,20 @@
  1.2001    if test x"$ac_file" != x-; then
  1.2002      {
  1.2003        $as_echo "/* $configure_input  */" \
  1.2004 -      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
  1.2005 -    } >"$ac_tmp/config.h" \
  1.2006 +      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
  1.2007 +    } >"$tmp/config.h" \
  1.2008        || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  1.2009 -    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
  1.2010 +    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
  1.2011        { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
  1.2012  $as_echo "$as_me: $ac_file is unchanged" >&6;}
  1.2013      else
  1.2014        rm -f "$ac_file"
  1.2015 -      mv "$ac_tmp/config.h" "$ac_file" \
  1.2016 +      mv "$tmp/config.h" "$ac_file" \
  1.2017  	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
  1.2018      fi
  1.2019    else
  1.2020      $as_echo "/* $configure_input  */" \
  1.2021 -      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
  1.2022 +      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
  1.2023        || as_fn_error $? "could not create -" "$LINENO" 5
  1.2024    fi
  1.2025   ;;
     2.1 --- a/common/autoconf/spec.gmk.in	Mon Feb 18 15:35:05 2013 -0500
     2.2 +++ b/common/autoconf/spec.gmk.in	Thu Feb 21 14:16:56 2013 +0100
     2.3 @@ -283,7 +283,7 @@
     2.4  OPENWIN_HOME:=@OPENWIN_HOME@
     2.5  
     2.6  # The lowest required version of macosx to enforce compatiblity for
     2.7 -MACOSX_REQUIRED_VERSION=@MACOSX_REQUIRED_VERSION@
     2.8 +MACOSX_VERSION_MIN=@MACOSX_VERSION_MIN@
     2.9  
    2.10  # There are two types: CC or CL
    2.11  # CC is gcc and others behaving reasonably similar.
     3.1 --- a/common/autoconf/toolchain.m4	Mon Feb 18 15:35:05 2013 -0500
     3.2 +++ b/common/autoconf/toolchain.m4	Thu Feb 21 14:16:56 2013 +0100
     3.3 @@ -876,10 +876,17 @@
     3.4  fi
     3.5  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
     3.6      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE"
     3.7 -    # Adding these macros will make it an error to link to mac APIs newer than OS version 10.7
     3.8 -    MACOSX_REQUIRED_VERSION=1070
     3.9 -    AC_SUBST(MACOSX_REQUIRED_VERSION)
    3.10 -    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(MACOSX_REQUIRED_VERSION) -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(MACOSX_REQUIRED_VERSION)" 
    3.11 +    # Setting these parameters makes it an error to link to macosx APIs that are 
    3.12 +    # newer than the given OS version and makes the linked binaries compatible even
    3.13 +    # if built on a newer version of the OS.
    3.14 +    # The expected format is X.Y.Z
    3.15 +    MACOSX_VERSION_MIN=10.7.0
    3.16 +    AC_SUBST(MACOSX_VERSION_MIN)
    3.17 +    # The macro takes the version with no dots, ex: 1070
    3.18 +    # Let the flags variables get resolved in make for easier override on make
    3.19 +    # command line.
    3.20 +    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
    3.21 +    LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
    3.22  fi
    3.23  if test "x$OPENJDK_TARGET_OS" = xbsd; then
    3.24      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE"

mercurial