8009988: build-infra: Fix configure output for zip debuginfo check

Tue, 02 Apr 2013 13:59:30 +0100

author
andrew
date
Tue, 02 Apr 2013 13:59:30 +0100
changeset 664
15c1642967c9
parent 658
466685ba01bf
child 665
f3cdfb3d360d

8009988: build-infra: Fix configure output for zip debuginfo check
Summary: No output from zip debuginfo option when default is used.
Reviewed-by: tbell

common/autoconf/autogen.sh file | annotate | diff | comparison | revisions
common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/autoconf/jdk-options.m4 file | annotate | diff | comparison | revisions
     1.1 --- a/common/autoconf/autogen.sh	Thu Mar 21 10:42:22 2013 -0700
     1.2 +++ b/common/autoconf/autogen.sh	Tue Apr 02 13:59:30 2013 +0100
     1.3 @@ -43,14 +43,24 @@
     1.4  
     1.5  custom_hook=$custom_script_dir/custom-hook.m4
     1.6  
     1.7 -if test "x`which autoconf 2> /dev/null`" = x; then
     1.8 +AUTOCONF=$(which autoconf 2> /dev/null);
     1.9 +AUTOCONF_267=$(which autoconf-2.67 2> /dev/null);
    1.10 +
    1.11 +echo "Autoconf found: ${AUTOCONF}"
    1.12 +echo "Autoconf-2.67 found: ${AUTOCONF_267}"
    1.13 +
    1.14 +if test "x${AUTOCONF}" = x; then
    1.15    echo You need autoconf installed to be able to regenerate the configure script
    1.16    echo Error: Cannot find autoconf 1>&2
    1.17    exit 1
    1.18  fi
    1.19  
    1.20 -echo Generating generated-configure.sh
    1.21 -cat $script_dir/configure.ac  | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | autoconf -W all -I$script_dir - > $script_dir/generated-configure.sh
    1.22 +if test "x${AUTOCONF_267}" != x; then
    1.23 +  AUTOCONF=${AUTOCONF_267};
    1.24 +fi
    1.25 +
    1.26 +echo Generating generated-configure.sh with ${AUTOCONF}
    1.27 +cat $script_dir/configure.ac  | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | ${AUTOCONF} -W all -I$script_dir - > $script_dir/generated-configure.sh
    1.28  rm -rf autom4te.cache
    1.29  
    1.30  if test -e $custom_hook; then
    1.31 @@ -58,7 +68,7 @@
    1.32    # We have custom sources available; also generate configure script
    1.33    # with custom hooks compiled in.
    1.34    cat $script_dir/configure.ac | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | \
    1.35 -    sed -e "s|#CUSTOM_AUTOCONF_INCLUDE|m4_include([$custom_hook])|" | autoconf -W all -I$script_dir - > $custom_script_dir/generated-configure.sh
    1.36 +    sed -e "s|#CUSTOM_AUTOCONF_INCLUDE|m4_include([$custom_hook])|" | ${AUTOCONF} -W all -I$script_dir - > $custom_script_dir/generated-configure.sh
    1.37    rm -rf autom4te.cache
    1.38  else
    1.39    echo No custom hook found:  $custom_hook
     2.1 --- a/common/autoconf/generated-configure.sh	Thu Mar 21 10:42:22 2013 -0700
     2.2 +++ b/common/autoconf/generated-configure.sh	Tue Apr 02 13:59:30 2013 +0100
     2.3 @@ -1,6 +1,6 @@
     2.4  #! /bin/sh
     2.5  # Guess values for system-dependent variables and create Makefiles.
     2.6 -# Generated by GNU Autoconf 2.68 for OpenJDK jdk8.
     2.7 +# Generated by GNU Autoconf 2.67 for OpenJDK jdk8.
     2.8  #
     2.9  # Report bugs to <build-dev@openjdk.java.net>.
    2.10  #
    2.11 @@ -91,7 +91,6 @@
    2.12  IFS=" ""	$as_nl"
    2.13  
    2.14  # Find who we are.  Look in the path if we contain no directory separator.
    2.15 -as_myself=
    2.16  case $0 in #((
    2.17    *[\\/]* ) as_myself=$0 ;;
    2.18    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    2.19 @@ -217,18 +216,11 @@
    2.20    # We cannot yet assume a decent shell, so we have to provide a
    2.21  	# neutralization value for shells without unset; and this also
    2.22  	# works around shells that cannot unset nonexistent variables.
    2.23 -	# Preserve -v and -x to the replacement shell.
    2.24  	BASH_ENV=/dev/null
    2.25  	ENV=/dev/null
    2.26  	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
    2.27  	export CONFIG_SHELL
    2.28 -	case $- in # ((((
    2.29 -	  *v*x* | *x*v* ) as_opts=-vx ;;
    2.30 -	  *v* ) as_opts=-v ;;
    2.31 -	  *x* ) as_opts=-x ;;
    2.32 -	  * ) as_opts= ;;
    2.33 -	esac
    2.34 -	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
    2.35 +	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
    2.36  fi
    2.37  
    2.38      if test x$as_have_required = xno; then :
    2.39 @@ -1450,7 +1442,7 @@
    2.40      $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
    2.41      expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
    2.42        $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
    2.43 -    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
    2.44 +    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
    2.45      ;;
    2.46  
    2.47    esac
    2.48 @@ -1882,7 +1874,7 @@
    2.49  if $ac_init_version; then
    2.50    cat <<\_ACEOF
    2.51  OpenJDK configure jdk8
    2.52 -generated by GNU Autoconf 2.68
    2.53 +generated by GNU Autoconf 2.67
    2.54  
    2.55  Copyright (C) 2010 Free Software Foundation, Inc.
    2.56  This configure script is free software; the Free Software Foundation
    2.57 @@ -1928,7 +1920,7 @@
    2.58  
    2.59  	ac_retval=1
    2.60  fi
    2.61 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    2.62 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    2.63    as_fn_set_status $ac_retval
    2.64  
    2.65  } # ac_fn_c_try_compile
    2.66 @@ -1966,7 +1958,7 @@
    2.67  
    2.68  	ac_retval=1
    2.69  fi
    2.70 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    2.71 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    2.72    as_fn_set_status $ac_retval
    2.73  
    2.74  } # ac_fn_cxx_try_compile
    2.75 @@ -2004,7 +1996,7 @@
    2.76  
    2.77  	ac_retval=1
    2.78  fi
    2.79 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    2.80 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    2.81    as_fn_set_status $ac_retval
    2.82  
    2.83  } # ac_fn_objc_try_compile
    2.84 @@ -2041,7 +2033,7 @@
    2.85  
    2.86      ac_retval=1
    2.87  fi
    2.88 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    2.89 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    2.90    as_fn_set_status $ac_retval
    2.91  
    2.92  } # ac_fn_c_try_cpp
    2.93 @@ -2078,7 +2070,7 @@
    2.94  
    2.95      ac_retval=1
    2.96  fi
    2.97 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    2.98 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    2.99    as_fn_set_status $ac_retval
   2.100  
   2.101  } # ac_fn_cxx_try_cpp
   2.102 @@ -2091,10 +2083,10 @@
   2.103  ac_fn_cxx_check_header_mongrel ()
   2.104  {
   2.105    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   2.106 -  if eval \${$3+:} false; then :
   2.107 +  if eval "test \"\${$3+set}\"" = set; then :
   2.108    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   2.109  $as_echo_n "checking for $2... " >&6; }
   2.110 -if eval \${$3+:} false; then :
   2.111 +if eval "test \"\${$3+set}\"" = set; then :
   2.112    $as_echo_n "(cached) " >&6
   2.113  fi
   2.114  eval ac_res=\$$3
   2.115 @@ -2161,7 +2153,7 @@
   2.116  esac
   2.117    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   2.118  $as_echo_n "checking for $2... " >&6; }
   2.119 -if eval \${$3+:} false; then :
   2.120 +if eval "test \"\${$3+set}\"" = set; then :
   2.121    $as_echo_n "(cached) " >&6
   2.122  else
   2.123    eval "$3=\$ac_header_compiler"
   2.124 @@ -2170,7 +2162,7 @@
   2.125  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   2.126  $as_echo "$ac_res" >&6; }
   2.127  fi
   2.128 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   2.129 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   2.130  
   2.131  } # ac_fn_cxx_check_header_mongrel
   2.132  
   2.133 @@ -2211,7 +2203,7 @@
   2.134         ac_retval=$ac_status
   2.135  fi
   2.136    rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   2.137 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   2.138 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   2.139    as_fn_set_status $ac_retval
   2.140  
   2.141  } # ac_fn_cxx_try_run
   2.142 @@ -2225,7 +2217,7 @@
   2.143    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   2.144    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   2.145  $as_echo_n "checking for $2... " >&6; }
   2.146 -if eval \${$3+:} false; then :
   2.147 +if eval "test \"\${$3+set}\"" = set; then :
   2.148    $as_echo_n "(cached) " >&6
   2.149  else
   2.150    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   2.151 @@ -2243,7 +2235,7 @@
   2.152  eval ac_res=\$$3
   2.153  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   2.154  $as_echo "$ac_res" >&6; }
   2.155 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   2.156 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   2.157  
   2.158  } # ac_fn_cxx_check_header_compile
   2.159  
   2.160 @@ -2420,7 +2412,7 @@
   2.161  rm -f conftest.val
   2.162  
   2.163    fi
   2.164 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   2.165 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   2.166    as_fn_set_status $ac_retval
   2.167  
   2.168  } # ac_fn_cxx_compute_int
   2.169 @@ -2466,7 +2458,7 @@
   2.170    # interfere with the next link command; also delete a directory that is
   2.171    # left behind by Apple's compiler.  We do this before executing the actions.
   2.172    rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   2.173 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   2.174 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   2.175    as_fn_set_status $ac_retval
   2.176  
   2.177  } # ac_fn_cxx_try_link
   2.178 @@ -2479,7 +2471,7 @@
   2.179    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   2.180    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   2.181  $as_echo_n "checking for $2... " >&6; }
   2.182 -if eval \${$3+:} false; then :
   2.183 +if eval "test \"\${$3+set}\"" = set; then :
   2.184    $as_echo_n "(cached) " >&6
   2.185  else
   2.186    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   2.187 @@ -2534,7 +2526,7 @@
   2.188  eval ac_res=\$$3
   2.189  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   2.190  $as_echo "$ac_res" >&6; }
   2.191 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   2.192 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   2.193  
   2.194  } # ac_fn_cxx_check_func
   2.195  
   2.196 @@ -2547,7 +2539,7 @@
   2.197    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   2.198    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
   2.199  $as_echo_n "checking for $2... " >&6; }
   2.200 -if eval \${$3+:} false; then :
   2.201 +if eval "test \"\${$3+set}\"" = set; then :
   2.202    $as_echo_n "(cached) " >&6
   2.203  else
   2.204    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   2.205 @@ -2565,7 +2557,7 @@
   2.206  eval ac_res=\$$3
   2.207  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
   2.208  $as_echo "$ac_res" >&6; }
   2.209 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   2.210 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   2.211  
   2.212  } # ac_fn_c_check_header_compile
   2.213  cat >config.log <<_ACEOF
   2.214 @@ -2573,7 +2565,7 @@
   2.215  running configure, to aid debugging if configure makes a mistake.
   2.216  
   2.217  It was created by OpenJDK $as_me jdk8, which was
   2.218 -generated by GNU Autoconf 2.68.  Invocation command line was
   2.219 +generated by GNU Autoconf 2.67.  Invocation command line was
   2.220  
   2.221    $ $0 $@
   2.222  
   2.223 @@ -3753,7 +3745,7 @@
   2.224  #CUSTOM_AUTOCONF_INCLUDE
   2.225  
   2.226  # Do not change or remove the following line, it is needed for consistency checks:
   2.227 -DATE_WHEN_GENERATED=1363706268
   2.228 +DATE_WHEN_GENERATED=1364562324
   2.229  
   2.230  ###############################################################################
   2.231  #
   2.232 @@ -3791,7 +3783,7 @@
   2.233  set dummy $ac_prog; ac_word=$2
   2.234  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.235  $as_echo_n "checking for $ac_word... " >&6; }
   2.236 -if ${ac_cv_path_BASENAME+:} false; then :
   2.237 +if test "${ac_cv_path_BASENAME+set}" = set; then :
   2.238    $as_echo_n "(cached) " >&6
   2.239  else
   2.240    case $BASENAME in
   2.241 @@ -3850,7 +3842,7 @@
   2.242  set dummy $ac_prog; ac_word=$2
   2.243  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.244  $as_echo_n "checking for $ac_word... " >&6; }
   2.245 -if ${ac_cv_path_BASH+:} false; then :
   2.246 +if test "${ac_cv_path_BASH+set}" = set; then :
   2.247    $as_echo_n "(cached) " >&6
   2.248  else
   2.249    case $BASH in
   2.250 @@ -3909,7 +3901,7 @@
   2.251  set dummy $ac_prog; ac_word=$2
   2.252  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.253  $as_echo_n "checking for $ac_word... " >&6; }
   2.254 -if ${ac_cv_path_CAT+:} false; then :
   2.255 +if test "${ac_cv_path_CAT+set}" = set; then :
   2.256    $as_echo_n "(cached) " >&6
   2.257  else
   2.258    case $CAT in
   2.259 @@ -3968,7 +3960,7 @@
   2.260  set dummy $ac_prog; ac_word=$2
   2.261  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.262  $as_echo_n "checking for $ac_word... " >&6; }
   2.263 -if ${ac_cv_path_CHMOD+:} false; then :
   2.264 +if test "${ac_cv_path_CHMOD+set}" = set; then :
   2.265    $as_echo_n "(cached) " >&6
   2.266  else
   2.267    case $CHMOD in
   2.268 @@ -4027,7 +4019,7 @@
   2.269  set dummy $ac_prog; ac_word=$2
   2.270  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.271  $as_echo_n "checking for $ac_word... " >&6; }
   2.272 -if ${ac_cv_path_CMP+:} false; then :
   2.273 +if test "${ac_cv_path_CMP+set}" = set; then :
   2.274    $as_echo_n "(cached) " >&6
   2.275  else
   2.276    case $CMP in
   2.277 @@ -4086,7 +4078,7 @@
   2.278  set dummy $ac_prog; ac_word=$2
   2.279  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.280  $as_echo_n "checking for $ac_word... " >&6; }
   2.281 -if ${ac_cv_path_COMM+:} false; then :
   2.282 +if test "${ac_cv_path_COMM+set}" = set; then :
   2.283    $as_echo_n "(cached) " >&6
   2.284  else
   2.285    case $COMM in
   2.286 @@ -4145,7 +4137,7 @@
   2.287  set dummy $ac_prog; ac_word=$2
   2.288  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.289  $as_echo_n "checking for $ac_word... " >&6; }
   2.290 -if ${ac_cv_path_CP+:} false; then :
   2.291 +if test "${ac_cv_path_CP+set}" = set; then :
   2.292    $as_echo_n "(cached) " >&6
   2.293  else
   2.294    case $CP in
   2.295 @@ -4204,7 +4196,7 @@
   2.296  set dummy $ac_prog; ac_word=$2
   2.297  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.298  $as_echo_n "checking for $ac_word... " >&6; }
   2.299 -if ${ac_cv_path_CPIO+:} false; then :
   2.300 +if test "${ac_cv_path_CPIO+set}" = set; then :
   2.301    $as_echo_n "(cached) " >&6
   2.302  else
   2.303    case $CPIO in
   2.304 @@ -4263,7 +4255,7 @@
   2.305  set dummy $ac_prog; ac_word=$2
   2.306  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.307  $as_echo_n "checking for $ac_word... " >&6; }
   2.308 -if ${ac_cv_path_CUT+:} false; then :
   2.309 +if test "${ac_cv_path_CUT+set}" = set; then :
   2.310    $as_echo_n "(cached) " >&6
   2.311  else
   2.312    case $CUT in
   2.313 @@ -4322,7 +4314,7 @@
   2.314  set dummy $ac_prog; ac_word=$2
   2.315  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.316  $as_echo_n "checking for $ac_word... " >&6; }
   2.317 -if ${ac_cv_path_DATE+:} false; then :
   2.318 +if test "${ac_cv_path_DATE+set}" = set; then :
   2.319    $as_echo_n "(cached) " >&6
   2.320  else
   2.321    case $DATE in
   2.322 @@ -4381,7 +4373,7 @@
   2.323  set dummy $ac_prog; ac_word=$2
   2.324  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.325  $as_echo_n "checking for $ac_word... " >&6; }
   2.326 -if ${ac_cv_path_DIFF+:} false; then :
   2.327 +if test "${ac_cv_path_DIFF+set}" = set; then :
   2.328    $as_echo_n "(cached) " >&6
   2.329  else
   2.330    case $DIFF in
   2.331 @@ -4440,7 +4432,7 @@
   2.332  set dummy $ac_prog; ac_word=$2
   2.333  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.334  $as_echo_n "checking for $ac_word... " >&6; }
   2.335 -if ${ac_cv_path_DIRNAME+:} false; then :
   2.336 +if test "${ac_cv_path_DIRNAME+set}" = set; then :
   2.337    $as_echo_n "(cached) " >&6
   2.338  else
   2.339    case $DIRNAME in
   2.340 @@ -4499,7 +4491,7 @@
   2.341  set dummy $ac_prog; ac_word=$2
   2.342  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.343  $as_echo_n "checking for $ac_word... " >&6; }
   2.344 -if ${ac_cv_path_ECHO+:} false; then :
   2.345 +if test "${ac_cv_path_ECHO+set}" = set; then :
   2.346    $as_echo_n "(cached) " >&6
   2.347  else
   2.348    case $ECHO in
   2.349 @@ -4558,7 +4550,7 @@
   2.350  set dummy $ac_prog; ac_word=$2
   2.351  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.352  $as_echo_n "checking for $ac_word... " >&6; }
   2.353 -if ${ac_cv_path_EXPR+:} false; then :
   2.354 +if test "${ac_cv_path_EXPR+set}" = set; then :
   2.355    $as_echo_n "(cached) " >&6
   2.356  else
   2.357    case $EXPR in
   2.358 @@ -4617,7 +4609,7 @@
   2.359  set dummy $ac_prog; ac_word=$2
   2.360  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.361  $as_echo_n "checking for $ac_word... " >&6; }
   2.362 -if ${ac_cv_path_FILE+:} false; then :
   2.363 +if test "${ac_cv_path_FILE+set}" = set; then :
   2.364    $as_echo_n "(cached) " >&6
   2.365  else
   2.366    case $FILE in
   2.367 @@ -4676,7 +4668,7 @@
   2.368  set dummy $ac_prog; ac_word=$2
   2.369  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.370  $as_echo_n "checking for $ac_word... " >&6; }
   2.371 -if ${ac_cv_path_FIND+:} false; then :
   2.372 +if test "${ac_cv_path_FIND+set}" = set; then :
   2.373    $as_echo_n "(cached) " >&6
   2.374  else
   2.375    case $FIND in
   2.376 @@ -4735,7 +4727,7 @@
   2.377  set dummy $ac_prog; ac_word=$2
   2.378  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.379  $as_echo_n "checking for $ac_word... " >&6; }
   2.380 -if ${ac_cv_path_HEAD+:} false; then :
   2.381 +if test "${ac_cv_path_HEAD+set}" = set; then :
   2.382    $as_echo_n "(cached) " >&6
   2.383  else
   2.384    case $HEAD in
   2.385 @@ -4794,7 +4786,7 @@
   2.386  set dummy $ac_prog; ac_word=$2
   2.387  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.388  $as_echo_n "checking for $ac_word... " >&6; }
   2.389 -if ${ac_cv_path_LN+:} false; then :
   2.390 +if test "${ac_cv_path_LN+set}" = set; then :
   2.391    $as_echo_n "(cached) " >&6
   2.392  else
   2.393    case $LN in
   2.394 @@ -4853,7 +4845,7 @@
   2.395  set dummy $ac_prog; ac_word=$2
   2.396  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.397  $as_echo_n "checking for $ac_word... " >&6; }
   2.398 -if ${ac_cv_path_LS+:} false; then :
   2.399 +if test "${ac_cv_path_LS+set}" = set; then :
   2.400    $as_echo_n "(cached) " >&6
   2.401  else
   2.402    case $LS in
   2.403 @@ -4912,7 +4904,7 @@
   2.404  set dummy $ac_prog; ac_word=$2
   2.405  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.406  $as_echo_n "checking for $ac_word... " >&6; }
   2.407 -if ${ac_cv_path_MKDIR+:} false; then :
   2.408 +if test "${ac_cv_path_MKDIR+set}" = set; then :
   2.409    $as_echo_n "(cached) " >&6
   2.410  else
   2.411    case $MKDIR in
   2.412 @@ -4971,7 +4963,7 @@
   2.413  set dummy $ac_prog; ac_word=$2
   2.414  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.415  $as_echo_n "checking for $ac_word... " >&6; }
   2.416 -if ${ac_cv_path_MKTEMP+:} false; then :
   2.417 +if test "${ac_cv_path_MKTEMP+set}" = set; then :
   2.418    $as_echo_n "(cached) " >&6
   2.419  else
   2.420    case $MKTEMP in
   2.421 @@ -5030,7 +5022,7 @@
   2.422  set dummy $ac_prog; ac_word=$2
   2.423  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.424  $as_echo_n "checking for $ac_word... " >&6; }
   2.425 -if ${ac_cv_path_MV+:} false; then :
   2.426 +if test "${ac_cv_path_MV+set}" = set; then :
   2.427    $as_echo_n "(cached) " >&6
   2.428  else
   2.429    case $MV in
   2.430 @@ -5089,7 +5081,7 @@
   2.431  set dummy $ac_prog; ac_word=$2
   2.432  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.433  $as_echo_n "checking for $ac_word... " >&6; }
   2.434 -if ${ac_cv_path_PRINTF+:} false; then :
   2.435 +if test "${ac_cv_path_PRINTF+set}" = set; then :
   2.436    $as_echo_n "(cached) " >&6
   2.437  else
   2.438    case $PRINTF in
   2.439 @@ -5148,7 +5140,7 @@
   2.440  set dummy $ac_prog; ac_word=$2
   2.441  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.442  $as_echo_n "checking for $ac_word... " >&6; }
   2.443 -if ${ac_cv_path_THEPWDCMD+:} false; then :
   2.444 +if test "${ac_cv_path_THEPWDCMD+set}" = set; then :
   2.445    $as_echo_n "(cached) " >&6
   2.446  else
   2.447    case $THEPWDCMD in
   2.448 @@ -5207,7 +5199,7 @@
   2.449  set dummy $ac_prog; ac_word=$2
   2.450  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.451  $as_echo_n "checking for $ac_word... " >&6; }
   2.452 -if ${ac_cv_path_RM+:} false; then :
   2.453 +if test "${ac_cv_path_RM+set}" = set; then :
   2.454    $as_echo_n "(cached) " >&6
   2.455  else
   2.456    case $RM in
   2.457 @@ -5266,7 +5258,7 @@
   2.458  set dummy $ac_prog; ac_word=$2
   2.459  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.460  $as_echo_n "checking for $ac_word... " >&6; }
   2.461 -if ${ac_cv_path_SH+:} false; then :
   2.462 +if test "${ac_cv_path_SH+set}" = set; then :
   2.463    $as_echo_n "(cached) " >&6
   2.464  else
   2.465    case $SH in
   2.466 @@ -5325,7 +5317,7 @@
   2.467  set dummy $ac_prog; ac_word=$2
   2.468  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.469  $as_echo_n "checking for $ac_word... " >&6; }
   2.470 -if ${ac_cv_path_SORT+:} false; then :
   2.471 +if test "${ac_cv_path_SORT+set}" = set; then :
   2.472    $as_echo_n "(cached) " >&6
   2.473  else
   2.474    case $SORT in
   2.475 @@ -5384,7 +5376,7 @@
   2.476  set dummy $ac_prog; ac_word=$2
   2.477  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.478  $as_echo_n "checking for $ac_word... " >&6; }
   2.479 -if ${ac_cv_path_TAIL+:} false; then :
   2.480 +if test "${ac_cv_path_TAIL+set}" = set; then :
   2.481    $as_echo_n "(cached) " >&6
   2.482  else
   2.483    case $TAIL in
   2.484 @@ -5443,7 +5435,7 @@
   2.485  set dummy $ac_prog; ac_word=$2
   2.486  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.487  $as_echo_n "checking for $ac_word... " >&6; }
   2.488 -if ${ac_cv_path_TAR+:} false; then :
   2.489 +if test "${ac_cv_path_TAR+set}" = set; then :
   2.490    $as_echo_n "(cached) " >&6
   2.491  else
   2.492    case $TAR in
   2.493 @@ -5502,7 +5494,7 @@
   2.494  set dummy $ac_prog; ac_word=$2
   2.495  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.496  $as_echo_n "checking for $ac_word... " >&6; }
   2.497 -if ${ac_cv_path_TEE+:} false; then :
   2.498 +if test "${ac_cv_path_TEE+set}" = set; then :
   2.499    $as_echo_n "(cached) " >&6
   2.500  else
   2.501    case $TEE in
   2.502 @@ -5561,7 +5553,7 @@
   2.503  set dummy $ac_prog; ac_word=$2
   2.504  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.505  $as_echo_n "checking for $ac_word... " >&6; }
   2.506 -if ${ac_cv_path_TOUCH+:} false; then :
   2.507 +if test "${ac_cv_path_TOUCH+set}" = set; then :
   2.508    $as_echo_n "(cached) " >&6
   2.509  else
   2.510    case $TOUCH in
   2.511 @@ -5620,7 +5612,7 @@
   2.512  set dummy $ac_prog; ac_word=$2
   2.513  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.514  $as_echo_n "checking for $ac_word... " >&6; }
   2.515 -if ${ac_cv_path_TR+:} false; then :
   2.516 +if test "${ac_cv_path_TR+set}" = set; then :
   2.517    $as_echo_n "(cached) " >&6
   2.518  else
   2.519    case $TR in
   2.520 @@ -5679,7 +5671,7 @@
   2.521  set dummy $ac_prog; ac_word=$2
   2.522  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.523  $as_echo_n "checking for $ac_word... " >&6; }
   2.524 -if ${ac_cv_path_UNAME+:} false; then :
   2.525 +if test "${ac_cv_path_UNAME+set}" = set; then :
   2.526    $as_echo_n "(cached) " >&6
   2.527  else
   2.528    case $UNAME in
   2.529 @@ -5738,7 +5730,7 @@
   2.530  set dummy $ac_prog; ac_word=$2
   2.531  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.532  $as_echo_n "checking for $ac_word... " >&6; }
   2.533 -if ${ac_cv_path_UNIQ+:} false; then :
   2.534 +if test "${ac_cv_path_UNIQ+set}" = set; then :
   2.535    $as_echo_n "(cached) " >&6
   2.536  else
   2.537    case $UNIQ in
   2.538 @@ -5797,7 +5789,7 @@
   2.539  set dummy $ac_prog; ac_word=$2
   2.540  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.541  $as_echo_n "checking for $ac_word... " >&6; }
   2.542 -if ${ac_cv_path_WC+:} false; then :
   2.543 +if test "${ac_cv_path_WC+set}" = set; then :
   2.544    $as_echo_n "(cached) " >&6
   2.545  else
   2.546    case $WC in
   2.547 @@ -5856,7 +5848,7 @@
   2.548  set dummy $ac_prog; ac_word=$2
   2.549  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.550  $as_echo_n "checking for $ac_word... " >&6; }
   2.551 -if ${ac_cv_path_WHICH+:} false; then :
   2.552 +if test "${ac_cv_path_WHICH+set}" = set; then :
   2.553    $as_echo_n "(cached) " >&6
   2.554  else
   2.555    case $WHICH in
   2.556 @@ -5915,7 +5907,7 @@
   2.557  set dummy $ac_prog; ac_word=$2
   2.558  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.559  $as_echo_n "checking for $ac_word... " >&6; }
   2.560 -if ${ac_cv_path_XARGS+:} false; then :
   2.561 +if test "${ac_cv_path_XARGS+set}" = set; then :
   2.562    $as_echo_n "(cached) " >&6
   2.563  else
   2.564    case $XARGS in
   2.565 @@ -5975,7 +5967,7 @@
   2.566  set dummy $ac_prog; ac_word=$2
   2.567  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.568  $as_echo_n "checking for $ac_word... " >&6; }
   2.569 -if ${ac_cv_prog_AWK+:} false; then :
   2.570 +if test "${ac_cv_prog_AWK+set}" = set; then :
   2.571    $as_echo_n "(cached) " >&6
   2.572  else
   2.573    if test -n "$AWK"; then
   2.574 @@ -6025,7 +6017,7 @@
   2.575  
   2.576  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
   2.577  $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
   2.578 -if ${ac_cv_path_GREP+:} false; then :
   2.579 +if test "${ac_cv_path_GREP+set}" = set; then :
   2.580    $as_echo_n "(cached) " >&6
   2.581  else
   2.582    if test -z "$GREP"; then
   2.583 @@ -6100,7 +6092,7 @@
   2.584  
   2.585  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
   2.586  $as_echo_n "checking for egrep... " >&6; }
   2.587 -if ${ac_cv_path_EGREP+:} false; then :
   2.588 +if test "${ac_cv_path_EGREP+set}" = set; then :
   2.589    $as_echo_n "(cached) " >&6
   2.590  else
   2.591    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
   2.592 @@ -6179,7 +6171,7 @@
   2.593  
   2.594  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
   2.595  $as_echo_n "checking for fgrep... " >&6; }
   2.596 -if ${ac_cv_path_FGREP+:} false; then :
   2.597 +if test "${ac_cv_path_FGREP+set}" = set; then :
   2.598    $as_echo_n "(cached) " >&6
   2.599  else
   2.600    if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
   2.601 @@ -6258,7 +6250,7 @@
   2.602  
   2.603  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
   2.604  $as_echo_n "checking for a sed that does not truncate output... " >&6; }
   2.605 -if ${ac_cv_path_SED+:} false; then :
   2.606 +if test "${ac_cv_path_SED+set}" = set; then :
   2.607    $as_echo_n "(cached) " >&6
   2.608  else
   2.609              ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
   2.610 @@ -6344,7 +6336,7 @@
   2.611  set dummy $ac_prog; ac_word=$2
   2.612  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.613  $as_echo_n "checking for $ac_word... " >&6; }
   2.614 -if ${ac_cv_path_NAWK+:} false; then :
   2.615 +if test "${ac_cv_path_NAWK+set}" = set; then :
   2.616    $as_echo_n "(cached) " >&6
   2.617  else
   2.618    case $NAWK in
   2.619 @@ -6404,7 +6396,7 @@
   2.620  set dummy cygpath; ac_word=$2
   2.621  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.622  $as_echo_n "checking for $ac_word... " >&6; }
   2.623 -if ${ac_cv_path_CYGPATH+:} false; then :
   2.624 +if test "${ac_cv_path_CYGPATH+set}" = set; then :
   2.625    $as_echo_n "(cached) " >&6
   2.626  else
   2.627    case $CYGPATH in
   2.628 @@ -6444,7 +6436,7 @@
   2.629  set dummy readlink; ac_word=$2
   2.630  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.631  $as_echo_n "checking for $ac_word... " >&6; }
   2.632 -if ${ac_cv_path_READLINK+:} false; then :
   2.633 +if test "${ac_cv_path_READLINK+set}" = set; then :
   2.634    $as_echo_n "(cached) " >&6
   2.635  else
   2.636    case $READLINK in
   2.637 @@ -6484,7 +6476,7 @@
   2.638  set dummy df; ac_word=$2
   2.639  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.640  $as_echo_n "checking for $ac_word... " >&6; }
   2.641 -if ${ac_cv_path_DF+:} false; then :
   2.642 +if test "${ac_cv_path_DF+set}" = set; then :
   2.643    $as_echo_n "(cached) " >&6
   2.644  else
   2.645    case $DF in
   2.646 @@ -6524,7 +6516,7 @@
   2.647  set dummy SetFile; ac_word=$2
   2.648  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.649  $as_echo_n "checking for $ac_word... " >&6; }
   2.650 -if ${ac_cv_path_SETFILE+:} false; then :
   2.651 +if test "${ac_cv_path_SETFILE+set}" = set; then :
   2.652    $as_echo_n "(cached) " >&6
   2.653  else
   2.654    case $SETFILE in
   2.655 @@ -6570,7 +6562,7 @@
   2.656  
   2.657  { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
   2.658  $as_echo_n "checking build system type... " >&6; }
   2.659 -if ${ac_cv_build+:} false; then :
   2.660 +if test "${ac_cv_build+set}" = set; then :
   2.661    $as_echo_n "(cached) " >&6
   2.662  else
   2.663    ac_build_alias=$build_alias
   2.664 @@ -6604,7 +6596,7 @@
   2.665  
   2.666  { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
   2.667  $as_echo_n "checking host system type... " >&6; }
   2.668 -if ${ac_cv_host+:} false; then :
   2.669 +if test "${ac_cv_host+set}" = set; then :
   2.670    $as_echo_n "(cached) " >&6
   2.671  else
   2.672    if test "x$host_alias" = x; then
   2.673 @@ -6637,7 +6629,7 @@
   2.674  
   2.675  { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
   2.676  $as_echo_n "checking target system type... " >&6; }
   2.677 -if ${ac_cv_target+:} false; then :
   2.678 +if test "${ac_cv_target+set}" = set; then :
   2.679    $as_echo_n "(cached) " >&6
   2.680  else
   2.681    if test "x$target_alias" = x; then
   2.682 @@ -8118,7 +8110,7 @@
   2.683  set dummy $ac_prog; ac_word=$2
   2.684  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.685  $as_echo_n "checking for $ac_word... " >&6; }
   2.686 -if ${ac_cv_prog_PKGHANDLER+:} false; then :
   2.687 +if test "${ac_cv_prog_PKGHANDLER+set}" = set; then :
   2.688    $as_echo_n "(cached) " >&6
   2.689  else
   2.690    if test -n "$PKGHANDLER"; then
   2.691 @@ -8483,7 +8475,7 @@
   2.692  set dummy $ac_prog; ac_word=$2
   2.693  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.694  $as_echo_n "checking for $ac_word... " >&6; }
   2.695 -if ${ac_cv_path_CHECK_GMAKE+:} false; then :
   2.696 +if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then :
   2.697    $as_echo_n "(cached) " >&6
   2.698  else
   2.699    case $CHECK_GMAKE in
   2.700 @@ -8837,7 +8829,7 @@
   2.701  set dummy $ac_prog; ac_word=$2
   2.702  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.703  $as_echo_n "checking for $ac_word... " >&6; }
   2.704 -if ${ac_cv_path_CHECK_MAKE+:} false; then :
   2.705 +if test "${ac_cv_path_CHECK_MAKE+set}" = set; then :
   2.706    $as_echo_n "(cached) " >&6
   2.707  else
   2.708    case $CHECK_MAKE in
   2.709 @@ -9196,7 +9188,7 @@
   2.710  set dummy $ac_prog; ac_word=$2
   2.711  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.712  $as_echo_n "checking for $ac_word... " >&6; }
   2.713 -if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then :
   2.714 +if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then :
   2.715    $as_echo_n "(cached) " >&6
   2.716  else
   2.717    case $CHECK_TOOLSDIR_GMAKE in
   2.718 @@ -9549,7 +9541,7 @@
   2.719  set dummy $ac_prog; ac_word=$2
   2.720  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.721  $as_echo_n "checking for $ac_word... " >&6; }
   2.722 -if ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then :
   2.723 +if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then :
   2.724    $as_echo_n "(cached) " >&6
   2.725  else
   2.726    case $CHECK_TOOLSDIR_MAKE in
   2.727 @@ -9945,7 +9937,7 @@
   2.728  set dummy $ac_prog; ac_word=$2
   2.729  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.730  $as_echo_n "checking for $ac_word... " >&6; }
   2.731 -if ${ac_cv_path_UNZIP+:} false; then :
   2.732 +if test "${ac_cv_path_UNZIP+set}" = set; then :
   2.733    $as_echo_n "(cached) " >&6
   2.734  else
   2.735    case $UNZIP in
   2.736 @@ -10004,7 +9996,7 @@
   2.737  set dummy $ac_prog; ac_word=$2
   2.738  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.739  $as_echo_n "checking for $ac_word... " >&6; }
   2.740 -if ${ac_cv_path_ZIP+:} false; then :
   2.741 +if test "${ac_cv_path_ZIP+set}" = set; then :
   2.742    $as_echo_n "(cached) " >&6
   2.743  else
   2.744    case $ZIP in
   2.745 @@ -10063,7 +10055,7 @@
   2.746  set dummy ldd; ac_word=$2
   2.747  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.748  $as_echo_n "checking for $ac_word... " >&6; }
   2.749 -if ${ac_cv_path_LDD+:} false; then :
   2.750 +if test "${ac_cv_path_LDD+set}" = set; then :
   2.751    $as_echo_n "(cached) " >&6
   2.752  else
   2.753    case $LDD in
   2.754 @@ -10109,7 +10101,7 @@
   2.755  set dummy otool; ac_word=$2
   2.756  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.757  $as_echo_n "checking for $ac_word... " >&6; }
   2.758 -if ${ac_cv_path_OTOOL+:} false; then :
   2.759 +if test "${ac_cv_path_OTOOL+set}" = set; then :
   2.760    $as_echo_n "(cached) " >&6
   2.761  else
   2.762    case $OTOOL in
   2.763 @@ -10154,7 +10146,7 @@
   2.764  set dummy $ac_prog; ac_word=$2
   2.765  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.766  $as_echo_n "checking for $ac_word... " >&6; }
   2.767 -if ${ac_cv_path_READELF+:} false; then :
   2.768 +if test "${ac_cv_path_READELF+set}" = set; then :
   2.769    $as_echo_n "(cached) " >&6
   2.770  else
   2.771    case $READELF in
   2.772 @@ -10197,7 +10189,7 @@
   2.773  set dummy hg; ac_word=$2
   2.774  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.775  $as_echo_n "checking for $ac_word... " >&6; }
   2.776 -if ${ac_cv_path_HG+:} false; then :
   2.777 +if test "${ac_cv_path_HG+set}" = set; then :
   2.778    $as_echo_n "(cached) " >&6
   2.779  else
   2.780    case $HG in
   2.781 @@ -10237,7 +10229,7 @@
   2.782  set dummy stat; ac_word=$2
   2.783  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.784  $as_echo_n "checking for $ac_word... " >&6; }
   2.785 -if ${ac_cv_path_STAT+:} false; then :
   2.786 +if test "${ac_cv_path_STAT+set}" = set; then :
   2.787    $as_echo_n "(cached) " >&6
   2.788  else
   2.789    case $STAT in
   2.790 @@ -10277,7 +10269,7 @@
   2.791  set dummy time; ac_word=$2
   2.792  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.793  $as_echo_n "checking for $ac_word... " >&6; }
   2.794 -if ${ac_cv_path_TIME+:} false; then :
   2.795 +if test "${ac_cv_path_TIME+set}" = set; then :
   2.796    $as_echo_n "(cached) " >&6
   2.797  else
   2.798    case $TIME in
   2.799 @@ -10322,7 +10314,7 @@
   2.800  set dummy $ac_prog; ac_word=$2
   2.801  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.802  $as_echo_n "checking for $ac_word... " >&6; }
   2.803 -if ${ac_cv_path_COMM+:} false; then :
   2.804 +if test "${ac_cv_path_COMM+set}" = set; then :
   2.805    $as_echo_n "(cached) " >&6
   2.806  else
   2.807    case $COMM in
   2.808 @@ -10386,7 +10378,7 @@
   2.809  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
   2.810  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.811  $as_echo_n "checking for $ac_word... " >&6; }
   2.812 -if ${ac_cv_path_PKG_CONFIG+:} false; then :
   2.813 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
   2.814    $as_echo_n "(cached) " >&6
   2.815  else
   2.816    case $PKG_CONFIG in
   2.817 @@ -10429,7 +10421,7 @@
   2.818  set dummy pkg-config; ac_word=$2
   2.819  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.820  $as_echo_n "checking for $ac_word... " >&6; }
   2.821 -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
   2.822 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
   2.823    $as_echo_n "(cached) " >&6
   2.824  else
   2.825    case $ac_pt_PKG_CONFIG in
   2.826 @@ -10602,7 +10594,7 @@
   2.827  set dummy $ac_prog; ac_word=$2
   2.828  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.829  $as_echo_n "checking for $ac_word... " >&6; }
   2.830 -if ${ac_cv_prog_BDEPS_UNZIP+:} false; then :
   2.831 +if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then :
   2.832    $as_echo_n "(cached) " >&6
   2.833  else
   2.834    if test -n "$BDEPS_UNZIP"; then
   2.835 @@ -10648,7 +10640,7 @@
   2.836  set dummy $ac_prog; ac_word=$2
   2.837  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.838  $as_echo_n "checking for $ac_word... " >&6; }
   2.839 -if ${ac_cv_prog_BDEPS_FTP+:} false; then :
   2.840 +if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then :
   2.841    $as_echo_n "(cached) " >&6
   2.842  else
   2.843    if test -n "$BDEPS_FTP"; then
   2.844 @@ -11921,7 +11913,7 @@
   2.845  set dummy javac; ac_word=$2
   2.846  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.847  $as_echo_n "checking for $ac_word... " >&6; }
   2.848 -if ${ac_cv_path_JAVAC_CHECK+:} false; then :
   2.849 +if test "${ac_cv_path_JAVAC_CHECK+set}" = set; then :
   2.850    $as_echo_n "(cached) " >&6
   2.851  else
   2.852    case $JAVAC_CHECK in
   2.853 @@ -11961,7 +11953,7 @@
   2.854  set dummy java; ac_word=$2
   2.855  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.856  $as_echo_n "checking for $ac_word... " >&6; }
   2.857 -if ${ac_cv_path_JAVA_CHECK+:} false; then :
   2.858 +if test "${ac_cv_path_JAVA_CHECK+set}" = set; then :
   2.859    $as_echo_n "(cached) " >&6
   2.860  else
   2.861    case $JAVA_CHECK in
   2.862 @@ -16035,7 +16027,7 @@
   2.863  set dummy link; ac_word=$2
   2.864  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.865  $as_echo_n "checking for $ac_word... " >&6; }
   2.866 -if ${ac_cv_path_CYGWIN_LINK+:} false; then :
   2.867 +if test "${ac_cv_path_CYGWIN_LINK+set}" = set; then :
   2.868    $as_echo_n "(cached) " >&6
   2.869  else
   2.870    case $CYGWIN_LINK in
   2.871 @@ -17450,7 +17442,7 @@
   2.872  set dummy $ac_prog; ac_word=$2
   2.873  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.874  $as_echo_n "checking for $ac_word... " >&6; }
   2.875 -if ${ac_cv_path_BUILD_CC+:} false; then :
   2.876 +if test "${ac_cv_path_BUILD_CC+set}" = set; then :
   2.877    $as_echo_n "(cached) " >&6
   2.878  else
   2.879    case $BUILD_CC in
   2.880 @@ -17761,7 +17753,7 @@
   2.881  set dummy $ac_prog; ac_word=$2
   2.882  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.883  $as_echo_n "checking for $ac_word... " >&6; }
   2.884 -if ${ac_cv_path_BUILD_CXX+:} false; then :
   2.885 +if test "${ac_cv_path_BUILD_CXX+set}" = set; then :
   2.886    $as_echo_n "(cached) " >&6
   2.887  else
   2.888    case $BUILD_CXX in
   2.889 @@ -18070,7 +18062,7 @@
   2.890  set dummy ld; ac_word=$2
   2.891  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.892  $as_echo_n "checking for $ac_word... " >&6; }
   2.893 -if ${ac_cv_path_BUILD_LD+:} false; then :
   2.894 +if test "${ac_cv_path_BUILD_LD+set}" = set; then :
   2.895    $as_echo_n "(cached) " >&6
   2.896  else
   2.897    case $BUILD_LD in
   2.898 @@ -18586,7 +18578,7 @@
   2.899  set dummy $ac_prog; ac_word=$2
   2.900  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.901  $as_echo_n "checking for $ac_word... " >&6; }
   2.902 -if ${ac_cv_path_TOOLS_DIR_CC+:} false; then :
   2.903 +if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then :
   2.904    $as_echo_n "(cached) " >&6
   2.905  else
   2.906    case $TOOLS_DIR_CC in
   2.907 @@ -18638,7 +18630,7 @@
   2.908  set dummy $ac_prog; ac_word=$2
   2.909  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.910  $as_echo_n "checking for $ac_word... " >&6; }
   2.911 -if ${ac_cv_path_POTENTIAL_CC+:} false; then :
   2.912 +if test "${ac_cv_path_POTENTIAL_CC+set}" = set; then :
   2.913    $as_echo_n "(cached) " >&6
   2.914  else
   2.915    case $POTENTIAL_CC in
   2.916 @@ -19051,7 +19043,7 @@
   2.917  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
   2.918  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.919  $as_echo_n "checking for $ac_word... " >&6; }
   2.920 -if ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then :
   2.921 +if test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then :
   2.922    $as_echo_n "(cached) " >&6
   2.923  else
   2.924    if test -n "$PROPER_COMPILER_CC"; then
   2.925 @@ -19095,7 +19087,7 @@
   2.926  set dummy $ac_prog; ac_word=$2
   2.927  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.928  $as_echo_n "checking for $ac_word... " >&6; }
   2.929 -if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then :
   2.930 +if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then :
   2.931    $as_echo_n "(cached) " >&6
   2.932  else
   2.933    if test -n "$ac_ct_PROPER_COMPILER_CC"; then
   2.934 @@ -19545,7 +19537,7 @@
   2.935  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
   2.936  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.937  $as_echo_n "checking for $ac_word... " >&6; }
   2.938 -if ${ac_cv_prog_CC+:} false; then :
   2.939 +if test "${ac_cv_prog_CC+set}" = set; then :
   2.940    $as_echo_n "(cached) " >&6
   2.941  else
   2.942    if test -n "$CC"; then
   2.943 @@ -19589,7 +19581,7 @@
   2.944  set dummy $ac_prog; ac_word=$2
   2.945  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.946  $as_echo_n "checking for $ac_word... " >&6; }
   2.947 -if ${ac_cv_prog_ac_ct_CC+:} false; then :
   2.948 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   2.949    $as_echo_n "(cached) " >&6
   2.950  else
   2.951    if test -n "$ac_ct_CC"; then
   2.952 @@ -19870,7 +19862,7 @@
   2.953  ac_clean_files=$ac_clean_files_save
   2.954  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
   2.955  $as_echo_n "checking for suffix of object files... " >&6; }
   2.956 -if ${ac_cv_objext+:} false; then :
   2.957 +if test "${ac_cv_objext+set}" = set; then :
   2.958    $as_echo_n "(cached) " >&6
   2.959  else
   2.960    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   2.961 @@ -19921,7 +19913,7 @@
   2.962  ac_objext=$OBJEXT
   2.963  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
   2.964  $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
   2.965 -if ${ac_cv_c_compiler_gnu+:} false; then :
   2.966 +if test "${ac_cv_c_compiler_gnu+set}" = set; then :
   2.967    $as_echo_n "(cached) " >&6
   2.968  else
   2.969    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   2.970 @@ -19958,7 +19950,7 @@
   2.971  ac_save_CFLAGS=$CFLAGS
   2.972  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
   2.973  $as_echo_n "checking whether $CC accepts -g... " >&6; }
   2.974 -if ${ac_cv_prog_cc_g+:} false; then :
   2.975 +if test "${ac_cv_prog_cc_g+set}" = set; then :
   2.976    $as_echo_n "(cached) " >&6
   2.977  else
   2.978    ac_save_c_werror_flag=$ac_c_werror_flag
   2.979 @@ -20036,7 +20028,7 @@
   2.980  fi
   2.981  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
   2.982  $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
   2.983 -if ${ac_cv_prog_cc_c89+:} false; then :
   2.984 +if test "${ac_cv_prog_cc_c89+set}" = set; then :
   2.985    $as_echo_n "(cached) " >&6
   2.986  else
   2.987    ac_cv_prog_cc_c89=no
   2.988 @@ -20159,7 +20151,7 @@
   2.989  set dummy $ac_prog; ac_word=$2
   2.990  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   2.991  $as_echo_n "checking for $ac_word... " >&6; }
   2.992 -if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then :
   2.993 +if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then :
   2.994    $as_echo_n "(cached) " >&6
   2.995  else
   2.996    case $TOOLS_DIR_CXX in
   2.997 @@ -20211,7 +20203,7 @@
   2.998  set dummy $ac_prog; ac_word=$2
   2.999  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1000  $as_echo_n "checking for $ac_word... " >&6; }
  2.1001 -if ${ac_cv_path_POTENTIAL_CXX+:} false; then :
  2.1002 +if test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then :
  2.1003    $as_echo_n "(cached) " >&6
  2.1004  else
  2.1005    case $POTENTIAL_CXX in
  2.1006 @@ -20624,7 +20616,7 @@
  2.1007  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  2.1008  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1009  $as_echo_n "checking for $ac_word... " >&6; }
  2.1010 -if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then :
  2.1011 +if test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then :
  2.1012    $as_echo_n "(cached) " >&6
  2.1013  else
  2.1014    if test -n "$PROPER_COMPILER_CXX"; then
  2.1015 @@ -20668,7 +20660,7 @@
  2.1016  set dummy $ac_prog; ac_word=$2
  2.1017  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1018  $as_echo_n "checking for $ac_word... " >&6; }
  2.1019 -if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then :
  2.1020 +if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then :
  2.1021    $as_echo_n "(cached) " >&6
  2.1022  else
  2.1023    if test -n "$ac_ct_PROPER_COMPILER_CXX"; then
  2.1024 @@ -21122,7 +21114,7 @@
  2.1025  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  2.1026  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1027  $as_echo_n "checking for $ac_word... " >&6; }
  2.1028 -if ${ac_cv_prog_CXX+:} false; then :
  2.1029 +if test "${ac_cv_prog_CXX+set}" = set; then :
  2.1030    $as_echo_n "(cached) " >&6
  2.1031  else
  2.1032    if test -n "$CXX"; then
  2.1033 @@ -21166,7 +21158,7 @@
  2.1034  set dummy $ac_prog; ac_word=$2
  2.1035  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1036  $as_echo_n "checking for $ac_word... " >&6; }
  2.1037 -if ${ac_cv_prog_ac_ct_CXX+:} false; then :
  2.1038 +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
  2.1039    $as_echo_n "(cached) " >&6
  2.1040  else
  2.1041    if test -n "$ac_ct_CXX"; then
  2.1042 @@ -21244,7 +21236,7 @@
  2.1043  
  2.1044  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
  2.1045  $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
  2.1046 -if ${ac_cv_cxx_compiler_gnu+:} false; then :
  2.1047 +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
  2.1048    $as_echo_n "(cached) " >&6
  2.1049  else
  2.1050    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  2.1051 @@ -21281,7 +21273,7 @@
  2.1052  ac_save_CXXFLAGS=$CXXFLAGS
  2.1053  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
  2.1054  $as_echo_n "checking whether $CXX accepts -g... " >&6; }
  2.1055 -if ${ac_cv_prog_cxx_g+:} false; then :
  2.1056 +if test "${ac_cv_prog_cxx_g+set}" = set; then :
  2.1057    $as_echo_n "(cached) " >&6
  2.1058  else
  2.1059    ac_save_cxx_werror_flag=$ac_cxx_werror_flag
  2.1060 @@ -21379,7 +21371,7 @@
  2.1061  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  2.1062  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1063  $as_echo_n "checking for $ac_word... " >&6; }
  2.1064 -if ${ac_cv_prog_OBJC+:} false; then :
  2.1065 +if test "${ac_cv_prog_OBJC+set}" = set; then :
  2.1066    $as_echo_n "(cached) " >&6
  2.1067  else
  2.1068    if test -n "$OBJC"; then
  2.1069 @@ -21423,7 +21415,7 @@
  2.1070  set dummy $ac_prog; ac_word=$2
  2.1071  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1072  $as_echo_n "checking for $ac_word... " >&6; }
  2.1073 -if ${ac_cv_prog_ac_ct_OBJC+:} false; then :
  2.1074 +if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then :
  2.1075    $as_echo_n "(cached) " >&6
  2.1076  else
  2.1077    if test -n "$ac_ct_OBJC"; then
  2.1078 @@ -21499,7 +21491,7 @@
  2.1079  
  2.1080  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5
  2.1081  $as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; }
  2.1082 -if ${ac_cv_objc_compiler_gnu+:} false; then :
  2.1083 +if test "${ac_cv_objc_compiler_gnu+set}" = set; then :
  2.1084    $as_echo_n "(cached) " >&6
  2.1085  else
  2.1086    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  2.1087 @@ -21536,7 +21528,7 @@
  2.1088  ac_save_OBJCFLAGS=$OBJCFLAGS
  2.1089  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5
  2.1090  $as_echo_n "checking whether $OBJC accepts -g... " >&6; }
  2.1091 -if ${ac_cv_prog_objc_g+:} false; then :
  2.1092 +if test "${ac_cv_prog_objc_g+set}" = set; then :
  2.1093    $as_echo_n "(cached) " >&6
  2.1094  else
  2.1095    ac_save_objc_werror_flag=$ac_objc_werror_flag
  2.1096 @@ -21912,7 +21904,7 @@
  2.1097  set dummy ${ac_tool_prefix}ar; ac_word=$2
  2.1098  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1099  $as_echo_n "checking for $ac_word... " >&6; }
  2.1100 -if ${ac_cv_prog_AR+:} false; then :
  2.1101 +if test "${ac_cv_prog_AR+set}" = set; then :
  2.1102    $as_echo_n "(cached) " >&6
  2.1103  else
  2.1104    if test -n "$AR"; then
  2.1105 @@ -21952,7 +21944,7 @@
  2.1106  set dummy ar; ac_word=$2
  2.1107  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1108  $as_echo_n "checking for $ac_word... " >&6; }
  2.1109 -if ${ac_cv_prog_ac_ct_AR+:} false; then :
  2.1110 +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
  2.1111    $as_echo_n "(cached) " >&6
  2.1112  else
  2.1113    if test -n "$ac_ct_AR"; then
  2.1114 @@ -22294,7 +22286,7 @@
  2.1115  set dummy link; ac_word=$2
  2.1116  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1117  $as_echo_n "checking for $ac_word... " >&6; }
  2.1118 -if ${ac_cv_prog_WINLD+:} false; then :
  2.1119 +if test "${ac_cv_prog_WINLD+set}" = set; then :
  2.1120    $as_echo_n "(cached) " >&6
  2.1121  else
  2.1122    if test -n "$WINLD"; then
  2.1123 @@ -22633,7 +22625,7 @@
  2.1124  set dummy mt; ac_word=$2
  2.1125  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1126  $as_echo_n "checking for $ac_word... " >&6; }
  2.1127 -if ${ac_cv_prog_MT+:} false; then :
  2.1128 +if test "${ac_cv_prog_MT+set}" = set; then :
  2.1129    $as_echo_n "(cached) " >&6
  2.1130  else
  2.1131    if test -n "$MT"; then
  2.1132 @@ -22954,7 +22946,7 @@
  2.1133  set dummy rc; ac_word=$2
  2.1134  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1135  $as_echo_n "checking for $ac_word... " >&6; }
  2.1136 -if ${ac_cv_prog_RC+:} false; then :
  2.1137 +if test "${ac_cv_prog_RC+set}" = set; then :
  2.1138    $as_echo_n "(cached) " >&6
  2.1139  else
  2.1140    if test -n "$RC"; then
  2.1141 @@ -23345,7 +23337,7 @@
  2.1142  set dummy lib; ac_word=$2
  2.1143  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1144  $as_echo_n "checking for $ac_word... " >&6; }
  2.1145 -if ${ac_cv_prog_WINAR+:} false; then :
  2.1146 +if test "${ac_cv_prog_WINAR+set}" = set; then :
  2.1147    $as_echo_n "(cached) " >&6
  2.1148  else
  2.1149    if test -n "$WINAR"; then
  2.1150 @@ -23651,7 +23643,7 @@
  2.1151  set dummy dumpbin; ac_word=$2
  2.1152  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1153  $as_echo_n "checking for $ac_word... " >&6; }
  2.1154 -if ${ac_cv_prog_DUMPBIN+:} false; then :
  2.1155 +if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
  2.1156    $as_echo_n "(cached) " >&6
  2.1157  else
  2.1158    if test -n "$DUMPBIN"; then
  2.1159 @@ -23970,7 +23962,7 @@
  2.1160    CPP=
  2.1161  fi
  2.1162  if test -z "$CPP"; then
  2.1163 -  if ${ac_cv_prog_CPP+:} false; then :
  2.1164 +  if test "${ac_cv_prog_CPP+set}" = set; then :
  2.1165    $as_echo_n "(cached) " >&6
  2.1166  else
  2.1167        # Double quotes because CPP needs to be expanded
  2.1168 @@ -24370,7 +24362,7 @@
  2.1169  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
  2.1170  $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
  2.1171  if test -z "$CXXCPP"; then
  2.1172 -  if ${ac_cv_prog_CXXCPP+:} false; then :
  2.1173 +  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
  2.1174    $as_echo_n "(cached) " >&6
  2.1175  else
  2.1176        # Double quotes because CXXCPP needs to be expanded
  2.1177 @@ -24788,7 +24780,7 @@
  2.1178  set dummy as; ac_word=$2
  2.1179  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1180  $as_echo_n "checking for $ac_word... " >&6; }
  2.1181 -if ${ac_cv_path_AS+:} false; then :
  2.1182 +if test "${ac_cv_path_AS+set}" = set; then :
  2.1183    $as_echo_n "(cached) " >&6
  2.1184  else
  2.1185    case $AS in
  2.1186 @@ -25102,7 +25094,7 @@
  2.1187  set dummy $ac_prog; ac_word=$2
  2.1188  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1189  $as_echo_n "checking for $ac_word... " >&6; }
  2.1190 -if ${ac_cv_path_NM+:} false; then :
  2.1191 +if test "${ac_cv_path_NM+set}" = set; then :
  2.1192    $as_echo_n "(cached) " >&6
  2.1193  else
  2.1194    case $NM in
  2.1195 @@ -25411,7 +25403,7 @@
  2.1196  set dummy strip; ac_word=$2
  2.1197  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1198  $as_echo_n "checking for $ac_word... " >&6; }
  2.1199 -if ${ac_cv_path_STRIP+:} false; then :
  2.1200 +if test "${ac_cv_path_STRIP+set}" = set; then :
  2.1201    $as_echo_n "(cached) " >&6
  2.1202  else
  2.1203    case $STRIP in
  2.1204 @@ -25717,7 +25709,7 @@
  2.1205  set dummy mcs; ac_word=$2
  2.1206  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1207  $as_echo_n "checking for $ac_word... " >&6; }
  2.1208 -if ${ac_cv_path_MCS+:} false; then :
  2.1209 +if test "${ac_cv_path_MCS+set}" = set; then :
  2.1210    $as_echo_n "(cached) " >&6
  2.1211  else
  2.1212    case $MCS in
  2.1213 @@ -26025,7 +26017,7 @@
  2.1214  set dummy ${ac_tool_prefix}nm; ac_word=$2
  2.1215  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1216  $as_echo_n "checking for $ac_word... " >&6; }
  2.1217 -if ${ac_cv_prog_NM+:} false; then :
  2.1218 +if test "${ac_cv_prog_NM+set}" = set; then :
  2.1219    $as_echo_n "(cached) " >&6
  2.1220  else
  2.1221    if test -n "$NM"; then
  2.1222 @@ -26065,7 +26057,7 @@
  2.1223  set dummy nm; ac_word=$2
  2.1224  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1225  $as_echo_n "checking for $ac_word... " >&6; }
  2.1226 -if ${ac_cv_prog_ac_ct_NM+:} false; then :
  2.1227 +if test "${ac_cv_prog_ac_ct_NM+set}" = set; then :
  2.1228    $as_echo_n "(cached) " >&6
  2.1229  else
  2.1230    if test -n "$ac_ct_NM"; then
  2.1231 @@ -26383,7 +26375,7 @@
  2.1232  set dummy ${ac_tool_prefix}strip; ac_word=$2
  2.1233  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1234  $as_echo_n "checking for $ac_word... " >&6; }
  2.1235 -if ${ac_cv_prog_STRIP+:} false; then :
  2.1236 +if test "${ac_cv_prog_STRIP+set}" = set; then :
  2.1237    $as_echo_n "(cached) " >&6
  2.1238  else
  2.1239    if test -n "$STRIP"; then
  2.1240 @@ -26423,7 +26415,7 @@
  2.1241  set dummy strip; ac_word=$2
  2.1242  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1243  $as_echo_n "checking for $ac_word... " >&6; }
  2.1244 -if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
  2.1245 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
  2.1246    $as_echo_n "(cached) " >&6
  2.1247  else
  2.1248    if test -n "$ac_ct_STRIP"; then
  2.1249 @@ -26748,7 +26740,7 @@
  2.1250  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  2.1251  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1252  $as_echo_n "checking for $ac_word... " >&6; }
  2.1253 -if ${ac_cv_prog_OBJCOPY+:} false; then :
  2.1254 +if test "${ac_cv_prog_OBJCOPY+set}" = set; then :
  2.1255    $as_echo_n "(cached) " >&6
  2.1256  else
  2.1257    if test -n "$OBJCOPY"; then
  2.1258 @@ -26792,7 +26784,7 @@
  2.1259  set dummy $ac_prog; ac_word=$2
  2.1260  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1261  $as_echo_n "checking for $ac_word... " >&6; }
  2.1262 -if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then :
  2.1263 +if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then :
  2.1264    $as_echo_n "(cached) " >&6
  2.1265  else
  2.1266    if test -n "$ac_ct_OBJCOPY"; then
  2.1267 @@ -27119,7 +27111,7 @@
  2.1268  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  2.1269  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1270  $as_echo_n "checking for $ac_word... " >&6; }
  2.1271 -if ${ac_cv_prog_OBJDUMP+:} false; then :
  2.1272 +if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
  2.1273    $as_echo_n "(cached) " >&6
  2.1274  else
  2.1275    if test -n "$OBJDUMP"; then
  2.1276 @@ -27163,7 +27155,7 @@
  2.1277  set dummy $ac_prog; ac_word=$2
  2.1278  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1279  $as_echo_n "checking for $ac_word... " >&6; }
  2.1280 -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
  2.1281 +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
  2.1282    $as_echo_n "(cached) " >&6
  2.1283  else
  2.1284    if test -n "$ac_ct_OBJDUMP"; then
  2.1285 @@ -27487,7 +27479,7 @@
  2.1286  set dummy lipo; ac_word=$2
  2.1287  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1288  $as_echo_n "checking for $ac_word... " >&6; }
  2.1289 -if ${ac_cv_path_LIPO+:} false; then :
  2.1290 +if test "${ac_cv_path_LIPO+set}" = set; then :
  2.1291    $as_echo_n "(cached) " >&6
  2.1292  else
  2.1293    case $LIPO in
  2.1294 @@ -27802,7 +27794,7 @@
  2.1295  
  2.1296  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
  2.1297  $as_echo_n "checking for ANSI C header files... " >&6; }
  2.1298 -if ${ac_cv_header_stdc+:} false; then :
  2.1299 +if test "${ac_cv_header_stdc+set}" = set; then :
  2.1300    $as_echo_n "(cached) " >&6
  2.1301  else
  2.1302    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  2.1303 @@ -27978,7 +27970,7 @@
  2.1304  for ac_header in stdio.h
  2.1305  do :
  2.1306    ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default"
  2.1307 -if test "x$ac_cv_header_stdio_h" = xyes; then :
  2.1308 +if test "x$ac_cv_header_stdio_h" = x""yes; then :
  2.1309    cat >>confdefs.h <<_ACEOF
  2.1310  #define HAVE_STDIO_H 1
  2.1311  _ACEOF
  2.1312 @@ -28007,7 +27999,7 @@
  2.1313  # This bug is HP SR number 8606223364.
  2.1314  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5
  2.1315  $as_echo_n "checking size of int *... " >&6; }
  2.1316 -if ${ac_cv_sizeof_int_p+:} false; then :
  2.1317 +if test "${ac_cv_sizeof_int_p+set}" = set; then :
  2.1318    $as_echo_n "(cached) " >&6
  2.1319  else
  2.1320    if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p"        "$ac_includes_default"; then :
  2.1321 @@ -28064,7 +28056,7 @@
  2.1322  #
  2.1323   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
  2.1324  $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
  2.1325 -if ${ac_cv_c_bigendian+:} false; then :
  2.1326 +if test "${ac_cv_c_bigendian+set}" = set; then :
  2.1327    $as_echo_n "(cached) " >&6
  2.1328  else
  2.1329    ac_cv_c_bigendian=unknown
  2.1330 @@ -28903,14 +28895,15 @@
  2.1331  #
  2.1332  # ZIP_DEBUGINFO_FILES
  2.1333  #
  2.1334 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should zip debug-info files" >&5
  2.1335 +$as_echo_n "checking if we should zip debug-info files... " >&6; }
  2.1336  # Check whether --enable-zip-debug-info was given.
  2.1337  if test "${enable_zip_debug_info+set}" = set; then :
  2.1338 -  enableval=$enable_zip_debug_info;
  2.1339 -fi
  2.1340 -
  2.1341 -
  2.1342 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should zip debug-info files" >&5
  2.1343 -$as_echo_n "checking if we should zip debug-info files... " >&6; }
  2.1344 +  enableval=$enable_zip_debug_info; enable_zip_debug_info="${enableval}"
  2.1345 +else
  2.1346 +  enable_zip_debug_info="yes"
  2.1347 +fi
  2.1348 +
  2.1349  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_zip_debug_info}" >&5
  2.1350  $as_echo "${enable_zip_debug_info}" >&6; }
  2.1351  
  2.1352 @@ -29076,7 +29069,7 @@
  2.1353  else
  2.1354    case $x_includes,$x_libraries in #(
  2.1355      *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
  2.1356 -    *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
  2.1357 +    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
  2.1358    $as_echo_n "(cached) " >&6
  2.1359  else
  2.1360    # One or both of the vars are not set, and there is no cached value.
  2.1361 @@ -29353,7 +29346,7 @@
  2.1362  else
  2.1363    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
  2.1364  $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
  2.1365 -if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
  2.1366 +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
  2.1367    $as_echo_n "(cached) " >&6
  2.1368  else
  2.1369    ac_check_lib_save_LIBS=$LIBS
  2.1370 @@ -29387,14 +29380,14 @@
  2.1371  fi
  2.1372  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
  2.1373  $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
  2.1374 -if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
  2.1375 +if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
  2.1376    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
  2.1377  fi
  2.1378  
  2.1379      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
  2.1380        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
  2.1381  $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
  2.1382 -if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
  2.1383 +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
  2.1384    $as_echo_n "(cached) " >&6
  2.1385  else
  2.1386    ac_check_lib_save_LIBS=$LIBS
  2.1387 @@ -29428,7 +29421,7 @@
  2.1388  fi
  2.1389  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
  2.1390  $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
  2.1391 -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
  2.1392 +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
  2.1393    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
  2.1394  fi
  2.1395  
  2.1396 @@ -29447,14 +29440,14 @@
  2.1397      # The functions gethostbyname, getservbyname, and inet_addr are
  2.1398      # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
  2.1399      ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
  2.1400 -if test "x$ac_cv_func_gethostbyname" = xyes; then :
  2.1401 +if test "x$ac_cv_func_gethostbyname" = x""yes; then :
  2.1402  
  2.1403  fi
  2.1404  
  2.1405      if test $ac_cv_func_gethostbyname = no; then
  2.1406        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
  2.1407  $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
  2.1408 -if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
  2.1409 +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
  2.1410    $as_echo_n "(cached) " >&6
  2.1411  else
  2.1412    ac_check_lib_save_LIBS=$LIBS
  2.1413 @@ -29488,14 +29481,14 @@
  2.1414  fi
  2.1415  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
  2.1416  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
  2.1417 -if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
  2.1418 +if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
  2.1419    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
  2.1420  fi
  2.1421  
  2.1422        if test $ac_cv_lib_nsl_gethostbyname = no; then
  2.1423  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
  2.1424  $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
  2.1425 -if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
  2.1426 +if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
  2.1427    $as_echo_n "(cached) " >&6
  2.1428  else
  2.1429    ac_check_lib_save_LIBS=$LIBS
  2.1430 @@ -29529,7 +29522,7 @@
  2.1431  fi
  2.1432  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
  2.1433  $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
  2.1434 -if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
  2.1435 +if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
  2.1436    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  2.1437  fi
  2.1438  
  2.1439 @@ -29544,14 +29537,14 @@
  2.1440      # must be given before -lnsl if both are needed.  We assume that
  2.1441      # if connect needs -lnsl, so does gethostbyname.
  2.1442      ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect"
  2.1443 -if test "x$ac_cv_func_connect" = xyes; then :
  2.1444 +if test "x$ac_cv_func_connect" = x""yes; then :
  2.1445  
  2.1446  fi
  2.1447  
  2.1448      if test $ac_cv_func_connect = no; then
  2.1449        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
  2.1450  $as_echo_n "checking for connect in -lsocket... " >&6; }
  2.1451 -if ${ac_cv_lib_socket_connect+:} false; then :
  2.1452 +if test "${ac_cv_lib_socket_connect+set}" = set; then :
  2.1453    $as_echo_n "(cached) " >&6
  2.1454  else
  2.1455    ac_check_lib_save_LIBS=$LIBS
  2.1456 @@ -29585,7 +29578,7 @@
  2.1457  fi
  2.1458  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
  2.1459  $as_echo "$ac_cv_lib_socket_connect" >&6; }
  2.1460 -if test "x$ac_cv_lib_socket_connect" = xyes; then :
  2.1461 +if test "x$ac_cv_lib_socket_connect" = x""yes; then :
  2.1462    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
  2.1463  fi
  2.1464  
  2.1465 @@ -29593,14 +29586,14 @@
  2.1466  
  2.1467      # Guillermo Gomez says -lposix is necessary on A/UX.
  2.1468      ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove"
  2.1469 -if test "x$ac_cv_func_remove" = xyes; then :
  2.1470 +if test "x$ac_cv_func_remove" = x""yes; then :
  2.1471  
  2.1472  fi
  2.1473  
  2.1474      if test $ac_cv_func_remove = no; then
  2.1475        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
  2.1476  $as_echo_n "checking for remove in -lposix... " >&6; }
  2.1477 -if ${ac_cv_lib_posix_remove+:} false; then :
  2.1478 +if test "${ac_cv_lib_posix_remove+set}" = set; then :
  2.1479    $as_echo_n "(cached) " >&6
  2.1480  else
  2.1481    ac_check_lib_save_LIBS=$LIBS
  2.1482 @@ -29634,7 +29627,7 @@
  2.1483  fi
  2.1484  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
  2.1485  $as_echo "$ac_cv_lib_posix_remove" >&6; }
  2.1486 -if test "x$ac_cv_lib_posix_remove" = xyes; then :
  2.1487 +if test "x$ac_cv_lib_posix_remove" = x""yes; then :
  2.1488    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  2.1489  fi
  2.1490  
  2.1491 @@ -29642,14 +29635,14 @@
  2.1492  
  2.1493      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
  2.1494      ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
  2.1495 -if test "x$ac_cv_func_shmat" = xyes; then :
  2.1496 +if test "x$ac_cv_func_shmat" = x""yes; then :
  2.1497  
  2.1498  fi
  2.1499  
  2.1500      if test $ac_cv_func_shmat = no; then
  2.1501        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
  2.1502  $as_echo_n "checking for shmat in -lipc... " >&6; }
  2.1503 -if ${ac_cv_lib_ipc_shmat+:} false; then :
  2.1504 +if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
  2.1505    $as_echo_n "(cached) " >&6
  2.1506  else
  2.1507    ac_check_lib_save_LIBS=$LIBS
  2.1508 @@ -29683,7 +29676,7 @@
  2.1509  fi
  2.1510  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
  2.1511  $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
  2.1512 -if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
  2.1513 +if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
  2.1514    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  2.1515  fi
  2.1516  
  2.1517 @@ -29701,7 +29694,7 @@
  2.1518    # John Interrante, Karl Berry
  2.1519    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
  2.1520  $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
  2.1521 -if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
  2.1522 +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
  2.1523    $as_echo_n "(cached) " >&6
  2.1524  else
  2.1525    ac_check_lib_save_LIBS=$LIBS
  2.1526 @@ -29735,7 +29728,7 @@
  2.1527  fi
  2.1528  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
  2.1529  $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
  2.1530 -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
  2.1531 +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
  2.1532    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  2.1533  fi
  2.1534  
  2.1535 @@ -30748,7 +30741,7 @@
  2.1536              LDFLAGS="$FREETYPE2_LIBS"
  2.1537              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5
  2.1538  $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; }
  2.1539 -if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then :
  2.1540 +if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then :
  2.1541    $as_echo_n "(cached) " >&6
  2.1542  else
  2.1543    ac_check_lib_save_LIBS=$LIBS
  2.1544 @@ -30782,7 +30775,7 @@
  2.1545  fi
  2.1546  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5
  2.1547  $as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; }
  2.1548 -if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then :
  2.1549 +if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then :
  2.1550    FREETYPE2_FOUND=true
  2.1551  else
  2.1552    as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5
  2.1553 @@ -31070,7 +31063,7 @@
  2.1554  	    for ac_header in alsa/asoundlib.h
  2.1555  do :
  2.1556    ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default"
  2.1557 -if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then :
  2.1558 +if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then :
  2.1559    cat >>confdefs.h <<_ACEOF
  2.1560  #define HAVE_ALSA_ASOUNDLIB_H 1
  2.1561  _ACEOF
  2.1562 @@ -31129,7 +31122,7 @@
  2.1563  USE_EXTERNAL_LIBJPEG=true
  2.1564  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5
  2.1565  $as_echo_n "checking for main in -ljpeg... " >&6; }
  2.1566 -if ${ac_cv_lib_jpeg_main+:} false; then :
  2.1567 +if test "${ac_cv_lib_jpeg_main+set}" = set; then :
  2.1568    $as_echo_n "(cached) " >&6
  2.1569  else
  2.1570    ac_check_lib_save_LIBS=$LIBS
  2.1571 @@ -31157,7 +31150,7 @@
  2.1572  fi
  2.1573  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5
  2.1574  $as_echo "$ac_cv_lib_jpeg_main" >&6; }
  2.1575 -if test "x$ac_cv_lib_jpeg_main" = xyes; then :
  2.1576 +if test "x$ac_cv_lib_jpeg_main" = x""yes; then :
  2.1577    cat >>confdefs.h <<_ACEOF
  2.1578  #define HAVE_LIBJPEG 1
  2.1579  _ACEOF
  2.1580 @@ -31181,7 +31174,7 @@
  2.1581  USE_EXTERNAL_LIBJPEG=true
  2.1582  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgif" >&5
  2.1583  $as_echo_n "checking for main in -lgif... " >&6; }
  2.1584 -if ${ac_cv_lib_gif_main+:} false; then :
  2.1585 +if test "${ac_cv_lib_gif_main+set}" = set; then :
  2.1586    $as_echo_n "(cached) " >&6
  2.1587  else
  2.1588    ac_check_lib_save_LIBS=$LIBS
  2.1589 @@ -31209,7 +31202,7 @@
  2.1590  fi
  2.1591  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_main" >&5
  2.1592  $as_echo "$ac_cv_lib_gif_main" >&6; }
  2.1593 -if test "x$ac_cv_lib_gif_main" = xyes; then :
  2.1594 +if test "x$ac_cv_lib_gif_main" = x""yes; then :
  2.1595    cat >>confdefs.h <<_ACEOF
  2.1596  #define HAVE_LIBGIF 1
  2.1597  _ACEOF
  2.1598 @@ -31239,7 +31232,7 @@
  2.1599  
  2.1600  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
  2.1601  $as_echo_n "checking for compress in -lz... " >&6; }
  2.1602 -if ${ac_cv_lib_z_compress+:} false; then :
  2.1603 +if test "${ac_cv_lib_z_compress+set}" = set; then :
  2.1604    $as_echo_n "(cached) " >&6
  2.1605  else
  2.1606    ac_check_lib_save_LIBS=$LIBS
  2.1607 @@ -31273,7 +31266,7 @@
  2.1608  fi
  2.1609  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
  2.1610  $as_echo "$ac_cv_lib_z_compress" >&6; }
  2.1611 -if test "x$ac_cv_lib_z_compress" = xyes; then :
  2.1612 +if test "x$ac_cv_lib_z_compress" = x""yes; then :
  2.1613     ZLIB_FOUND=yes
  2.1614  else
  2.1615     ZLIB_FOUND=no
  2.1616 @@ -31366,7 +31359,7 @@
  2.1617  
  2.1618  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
  2.1619  $as_echo_n "checking for cos in -lm... " >&6; }
  2.1620 -if ${ac_cv_lib_m_cos+:} false; then :
  2.1621 +if test "${ac_cv_lib_m_cos+set}" = set; then :
  2.1622    $as_echo_n "(cached) " >&6
  2.1623  else
  2.1624    ac_check_lib_save_LIBS=$LIBS
  2.1625 @@ -31400,7 +31393,7 @@
  2.1626  fi
  2.1627  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
  2.1628  $as_echo "$ac_cv_lib_m_cos" >&6; }
  2.1629 -if test "x$ac_cv_lib_m_cos" = xyes; then :
  2.1630 +if test "x$ac_cv_lib_m_cos" = x""yes; then :
  2.1631    cat >>confdefs.h <<_ACEOF
  2.1632  #define HAVE_LIBM 1
  2.1633  _ACEOF
  2.1634 @@ -31424,7 +31417,7 @@
  2.1635  LIBS=""
  2.1636  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
  2.1637  $as_echo_n "checking for dlopen in -ldl... " >&6; }
  2.1638 -if ${ac_cv_lib_dl_dlopen+:} false; then :
  2.1639 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
  2.1640    $as_echo_n "(cached) " >&6
  2.1641  else
  2.1642    ac_check_lib_save_LIBS=$LIBS
  2.1643 @@ -31458,7 +31451,7 @@
  2.1644  fi
  2.1645  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
  2.1646  $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
  2.1647 -if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
  2.1648 +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
  2.1649    cat >>confdefs.h <<_ACEOF
  2.1650  #define HAVE_LIBDL 1
  2.1651  _ACEOF
  2.1652 @@ -32148,7 +32141,7 @@
  2.1653  set dummy ccache; ac_word=$2
  2.1654  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2.1655  $as_echo_n "checking for $ac_word... " >&6; }
  2.1656 -if ${ac_cv_path_CCACHE+:} false; then :
  2.1657 +if test "${ac_cv_path_CCACHE+set}" = set; then :
  2.1658    $as_echo_n "(cached) " >&6
  2.1659  else
  2.1660    case $CCACHE in
  2.1661 @@ -32409,21 +32402,10 @@
  2.1662       :end' >>confcache
  2.1663  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
  2.1664    if test -w "$cache_file"; then
  2.1665 -    if test "x$cache_file" != "x/dev/null"; then
  2.1666 +    test "x$cache_file" != "x/dev/null" &&
  2.1667        { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
  2.1668  $as_echo "$as_me: updating cache $cache_file" >&6;}
  2.1669 -      if test ! -f "$cache_file" || test -h "$cache_file"; then
  2.1670 -	cat confcache >"$cache_file"
  2.1671 -      else
  2.1672 -        case $cache_file in #(
  2.1673 -        */* | ?:*)
  2.1674 -	  mv -f confcache "$cache_file"$$ &&
  2.1675 -	  mv -f "$cache_file"$$ "$cache_file" ;; #(
  2.1676 -        *)
  2.1677 -	  mv -f confcache "$cache_file" ;;
  2.1678 -	esac
  2.1679 -      fi
  2.1680 -    fi
  2.1681 +    cat confcache >$cache_file
  2.1682    else
  2.1683      { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
  2.1684  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
  2.1685 @@ -32455,7 +32437,7 @@
  2.1686  
  2.1687  
  2.1688  
  2.1689 -: "${CONFIG_STATUS=./config.status}"
  2.1690 +: ${CONFIG_STATUS=./config.status}
  2.1691  ac_write_fail=0
  2.1692  ac_clean_files_save=$ac_clean_files
  2.1693  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
  2.1694 @@ -32556,7 +32538,6 @@
  2.1695  IFS=" ""	$as_nl"
  2.1696  
  2.1697  # Find who we are.  Look in the path if we contain no directory separator.
  2.1698 -as_myself=
  2.1699  case $0 in #((
  2.1700    *[\\/]* ) as_myself=$0 ;;
  2.1701    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  2.1702 @@ -32864,7 +32845,7 @@
  2.1703  # values after options handling.
  2.1704  ac_log="
  2.1705  This file was extended by OpenJDK $as_me jdk8, which was
  2.1706 -generated by GNU Autoconf 2.68.  Invocation command line was
  2.1707 +generated by GNU Autoconf 2.67.  Invocation command line was
  2.1708  
  2.1709    CONFIG_FILES    = $CONFIG_FILES
  2.1710    CONFIG_HEADERS  = $CONFIG_HEADERS
  2.1711 @@ -32927,7 +32908,7 @@
  2.1712  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  2.1713  ac_cs_version="\\
  2.1714  OpenJDK config.status jdk8
  2.1715 -configured by $0, generated by GNU Autoconf 2.68,
  2.1716 +configured by $0, generated by GNU Autoconf 2.67,
  2.1717    with options \\"\$ac_cs_config\\"
  2.1718  
  2.1719  Copyright (C) 2010 Free Software Foundation, Inc.
  2.1720 @@ -33078,10 +33059,9 @@
  2.1721  # after its creation but before its name has been assigned to `$tmp'.
  2.1722  $debug ||
  2.1723  {
  2.1724 -  tmp= ac_tmp=
  2.1725 +  tmp=
  2.1726    trap 'exit_status=$?
  2.1727 -  : "${ac_tmp:=$tmp}"
  2.1728 -  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
  2.1729 +  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  2.1730  ' 0
  2.1731    trap 'as_fn_exit 1' 1 2 13 15
  2.1732  }
  2.1733 @@ -33089,13 +33069,12 @@
  2.1734  
  2.1735  {
  2.1736    tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
  2.1737 -  test -d "$tmp"
  2.1738 +  test -n "$tmp" && test -d "$tmp"
  2.1739  }  ||
  2.1740  {
  2.1741    tmp=./conf$$-$RANDOM
  2.1742    (umask 077 && mkdir "$tmp")
  2.1743  } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
  2.1744 -ac_tmp=$tmp
  2.1745  
  2.1746  # Set up the scripts for CONFIG_FILES section.
  2.1747  # No need to generate them if there are no CONFIG_FILES.
  2.1748 @@ -33117,7 +33096,7 @@
  2.1749    ac_cs_awk_cr=$ac_cr
  2.1750  fi
  2.1751  
  2.1752 -echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
  2.1753 +echo 'BEGIN {' >"$tmp/subs1.awk" &&
  2.1754  _ACEOF
  2.1755  
  2.1756  
  2.1757 @@ -33145,7 +33124,7 @@
  2.1758  rm -f conf$$subs.sh
  2.1759  
  2.1760  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  2.1761 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
  2.1762 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
  2.1763  _ACEOF
  2.1764  sed -n '
  2.1765  h
  2.1766 @@ -33193,7 +33172,7 @@
  2.1767  rm -f conf$$subs.awk
  2.1768  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  2.1769  _ACAWK
  2.1770 -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
  2.1771 +cat >>"\$tmp/subs1.awk" <<_ACAWK &&
  2.1772    for (key in S) S_is_set[key] = 1
  2.1773    FS = ""
  2.1774  
  2.1775 @@ -33225,7 +33204,7 @@
  2.1776    sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
  2.1777  else
  2.1778    cat
  2.1779 -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
  2.1780 +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
  2.1781    || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
  2.1782  _ACEOF
  2.1783  
  2.1784 @@ -33259,7 +33238,7 @@
  2.1785  # No need to generate them if there are no CONFIG_HEADERS.
  2.1786  # This happens for instance with `./config.status Makefile'.
  2.1787  if test -n "$CONFIG_HEADERS"; then
  2.1788 -cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
  2.1789 +cat >"$tmp/defines.awk" <<\_ACAWK ||
  2.1790  BEGIN {
  2.1791  _ACEOF
  2.1792  
  2.1793 @@ -33271,8 +33250,8 @@
  2.1794  # handling of long lines.
  2.1795  ac_delim='%!_!# '
  2.1796  for ac_last_try in false false :; do
  2.1797 -  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
  2.1798 -  if test -z "$ac_tt"; then
  2.1799 +  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
  2.1800 +  if test -z "$ac_t"; then
  2.1801      break
  2.1802    elif $ac_last_try; then
  2.1803      as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
  2.1804 @@ -33392,7 +33371,7 @@
  2.1805      for ac_f
  2.1806      do
  2.1807        case $ac_f in
  2.1808 -      -) ac_f="$ac_tmp/stdin";;
  2.1809 +      -) ac_f="$tmp/stdin";;
  2.1810        *) # Look for the file first in the build tree, then in the source tree
  2.1811  	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
  2.1812  	 # because $ac_f cannot contain `:'.
  2.1813 @@ -33427,7 +33406,7 @@
  2.1814      esac
  2.1815  
  2.1816      case $ac_tag in
  2.1817 -    *:-:* | *:-) cat >"$ac_tmp/stdin" \
  2.1818 +    *:-:* | *:-) cat >"$tmp/stdin" \
  2.1819        || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
  2.1820      esac
  2.1821      ;;
  2.1822 @@ -33553,22 +33532,21 @@
  2.1823  s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
  2.1824  $ac_datarootdir_hack
  2.1825  "
  2.1826 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
  2.1827 -  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  2.1828 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
  2.1829 +  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  2.1830  
  2.1831  test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
  2.1832 -  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
  2.1833 -  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
  2.1834 -      "$ac_tmp/out"`; test -z "$ac_out"; } &&
  2.1835 +  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
  2.1836 +  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
  2.1837    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  2.1838  which seems to be undefined.  Please make sure it is defined" >&5
  2.1839  $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  2.1840  which seems to be undefined.  Please make sure it is defined" >&2;}
  2.1841  
  2.1842 -  rm -f "$ac_tmp/stdin"
  2.1843 +  rm -f "$tmp/stdin"
  2.1844    case $ac_file in
  2.1845 -  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
  2.1846 -  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
  2.1847 +  -) cat "$tmp/out" && rm -f "$tmp/out";;
  2.1848 +  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
  2.1849    esac \
  2.1850    || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  2.1851   ;;
  2.1852 @@ -33579,20 +33557,20 @@
  2.1853    if test x"$ac_file" != x-; then
  2.1854      {
  2.1855        $as_echo "/* $configure_input  */" \
  2.1856 -      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
  2.1857 -    } >"$ac_tmp/config.h" \
  2.1858 +      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
  2.1859 +    } >"$tmp/config.h" \
  2.1860        || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  2.1861 -    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
  2.1862 +    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
  2.1863        { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
  2.1864  $as_echo "$as_me: $ac_file is unchanged" >&6;}
  2.1865      else
  2.1866        rm -f "$ac_file"
  2.1867 -      mv "$ac_tmp/config.h" "$ac_file" \
  2.1868 +      mv "$tmp/config.h" "$ac_file" \
  2.1869  	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
  2.1870      fi
  2.1871    else
  2.1872      $as_echo "/* $configure_input  */" \
  2.1873 -      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
  2.1874 +      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
  2.1875        || as_fn_error $? "could not create -" "$LINENO" 5
  2.1876    fi
  2.1877   ;;
     3.1 --- a/common/autoconf/jdk-options.m4	Thu Mar 21 10:42:22 2013 -0700
     3.2 +++ b/common/autoconf/jdk-options.m4	Tue Apr 02 13:59:30 2013 +0100
     3.3 @@ -519,10 +519,10 @@
     3.4  #
     3.5  # ZIP_DEBUGINFO_FILES
     3.6  #
     3.7 +AC_MSG_CHECKING([if we should zip debug-info files])
     3.8  AC_ARG_ENABLE([zip-debug-info],
     3.9 -              [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])])
    3.10 -
    3.11 -AC_MSG_CHECKING([if we should zip debug-info files])
    3.12 +              [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])],
    3.13 +	      [enable_zip_debug_info="${enableval}"], [enable_zip_debug_info="yes"])
    3.14  AC_MSG_RESULT([${enable_zip_debug_info}])
    3.15  
    3.16  if test "x${enable_zip_debug_info}" = "xno"; then

mercurial