--- a/configure	Sat Apr 23 23:47:13 2011 +0200
+++ b/configure	Tue Apr 26 23:41:47 2011 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.66 for XEmacs 21.5.
+# Generated by GNU Autoconf 2.68 for XEmacs 21.5.
 #
 # Report bugs to <xemacs-beta@xemacs.org>.
 #
@@ -135,6 +135,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -260,11 +261,18 @@
   # We cannot yet assume a decent shell, so we have to provide a
 	# neutralization value for shells without unset; and this also
 	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
 	BASH_ENV=/dev/null
 	ENV=/dev/null
 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -1100,8 +1108,9 @@
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1441,7 +1450,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -2017,8 +2026,9 @@
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
-  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
-              the first program found out of: `bison -y', `byacc', `yacc'.
+  YACC        The `Yet Another Compiler Compiler' implementation to use.
+              Defaults to the first program found out of: `bison -y', `byacc',
+              `yacc'.
   YFLAGS      The list of arguments that will be passed by default to $YACC.
               This script will default YFLAGS to the empty string to avoid a
               default value of `-d' given by some make applications.
@@ -2093,7 +2103,7 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 XEmacs configure 21.5
-generated by GNU Autoconf 2.66
+generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -2185,7 +2195,7 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -2211,7 +2221,7 @@
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
+  test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -2222,7 +2232,7 @@
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -2235,10 +2245,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
+  if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -2274,7 +2284,7 @@
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -2305,7 +2315,7 @@
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -2314,7 +2324,7 @@
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 
@@ -2355,7 +2365,7 @@
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -2369,7 +2379,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2387,7 +2397,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
@@ -2432,7 +2442,7 @@
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -2445,7 +2455,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2500,7 +2510,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 
@@ -2515,7 +2525,7 @@
   as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
 $as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2546,7 +2556,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_decl
 
@@ -2559,7 +2569,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=no"
@@ -2600,7 +2610,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
 
@@ -2613,7 +2623,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 $as_echo_n "checking for $2.$3... " >&6; }
-if eval "test \"\${$4+set}\"" = set; then :
+if eval \${$4+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2657,7 +2667,7 @@
 eval ac_res=\$$4
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_member
 
@@ -2834,7 +2844,7 @@
 rm -f conftest.val
 
   fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
@@ -2872,7 +2882,7 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_compile
@@ -2881,7 +2891,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by XEmacs $as_me 21.5, which was
-generated by GNU Autoconf 2.66.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
 
@@ -5619,7 +5629,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
@@ -6027,7 +6037,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -6067,7 +6077,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -6120,7 +6130,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -6160,7 +6170,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -6219,7 +6229,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -6263,7 +6273,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -6546,7 +6556,7 @@
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6597,7 +6607,7 @@
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6634,7 +6644,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -6712,7 +6722,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -6826,7 +6836,7 @@
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -6856,7 +6866,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -6872,11 +6882,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -6915,7 +6925,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -6931,11 +6941,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
@@ -6957,7 +6967,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -7020,7 +7030,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -7087,7 +7097,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7216,7 +7226,7 @@
 
 
   ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = x""yes; then :
+if test "x$ac_cv_header_minix_config_h" = xyes; then :
   MINIX=yes
 else
   MINIX=
@@ -7238,7 +7248,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
+if ${ac_cv_safe_to_define___extensions__+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7289,7 +7299,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -7329,7 +7339,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -7382,7 +7392,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -7422,7 +7432,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -7481,7 +7491,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -7525,7 +7535,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -7609,7 +7619,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7646,7 +7656,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -7724,7 +7734,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -7837,7 +7847,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -7877,7 +7887,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -7930,7 +7940,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -7970,7 +7980,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -8029,7 +8039,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -8073,7 +8083,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -8157,7 +8167,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8194,7 +8204,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -8272,7 +8282,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -8385,7 +8395,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -8425,7 +8435,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -8478,7 +8488,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -8518,7 +8528,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -8577,7 +8587,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -8621,7 +8631,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -8705,7 +8715,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8742,7 +8752,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -8820,7 +8830,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -9011,7 +9021,7 @@
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -9041,7 +9051,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -9057,11 +9067,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -9100,7 +9110,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -9116,11 +9126,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
@@ -9851,7 +9861,7 @@
   done
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for terminateAndUnload in -lc" >&5
 $as_echo_n "checking for terminateAndUnload in -lc... " >&6; }
-if test "${ac_cv_lib_c_terminateAndUnload+set}" = set; then :
+if ${ac_cv_lib_c_terminateAndUnload+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -9885,7 +9895,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_terminateAndUnload" >&5
 $as_echo "$ac_cv_lib_c_terminateAndUnload" >&6; }
-if test "x$ac_cv_lib_c_terminateAndUnload" = x""yes; then :
+if test "x$ac_cv_lib_c_terminateAndUnload" = xyes; then :
   libs_system="$libs_system -lC" &&  if test "$verbose" = "yes"; then echo "    Appending \"-lC\" to \$libs_system"; fi
 fi
 
@@ -10206,7 +10216,7 @@
 fi
 after_morecore_hook_exists=yes
 ac_fn_c_check_func "$LINENO" "malloc_set_state" "ac_cv_func_malloc_set_state"
-if test "x$ac_cv_func_malloc_set_state" = x""yes; then :
+if test "x$ac_cv_func_malloc_set_state" = xyes; then :
 
 else
   doug_lea_malloc=no
@@ -10269,7 +10279,7 @@
 set dummy ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
+if ${ac_cv_prog_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
@@ -10311,7 +10321,7 @@
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -10351,7 +10361,7 @@
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -10415,7 +10425,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10497,7 +10507,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_YACC+set}" = set; then :
+if ${ac_cv_prog_YACC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$YACC"; then
@@ -10550,7 +10560,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
 $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
-if test "${ac_cv_header_sys_wait_h+set}" = set; then :
+if ${ac_cv_header_sys_wait_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10591,7 +10601,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10703,7 +10713,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
 $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if test "${ac_cv_header_time+set}" = set; then :
+if ${ac_cv_header_time+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10743,7 +10753,7 @@
 #endif
 
 "
-if test "x$ac_cv_have_decl_sys_siglist" = x""yes; then :
+if test "x$ac_cv_have_decl_sys_siglist" = xyes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -10780,7 +10790,7 @@
       for ac_func in utimes
 do :
   ac_fn_c_check_func "$LINENO" "utimes" "ac_cv_func_utimes"
-if test "x$ac_cv_func_utimes" = x""yes; then :
+if test "x$ac_cv_func_utimes" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_UTIMES 1
 _ACEOF
@@ -10794,7 +10804,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
 $as_echo_n "checking return type of signal handlers... " >&6; }
-if test "${ac_cv_type_signal+set}" = set; then :
+if ${ac_cv_type_signal+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10826,7 +10836,7 @@
 
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = x""yes; then :
+if test "x$ac_cv_type_size_t" = xyes; then :
 
 else
 
@@ -10837,7 +10847,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = x""yes; then :
+if test "x$ac_cv_type_pid_t" = xyes; then :
 
 else
 
@@ -10849,7 +10859,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
 $as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-if test "${ac_cv_type_uid_t+set}" = set; then :
+if ${ac_cv_type_uid_t+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10878,7 +10888,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-if test "x$ac_cv_type_mode_t" = x""yes; then :
+if test "x$ac_cv_type_mode_t" = xyes; then :
 
 else
 
@@ -10889,7 +10899,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-if test "x$ac_cv_type_off_t" = x""yes; then :
+if test "x$ac_cv_type_off_t" = xyes; then :
 
 else
 
@@ -10900,7 +10910,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
-if test "x$ac_cv_type_ssize_t" = x""yes; then :
+if test "x$ac_cv_type_ssize_t" = xyes; then :
 
 else
 
@@ -11007,7 +11017,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
 $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if test "${ac_cv_struct_tm+set}" = set; then :
+if ${ac_cv_struct_tm+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11044,7 +11054,7 @@
 #include <$ac_cv_struct_tm>
 
 "
-if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then :
+if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_TM_TM_ZONE 1
@@ -11060,7 +11070,7 @@
 else
   ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
 "
-if test "x$ac_cv_have_decl_tzname" = x""yes; then :
+if test "x$ac_cv_have_decl_tzname" = xyes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -11072,7 +11082,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
 $as_echo_n "checking for tzname... " >&6; }
-if test "${ac_cv_var_tzname+set}" = set; then :
+if ${ac_cv_var_tzname+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11110,7 +11120,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if test "${ac_cv_c_const+set}" = set; then :
+if ${ac_cv_c_const+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11193,7 +11203,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -11223,7 +11233,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then :
+if ${ac_cv_c_bigendian+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_bigendian=unknown
@@ -11452,7 +11462,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
 $as_echo_n "checking size of short... " >&6; }
-if test "${ac_cv_sizeof_short+set}" = set; then :
+if ${ac_cv_sizeof_short+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
@@ -11491,7 +11501,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
 $as_echo_n "checking size of int... " >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then :
+if ${ac_cv_sizeof_int+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
@@ -11524,7 +11534,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
 $as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then :
+if ${ac_cv_sizeof_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
@@ -11557,7 +11567,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
 $as_echo_n "checking size of long long... " >&6; }
-if test "${ac_cv_sizeof_long_long+set}" = set; then :
+if ${ac_cv_sizeof_long_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
@@ -11590,7 +11600,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
 $as_echo_n "checking size of void *... " >&6; }
-if test "${ac_cv_sizeof_void_p+set}" = set; then :
+if ${ac_cv_sizeof_void_p+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
@@ -11623,7 +11633,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5
 $as_echo_n "checking size of double... " >&6; }
-if test "${ac_cv_sizeof_double+set}" = set; then :
+if ${ac_cv_sizeof_double+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double"        "$ac_includes_default"; then :
@@ -11653,7 +11663,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5
 $as_echo_n "checking for long file names... " >&6; }
-if test "${ac_cv_sys_long_file_names+set}" = set; then :
+if ${ac_cv_sys_long_file_names+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_sys_long_file_names=yes
@@ -11693,12 +11703,12 @@
 
 
 ac_fn_c_check_func "$LINENO" "sin" "ac_cv_func_sin"
-if test "x$ac_cv_func_sin" = x""yes; then :
+if test "x$ac_cv_func_sin" = xyes; then :
 
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
 $as_echo_n "checking for sin in -lm... " >&6; }
-if test "${ac_cv_lib_m_sin+set}" = set; then :
+if ${ac_cv_lib_m_sin+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11732,7 +11742,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5
 $as_echo "$ac_cv_lib_m_sin" >&6; }
-if test "x$ac_cv_lib_m_sin" = x""yes; then :
+if test "x$ac_cv_lib_m_sin" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
 _ACEOF
@@ -11765,7 +11775,7 @@
 for ac_func in mkstemp
 do :
   ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp"
-if test "x$ac_cv_func_mkstemp" = x""yes; then :
+if test "x$ac_cv_func_mkstemp" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MKSTEMP 1
 _ACEOF
@@ -11936,7 +11946,7 @@
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgdk_imlib" >&5
 $as_echo_n "checking for main in -lgdk_imlib... " >&6; }
-if test "${ac_cv_lib_gdk_imlib_main+set}" = set; then :
+if ${ac_cv_lib_gdk_imlib_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11964,13 +11974,13 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdk_imlib_main" >&5
 $as_echo "$ac_cv_lib_gdk_imlib_main" >&6; }
-if test "x$ac_cv_lib_gdk_imlib_main" = x""yes; then :
+if test "x$ac_cv_lib_gdk_imlib_main" = xyes; then :
   libs_gtk="-lgdk_imlib $libs_gtk" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lgdk_imlib\" to \$libs_gtk"; fi
 fi
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Imlib_init in -lImlib" >&5
 $as_echo_n "checking for Imlib_init in -lImlib... " >&6; }
-if test "${ac_cv_lib_Imlib_Imlib_init+set}" = set; then :
+if ${ac_cv_lib_Imlib_Imlib_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12004,14 +12014,14 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Imlib_Imlib_init" >&5
 $as_echo "$ac_cv_lib_Imlib_Imlib_init" >&6; }
-if test "x$ac_cv_lib_Imlib_Imlib_init" = x""yes; then :
+if test "x$ac_cv_lib_Imlib_Imlib_init" = xyes; then :
   libs_gtk="$libs_gtk -lImlib" &&  if test "$verbose" = "yes"; then echo "    Appending \"-lImlib\" to \$libs_gtk"; fi
 fi
 
       for ac_func in gdk_imlib_init
 do :
   ac_fn_c_check_func "$LINENO" "gdk_imlib_init" "ac_cv_func_gdk_imlib_init"
-if test "x$ac_cv_func_gdk_imlib_init" = x""yes; then :
+if test "x$ac_cv_func_gdk_imlib_init" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GDK_IMLIB_INIT 1
 _ACEOF
@@ -12077,7 +12087,7 @@
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lxml" >&5
 $as_echo_n "checking for main in -lxml... " >&6; }
-if test "${ac_cv_lib_xml_main+set}" = set; then :
+if ${ac_cv_lib_xml_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12105,13 +12115,13 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml_main" >&5
 $as_echo "$ac_cv_lib_xml_main" >&6; }
-if test "x$ac_cv_lib_xml_main" = x""yes; then :
+if test "x$ac_cv_lib_xml_main" = xyes; then :
   libs_gtk="-lxml $libs_gtk" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lxml\" to \$libs_gtk"; fi
 fi
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lglade" >&5
 $as_echo_n "checking for main in -lglade... " >&6; }
-if test "${ac_cv_lib_glade_main+set}" = set; then :
+if ${ac_cv_lib_glade_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12139,13 +12149,13 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_glade_main" >&5
 $as_echo "$ac_cv_lib_glade_main" >&6; }
-if test "x$ac_cv_lib_glade_main" = x""yes; then :
+if test "x$ac_cv_lib_glade_main" = xyes; then :
   libs_gtk="-lglade $libs_gtk" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lglade\" to \$libs_gtk"; fi
 fi
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lglade-gnome" >&5
 $as_echo_n "checking for main in -lglade-gnome... " >&6; }
-if test "${ac_cv_lib_glade_gnome_main+set}" = set; then :
+if ${ac_cv_lib_glade_gnome_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12173,7 +12183,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_glade_gnome_main" >&5
 $as_echo "$ac_cv_lib_glade_gnome_main" >&6; }
-if test "x$ac_cv_lib_glade_gnome_main" = x""yes; then :
+if test "x$ac_cv_lib_glade_gnome_main" = xyes; then :
   libs_gtk="-lglade-gnome $libs_gtk" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lglade-gnome\" to \$libs_gtk"; fi
 fi
 
@@ -12242,7 +12252,7 @@
 else
   case $x_includes,$x_libraries in #(
     *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
-    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
+    *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   # One or both of the vars are not set, and there is no cached value.
@@ -12345,7 +12355,7 @@
   fi
 done
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 fi # $ac_x_includes = no
 
 if test "$ac_x_libraries" = no; then
@@ -12519,7 +12529,7 @@
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
+if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12553,14 +12563,14 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
+if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12594,7 +12604,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
@@ -12613,14 +12623,14 @@
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
     ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-if test "x$ac_cv_func_gethostbyname" = x""yes; then :
+if test "x$ac_cv_func_gethostbyname" = xyes; then :
 
 fi
 
     if test $ac_cv_func_gethostbyname = no; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
+if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12654,14 +12664,14 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
+if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
+if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12695,7 +12705,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
+if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi
 
@@ -12710,14 +12720,14 @@
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
     ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-if test "x$ac_cv_func_connect" = x""yes; then :
+if test "x$ac_cv_func_connect" = xyes; then :
 
 fi
 
     if test $ac_cv_func_connect = no; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
 $as_echo_n "checking for connect in -lsocket... " >&6; }
-if test "${ac_cv_lib_socket_connect+set}" = set; then :
+if ${ac_cv_lib_socket_connect+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12751,7 +12761,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
 $as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = x""yes; then :
+if test "x$ac_cv_lib_socket_connect" = xyes; then :
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi
 
@@ -12759,14 +12769,14 @@
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
     ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
-if test "x$ac_cv_func_remove" = x""yes; then :
+if test "x$ac_cv_func_remove" = xyes; then :
 
 fi
 
     if test $ac_cv_func_remove = no; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
 $as_echo_n "checking for remove in -lposix... " >&6; }
-if test "${ac_cv_lib_posix_remove+set}" = set; then :
+if ${ac_cv_lib_posix_remove+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12800,7 +12810,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
 $as_echo "$ac_cv_lib_posix_remove" >&6; }
-if test "x$ac_cv_lib_posix_remove" = x""yes; then :
+if test "x$ac_cv_lib_posix_remove" = xyes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
 
@@ -12808,14 +12818,14 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
-if test "x$ac_cv_func_shmat" = x""yes; then :
+if test "x$ac_cv_func_shmat" = xyes; then :
 
 fi
 
     if test $ac_cv_func_shmat = no; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
 $as_echo_n "checking for shmat in -lipc... " >&6; }
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
+if ${ac_cv_lib_ipc_shmat+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12849,7 +12859,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
 $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
+if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 
@@ -12867,7 +12877,7 @@
   # John Interrante, Karl Berry
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
+if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12901,7 +12911,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
 
@@ -12923,10 +12933,10 @@
   SRC_SUBDIR_DEPS="$SRC_SUBDIR_DEPS lwlib" &&  if test "$verbose" = "yes"; then echo "    Appending \"lwlib\" to \$SRC_SUBDIR_DEPS"; fi
 
     ac_fn_c_check_header_mongrel "$LINENO" "Xm/Xm.h" "ac_cv_header_Xm_Xm_h" "$ac_includes_default"
-if test "x$ac_cv_header_Xm_Xm_h" = x""yes; then :
+if test "x$ac_cv_header_Xm_Xm_h" = xyes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmStringFree in -lXm" >&5
 $as_echo_n "checking for XmStringFree in -lXm... " >&6; }
-if test "${ac_cv_lib_Xm_XmStringFree+set}" = set; then :
+if ${ac_cv_lib_Xm_XmStringFree+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12960,7 +12970,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_XmStringFree" >&5
 $as_echo "$ac_cv_lib_Xm_XmStringFree" >&6; }
-if test "x$ac_cv_lib_Xm_XmStringFree" = x""yes; then :
+if test "x$ac_cv_lib_Xm_XmStringFree" = xyes; then :
   got_motif=yes
 fi
 
@@ -13129,7 +13139,7 @@
   fi
 
     ac_fn_c_check_header_mongrel "$LINENO" "X11/Intrinsic.h" "ac_cv_header_X11_Intrinsic_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Intrinsic_h" = x""yes; then :
+if test "x$ac_cv_header_X11_Intrinsic_h" = xyes; then :
 
 else
   as_fn_error $? "Unable to find X11 header files." "$LINENO" 5
@@ -13139,7 +13149,7 @@
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5
 $as_echo_n "checking for XOpenDisplay in -lX11... " >&6; }
-if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then :
+if ${ac_cv_lib_X11_XOpenDisplay+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13173,14 +13183,14 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 $as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; }
-if test "x$ac_cv_lib_X11_XOpenDisplay" = x""yes; then :
+if test "x$ac_cv_lib_X11_XOpenDisplay" = xyes; then :
   have_lib_x11=yes
 fi
 
   if test "$have_lib_x11" != "yes"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XGetFontProperty in -lX11" >&5
 $as_echo_n "checking for XGetFontProperty in -lX11... " >&6; }
-if test "${ac_cv_lib_X11_XGetFontProperty+set}" = set; then :
+if ${ac_cv_lib_X11_XGetFontProperty+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13214,7 +13224,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XGetFontProperty" >&5
 $as_echo "$ac_cv_lib_X11_XGetFontProperty" >&6; }
-if test "x$ac_cv_lib_X11_XGetFontProperty" = x""yes; then :
+if test "x$ac_cv_lib_X11_XGetFontProperty" = xyes; then :
   ld_switch_x_site="-b i486-linuxaout $ld_switch_x_site"
 else
   as_fn_error $? "Unable to find X11 libraries." "$LINENO" 5
@@ -13226,7 +13236,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeSelectInput in -lXext" >&5
 $as_echo_n "checking for XShapeSelectInput in -lXext... " >&6; }
-if test "${ac_cv_lib_Xext_XShapeSelectInput+set}" = set; then :
+if ${ac_cv_lib_Xext_XShapeSelectInput+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13260,14 +13270,14 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeSelectInput" >&5
 $as_echo "$ac_cv_lib_Xext_XShapeSelectInput" >&6; }
-if test "x$ac_cv_lib_Xext_XShapeSelectInput" = x""yes; then :
+if test "x$ac_cv_lib_Xext_XShapeSelectInput" = xyes; then :
   libs_x="-lXext $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lXext\" to \$libs_x"; fi
 fi
 
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XtOpenDisplay in -lXt" >&5
 $as_echo_n "checking for XtOpenDisplay in -lXt... " >&6; }
-if test "${ac_cv_lib_Xt_XtOpenDisplay+set}" = set; then :
+if ${ac_cv_lib_Xt_XtOpenDisplay+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13301,7 +13311,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xt_XtOpenDisplay" >&5
 $as_echo "$ac_cv_lib_Xt_XtOpenDisplay" >&6; }
-if test "x$ac_cv_lib_Xt_XtOpenDisplay" = x""yes; then :
+if test "x$ac_cv_lib_Xt_XtOpenDisplay" = xyes; then :
   libs_x="-lXt $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lXt\" to \$libs_x"; fi
 else
   as_fn_error $? "Unable to find X11 libraries." "$LINENO" 5
@@ -13371,7 +13381,7 @@
     for ac_func in XRegisterIMInstantiateCallback
 do :
   ac_fn_c_check_func "$LINENO" "XRegisterIMInstantiateCallback" "ac_cv_func_XRegisterIMInstantiateCallback"
-if test "x$ac_cv_func_XRegisterIMInstantiateCallback" = x""yes; then :
+if test "x$ac_cv_func_XRegisterIMInstantiateCallback" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_XREGISTERIMINSTANTIATECALLBACK 1
 _ACEOF
@@ -13403,7 +13413,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
 $as_echo_n "checking for XmuReadBitmapDataFromFile in -lXmu... " >&6; }
-if test "${ac_cv_lib_Xmu_XmuReadBitmapDataFromFile+set}" = set; then :
+if ${ac_cv_lib_Xmu_XmuReadBitmapDataFromFile+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13437,7 +13447,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xmu_XmuReadBitmapDataFromFile" >&5
 $as_echo "$ac_cv_lib_Xmu_XmuReadBitmapDataFromFile" >&6; }
-if test "x$ac_cv_lib_Xmu_XmuReadBitmapDataFromFile" = x""yes; then :
+if test "x$ac_cv_lib_Xmu_XmuReadBitmapDataFromFile" = xyes; then :
   with_xmu=yes
 else
   with_xmu=no
@@ -13453,7 +13463,7 @@
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXbsd" >&5
 $as_echo_n "checking for main in -lXbsd... " >&6; }
-if test "${ac_cv_lib_Xbsd_main+set}" = set; then :
+if ${ac_cv_lib_Xbsd_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13481,7 +13491,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xbsd_main" >&5
 $as_echo "$ac_cv_lib_Xbsd_main" >&6; }
-if test "x$ac_cv_lib_Xbsd_main" = x""yes; then :
+if test "x$ac_cv_lib_Xbsd_main" = xyes; then :
   libs_x="-lXbsd $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lXbsd\" to \$libs_x"; fi
 fi
 
@@ -13516,7 +13526,7 @@
       for ac_header in freetype/config/ftheader.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "freetype/config/ftheader.h" "ac_cv_header_freetype_config_ftheader_h" "$ac_includes_default"
-if test "x$ac_cv_header_freetype_config_ftheader_h" = x""yes; then :
+if test "x$ac_cv_header_freetype_config_ftheader_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FREETYPE_CONFIG_FTHEADER_H 1
 _ACEOF
@@ -13536,7 +13546,7 @@
 	    for ac_header in freetype/config/ftheader.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "freetype/config/ftheader.h" "ac_cv_header_freetype_config_ftheader_h" "$ac_includes_default"
-if test "x$ac_cv_header_freetype_config_ftheader_h" = x""yes; then :
+if test "x$ac_cv_header_freetype_config_ftheader_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FREETYPE_CONFIG_FTHEADER_H 1
 _ACEOF
@@ -13559,7 +13569,7 @@
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRenderQueryExtension in -lXrender" >&5
 $as_echo_n "checking for XRenderQueryExtension in -lXrender... " >&6; }
-if test "${ac_cv_lib_Xrender_XRenderQueryExtension+set}" = set; then :
+if ${ac_cv_lib_Xrender_XRenderQueryExtension+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13593,7 +13603,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderQueryExtension" >&5
 $as_echo "$ac_cv_lib_Xrender_XRenderQueryExtension" >&6; }
-if test "x$ac_cv_lib_Xrender_XRenderQueryExtension" = x""yes; then :
+if test "x$ac_cv_lib_Xrender_XRenderQueryExtension" = xyes; then :
   libs_x="-lXrender $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lXrender\" to \$libs_x"; fi
 else
   { echo "Error:" "Unable to find libXrender for --with-xft" >&2; exit 1; }
@@ -13601,7 +13611,7 @@
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FcPatternCreate in -lfontconfig" >&5
 $as_echo_n "checking for FcPatternCreate in -lfontconfig... " >&6; }
-if test "${ac_cv_lib_fontconfig_FcPatternCreate+set}" = set; then :
+if ${ac_cv_lib_fontconfig_FcPatternCreate+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13635,7 +13645,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fontconfig_FcPatternCreate" >&5
 $as_echo "$ac_cv_lib_fontconfig_FcPatternCreate" >&6; }
-if test "x$ac_cv_lib_fontconfig_FcPatternCreate" = x""yes; then :
+if test "x$ac_cv_lib_fontconfig_FcPatternCreate" = xyes; then :
   libs_x="-lfontconfig $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lfontconfig\" to \$libs_x"; fi
 else
   { echo "Error:" "Unable to find libfontconfig for --with-xft" >&2; exit 1; }
@@ -13643,7 +13653,7 @@
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XftFontOpen in -lXft" >&5
 $as_echo_n "checking for XftFontOpen in -lXft... " >&6; }
-if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then :
+if ${ac_cv_lib_Xft_XftFontOpen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13677,7 +13687,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xft_XftFontOpen" >&5
 $as_echo "$ac_cv_lib_Xft_XftFontOpen" >&6; }
-if test "x$ac_cv_lib_Xft_XftFontOpen" = x""yes; then :
+if test "x$ac_cv_lib_Xft_XftFontOpen" = xyes; then :
   libs_x="-lXft $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lXft\" to \$libs_x"; fi
 else
   { echo "Error:" "Unable to find libXft for --with-xft" >&2; exit 1; }
@@ -13687,7 +13697,7 @@
       for ac_func in FcConfigGetRescanInterval
 do :
   ac_fn_c_check_func "$LINENO" "FcConfigGetRescanInterval" "ac_cv_func_FcConfigGetRescanInterval"
-if test "x$ac_cv_func_FcConfigGetRescanInterval" = x""yes; then :
+if test "x$ac_cv_func_FcConfigGetRescanInterval" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FCCONFIGGETRESCANINTERVAL 1
 _ACEOF
@@ -13698,7 +13708,7 @@
       for ac_func in FcConfigSetRescanInterval
 do :
   ac_fn_c_check_func "$LINENO" "FcConfigSetRescanInterval" "ac_cv_func_FcConfigSetRescanInterval"
-if test "x$ac_cv_func_FcConfigSetRescanInterval" = x""yes; then :
+if test "x$ac_cv_func_FcConfigSetRescanInterval" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FCCONFIGSETRESCANINTERVAL 1
 _ACEOF
@@ -13723,7 +13733,7 @@
 $as_echo "" >&6; }
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgdi32" >&5
 $as_echo_n "checking for main in -lgdi32... " >&6; }
-if test "${ac_cv_lib_gdi32_main+set}" = set; then :
+if ${ac_cv_lib_gdi32_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13751,7 +13761,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdi32_main" >&5
 $as_echo "$ac_cv_lib_gdi32_main" >&6; }
-if test "x$ac_cv_lib_gdi32_main" = x""yes; then :
+if test "x$ac_cv_lib_gdi32_main" = xyes; then :
   with_msw=yes
 fi
 
@@ -13849,7 +13859,7 @@
 #include <X11/Xutil.h>
 
 "
-if test "x$ac_cv_header_X11_extensions_shape_h" = x""yes; then :
+if test "x$ac_cv_header_X11_extensions_shape_h" = xyes; then :
 
    $as_echo "#define HAVE_BALLOON_HELP 1" >>confdefs.h
 
@@ -13886,7 +13896,7 @@
 
 test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
 test -z "$with_xauth" && { ac_fn_c_check_header_mongrel "$LINENO" "X11/Xauth.h" "ac_cv_header_X11_Xauth_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xauth_h" = x""yes; then :
+if test "x$ac_cv_header_X11_Xauth_h" = xyes; then :
 
 else
   with_xauth=no
@@ -13895,7 +13905,7 @@
  }
 test -z "$with_xauth" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauGetAuthByAddr in -lXau" >&5
 $as_echo_n "checking for XauGetAuthByAddr in -lXau... " >&6; }
-if test "${ac_cv_lib_Xau_XauGetAuthByAddr+set}" = set; then :
+if ${ac_cv_lib_Xau_XauGetAuthByAddr+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13929,7 +13939,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xau_XauGetAuthByAddr" >&5
 $as_echo "$ac_cv_lib_Xau_XauGetAuthByAddr" >&6; }
-if test "x$ac_cv_lib_Xau_XauGetAuthByAddr" = x""yes; then :
+if test "x$ac_cv_lib_Xau_XauGetAuthByAddr" = xyes; then :
   :
 else
   with_xauth=no
@@ -13971,7 +13981,7 @@
       ;;
     * )
             ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5
 $as_echo_n "checking for dlopen in -lc... " >&6; }
@@ -14052,7 +14062,7 @@
 
       else
 		ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
-if test "x$ac_cv_header_dl_h" = x""yes; then :
+if test "x$ac_cv_header_dl_h" = xyes; then :
 
 	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -lc" >&5
 $as_echo_n "checking for shl_load in -lc... " >&6; }
@@ -14108,7 +14118,7 @@
 
 	else
 	  	  ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
-if test "x$ac_cv_header_ltdl_h" = x""yes; then :
+if test "x$ac_cv_header_ltdl_h" = xyes; then :
 
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lt_dlinit in -lltdl" >&5
 $as_echo_n "checking for lt_dlinit in -lltdl... " >&6; }
@@ -14777,7 +14787,7 @@
   for extra_libs in "" "-lI18N -lce" "-lcxx"; do
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tt_message_create in -ltt" >&5
 $as_echo_n "checking for tt_message_create in -ltt... " >&6; }
-if test "${ac_cv_lib_tt_tt_message_create+set}" = set; then :
+if ${ac_cv_lib_tt_tt_message_create+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -14811,7 +14821,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tt_tt_message_create" >&5
 $as_echo "$ac_cv_lib_tt_tt_message_create" >&6; }
-if test "x$ac_cv_lib_tt_tt_message_create" = x""yes; then :
+if test "x$ac_cv_lib_tt_tt_message_create" = xyes; then :
   tt_libs="-ltt $extra_libs"; break
 else
   :
@@ -14839,7 +14849,7 @@
 fi
 
 test -z "$with_cde" && { ac_fn_c_check_header_mongrel "$LINENO" "Dt/Dt.h" "ac_cv_header_Dt_Dt_h" "$ac_includes_default"
-if test "x$ac_cv_header_Dt_Dt_h" = x""yes; then :
+if test "x$ac_cv_header_Dt_Dt_h" = xyes; then :
 
 else
   with_cde=no
@@ -14848,7 +14858,7 @@
  }
 test -z "$with_cde" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DtDndDragStart in -lDtSvc" >&5
 $as_echo_n "checking for DtDndDragStart in -lDtSvc... " >&6; }
-if test "${ac_cv_lib_DtSvc_DtDndDragStart+set}" = set; then :
+if ${ac_cv_lib_DtSvc_DtDndDragStart+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -14882,7 +14892,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_DtSvc_DtDndDragStart" >&5
 $as_echo "$ac_cv_lib_DtSvc_DtDndDragStart" >&6; }
-if test "x$ac_cv_lib_DtSvc_DtDndDragStart" = x""yes; then :
+if test "x$ac_cv_lib_DtSvc_DtDndDragStart" = xyes; then :
   :
 else
   with_cde=no
@@ -14932,7 +14942,7 @@
 $as_echo "" >&6; }
 ldap_libs=
 test -z "$with_ldap" && { ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default"
-if test "x$ac_cv_header_ldap_h" = x""yes; then :
+if test "x$ac_cv_header_ldap_h" = xyes; then :
 
 else
   with_ldap=no
@@ -14940,7 +14950,7 @@
 
  }
 test -z "$with_ldap" && { ac_fn_c_check_header_mongrel "$LINENO" "lber.h" "ac_cv_header_lber_h" "$ac_includes_default"
-if test "x$ac_cv_header_lber_h" = x""yes; then :
+if test "x$ac_cv_header_lber_h" = xyes; then :
 
 else
   with_ldap=no
@@ -14950,7 +14960,7 @@
 if test "$with_ldap" != "no"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_search in -lldap" >&5
 $as_echo_n "checking for ldap_search in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_ldap_search+set}" = set; then :
+if ${ac_cv_lib_ldap_ldap_search+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -14984,13 +14994,13 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_search" >&5
 $as_echo "$ac_cv_lib_ldap_ldap_search" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_search" = x""yes; then :
+if test "x$ac_cv_lib_ldap_ldap_search" = xyes; then :
   with_ldap=yes
 fi
 
     test "$with_ldap" != "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_open in -lldap" >&5
 $as_echo_n "checking for ldap_open in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_ldap_open+set}" = set; then :
+if ${ac_cv_lib_ldap_ldap_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15024,13 +15034,13 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_open" >&5
 $as_echo "$ac_cv_lib_ldap_ldap_open" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_open" = x""yes; then :
+if test "x$ac_cv_lib_ldap_ldap_open" = xyes; then :
   with_ldap=yes with_ldap_lber=yes
 fi
  }
   test "$with_ldap" != "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_open in -lldap" >&5
 $as_echo_n "checking for ldap_open in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_ldap_open+set}" = set; then :
+if ${ac_cv_lib_ldap_ldap_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15064,13 +15074,13 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_open" >&5
 $as_echo "$ac_cv_lib_ldap_ldap_open" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_open" = x""yes; then :
+if test "x$ac_cv_lib_ldap_ldap_open" = xyes; then :
   with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes
 fi
  }
   test "$with_ldap" != "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_open in -lldap" >&5
 $as_echo_n "checking for ldap_open in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_ldap_open+set}" = set; then :
+if ${ac_cv_lib_ldap_ldap_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15104,13 +15114,13 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_open" >&5
 $as_echo "$ac_cv_lib_ldap_ldap_open" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_open" = x""yes; then :
+if test "x$ac_cv_lib_ldap_ldap_open" = xyes; then :
   with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes with_ldap_des=yes
 fi
  }
               test "$with_ldap_lber" != "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_pvt_opt_on in -llber" >&5
 $as_echo_n "checking for ber_pvt_opt_on in -llber... " >&6; }
-if test "${ac_cv_lib_lber_ber_pvt_opt_on+set}" = set; then :
+if ${ac_cv_lib_lber_ber_pvt_opt_on+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15144,7 +15154,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lber_ber_pvt_opt_on" >&5
 $as_echo "$ac_cv_lib_lber_ber_pvt_opt_on" >&6; }
-if test "x$ac_cv_lib_lber_ber_pvt_opt_on" = x""yes; then :
+if test "x$ac_cv_lib_lber_ber_pvt_opt_on" = xyes; then :
   with_ldap_lber=yes
 fi
  }
@@ -15206,7 +15216,7 @@
   if test -n "$libpq_fe_h_file"; then
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQconnectdb in -lpq" >&5
 $as_echo_n "checking for PQconnectdb in -lpq... " >&6; }
-if test "${ac_cv_lib_pq_PQconnectdb+set}" = set; then :
+if ${ac_cv_lib_pq_PQconnectdb+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15240,14 +15250,14 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQconnectdb" >&5
 $as_echo "$ac_cv_lib_pq_PQconnectdb" >&6; }
-if test "x$ac_cv_lib_pq_PQconnectdb" = x""yes; then :
+if test "x$ac_cv_lib_pq_PQconnectdb" = xyes; then :
   pq_libs="-lpq"
 else
 
       unset ac_cv_lib_pq_PQconnectdb;
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQconnectdb in -lpq" >&5
 $as_echo_n "checking for PQconnectdb in -lpq... " >&6; }
-if test "${ac_cv_lib_pq_PQconnectdb+set}" = set; then :
+if ${ac_cv_lib_pq_PQconnectdb+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15281,7 +15291,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQconnectdb" >&5
 $as_echo "$ac_cv_lib_pq_PQconnectdb" >&6; }
-if test "x$ac_cv_lib_pq_PQconnectdb" = x""yes; then :
+if test "x$ac_cv_lib_pq_PQconnectdb" = xyes; then :
   pq_libs="-lpq -lcrypto -lssl"
 fi
 
@@ -15300,7 +15310,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQconnectStart in -lpq" >&5
 $as_echo_n "checking for PQconnectStart in -lpq... " >&6; }
-if test "${ac_cv_lib_pq_PQconnectStart+set}" = set; then :
+if ${ac_cv_lib_pq_PQconnectStart+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15334,7 +15344,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQconnectStart" >&5
 $as_echo "$ac_cv_lib_pq_PQconnectStart" >&6; }
-if test "x$ac_cv_lib_pq_PQconnectStart" = x""yes; then :
+if test "x$ac_cv_lib_pq_PQconnectStart" = xyes; then :
 
                  with_postgresqlv7=yes;
                  $as_echo "#define HAVE_POSTGRESQLV7 1" >>confdefs.h
@@ -15477,7 +15487,7 @@
   fi
 
     test -z "$with_xface" && { ac_fn_c_check_header_mongrel "$LINENO" "compface.h" "ac_cv_header_compface_h" "$ac_includes_default"
-if test "x$ac_cv_header_compface_h" = x""yes; then :
+if test "x$ac_cv_header_compface_h" = xyes; then :
 
 else
   with_xface=no
@@ -15486,7 +15496,7 @@
  }
   test -z "$with_xface" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UnGenFace in -lcompface" >&5
 $as_echo_n "checking for UnGenFace in -lcompface... " >&6; }
-if test "${ac_cv_lib_compface_UnGenFace+set}" = set; then :
+if ${ac_cv_lib_compface_UnGenFace+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15520,7 +15530,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_compface_UnGenFace" >&5
 $as_echo "$ac_cv_lib_compface_UnGenFace" >&6; }
-if test "x$ac_cv_lib_compface_UnGenFace" = x""yes; then :
+if test "x$ac_cv_lib_compface_UnGenFace" = xyes; then :
   :
 else
   with_xface=no
@@ -15534,7 +15544,7 @@
   fi
 
     test -z "$with_gif" && { ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
-if test "x$ac_cv_header_gif_lib_h" = x""yes; then :
+if test "x$ac_cv_header_gif_lib_h" = xyes; then :
 
 else
   with_gif=no
@@ -15545,7 +15555,7 @@
     with_gif="yes"
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lgif" >&5
 $as_echo_n "checking for EGifPutExtensionLast in -lgif... " >&6; }
-if test "${ac_cv_lib_gif_EGifPutExtensionLast+set}" = set; then :
+if ${ac_cv_lib_gif_EGifPutExtensionLast+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15579,12 +15589,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5
 $as_echo "$ac_cv_lib_gif_EGifPutExtensionLast" >&6; }
-if test "x$ac_cv_lib_gif_EGifPutExtensionLast" = x""yes; then :
+if test "x$ac_cv_lib_gif_EGifPutExtensionLast" = xyes; then :
   libs_x="-lgif $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lgif\" to \$libs_x"; fi
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lungif" >&5
 $as_echo_n "checking for EGifPutExtensionLast in -lungif... " >&6; }
-if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then :
+if ${ac_cv_lib_ungif_EGifPutExtensionLast+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15618,7 +15628,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
 $as_echo "$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; }
-if test "x$ac_cv_lib_ungif_EGifPutExtensionLast" = x""yes; then :
+if test "x$ac_cv_lib_ungif_EGifPutExtensionLast" = xyes; then :
   libs_x="-lungif $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lungif\" to \$libs_x"; fi
 else
   with_gif=no
@@ -15635,7 +15645,7 @@
       if test "$with_png $with_tiff" != "no no"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lc" >&5
 $as_echo_n "checking for inflate in -lc... " >&6; }
-if test "${ac_cv_lib_c_inflate+set}" = set; then :
+if ${ac_cv_lib_c_inflate+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15669,13 +15679,13 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_inflate" >&5
 $as_echo "$ac_cv_lib_c_inflate" >&6; }
-if test "x$ac_cv_lib_c_inflate" = x""yes; then :
+if test "x$ac_cv_lib_c_inflate" = xyes; then :
   :
 else
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5
 $as_echo_n "checking for inflate in -lz... " >&6; }
-if test "${ac_cv_lib_z_inflate+set}" = set; then :
+if ${ac_cv_lib_z_inflate+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15709,13 +15719,13 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5
 $as_echo "$ac_cv_lib_z_inflate" >&6; }
-if test "x$ac_cv_lib_z_inflate" = x""yes; then :
+if test "x$ac_cv_lib_z_inflate" = xyes; then :
   libs_x="-lz $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lz\" to \$libs_x"; fi
 else
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lgz" >&5
 $as_echo_n "checking for inflate in -lgz... " >&6; }
-if test "${ac_cv_lib_gz_inflate+set}" = set; then :
+if ${ac_cv_lib_gz_inflate+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15749,7 +15759,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gz_inflate" >&5
 $as_echo "$ac_cv_lib_gz_inflate" >&6; }
-if test "x$ac_cv_lib_gz_inflate" = x""yes; then :
+if test "x$ac_cv_lib_gz_inflate" = xyes; then :
   libs_x="-lgz $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lgz\" to \$libs_x"; fi
 fi
 
@@ -15760,7 +15770,7 @@
   fi
 
     test -z "$with_jpeg" && { ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
-if test "x$ac_cv_header_jpeglib_h" = x""yes; then :
+if test "x$ac_cv_header_jpeglib_h" = xyes; then :
 
 else
   with_jpeg=no
@@ -15769,7 +15779,7 @@
  }
   test -z "$with_jpeg" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_destroy_decompress in -ljpeg" >&5
 $as_echo_n "checking for jpeg_destroy_decompress in -ljpeg... " >&6; }
-if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then :
+if ${ac_cv_lib_jpeg_jpeg_destroy_decompress+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15803,7 +15813,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5
 $as_echo "$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; }
-if test "x$ac_cv_lib_jpeg_jpeg_destroy_decompress" = x""yes; then :
+if test "x$ac_cv_lib_jpeg_jpeg_destroy_decompress" = xyes; then :
   :
 else
   with_jpeg=no
@@ -15818,14 +15828,14 @@
 
     png_problem=""
   test -z "$with_png" && { ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
-if test "x$ac_cv_func_pow" = x""yes; then :
+if test "x$ac_cv_func_pow" = xyes; then :
 
 else
   with_png=no
 fi
  }
   test -z "$with_png" && { ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
-if test "x$ac_cv_header_png_h" = x""yes; then :
+if test "x$ac_cv_header_png_h" = xyes; then :
 
 else
   with_png=no
@@ -15834,7 +15844,7 @@
  }
   test -z "$with_png" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_image in -lpng" >&5
 $as_echo_n "checking for png_read_image in -lpng... " >&6; }
-if test "${ac_cv_lib_png_png_read_image+set}" = set; then :
+if ${ac_cv_lib_png_png_read_image+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15868,7 +15878,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_read_image" >&5
 $as_echo "$ac_cv_lib_png_png_read_image" >&6; }
-if test "x$ac_cv_lib_png_png_read_image" = x""yes; then :
+if test "x$ac_cv_lib_png_png_read_image" = xyes; then :
   :
 else
   with_png=no
@@ -15927,7 +15937,7 @@
   fi
 
     test -z "$with_tiff" && { ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
-if test "x$ac_cv_header_tiffio_h" = x""yes; then :
+if test "x$ac_cv_header_tiffio_h" = xyes; then :
 
 else
   with_tiff=no
@@ -15936,7 +15946,7 @@
  }
   test -z "$with_tiff" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFClientOpen in -ltiff" >&5
 $as_echo_n "checking for TIFFClientOpen in -ltiff... " >&6; }
-if test "${ac_cv_lib_tiff_TIFFClientOpen+set}" = set; then :
+if ${ac_cv_lib_tiff_TIFFClientOpen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15970,7 +15980,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFClientOpen" >&5
 $as_echo "$ac_cv_lib_tiff_TIFFClientOpen" >&6; }
-if test "x$ac_cv_lib_tiff_TIFFClientOpen" = x""yes; then :
+if test "x$ac_cv_lib_tiff_TIFFClientOpen" = xyes; then :
   :
 else
   with_tiff=no
@@ -15987,7 +15997,7 @@
 
 if test "$with_gtk" = "yes"; then
     test -z "$with_xface" && { ac_fn_c_check_header_mongrel "$LINENO" "compface.h" "ac_cv_header_compface_h" "$ac_includes_default"
-if test "x$ac_cv_header_compface_h" = x""yes; then :
+if test "x$ac_cv_header_compface_h" = xyes; then :
 
 else
   with_xface=no
@@ -15996,7 +16006,7 @@
  }
   test -z "$with_xface" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UnGenFace in -lcompface" >&5
 $as_echo_n "checking for UnGenFace in -lcompface... " >&6; }
-if test "${ac_cv_lib_compface_UnGenFace+set}" = set; then :
+if ${ac_cv_lib_compface_UnGenFace+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16030,7 +16040,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_compface_UnGenFace" >&5
 $as_echo "$ac_cv_lib_compface_UnGenFace" >&6; }
-if test "x$ac_cv_lib_compface_UnGenFace" = x""yes; then :
+if test "x$ac_cv_lib_compface_UnGenFace" = xyes; then :
   :
 else
   with_xface=no
@@ -16080,7 +16090,7 @@
     as_ac_Lib=`$as_echo "ac_cv_lib_$athena_variant''_XawScrollbarSetThumb" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
 $as_echo_n "checking for XawScrollbarSetThumb in -l$athena_variant... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16120,7 +16130,7 @@
                 as_ac_Lib=`$as_echo "ac_cv_lib_$athena_variant''_XawSme3dComputeTopShadowRGB" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawSme3dComputeTopShadowRGB in -l$athena_variant" >&5
 $as_echo_n "checking for XawSme3dComputeTopShadowRGB in -l$athena_variant... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16172,7 +16182,7 @@
         as_ac_Lib=`$as_echo "ac_cv_lib_$athena_variant''_XawSme3dComputeTopShadowRGB" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawSme3dComputeTopShadowRGB in -l$athena_variant" >&5
 $as_echo_n "checking for XawSme3dComputeTopShadowRGB in -l$athena_variant... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16212,7 +16222,7 @@
 else
               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawSme3dComputeTopShadowRGB in -lXaw" >&5
 $as_echo_n "checking for XawSme3dComputeTopShadowRGB in -lXaw... " >&6; }
-if test "${ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB+set}" = set; then :
+if ${ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16246,7 +16256,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB" >&5
 $as_echo "$ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB" >&6; }
-if test "x$ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB" = x""yes; then :
+if test "x$ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB" = xyes; then :
 
           athena_lib=Xaw;
           { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming that libXaw is actually $athena_variant." >&5
@@ -16263,7 +16273,7 @@
 
     if test "$athena_3d" = "no"; then
     ac_fn_c_check_header_mongrel "$LINENO" "X11/Xaw/ThreeD.h" "ac_cv_header_X11_Xaw_ThreeD_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xaw_ThreeD_h" = x""yes; then :
+if test "x$ac_cv_header_X11_Xaw_ThreeD_h" = xyes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a non-3d Athena header set." >&5
 $as_echo "$as_me: WARNING: Could not find a non-3d Athena header set." >&2;}
 else
@@ -16271,7 +16281,7 @@
 #include <X11/Intrinsic.h>
 
 "
-if test "x$ac_cv_header_X11_Xaw_XawInit_h" = x""yes; then :
+if test "x$ac_cv_header_X11_Xaw_XawInit_h" = xyes; then :
   athena_h_path=X11/Xaw
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a non-3d Athena header set." >&5
@@ -16333,9 +16343,9 @@
 #include <X11/Intrinsic.h>
 
 "
-if test "x$ac_cv_header_X11_Xaw3d_XawInit_h" = x""yes; then :
+if test "x$ac_cv_header_X11_Xaw3d_XawInit_h" = xyes; then :
   ac_fn_c_check_header_mongrel "$LINENO" "X11/Xaw3d/ThreeD.h" "ac_cv_header_X11_Xaw3d_ThreeD_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xaw3d_ThreeD_h" = x""yes; then :
+if test "x$ac_cv_header_X11_Xaw3d_ThreeD_h" = xyes; then :
 
             { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming that X11/Xaw3d headers are suitable for $athena_variant." >&5
 $as_echo "$as_me: WARNING: Assuming that X11/Xaw3d headers are suitable for $athena_variant." >&2;}
@@ -16357,9 +16367,9 @@
 #include <X11/Intrinsic.h>
 
 "
-if test "x$ac_cv_header_Xaw3d_XawInit_h" = x""yes; then :
+if test "x$ac_cv_header_Xaw3d_XawInit_h" = xyes; then :
   ac_fn_c_check_header_mongrel "$LINENO" "Xaw3d/ThreeD.h" "ac_cv_header_Xaw3d_ThreeD_h" "$ac_includes_default"
-if test "x$ac_cv_header_Xaw3d_ThreeD_h" = x""yes; then :
+if test "x$ac_cv_header_Xaw3d_ThreeD_h" = xyes; then :
 
             { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming that Xaw3d headers are suitable for $athena_variant." >&5
 $as_echo "$as_me: WARNING: Assuming that Xaw3d headers are suitable for $athena_variant." >&2;}
@@ -16375,7 +16385,7 @@
 
             if test -z "$athena_h_path"; then
       ac_fn_c_check_header_mongrel "$LINENO" "X11/Xaw/ThreeD.h" "ac_cv_header_X11_Xaw_ThreeD_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xaw_ThreeD_h" = x""yes; then :
+if test "x$ac_cv_header_X11_Xaw_ThreeD_h" = xyes; then :
 
           { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming that X11/Xaw headers are suitable for $athena_variant." >&5
 $as_echo "$as_me: WARNING: Assuming that X11/Xaw headers are suitable for $athena_variant." >&2;}
@@ -16401,10 +16411,10 @@
 fi
 if test "$with_x11" = "yes"; then
         ac_fn_c_check_header_mongrel "$LINENO" "Xm/Xm.h" "ac_cv_header_Xm_Xm_h" "$ac_includes_default"
-if test "x$ac_cv_header_Xm_Xm_h" = x""yes; then :
+if test "x$ac_cv_header_Xm_Xm_h" = xyes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmStringCreate in -lXm" >&5
 $as_echo_n "checking for XmStringCreate in -lXm... " >&6; }
-if test "${ac_cv_lib_Xm_XmStringCreate+set}" = set; then :
+if ${ac_cv_lib_Xm_XmStringCreate+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16438,7 +16448,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_XmStringCreate" >&5
 $as_echo "$ac_cv_lib_Xm_XmStringCreate" >&6; }
-if test "x$ac_cv_lib_Xm_XmStringCreate" = x""yes; then :
+if test "x$ac_cv_lib_Xm_XmStringCreate" = xyes; then :
   have_motif=yes
 else
   have_motif=no
@@ -16700,7 +16710,7 @@
     for ac_header in libintl.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
-if test "x$ac_cv_header_libintl_h" = x""yes; then :
+if test "x$ac_cv_header_libintl_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBINTL_H 1
 _ACEOF
@@ -16711,7 +16721,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strerror in -lintl" >&5
 $as_echo_n "checking for strerror in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_strerror+set}" = set; then :
+if ${ac_cv_lib_intl_strerror+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16745,7 +16755,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strerror" >&5
 $as_echo "$ac_cv_lib_intl_strerror" >&6; }
-if test "x$ac_cv_lib_intl_strerror" = x""yes; then :
+if test "x$ac_cv_lib_intl_strerror" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBINTL 1
 _ACEOF
@@ -16762,7 +16772,7 @@
 $as_echo_n "checking for XIM... " >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenIM in -lX11" >&5
 $as_echo_n "checking for XOpenIM in -lX11... " >&6; }
-if test "${ac_cv_lib_X11_XOpenIM+set}" = set; then :
+if ${ac_cv_lib_X11_XOpenIM+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16796,7 +16806,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenIM" >&5
 $as_echo "$ac_cv_lib_X11_XOpenIM" >&6; }
-if test "x$ac_cv_lib_X11_XOpenIM" = x""yes; then :
+if test "x$ac_cv_lib_X11_XOpenIM" = xyes; then :
   with_xim=xlib
 else
   with_xim=no
@@ -16805,7 +16815,7 @@
             if test "$need_motif $have_lesstif" = "yes no"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmImMbLookupString in -lXm" >&5
 $as_echo_n "checking for XmImMbLookupString in -lXm... " >&6; }
-if test "${ac_cv_lib_Xm_XmImMbLookupString+set}" = set; then :
+if ${ac_cv_lib_Xm_XmImMbLookupString+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16839,14 +16849,14 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_XmImMbLookupString" >&5
 $as_echo "$ac_cv_lib_Xm_XmImMbLookupString" >&6; }
-if test "x$ac_cv_lib_Xm_XmImMbLookupString" = x""yes; then :
+if test "x$ac_cv_lib_Xm_XmImMbLookupString" = xyes; then :
   with_xim=motif
 fi
 
             elif test "$have_motif $have_lesstif $with_xim" = "yes no no"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmImMbLookupString in -lXm" >&5
 $as_echo_n "checking for XmImMbLookupString in -lXm... " >&6; }
-if test "${ac_cv_lib_Xm_XmImMbLookupString+set}" = set; then :
+if ${ac_cv_lib_Xm_XmImMbLookupString+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16880,7 +16890,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_XmImMbLookupString" >&5
 $as_echo "$ac_cv_lib_Xm_XmImMbLookupString" >&6; }
-if test "x$ac_cv_lib_Xm_XmImMbLookupString" = x""yes; then :
+if test "x$ac_cv_lib_Xm_XmImMbLookupString" = xyes; then :
   with_xim=motif
 fi
 
@@ -16914,7 +16924,7 @@
 $as_echo_n "checking for XFontSet... " >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmbDrawString in -lX11" >&5
 $as_echo_n "checking for XmbDrawString in -lX11... " >&6; }
-if test "${ac_cv_lib_X11_XmbDrawString+set}" = set; then :
+if ${ac_cv_lib_X11_XmbDrawString+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16948,7 +16958,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XmbDrawString" >&5
 $as_echo "$ac_cv_lib_X11_XmbDrawString" >&6; }
-if test "x$ac_cv_lib_X11_XmbDrawString" = x""yes; then :
+if test "x$ac_cv_lib_X11_XmbDrawString" = xyes; then :
   :
 else
   with_xfs=no
@@ -16966,7 +16976,7 @@
   fi
     test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
   test -z "$with_wnn" && { ac_fn_c_check_header_mongrel "$LINENO" "wnn/jllib.h" "ac_cv_header_wnn_jllib_h" "$ac_includes_default"
-if test "x$ac_cv_header_wnn_jllib_h" = x""yes; then :
+if test "x$ac_cv_header_wnn_jllib_h" = xyes; then :
 
 else
   with_wnn=no
@@ -16974,7 +16984,7 @@
 
  }
     test -z "$with_wnn" && { ac_fn_c_check_header_mongrel "$LINENO" "wnn/commonhd.h" "ac_cv_header_wnn_commonhd_h" "$ac_includes_default"
-if test "x$ac_cv_header_wnn_commonhd_h" = x""yes; then :
+if test "x$ac_cv_header_wnn_commonhd_h" = xyes; then :
 
 else
   with_wnn=no
@@ -16985,7 +16995,7 @@
     for ac_func in crypt
 do :
   ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt"
-if test "x$ac_cv_func_crypt" = x""yes; then :
+if test "x$ac_cv_func_crypt" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CRYPT 1
 _ACEOF
@@ -16995,7 +17005,7 @@
 
     test "$ac_cv_func_crypt" != "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
 $as_echo_n "checking for crypt in -lcrypt... " >&6; }
-if test "${ac_cv_lib_crypt_crypt+set}" = set; then :
+if ${ac_cv_lib_crypt_crypt+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17029,7 +17039,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
 $as_echo "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = x""yes; then :
+if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBCRYPT 1
 _ACEOF
@@ -17042,7 +17052,7 @@
     if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jl_dic_list_e in -lwnn" >&5
 $as_echo_n "checking for jl_dic_list_e in -lwnn... " >&6; }
-if test "${ac_cv_lib_wnn_jl_dic_list_e+set}" = set; then :
+if ${ac_cv_lib_wnn_jl_dic_list_e+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17076,12 +17086,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wnn_jl_dic_list_e" >&5
 $as_echo "$ac_cv_lib_wnn_jl_dic_list_e" >&6; }
-if test "x$ac_cv_lib_wnn_jl_dic_list_e" = x""yes; then :
+if test "x$ac_cv_lib_wnn_jl_dic_list_e" = xyes; then :
   libwnn=wnn
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jl_dic_list_e in -lwnn4" >&5
 $as_echo_n "checking for jl_dic_list_e in -lwnn4... " >&6; }
-if test "${ac_cv_lib_wnn4_jl_dic_list_e+set}" = set; then :
+if ${ac_cv_lib_wnn4_jl_dic_list_e+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17115,12 +17125,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wnn4_jl_dic_list_e" >&5
 $as_echo "$ac_cv_lib_wnn4_jl_dic_list_e" >&6; }
-if test "x$ac_cv_lib_wnn4_jl_dic_list_e" = x""yes; then :
+if test "x$ac_cv_lib_wnn4_jl_dic_list_e" = xyes; then :
   libwnn=wnn4
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jl_dic_list_e in -lwnn6" >&5
 $as_echo_n "checking for jl_dic_list_e in -lwnn6... " >&6; }
-if test "${ac_cv_lib_wnn6_jl_dic_list_e+set}" = set; then :
+if ${ac_cv_lib_wnn6_jl_dic_list_e+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17154,12 +17164,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wnn6_jl_dic_list_e" >&5
 $as_echo "$ac_cv_lib_wnn6_jl_dic_list_e" >&6; }
-if test "x$ac_cv_lib_wnn6_jl_dic_list_e" = x""yes; then :
+if test "x$ac_cv_lib_wnn6_jl_dic_list_e" = xyes; then :
   libwnn=wnn6
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dic_list_e in -lwnn6_fromsrc" >&5
 $as_echo_n "checking for dic_list_e in -lwnn6_fromsrc... " >&6; }
-if test "${ac_cv_lib_wnn6_fromsrc_dic_list_e+set}" = set; then :
+if ${ac_cv_lib_wnn6_fromsrc_dic_list_e+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17193,7 +17203,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wnn6_fromsrc_dic_list_e" >&5
 $as_echo "$ac_cv_lib_wnn6_fromsrc_dic_list_e" >&6; }
-if test "x$ac_cv_lib_wnn6_fromsrc_dic_list_e" = x""yes; then :
+if test "x$ac_cv_lib_wnn6_fromsrc_dic_list_e" = xyes; then :
   libwnn=wnn6_fromsrc
 else
   with_wnn=no
@@ -17215,7 +17225,7 @@
       as_ac_Lib=`$as_echo "ac_cv_lib_$libwnn''_jl_fi_dic_list" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jl_fi_dic_list in -l$libwnn" >&5
 $as_echo_n "checking for jl_fi_dic_list in -l$libwnn... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17271,9 +17281,9 @@
         # using $ac_header_compiler is a hack, but autoconf doesn't let us
         # get at this information otherwise :-(
         ac_fn_c_check_header_mongrel "$LINENO" "canna/jrkanji.h" "ac_cv_header_canna_jrkanji_h" "$ac_includes_default"
-if test "x$ac_cv_header_canna_jrkanji_h" = x""yes; then :
+if test "x$ac_cv_header_canna_jrkanji_h" = xyes; then :
   ac_fn_c_check_header_mongrel "$LINENO" "canna/RK.h" "ac_cv_header_canna_RK_h" "$ac_includes_default"
-if test "x$ac_cv_header_canna_RK_h" = x""yes; then :
+if test "x$ac_cv_header_canna_RK_h" = xyes; then :
   have_canna=$ac_header_compiler
 fi
 
@@ -17300,7 +17310,7 @@
 
   test "$have_canna" = "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RkBgnBun in -lRKC" >&5
 $as_echo_n "checking for RkBgnBun in -lRKC... " >&6; }
-if test "${ac_cv_lib_RKC_RkBgnBun+set}" = set; then :
+if ${ac_cv_lib_RKC_RkBgnBun+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17334,7 +17344,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_RKC_RkBgnBun" >&5
 $as_echo "$ac_cv_lib_RKC_RkBgnBun" >&6; }
-if test "x$ac_cv_lib_RKC_RkBgnBun" = x""yes; then :
+if test "x$ac_cv_lib_RKC_RkBgnBun" = xyes; then :
   :
 else
   have_canna=no
@@ -17342,7 +17352,7 @@
  }
   test "$have_canna" = "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jrKanjiControl in -lcanna" >&5
 $as_echo_n "checking for jrKanjiControl in -lcanna... " >&6; }
-if test "${ac_cv_lib_canna_jrKanjiControl+set}" = set; then :
+if ${ac_cv_lib_canna_jrKanjiControl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17376,7 +17386,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_canna_jrKanjiControl" >&5
 $as_echo "$ac_cv_lib_canna_jrKanjiControl" >&6; }
-if test "x$ac_cv_lib_canna_jrKanjiControl" = x""yes; then :
+if test "x$ac_cv_lib_canna_jrKanjiControl" = xyes; then :
   :
 else
   have_canna=no
@@ -17414,7 +17424,7 @@
   libs_x="-lXm $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lXm\" to \$libs_x"; fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for layout_object_getvalue in -li18n" >&5
 $as_echo_n "checking for layout_object_getvalue in -li18n... " >&6; }
-if test "${ac_cv_lib_i18n_layout_object_getvalue+set}" = set; then :
+if ${ac_cv_lib_i18n_layout_object_getvalue+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17448,7 +17458,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_i18n_layout_object_getvalue" >&5
 $as_echo "$ac_cv_lib_i18n_layout_object_getvalue" >&6; }
-if test "x$ac_cv_lib_i18n_layout_object_getvalue" = x""yes; then :
+if test "x$ac_cv_lib_i18n_layout_object_getvalue" = xyes; then :
   libs_x="-li18n $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-li18n\" to \$libs_x"; fi
 fi
 
@@ -17519,7 +17529,7 @@
   *cygwin* ) for ac_func in cygwin_conv_path
 do :
   ac_fn_c_check_func "$LINENO" "cygwin_conv_path" "ac_cv_func_cygwin_conv_path"
-if test "x$ac_cv_func_cygwin_conv_path" = x""yes; then :
+if test "x$ac_cv_func_cygwin_conv_path" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CYGWIN_CONV_PATH 1
 _ACEOF
@@ -17556,14 +17566,14 @@
 
 if test "$check_vdb_posix" = "yes" ; then
     ac_fn_c_check_func "$LINENO" "mprotect" "ac_cv_func_mprotect"
-if test "x$ac_cv_func_mprotect" = x""yes; then :
+if test "x$ac_cv_func_mprotect" = xyes; then :
   $as_echo "#define HAVE_MPROTECT 1" >>confdefs.h
  have_vdb_mprotect=yes
 fi
 
 
     ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction"
-if test "x$ac_cv_func_sigaction" = x""yes; then :
+if test "x$ac_cv_func_sigaction" = xyes; then :
   $as_echo "#define HAVE_SIGACTION 1" >>confdefs.h
  have_vdb_sigaction=yes
 else
@@ -17572,14 +17582,14 @@
 
   ac_fn_c_check_member "$LINENO" "struct siginfo" "si_addr" "ac_cv_member_struct_siginfo_si_addr" "#include <signal.h>
 "
-if test "x$ac_cv_member_struct_siginfo_si_addr" = x""yes; then :
+if test "x$ac_cv_member_struct_siginfo_si_addr" = xyes; then :
   $as_echo "#define HAVE_STRUCT_SIGINFO_SI_ADDR 1" >>confdefs.h
  have_si_addr=yes
 fi
 
   ac_fn_c_check_member "$LINENO" "siginfo_t" "si_addr" "ac_cv_member_siginfo_t_si_addr" "#include <signal.h>
 "
-if test "x$ac_cv_member_siginfo_t_si_addr" = x""yes; then :
+if test "x$ac_cv_member_siginfo_t_si_addr" = xyes; then :
   $as_echo "#define HAVE_SIGINFO_T_SI_ADDR 1" >>confdefs.h
  have_si_addr=yes
 fi
@@ -17589,14 +17599,14 @@
   fi
 
     ac_fn_c_check_func "$LINENO" "signal" "ac_cv_func_signal"
-if test "x$ac_cv_func_signal" = x""yes; then :
+if test "x$ac_cv_func_signal" = xyes; then :
   $as_echo "#define HAVE_SIGNAL 1" >>confdefs.h
  have_vdb_signal=yes
 fi
 
   ac_fn_c_check_member "$LINENO" "struct sigcontext" "cr2" "ac_cv_member_struct_sigcontext_cr2" "#include <signal.h>
 "
-if test "x$ac_cv_member_struct_sigcontext_cr2" = x""yes; then :
+if test "x$ac_cv_member_struct_sigcontext_cr2" = xyes; then :
   $as_echo "#define HAVE_STRUCT_SIGCONTEXT_CR2 1" >>confdefs.h
  have_cr2=yes
 fi
@@ -17637,13 +17647,13 @@
 
 
 ac_fn_c_check_func "$LINENO" "openpty" "ac_cv_func_openpty"
-if test "x$ac_cv_func_openpty" = x""yes; then :
+if test "x$ac_cv_func_openpty" = xyes; then :
   have_openpty=yes
 else
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5
 $as_echo_n "checking for openpty in -lutil... " >&6; }
-if test "${ac_cv_lib_util_openpty+set}" = set; then :
+if ${ac_cv_lib_util_openpty+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17677,7 +17687,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5
 $as_echo "$ac_cv_lib_util_openpty" >&6; }
-if test "x$ac_cv_lib_util_openpty" = x""yes; then :
+if test "x$ac_cv_lib_util_openpty" = xyes; then :
   have_openpty=yes need_libutil=yes
 fi
 
@@ -17706,7 +17716,7 @@
     hpux*) for ac_header in sys/ptyio.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/ptyio.h" "ac_cv_header_sys_ptyio_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_ptyio_h" = x""yes; then :
+if test "x$ac_cv_header_sys_ptyio_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_PTYIO_H 1
 _ACEOF
@@ -17718,7 +17728,7 @@
   *) for ac_header in pty.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "pty.h" "ac_cv_header_pty_h" "$ac_includes_default"
-if test "x$ac_cv_header_pty_h" = x""yes; then :
+if test "x$ac_cv_header_pty_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PTY_H 1
 _ACEOF
@@ -17730,7 +17740,7 @@
      test "$ac_cv_header_pty_h" = "no" && for ac_header in sys/pty.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/pty.h" "ac_cv_header_sys_pty_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_pty_h" = x""yes; then :
+if test "x$ac_cv_header_sys_pty_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_PTY_H 1
 _ACEOF
@@ -17745,7 +17755,7 @@
 for ac_header in stropts.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "stropts.h" "ac_cv_header_stropts_h" "$ac_includes_default"
-if test "x$ac_cv_header_stropts_h" = x""yes; then :
+if test "x$ac_cv_header_stropts_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STROPTS_H 1
 _ACEOF
@@ -17758,7 +17768,7 @@
   for ac_func in isastream
 do :
   ac_fn_c_check_func "$LINENO" "isastream" "ac_cv_func_isastream"
-if test "x$ac_cv_func_isastream" = x""yes; then :
+if test "x$ac_cv_func_isastream" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ISASTREAM 1
 _ACEOF
@@ -17769,7 +17779,7 @@
   for ac_header in strtio.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "strtio.h" "ac_cv_header_strtio_h" "$ac_includes_default"
-if test "x$ac_cv_header_strtio_h" = x""yes; then :
+if test "x$ac_cv_header_strtio_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRTIO_H 1
 _ACEOF
@@ -17782,7 +17792,7 @@
 for ac_func in getloadavg
 do :
   ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg"
-if test "x$ac_cv_func_getloadavg" = x""yes; then :
+if test "x$ac_cv_func_getloadavg" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETLOADAVG 1
 _ACEOF
@@ -17795,7 +17805,7 @@
         for ac_header in sys/loadavg.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/loadavg.h" "ac_cv_header_sys_loadavg_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_loadavg_h" = x""yes; then :
+if test "x$ac_cv_header_sys_loadavg_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_LOADAVG_H 1
 _ACEOF
@@ -17811,7 +17821,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kstat_open in -lkstat" >&5
 $as_echo_n "checking for kstat_open in -lkstat... " >&6; }
-if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then :
+if ${ac_cv_lib_kstat_kstat_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17845,7 +17855,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kstat_kstat_open" >&5
 $as_echo "$ac_cv_lib_kstat_kstat_open" >&6; }
-if test "x$ac_cv_lib_kstat_kstat_open" = x""yes; then :
+if test "x$ac_cv_lib_kstat_kstat_open" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBKSTAT 1
 _ACEOF
@@ -17857,7 +17867,7 @@
   for ac_header in kstat.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "kstat.h" "ac_cv_header_kstat_h" "$ac_includes_default"
-if test "x$ac_cv_header_kstat_h" = x""yes; then :
+if test "x$ac_cv_header_kstat_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_KSTAT_H 1
 _ACEOF
@@ -17869,7 +17879,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_read in -lkvm" >&5
 $as_echo_n "checking for kvm_read in -lkvm... " >&6; }
-if test "${ac_cv_lib_kvm_kvm_read+set}" = set; then :
+if ${ac_cv_lib_kvm_kvm_read+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17903,7 +17913,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kvm_kvm_read" >&5
 $as_echo "$ac_cv_lib_kvm_kvm_read" >&6; }
-if test "x$ac_cv_lib_kvm_kvm_read" = x""yes; then :
+if test "x$ac_cv_lib_kvm_kvm_read" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBKVM 1
 _ACEOF
@@ -17965,7 +17975,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether localtime caches TZ" >&5
 $as_echo_n "checking whether localtime caches TZ... " >&6; }
-if test "${emacs_cv_localtime_cache+set}" = set; then :
+if ${emacs_cv_localtime_cache+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_func_tzset" = "yes"; then
@@ -18074,7 +18084,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then :
+if ${ac_cv_c_inline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
@@ -18154,7 +18164,7 @@
 # for constant arguments.  Useless!
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
 $as_echo_n "checking for working alloca.h... " >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then :
+if ${ac_cv_working_alloca_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18187,7 +18197,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
 $as_echo_n "checking for alloca... " >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then :
+if ${ac_cv_func_alloca_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18206,7 +18216,7 @@
  #pragma alloca
 #   else
 #    ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
+void *alloca (size_t);
 #    endif
 #   endif
 #  endif
@@ -18250,7 +18260,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if test "${ac_cv_os_cray+set}" = set; then :
+if ${ac_cv_os_cray+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18291,7 +18301,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
 $as_echo_n "checking stack direction for C alloca... " >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then :
+if ${ac_cv_c_stack_direction+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -18460,7 +18470,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strcoll" >&5
 $as_echo_n "checking for working strcoll... " >&6; }
-if test "${ac_cv_func_strcoll_works+set}" = set; then :
+if ${ac_cv_func_strcoll_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -18501,7 +18511,7 @@
 for ac_func in getpgrp
 do :
   ac_fn_c_check_func "$LINENO" "getpgrp" "ac_cv_func_getpgrp"
-if test "x$ac_cv_func_getpgrp" = x""yes; then :
+if test "x$ac_cv_func_getpgrp" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETPGRP 1
 _ACEOF
@@ -18511,7 +18521,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpgrp requires zero arguments" >&5
 $as_echo_n "checking whether getpgrp requires zero arguments... " >&6; }
-if test "${ac_cv_func_getpgrp_void+set}" = set; then :
+if ${ac_cv_func_getpgrp_void+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   # Use it with a single arg.
@@ -18638,7 +18648,7 @@
 
 
 ac_fn_c_check_header_mongrel "$LINENO" "termios.h" "ac_cv_header_termios_h" "$ac_includes_default"
-if test "x$ac_cv_header_termios_h" = x""yes; then :
+if test "x$ac_cv_header_termios_h" = xyes; then :
   $as_echo "#define HAVE_TERMIOS 1" >>confdefs.h
 
   $as_echo "#define SIGNALS_VIA_CHARACTERS 1" >>confdefs.h
@@ -18647,7 +18657,7 @@
 
 else
   ac_fn_c_check_header_mongrel "$LINENO" "termio.h" "ac_cv_header_termio_h" "$ac_includes_default"
-if test "x$ac_cv_header_termio_h" = x""yes; then :
+if test "x$ac_cv_header_termio_h" = xyes; then :
   $as_echo "#define HAVE_TERMIO 1" >>confdefs.h
 
 fi
@@ -18659,11 +18669,11 @@
 
 
 ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
-if test "x$ac_cv_func_socket" = x""yes; then :
+if test "x$ac_cv_func_socket" = xyes; then :
   ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default"
-if test "x$ac_cv_header_netinet_in_h" = x""yes; then :
+if test "x$ac_cv_header_netinet_in_h" = xyes; then :
   ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default"
-if test "x$ac_cv_header_arpa_inet_h" = x""yes; then :
+if test "x$ac_cv_header_arpa_inet_h" = xyes; then :
 
   $as_echo "#define HAVE_SOCKETS 1" >>confdefs.h
 
@@ -18730,11 +18740,11 @@
 
 
 ac_fn_c_check_func "$LINENO" "msgget" "ac_cv_func_msgget"
-if test "x$ac_cv_func_msgget" = x""yes; then :
+if test "x$ac_cv_func_msgget" = xyes; then :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/ipc.h" "ac_cv_header_sys_ipc_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_ipc_h" = x""yes; then :
+if test "x$ac_cv_header_sys_ipc_h" = xyes; then :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/msg.h" "ac_cv_header_sys_msg_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_msg_h" = x""yes; then :
+if test "x$ac_cv_header_sys_msg_h" = xyes; then :
   $as_echo "#define HAVE_SYSVIPC 1" >>confdefs.h
 
 fi
@@ -18747,12 +18757,12 @@
 
 
 ac_fn_c_check_header_mongrel "$LINENO" "dirent.h" "ac_cv_header_dirent_h" "$ac_includes_default"
-if test "x$ac_cv_header_dirent_h" = x""yes; then :
+if test "x$ac_cv_header_dirent_h" = xyes; then :
   $as_echo "#define SYSV_SYSTEM_DIR 1" >>confdefs.h
 
 else
   ac_fn_c_check_header_mongrel "$LINENO" "sys/dir.h" "ac_cv_header_sys_dir_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_dir_h" = x""yes; then :
+if test "x$ac_cv_header_sys_dir_h" = xyes; then :
 
 else
   $as_echo "#define NONSYSTEM_DIR_LIBRARY 1" >>confdefs.h
@@ -18765,7 +18775,7 @@
 
 
 ac_fn_c_check_header_mongrel "$LINENO" "nlist.h" "ac_cv_header_nlist_h" "$ac_includes_default"
-if test "x$ac_cv_header_nlist_h" = x""yes; then :
+if test "x$ac_cv_header_nlist_h" = xyes; then :
   $as_echo "#define NLIST_STRUCT 1" >>confdefs.h
 
 fi
@@ -18782,7 +18792,7 @@
 if test "$with_sound_native" != "no"; then
     if test -n "$with_native_sound_lib"; then
     ac_fn_c_check_header_mongrel "$LINENO" "multimedia/audio_device.h" "ac_cv_header_multimedia_audio_device_h" "$ac_includes_default"
-if test "x$ac_cv_header_multimedia_audio_device_h" = x""yes; then :
+if test "x$ac_cv_header_multimedia_audio_device_h" = xyes; then :
   sound_found=yes sound_cflags=""
       extra_objs="$extra_objs sunplay.o" &&  if test "$verbose" = "yes"; then
    echo "    xemacs will be linked with \"sunplay.o\""
@@ -18823,7 +18833,7 @@
       if test -z "$with_native_sound_lib"; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALopenport in -laudio" >&5
 $as_echo_n "checking for ALopenport in -laudio... " >&6; }
-if test "${ac_cv_lib_audio_ALopenport+set}" = set; then :
+if ${ac_cv_lib_audio_ALopenport+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -18857,7 +18867,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audio_ALopenport" >&5
 $as_echo "$ac_cv_lib_audio_ALopenport" >&6; }
-if test "x$ac_cv_lib_audio_ALopenport" = x""yes; then :
+if test "x$ac_cv_lib_audio_ALopenport" = xyes; then :
   with_native_sound_lib="-laudio"
 fi
 
@@ -18872,7 +18882,7 @@
       if test -z "$with_native_sound_lib"; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AOpenAudio in -lAlib" >&5
 $as_echo_n "checking for AOpenAudio in -lAlib... " >&6; }
-if test "${ac_cv_lib_Alib_AOpenAudio+set}" = set; then :
+if ${ac_cv_lib_Alib_AOpenAudio+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -18906,7 +18916,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Alib_AOpenAudio" >&5
 $as_echo "$ac_cv_lib_Alib_AOpenAudio" >&6; }
-if test "x$ac_cv_lib_Alib_AOpenAudio" = x""yes; then :
+if test "x$ac_cv_lib_Alib_AOpenAudio" = xyes; then :
   with_native_sound_lib="-lAlib"
 fi
 
@@ -18950,7 +18960,7 @@
 
 	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _oss_ioctl in -lossaudio" >&5
 $as_echo_n "checking for _oss_ioctl in -lossaudio... " >&6; }
-if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then :
+if ${ac_cv_lib_ossaudio__oss_ioctl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -18984,7 +18994,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
 $as_echo "$ac_cv_lib_ossaudio__oss_ioctl" >&6; }
-if test "x$ac_cv_lib_ossaudio__oss_ioctl" = x""yes; then :
+if test "x$ac_cv_lib_ossaudio__oss_ioctl" = xyes; then :
   with_native_sound_lib=-lossaudio
 		 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using NetBSD-deprecated -lossaudio" >&5
 $as_echo "$as_me: WARNING: Using NetBSD-deprecated -lossaudio" >&2;}
@@ -19031,11 +19041,11 @@
 
 if test "$with_sound_alsa" != "no"; then
   ac_fn_c_check_header_mongrel "$LINENO" "alsa/input.h" "ac_cv_header_alsa_input_h" "$ac_includes_default"
-if test "x$ac_cv_header_alsa_input_h" = x""yes; then :
+if test "x$ac_cv_header_alsa_input_h" = xyes; then :
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_open in -lasound" >&5
 $as_echo_n "checking for snd_pcm_open in -lasound... " >&6; }
-if test "${ac_cv_lib_asound_snd_pcm_open+set}" = set; then :
+if ${ac_cv_lib_asound_snd_pcm_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -19069,7 +19079,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_open" >&5
 $as_echo "$ac_cv_lib_asound_snd_pcm_open" >&6; }
-if test "x$ac_cv_lib_asound_snd_pcm_open" = x""yes; then :
+if test "x$ac_cv_lib_asound_snd_pcm_open" = xyes; then :
   have_alsa_sound=yes
 fi
 
@@ -19093,11 +19103,11 @@
 
 if test "$with_sound_nas" != "no"; then
   ac_fn_c_check_header_mongrel "$LINENO" "audio/audiolib.h" "ac_cv_header_audio_audiolib_h" "$ac_includes_default"
-if test "x$ac_cv_header_audio_audiolib_h" = x""yes; then :
+if test "x$ac_cv_header_audio_audiolib_h" = xyes; then :
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AuOpenServer in -laudio" >&5
 $as_echo_n "checking for AuOpenServer in -laudio... " >&6; }
-if test "${ac_cv_lib_audio_AuOpenServer+set}" = set; then :
+if ${ac_cv_lib_audio_AuOpenServer+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -19131,7 +19141,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audio_AuOpenServer" >&5
 $as_echo "$ac_cv_lib_audio_AuOpenServer" >&6; }
-if test "x$ac_cv_lib_audio_AuOpenServer" = x""yes; then :
+if test "x$ac_cv_lib_audio_AuOpenServer" = xyes; then :
   have_nas_sound=yes
 fi
 
@@ -19172,7 +19182,7 @@
 set dummy esd-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_have_esd_config+set}" = set; then :
+if ${ac_cv_prog_have_esd_config+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$have_esd_config"; then
@@ -19211,7 +19221,7 @@
     c_switch_site="$c_switch_site `esd-config --cflags`" &&  if test "$verbose" = "yes"; then echo "    Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi
     LIBS="`esd-config --libs` $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"`esd-config --libs`\" to \$LIBS"; fi
     ac_fn_c_check_func "$LINENO" "esd_play_stream" "ac_cv_func_esd_play_stream"
-if test "x$ac_cv_func_esd_play_stream" = x""yes; then :
+if test "x$ac_cv_func_esd_play_stream" = xyes; then :
   have_esd_sound=yes
 else
   c_switch_site="$save_c_switch_site" LIBS="$save_LIBS"
@@ -19252,7 +19262,7 @@
     if test -z "$with_ncurses"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
 $as_echo_n "checking for tgetent in -lncurses... " >&6; }
-if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then :
+if ${ac_cv_lib_ncurses_tgetent+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -19286,7 +19296,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
 $as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
-if test "x$ac_cv_lib_ncurses_tgetent" = x""yes; then :
+if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
   with_ncurses=yes
 else
   with_ncurses=no
@@ -19297,13 +19307,13 @@
     $as_echo "#define HAVE_NCURSES 1" >>confdefs.h
 
     ac_fn_c_check_header_mongrel "$LINENO" "ncurses/curses.h" "ac_cv_header_ncurses_curses_h" "$ac_includes_default"
-if test "x$ac_cv_header_ncurses_curses_h" = x""yes; then :
+if test "x$ac_cv_header_ncurses_curses_h" = xyes; then :
   curses_h_file=ncurses/curses.h
 fi
 
 
     ac_fn_c_check_header_mongrel "$LINENO" "ncurses/term.h" "ac_cv_header_ncurses_term_h" "$ac_includes_default"
-if test "x$ac_cv_header_ncurses_term_h" = x""yes; then :
+if test "x$ac_cv_header_ncurses_term_h" = xyes; then :
   term_h_file=ncurses/term.h
 fi
 
@@ -19317,7 +19327,7 @@
                         save_c_switch_site="$c_switch_site"
       c_switch_site="$c_switch_site -I/usr/include/ncurses"
       ac_fn_c_check_header_mongrel "$LINENO" "ncurses/curses.h" "ac_cv_header_ncurses_curses_h" "$ac_includes_default"
-if test "x$ac_cv_header_ncurses_curses_h" = x""yes; then :
+if test "x$ac_cv_header_ncurses_curses_h" = xyes; then :
   curses_h_file=ncurses/curses.h
 fi
 
@@ -19339,7 +19349,7 @@
 	  as_ac_Lib=`$as_echo "ac_cv_lib_$lib''_tgetent" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l$lib" >&5
 $as_echo_n "checking for tgetent in -l$lib... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -19389,7 +19399,7 @@
       else
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5
 $as_echo_n "checking for tgetent in -lcurses... " >&6; }
-if test "${ac_cv_lib_curses_tgetent+set}" = set; then :
+if ${ac_cv_lib_curses_tgetent+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -19423,12 +19433,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_tgetent" >&5
 $as_echo "$ac_cv_lib_curses_tgetent" >&6; }
-if test "x$ac_cv_lib_curses_tgetent" = x""yes; then :
+if test "x$ac_cv_lib_curses_tgetent" = xyes; then :
   LIBS="-lcurses $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lcurses\" to \$LIBS"; fi
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
 $as_echo_n "checking for tgetent in -ltermcap... " >&6; }
-if test "${ac_cv_lib_termcap_tgetent+set}" = set; then :
+if ${ac_cv_lib_termcap_tgetent+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -19462,7 +19472,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
 $as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
-if test "x$ac_cv_lib_termcap_tgetent" = x""yes; then :
+if test "x$ac_cv_lib_termcap_tgetent" = xyes; then :
   LIBS="-ltermcap $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-ltermcap\" to \$LIBS"; fi
 else
   extra_objs="$extra_objs termcap.o" &&  if test "$verbose" = "yes"; then
@@ -19486,11 +19496,11 @@
 
     if test "$with_gpm" != "no"; then
     ac_fn_c_check_header_mongrel "$LINENO" "gpm.h" "ac_cv_header_gpm_h" "$ac_includes_default"
-if test "x$ac_cv_header_gpm_h" = x""yes; then :
+if test "x$ac_cv_header_gpm_h" = xyes; then :
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Gpm_Open in -lgpm" >&5
 $as_echo_n "checking for Gpm_Open in -lgpm... " >&6; }
-if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then :
+if ${ac_cv_lib_gpm_Gpm_Open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -19524,7 +19534,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gpm_Gpm_Open" >&5
 $as_echo "$ac_cv_lib_gpm_Gpm_Open" >&6; }
-if test "x$ac_cv_lib_gpm_Gpm_Open" = x""yes; then :
+if test "x$ac_cv_lib_gpm_Gpm_Open" = xyes; then :
   have_gpm=yes
 fi
 
@@ -19584,7 +19594,7 @@
 if test "$with_database_gdbm" != "no"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -lgdbm" >&5
 $as_echo_n "checking for dbm_open in -lgdbm... " >&6; }
-if test "${ac_cv_lib_gdbm_dbm_open+set}" = set; then :
+if ${ac_cv_lib_gdbm_dbm_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -19618,14 +19628,14 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_dbm_open" >&5
 $as_echo "$ac_cv_lib_gdbm_dbm_open" >&6; }
-if test "x$ac_cv_lib_gdbm_dbm_open" = x""yes; then :
+if test "x$ac_cv_lib_gdbm_dbm_open" = xyes; then :
 
    with_database_gdbm=yes with_database_dbm=no libdbm=-lgdbm
 else
 
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -lgdbm_compat" >&5
 $as_echo_n "checking for dbm_open in -lgdbm_compat... " >&6; }
-if test "${ac_cv_lib_gdbm_compat_dbm_open+set}" = set; then :
+if ${ac_cv_lib_gdbm_compat_dbm_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -19659,7 +19669,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_compat_dbm_open" >&5
 $as_echo "$ac_cv_lib_gdbm_compat_dbm_open" >&6; }
-if test "x$ac_cv_lib_gdbm_compat_dbm_open" = x""yes; then :
+if test "x$ac_cv_lib_gdbm_compat_dbm_open" = xyes; then :
 
        with_database_gdbm=yes with_database_dbm=no libdbm="-lgdbm_compat -lgdbm"
 else
@@ -19677,13 +19687,13 @@
 
 if test "$with_database_dbm" != "no"; then
   ac_fn_c_check_func "$LINENO" "dbm_open" "ac_cv_func_dbm_open"
-if test "x$ac_cv_func_dbm_open" = x""yes; then :
+if test "x$ac_cv_func_dbm_open" = xyes; then :
   with_database_dbm=yes libdbm=
 else
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -ldbm" >&5
 $as_echo_n "checking for dbm_open in -ldbm... " >&6; }
-if test "${ac_cv_lib_dbm_dbm_open+set}" = set; then :
+if ${ac_cv_lib_dbm_dbm_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -19717,7 +19727,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dbm_dbm_open" >&5
 $as_echo "$ac_cv_lib_dbm_dbm_open" >&6; }
-if test "x$ac_cv_lib_dbm_dbm_open" = x""yes; then :
+if test "x$ac_cv_lib_dbm_dbm_open" = xyes; then :
   with_database_dbm=yes libdbm=-ldbm
 else
 
@@ -19770,7 +19780,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
+if ${ac_cv_prog_CXX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -19814,7 +19824,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
@@ -19892,7 +19902,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -19929,7 +19939,7 @@
 ac_save_CXXFLAGS=$CXXFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
+if ${ac_cv_prog_cxx_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -20057,7 +20067,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "u_int8_t" "ac_cv_type_u_int8_t" "$ac_includes_default"
-if test "x$ac_cv_type_u_int8_t" = x""yes; then :
+if test "x$ac_cv_type_u_int8_t" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_U_INT8_T 1
@@ -20066,7 +20076,7 @@
 
 fi
 ac_fn_c_check_type "$LINENO" "u_int16_t" "ac_cv_type_u_int16_t" "$ac_includes_default"
-if test "x$ac_cv_type_u_int16_t" = x""yes; then :
+if test "x$ac_cv_type_u_int16_t" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_U_INT16_T 1
@@ -20075,7 +20085,7 @@
 
 fi
 ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "$ac_includes_default"
-if test "x$ac_cv_type_u_int32_t" = x""yes; then :
+if test "x$ac_cv_type_u_int32_t" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_U_INT32_T 1
@@ -20193,7 +20203,7 @@
     as_ac_Lib=`$as_echo "ac_cv_lib_db_$dbfunc" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dbfunc in -ldb" >&5
 $as_echo_n "checking for $dbfunc in -ldb... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -20248,7 +20258,7 @@
     as_ac_Lib=`$as_echo "ac_cv_lib_db_$dbfunc" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dbfunc in -ldb" >&5
 $as_echo_n "checking for $dbfunc in -ldb... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -20310,7 +20320,7 @@
 if test "$with_socks" = "yes"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOCKSinit in -lsocks" >&5
 $as_echo_n "checking for SOCKSinit in -lsocks... " >&6; }
-if test "${ac_cv_lib_socks_SOCKSinit+set}" = set; then :
+if ${ac_cv_lib_socks_SOCKSinit+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -20344,7 +20354,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socks_SOCKSinit" >&5
 $as_echo "$ac_cv_lib_socks_SOCKSinit" >&6; }
-if test "x$ac_cv_lib_socks_SOCKSinit" = x""yes; then :
+if test "x$ac_cv_lib_socks_SOCKSinit" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSOCKS 1
 _ACEOF
@@ -20365,11 +20375,11 @@
 
 if test "$with_bignum" = "gmp"; then
   ac_fn_c_check_header_mongrel "$LINENO" "gmp.h" "ac_cv_header_gmp_h" "$ac_includes_default"
-if test "x$ac_cv_header_gmp_h" = x""yes; then :
+if test "x$ac_cv_header_gmp_h" = xyes; then :
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmpz_init in -lgmp" >&5
 $as_echo_n "checking for __gmpz_init in -lgmp... " >&6; }
-if test "${ac_cv_lib_gmp___gmpz_init+set}" = set; then :
+if ${ac_cv_lib_gmp___gmpz_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -20403,7 +20413,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_init" >&5
 $as_echo "$ac_cv_lib_gmp___gmpz_init" >&6; }
-if test "x$ac_cv_lib_gmp___gmpz_init" = x""yes; then :
+if test "x$ac_cv_lib_gmp___gmpz_init" = xyes; then :
   have_mpz_init=yes
 fi
 
@@ -20422,11 +20432,11 @@
 elif test "$with_bignum" = "mp"; then
   for library in "" "-lcrypto"; do
     ac_fn_c_check_header_mongrel "$LINENO" "mp.h" "ac_cv_header_mp_h" "$ac_includes_default"
-if test "x$ac_cv_header_mp_h" = x""yes; then :
+if test "x$ac_cv_header_mp_h" = xyes; then :
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mp_mfree in -lmp" >&5
 $as_echo_n "checking for mp_mfree in -lmp... " >&6; }
-if test "${ac_cv_lib_mp_mp_mfree+set}" = set; then :
+if ${ac_cv_lib_mp_mp_mfree+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -20460,13 +20470,13 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mp_mp_mfree" >&5
 $as_echo "$ac_cv_lib_mp_mp_mfree" >&6; }
-if test "x$ac_cv_lib_mp_mp_mfree" = x""yes; then :
+if test "x$ac_cv_lib_mp_mp_mfree" = xyes; then :
   have_mp_mfree=yes; break
 else
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mfree in -lmp" >&5
 $as_echo_n "checking for mfree in -lmp... " >&6; }
-if test "${ac_cv_lib_mp_mfree+set}" = set; then :
+if ${ac_cv_lib_mp_mfree+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -20500,7 +20510,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mp_mfree" >&5
 $as_echo "$ac_cv_lib_mp_mfree" >&6; }
-if test "x$ac_cv_lib_mp_mfree" = x""yes; then :
+if test "x$ac_cv_lib_mp_mfree" = xyes; then :
   have_mfree=yes; break
 fi
 
@@ -20518,7 +20528,7 @@
       LIBS="$LIBS $library" &&  if test "$verbose" = "yes"; then echo "    Appending \"$library\" to \$LIBS"; fi
     fi
     ac_fn_c_check_func "$LINENO" "mp_move" "ac_cv_func_mp_move"
-if test "x$ac_cv_func_mp_move" = x""yes; then :
+if test "x$ac_cv_func_mp_move" = xyes; then :
   $as_echo "#define HAVE_MP_MOVE 1" >>confdefs.h
 
 fi
@@ -20529,7 +20539,7 @@
       LIBS="$LIBS $library" &&  if test "$verbose" = "yes"; then echo "    Appending \"$library\" to \$LIBS"; fi
     fi
     ac_fn_c_check_func "$LINENO" "move" "ac_cv_func_move"
-if test "x$ac_cv_func_move" = x""yes; then :
+if test "x$ac_cv_func_move" = xyes; then :
   $as_echo "#define HAVE_MP_MOVE 1" >>confdefs.h
 
 fi
@@ -21451,10 +21461,21 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -21487,7 +21508,7 @@
 
 
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -21588,6 +21609,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -21895,7 +21917,7 @@
 # values after options handling.
 ac_log="
 This file was extended by XEmacs $as_me 21.5, which was
-generated by GNU Autoconf 2.66.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -21961,7 +21983,7 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 XEmacs config.status 21.5
-configured by $0, generated by GNU Autoconf 2.66,
+configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -21980,11 +22002,16 @@
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -22006,6 +22033,7 @@
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -22115,9 +22143,10 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -22125,12 +22154,13 @@
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -22152,7 +22182,7 @@
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -22180,7 +22210,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -22228,7 +22258,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -22260,7 +22290,7 @@
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
@@ -22294,7 +22324,7 @@
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -22306,8 +22336,8 @@
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
@@ -22427,7 +22457,7 @@
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -22462,7 +22492,7 @@
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
@@ -22593,21 +22623,22 @@
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
@@ -22618,20 +22649,20 @@
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
+      mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;