Mercurial > hg > xemacs-beta

changeset 4669:2c1fa63dddbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
automatic merge
author Stephen J. Turnbull <stephen@xemacs.org>
date Tue, 28 Jul 2009 23:29:22 +0900
parents 8b2a8ecf91cd (current diff) d71d2cefa42d (diff)
children 5a54ce6dc945
files
diffstat 6 files changed, 611 insertions(+), 752 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jul 28 23:24:15 2009 +0900
+++ b/ChangeLog	Tue Jul 28 23:29:22 2009 +0900
@@ -1,3 +1,17 @@
+2009-07-28  Mike Sperber  <mike@xemacs.org>
+
+	* Makefile.in.in: Don't install silly symlinks when $(prefix) !=
+	$(exec_prefix).
+
+2009-07-28  Mike Sperber  <mike@xemacs.org>
+
+	* configure.ac: Expand @PREFIX@ in paths.h.
+
+2009-07-28  Mike Sperber  <mike@xemacs.org>
+
+	* configure.ac: More accurate tests if paths have been set
+	explicitly on the configure command line.
+
 2009-07-26  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* configure.ac (XE_MERGED_ARG): Use correct separator when
--- a/Makefile.in.in	Tue Jul 28 23:24:15 2009 +0900
+++ b/Makefile.in.in	Tue Jul 28 23:29:22 2009 +0900
@@ -423,17 +423,6 @@
 	cd ${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${SHEBANG_PROGNAME}
 # endif /* CYGWIN */
 #endif /* WIN32_NATIVE */
-	if test "${prefix}" != "${exec_prefix}"; then \
-	  $(MAKEPATH) ${exec_prefix}/lib/${instvardir}; \
-	  for dir in \
-		lib/${inststaticdir} \
-	 	lib/${instvardir}/etc \
-		lib/${instvardir}/info \
-		lib/${instvardir}/lisp; do \
-	    if test ! -d ${exec_prefix}/$${dir}; then \
-	      $(LN_S) ${prefix}/$${dir} ${exec_prefix}/$${dir}; fi; \
-	  done; \
-	fi
 #ifdef HAVE_SHLIB
 	$(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(moduledir)
 #endif
--- a/configure	Tue Jul 28 23:24:15 2009 +0900
+++ b/configure	Tue Jul 28 23:29:22 2009 +0900
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for XEmacs 21.5.
+# Generated by GNU Autoconf 2.62 for XEmacs 21.5.
 #
 # Report bugs to <xemacs-beta@xemacs.org>.
 #
@@ -683,179 +683,179 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='LTLIBOBJS
-LIBOBJS
-internal_makefile_list
-XE_CFLAGS
-XEMACS_CC
-dynodump_arch
-sound_cflags
-native_sound_lib
-RECURSIVE_MAKE_ARGS
-ld_libs_all
-ld_libs_window_system
-ld_libs_general
-ld_switch_all
-ld_switch_window_system
-ld_switch_general
-c_switch_all
-c_switch_window_system
-c_switch_general
-opsysfile
-machfile
-extra_objs
-bitmapdir
-DOCDIR
-DOCDIR_USER_DEFINED
-ARCHLIBDIR
-ARCHLIBDIR_USER_DEFINED
-archlibdir
-ETCDIR
-ETCDIR_USER_DEFINED
-etcdir
-SITEMODULEDIR
-SITEMODULEDIR_USER_DEFINED
-sitemoduledir
-SITELISPDIR
-SITELISPDIR_USER_DEFINED
-sitelispdir
-MODULEDIR
-MODULEDIR_USER_DEFINED
-moduledir
-LISPDIR
-LISPDIR_USER_DEFINED
-lispdir
-PACKAGE_PATH
-PACKAGE_PATH_USER_DEFINED
-package_path
-LAST_PACKAGE_DIRECTORIES
-LAST_PACKAGE_DIRECTORIES_USER_DEFINED
-last_packages
-LATE_PACKAGE_DIRECTORIES
-LATE_PACKAGE_DIRECTORIES_USER_DEFINED
-late_packages
-EARLY_PACKAGE_DIRECTORIES
-EARLY_PACKAGE_DIRECTORIES_USER_DEFINED
-early_packages
-INFOPATH
-INFOPATH_USER_DEFINED
-infopath
-INFODIR
-INFODIR_USER_DEFINED
-EXEC_PREFIX
-EXEC_PREFIX_USER_DEFINED
-PREFIX
-PREFIX_USER_DEFINED
-extra_includes
-srcdir
-instvardir
-verbose_version
-version
-PROGNAME
-SUBDIR_MAKEFILES
-MAKE_SUBDIR
-INSTALL_ARCH_DEP_SUBDIR
-SRC_SUBDIR_DEPS
-have_esd_config
-ALLOCA
-canna_libs
-lwlib_objs
-postgresql_libs
-ldap_libs
-OBJECT_TO_BUILD
-MOD_INSTALL_PROGRAM
-INSTALLPATH
-MODCFLAGS
-MAKE_DOCFILE
-MODARCHDIR
-MOD_CC
+ac_subst_vars='SHELL
+PATH_SEPARATOR
+PACKAGE_NAME
+PACKAGE_TARNAME
+PACKAGE_VERSION
+PACKAGE_STRING
+PACKAGE_BUGREPORT
+exec_prefix
+prefix
+program_transform_name
+bindir
+sbindir
+libexecdir
+datarootdir
+datadir
+sysconfdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+docdir
+infodir
+htmldir
+dvidir
+pdfdir
+psdir
+libdir
+localedir
+mandir
+DEFS
+ECHO_C
+ECHO_N
+ECHO_T
+LIBS
+build_alias
+host_alias
+target_alias
+inststaticdir
+statedir
+LN_S
+blddir
+build
+build_cpu
+build_vendor
+build_os
+SHEBANG_PROGNAME
+configuration
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+ac_ct_CC
+EXEEXT
+OBJEXT
+CPP
+GREP
+EGREP
+start_flags
+ld_switch_shared
+start_files
+ld
+lib_gcc
+AR
+RANLIB
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+YACC
+YFLAGS
+SET_MAKE
+GTK_CONFIG
+XMKMF
+X_CFLAGS
+X_PRE_LIBS
+X_LIBS
+X_EXTRA_LIBS
+install_pp
+libs_xauth
+dnd_objs
+LIBSTDCPP
+dll_ld
+dll_cflags
+dll_ldflags
+dll_post
+dll_ldo
+ld_dynamic_link_flags
 with_modules
-ld_dynamic_link_flags
-dll_ldo
-dll_post
-dll_ldflags
-dll_cflags
-dll_ld
-LIBSTDCPP
-dnd_objs
-libs_xauth
-install_pp
-X_EXTRA_LIBS
-X_LIBS
-X_PRE_LIBS
-X_CFLAGS
-XMKMF
-GTK_CONFIG
-SET_MAKE
-YFLAGS
-YACC
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-RANLIB
-AR
-lib_gcc
-ld
-start_files
-ld_switch_shared
-start_flags
-EGREP
-GREP
-CPP
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-configuration
-SHEBANG_PROGNAME
-build_os
-build_vendor
-build_cpu
-build
-blddir
-LN_S
-statedir
-inststaticdir
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
+MOD_CC
+MODARCHDIR
+MAKE_DOCFILE
+MODCFLAGS
+INSTALLPATH
+MOD_INSTALL_PROGRAM
+OBJECT_TO_BUILD
+ldap_libs
+postgresql_libs
+lwlib_objs
+canna_libs
+ALLOCA
+have_esd_config
+SRC_SUBDIR_DEPS
+INSTALL_ARCH_DEP_SUBDIR
+MAKE_SUBDIR
+SUBDIR_MAKEFILES
+PROGNAME
+version
+verbose_version
+instvardir
+srcdir
+extra_includes
+PREFIX_USER_DEFINED
+PREFIX
+EXEC_PREFIX_USER_DEFINED
+EXEC_PREFIX
+INFODIR_USER_DEFINED
+INFODIR
+infopath
+INFOPATH_USER_DEFINED
+INFOPATH
+early_packages
+EARLY_PACKAGE_DIRECTORIES_USER_DEFINED
+EARLY_PACKAGE_DIRECTORIES
+late_packages
+LATE_PACKAGE_DIRECTORIES_USER_DEFINED
+LATE_PACKAGE_DIRECTORIES
+last_packages
+LAST_PACKAGE_DIRECTORIES_USER_DEFINED
+LAST_PACKAGE_DIRECTORIES
+package_path
+PACKAGE_PATH_USER_DEFINED
+PACKAGE_PATH
+lispdir
+LISPDIR_USER_DEFINED
+LISPDIR
+moduledir
+MODULEDIR_USER_DEFINED
+MODULEDIR
+sitelispdir
+SITELISPDIR_USER_DEFINED
+SITELISPDIR
+sitemoduledir
+SITEMODULEDIR_USER_DEFINED
+SITEMODULEDIR
+etcdir
+ETCDIR_USER_DEFINED
+ETCDIR
+archlibdir
+ARCHLIBDIR_USER_DEFINED
+ARCHLIBDIR
+DOCDIR_USER_DEFINED
+DOCDIR
+bitmapdir
+extra_objs
+machfile
+opsysfile
+c_switch_general
+c_switch_window_system
+c_switch_all
+ld_switch_general
+ld_switch_window_system
+ld_switch_all
+ld_libs_general
+ld_libs_window_system
+ld_libs_all
+RECURSIVE_MAKE_ARGS
+native_sound_lib
+sound_cflags
+dynodump_arch
+XEMACS_CC
+XE_CFLAGS
+internal_makefile_list
+LIBOBJS
+LTLIBOBJS'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
@@ -1503,9 +1503,9 @@
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+    fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
    { (exit 1); exit 1; }; } ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1558,7 +1558,7 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { $as_echo "$as_me: error: working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: Working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
   { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
@@ -2131,7 +2131,7 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 XEmacs configure 21.5
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -2191,7 +2191,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.63.  Invocation command line was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
 
@@ -2314,8 +2314,8 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -2518,8 +2518,6 @@
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
   { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
@@ -4865,13 +4863,6 @@
     *) break ;;
   esac
 done
-mandir_expanded=$mandir
-while true; do
-  case "$mandir_expanded" in
-    *\$* ) eval "mandir_expanded=$mandir_expanded" ;;
-    *) break ;;
-  esac
-done
 infodir_expanded=$infodir
 while true; do
   case "$infodir_expanded" in
@@ -4880,7 +4871,7 @@
   esac
 done
 
-if test "x$datadir_expanded" != "x$prefix_expanded/share"
+if test "x$datadir" != "x\${datarootdir}"
 then
   cat >>confdefs.h <<\_ACEOF
 #define INFODIR_USER_DEFINED 1
@@ -4896,7 +4887,7 @@
 
 fi
 
-if test "x$libdir_expanded" != "x$prefix_expanded/lib"
+if test "x$libdir" != "x\${exec_prefix}/lib"
 then
   cat >>confdefs.h <<\_ACEOF
 #define MODULEDIR_USER_DEFINED 1
@@ -4912,7 +4903,7 @@
 
 fi
 
-if test "x$infodir_expanded" != "x${prefix_expanded}/share/info"
+if test "x$infodir" != "x\${datarootdir}/info"
 then
   cat >>confdefs.h <<\_ACEOF
 #define INFODIR_USER_DEFINED 1
@@ -5858,8 +5849,12 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -6058,8 +6053,12 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -6069,13 +6068,11 @@
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
@@ -6205,13 +6202,11 @@
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+   { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
@@ -6239,15 +6234,13 @@
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
     fi
   fi
 fi
@@ -6290,13 +6283,11 @@
   esac
 done
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
@@ -6350,13 +6341,11 @@
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
@@ -6932,13 +6921,11 @@
 if $ac_preproc_ok; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 fi
 
 ac_ext=c
@@ -7324,9 +7311,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -7469,7 +7455,7 @@
 $as_echo "$ac_cv_header_minix_config_h" >&6; }
 
 fi
-if test "x$ac_cv_header_minix_config_h" = x""yes; then
+if test $ac_cv_header_minix_config_h = yes; then
   MINIX=yes
 else
   MINIX=
@@ -7660,8 +7646,12 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -7860,8 +7850,12 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -7871,13 +7865,11 @@
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
@@ -8351,8 +8343,12 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -8551,8 +8547,12 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -8562,13 +8562,11 @@
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
@@ -9042,8 +9040,12 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -9242,8 +9244,12 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -9253,13 +9259,11 @@
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
@@ -9646,13 +9650,11 @@
 
 if test "$GCC" = "yes"; then
 if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9701,13 +9703,11 @@
 
 
 if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9993,13 +9993,11 @@
 if $ac_preproc_ok; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 fi
 
 ac_ext=c
@@ -10113,13 +10111,11 @@
 esac
 
 if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -10969,7 +10965,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_c_terminateAndUnload = yes; then
   libs_system="$libs_system -lC" &&  if test "$verbose" = "yes"; then echo "    Appending \"-lC\" to \$libs_system"; fi
 fi
 
@@ -11391,7 +11387,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_set_state" >&5
 $as_echo "$ac_cv_func_malloc_set_state" >&6; }
-if test "x$ac_cv_func_malloc_set_state" = x""yes; then
+if test $ac_cv_func_malloc_set_state = yes; then
   :
 else
   doug_lea_malloc=no
@@ -11606,8 +11602,12 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -11909,9 +11909,8 @@
 $as_echo "$ac_res" >&6; }
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -12287,7 +12286,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_siglist" >&5
 $as_echo "$ac_cv_have_decl_sys_siglist" >&6; }
-if test "x$ac_cv_have_decl_sys_siglist" = x""yes; then
+if test $ac_cv_have_decl_sys_siglist = yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_SYS_SIGLIST 1
@@ -12444,9 +12443,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -12611,7 +12609,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
 $as_echo "$ac_cv_type_size_t" >&6; }
-if test "x$ac_cv_type_size_t" = x""yes; then
+if test $ac_cv_type_size_t = yes; then
   :
 else
 
@@ -12715,7 +12713,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
 $as_echo "$ac_cv_type_pid_t" >&6; }
-if test "x$ac_cv_type_pid_t" = x""yes; then
+if test $ac_cv_type_pid_t = yes; then
   :
 else
 
@@ -12857,7 +12855,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
 $as_echo "$ac_cv_type_mode_t" >&6; }
-if test "x$ac_cv_type_mode_t" = x""yes; then
+if test $ac_cv_type_mode_t = yes; then
   :
 else
 
@@ -12961,7 +12959,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
 $as_echo "$ac_cv_type_off_t" >&6; }
-if test "x$ac_cv_type_off_t" = x""yes; then
+if test $ac_cv_type_off_t = yes; then
   :
 else
 
@@ -13065,7 +13063,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
 $as_echo "$ac_cv_type_ssize_t" >&6; }
-if test "x$ac_cv_type_ssize_t" = x""yes; then
+if test $ac_cv_type_ssize_t = yes; then
   :
 else
 
@@ -13441,7 +13439,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
 $as_echo "$ac_cv_member_struct_tm_tm_zone" >&6; }
-if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then
+if test $ac_cv_member_struct_tm_tm_zone = yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_TM_TM_ZONE 1
@@ -13511,7 +13509,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5
 $as_echo "$ac_cv_have_decl_tzname" >&6; }
-if test "x$ac_cv_have_decl_tzname" = x""yes; then
+if test $ac_cv_have_decl_tzname = yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_TZNAME 1
@@ -13743,52 +13741,7 @@
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_bigendian=unknown
-    # See if we're dealing with a universal compiler.
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifndef __APPLE_CC__
-	       not a universal capable compiler
-	     #endif
-	     typedef int dummy;
-
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-
-	# Check for potential -arch flags.  It is not universal unless
-	# there are some -arch flags.  Note that *ppc* also matches
-	# ppc64.  This check is also rather less than ideal.
-	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
-	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
-	esac
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
     if test $ac_cv_c_bigendian = unknown; then
       # See if sys/param.h defines the BYTE_ORDER macro.
       cat >conftest.$ac_ext <<_ACEOF
@@ -14128,12 +14081,7 @@
    no)
       ;; #(
    universal)
-
-cat >>confdefs.h <<\_ACEOF
-#define AC_APPLE_UNIVERSAL_BUILD 1
-_ACEOF
-
-     ;; #(
+      ;; #(
    *)
      { { $as_echo "$as_me:$LINENO: error: unknown endianness
  presetting ac_cv_c_bigendian=no (or yes) will help" >&5
@@ -14394,13 +14342,11 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_short=$ac_lo;;
 '') if test "$ac_cv_type_short" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+   { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_short=0
    fi ;;
@@ -14476,13 +14422,11 @@
 
 ( exit $ac_status )
 if test "$ac_cv_type_short" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+   { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_short=0
    fi
@@ -14759,13 +14703,11 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_int=$ac_lo;;
 '') if test "$ac_cv_type_int" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+   { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_int=0
    fi ;;
@@ -14841,13 +14783,11 @@
 
 ( exit $ac_status )
 if test "$ac_cv_type_int" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+   { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_int=0
    fi
@@ -15118,13 +15058,11 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_long=$ac_lo;;
 '') if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+   { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_long=0
    fi ;;
@@ -15200,13 +15138,11 @@
 
 ( exit $ac_status )
 if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+   { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_long=0
    fi
@@ -15477,13 +15413,11 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_long_long=$ac_lo;;
 '') if test "$ac_cv_type_long_long" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute sizeof (long long)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+   { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_long_long=0
    fi ;;
@@ -15559,13 +15493,11 @@
 
 ( exit $ac_status )
 if test "$ac_cv_type_long_long" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute sizeof (long long)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+   { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_long_long=0
    fi
@@ -15836,13 +15768,11 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_void_p=$ac_lo;;
 '') if test "$ac_cv_type_void_p" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute sizeof (void *)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+   { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_void_p=0
    fi ;;
@@ -15918,13 +15848,11 @@
 
 ( exit $ac_status )
 if test "$ac_cv_type_void_p" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute sizeof (void *)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+   { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_void_p=0
    fi
@@ -16195,13 +16123,11 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_double=$ac_lo;;
 '') if test "$ac_cv_type_double" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (double)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (double)
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute sizeof (double)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+   { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_double=0
    fi ;;
@@ -16277,13 +16203,11 @@
 
 ( exit $ac_status )
 if test "$ac_cv_type_double" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (double)
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (double)
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute sizeof (double)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+   { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_double=0
    fi
@@ -16432,7 +16356,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_sin" >&5
 $as_echo "$ac_cv_func_sin" >&6; }
-if test "x$ac_cv_func_sin" = x""yes; then
+if test $ac_cv_func_sin = yes; then
   :
 else
 
@@ -16501,7 +16425,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_m_sin = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
 _ACEOF
@@ -16655,9 +16579,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16762,9 +16685,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16879,7 +16801,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_cma_open" >&5
 $as_echo "$ac_cv_lib_pthreads_cma_open" >&6; }
-if test "x$ac_cv_lib_pthreads_cma_open" = x""yes; then
+if test $ac_cv_lib_pthreads_cma_open = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPTHREADS 1
 _ACEOF
@@ -17067,7 +16989,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_gdk_imlib_main = yes; then
   libs_gtk="-lgdk_imlib $libs_gtk" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lgdk_imlib\" to \$libs_gtk"; fi
 fi
 
@@ -17136,7 +17058,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_Imlib_Imlib_init = yes; then
   libs_gtk="$libs_gtk -lImlib" &&  if test "$verbose" = "yes"; then echo "    Appending \"-lImlib\" to \$libs_gtk"; fi
 fi
 
@@ -17231,9 +17153,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -17429,9 +17350,8 @@
 $as_echo "$ac_res" >&6; }
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -17499,7 +17419,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_xml_main = yes; then
   libs_gtk="-lxml $libs_gtk" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lxml\" to \$libs_gtk"; fi
 fi
 
@@ -17562,7 +17482,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_glade_main = yes; then
   libs_gtk="-lglade $libs_gtk" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lglade\" to \$libs_gtk"; fi
 fi
 
@@ -17625,7 +17545,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_glade_gnome_main = yes; then
   libs_gtk="-lglade-gnome $libs_gtk" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lglade-gnome\" to \$libs_gtk"; fi
 fi
 
@@ -17699,8 +17619,8 @@
   have_x=disabled
 else
   case $x_includes,$x_libraries in #(
-    *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5
-$as_echo "$as_me: error: cannot use X directory names containing '" >&2;}
+    *\'*) { { $as_echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
+$as_echo "$as_me: error: Cannot use X directory names containing '" >&2;}
    { (exit 1); exit 1; }; };; #(
     *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
   $as_echo_n "(cached) " >&6
@@ -17738,7 +17658,7 @@
 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     esac
     case $ac_im_usrlibdir in
-	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
+	/usr/lib | /lib) ;;
 	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
     esac
   fi
@@ -18178,7 +18098,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
@@ -18248,7 +18168,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
@@ -18420,7 +18340,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
@@ -18490,7 +18410,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi
 
@@ -18656,7 +18576,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi
 
@@ -18815,7 +18735,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
 
@@ -18974,7 +18894,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 
@@ -19055,7 +18975,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
 
@@ -19210,7 +19130,7 @@
 $as_echo "$ac_cv_header_Xm_Xm_h" >&6; }
 
 fi
-if test "x$ac_cv_header_Xm_Xm_h" = x""yes; then
+if test $ac_cv_header_Xm_Xm_h = yes; then
   { $as_echo "$as_me:$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
@@ -19276,7 +19196,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_Xm_XmStringFree = yes; then
   got_motif=yes
 fi
 
@@ -19580,7 +19500,7 @@
 $as_echo "$ac_cv_header_X11_Intrinsic_h" >&6; }
 
 fi
-if test "x$ac_cv_header_X11_Intrinsic_h" = x""yes; then
+if test $ac_cv_header_X11_Intrinsic_h = yes; then
   :
 else
   { { $as_echo "$as_me:$LINENO: error: Unable to find X11 header files." >&5
@@ -19655,7 +19575,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_X11_XOpenDisplay = yes; then
   have_lib_x11=yes
 fi
 
@@ -19725,7 +19645,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_X11_XGetFontProperty = yes; then
   ld_switch_x_site="-b i486-linuxaout $ld_switch_x_site"
 else
   { { $as_echo "$as_me:$LINENO: error: Unable to find X11 libraries." >&5
@@ -19802,7 +19722,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_Xext_XShapeSelectInput = yes; then
   libs_x="-lXext $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lXext\" to \$libs_x"; fi
 fi
 
@@ -19872,7 +19792,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_Xt_XtOpenDisplay = yes; then
   libs_x="-lXt $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lXt\" to \$libs_x"; fi
 else
   { { $as_echo "$as_me:$LINENO: error: Unable to find X11 libraries." >&5
@@ -20037,9 +19957,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -20189,9 +20108,8 @@
 $as_echo "$ac_res" >&6; }
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -20292,9 +20210,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -20416,7 +20333,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_Xmu_XmuReadBitmapDataFromFile = yes; then
   with_xmu=yes
 else
   with_xmu=no
@@ -20493,7 +20410,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_Xbsd_main = yes; then
   libs_x="-lXbsd $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lXbsd\" to \$libs_x"; fi
 fi
 
@@ -20665,9 +20582,8 @@
 $as_echo "$ac_res" >&6; }
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -20824,9 +20740,8 @@
 $as_echo "$ac_res" >&6; }
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -20912,7 +20827,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_Xrender_XRenderQueryExtension = yes; 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; }
@@ -20983,7 +20898,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_fontconfig_FcPatternCreate = yes; 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; }
@@ -21054,7 +20969,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_Xft_XftFontOpen = yes; 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; }
@@ -21152,9 +21067,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -21253,9 +21167,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -21341,7 +21254,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_gdi32_main = yes; then
   with_msw=yes
 fi
 
@@ -21372,13 +21285,11 @@
       test "$enable_widgets"    != "no" && enable_widgets=msw
     fi
         if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -21520,7 +21431,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_shape_h" >&5
 $as_echo "$ac_cv_header_X11_extensions_shape_h" >&6; }
-if test "x$ac_cv_header_X11_extensions_shape_h" = x""yes; then
+if test $ac_cv_header_X11_extensions_shape_h = yes; then
 
    cat >>confdefs.h <<\_ACEOF
 #define HAVE_BALLOON_HELP 1
@@ -21697,7 +21608,7 @@
 $as_echo "$ac_cv_header_X11_Xauth_h" >&6; }
 
 fi
-if test "x$ac_cv_header_X11_Xauth_h" = x""yes; then
+if test $ac_cv_header_X11_Xauth_h = yes; then
   :
 else
   with_xauth=no
@@ -21769,7 +21680,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_Xau_XauGetAuthByAddr = yes; then
   :
 else
   with_xauth=no
@@ -21946,7 +21857,7 @@
 $as_echo "$ac_cv_header_dlfcn_h" >&6; }
 
 fi
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then
+if test $ac_cv_header_dlfcn_h = yes; then
 
 	{ $as_echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
 $as_echo_n "checking for dlopen in -lc... " >&6; }
@@ -22247,7 +22158,7 @@
 $as_echo "$ac_cv_header_dl_h" >&6; }
 
 fi
-if test "x$ac_cv_header_dl_h" = x""yes; then
+if test $ac_cv_header_dl_h = yes; then
 
 	  { $as_echo "$as_me:$LINENO: checking for shl_load in -lc" >&5
 $as_echo_n "checking for shl_load in -lc... " >&6; }
@@ -22494,7 +22405,7 @@
 $as_echo "$ac_cv_header_ltdl_h" >&6; }
 
 fi
-if test "x$ac_cv_header_ltdl_h" = x""yes; then
+if test $ac_cv_header_ltdl_h = yes; then
 
 	    { $as_echo "$as_me:$LINENO: checking for lt_dlinit in -lltdl" >&5
 $as_echo_n "checking for lt_dlinit in -lltdl... " >&6; }
@@ -23316,9 +23227,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -23499,9 +23409,8 @@
 $as_echo "$ac_res" >&6; }
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   tt_c_h_file="${dir}tt_c.h"; break
 fi
 
@@ -23583,7 +23492,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_tt_tt_message_create = yes; then
   tt_libs="-ltt $extra_libs"; break
 else
   :
@@ -23744,7 +23653,7 @@
 $as_echo "$ac_cv_header_Dt_Dt_h" >&6; }
 
 fi
-if test "x$ac_cv_header_Dt_Dt_h" = x""yes; then
+if test $ac_cv_header_Dt_Dt_h = yes; then
   :
 else
   with_cde=no
@@ -23816,7 +23725,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_DtSvc_DtDndDragStart = yes; then
   :
 else
   with_cde=no
@@ -24032,7 +23941,7 @@
 $as_echo "$ac_cv_header_ldap_h" >&6; }
 
 fi
-if test "x$ac_cv_header_ldap_h" = x""yes; then
+if test $ac_cv_header_ldap_h = yes; then
   :
 else
   with_ldap=no
@@ -24171,7 +24080,7 @@
 $as_echo "$ac_cv_header_lber_h" >&6; }
 
 fi
-if test "x$ac_cv_header_lber_h" = x""yes; then
+if test $ac_cv_header_lber_h = yes; then
   :
 else
   with_ldap=no
@@ -24244,7 +24153,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_ldap_ldap_search = yes; then
   with_ldap=yes
 fi
 
@@ -24313,7 +24222,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_ldap_ldap_open = yes; then
   with_ldap=yes with_ldap_lber=yes
 fi
  }
@@ -24382,7 +24291,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_ldap_ldap_open = yes; then
   with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes
 fi
  }
@@ -24451,7 +24360,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_ldap_ldap_open = yes; then
   with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes with_ldap_des=yes
 fi
  }
@@ -24520,7 +24429,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_lber_ber_pvt_opt_on = yes; then
   with_ldap_lber=yes
 fi
  }
@@ -24635,9 +24544,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -24799,9 +24707,8 @@
 $as_echo "$ac_res" >&6; }
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   libpq_fe_h_file=${header_dir}libpq-fe.h; break
 fi
 
@@ -24876,7 +24783,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_pq_PQconnectdb = yes; then
   pq_libs="-lpq"
 else
 
@@ -24946,7 +24853,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_pq_PQconnectdb = yes; then
   pq_libs="-lpq -lcrypto -lssl"
 fi
 
@@ -25030,7 +24937,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_pq_PQconnectStart = yes; then
 
                  with_postgresqlv7=yes;
                  cat >>confdefs.h <<\_ACEOF
@@ -25093,13 +25000,11 @@
 $as_echo_n "checking for Xpm - no older than 3.4f... " >&6; }
     xe_check_libs="$libname_xpm"
     if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -25373,7 +25278,7 @@
 $as_echo "$ac_cv_header_compface_h" >&6; }
 
 fi
-if test "x$ac_cv_header_compface_h" = x""yes; then
+if test $ac_cv_header_compface_h = yes; then
   :
 else
   with_xface=no
@@ -25445,7 +25350,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_compface_UnGenFace = yes; then
   :
 else
   with_xface=no
@@ -25534,7 +25439,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_c_inflate = yes; then
   :
 else
 
@@ -25603,7 +25508,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_z_inflate = yes; then
   libs_x="-lz $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lz\" to \$libs_x"; fi
 else
 
@@ -25672,7 +25577,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_gz_inflate = yes; then
   libs_x="-lgz $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lgz\" to \$libs_x"; fi
 fi
 
@@ -25814,7 +25719,7 @@
 $as_echo "$ac_cv_header_jpeglib_h" >&6; }
 
 fi
-if test "x$ac_cv_header_jpeglib_h" = x""yes; then
+if test $ac_cv_header_jpeglib_h = yes; then
   :
 else
   with_jpeg=no
@@ -25886,7 +25791,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_jpeg_jpeg_destroy_decompress = yes; then
   :
 else
   with_jpeg=no
@@ -25987,7 +25892,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_pow" >&5
 $as_echo "$ac_cv_func_pow" >&6; }
-if test "x$ac_cv_func_pow" = x""yes; then
+if test $ac_cv_func_pow = yes; then
   :
 else
   with_png=no
@@ -26125,7 +26030,7 @@
 $as_echo "$ac_cv_header_png_h" >&6; }
 
 fi
-if test "x$ac_cv_header_png_h" = x""yes; then
+if test $ac_cv_header_png_h = yes; then
   :
 else
   with_png=no
@@ -26197,7 +26102,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_png_png_read_image = yes; then
   :
 else
   with_png=no
@@ -26208,13 +26113,11 @@
 $as_echo_n "checking for workable png version information... " >&6; }
     xe_check_libs="-lpng -lz"
     if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -26423,7 +26326,7 @@
 $as_echo "$ac_cv_header_tiffio_h" >&6; }
 
 fi
-if test "x$ac_cv_header_tiffio_h" = x""yes; then
+if test $ac_cv_header_tiffio_h = yes; then
   :
 else
   with_tiff=no
@@ -26495,7 +26398,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_tiff_TIFFClientOpen = yes; then
   :
 else
   with_tiff=no
@@ -26645,7 +26548,7 @@
 $as_echo "$ac_cv_header_compface_h" >&6; }
 
 fi
-if test "x$ac_cv_header_compface_h" = x""yes; then
+if test $ac_cv_header_compface_h = yes; then
   :
 else
   with_xface=no
@@ -26717,7 +26620,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_compface_UnGenFace = yes; then
   :
 else
   with_xface=no
@@ -26834,9 +26737,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Lib'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
 
                 as_ac_Lib=`$as_echo "ac_cv_lib_$athena_variant''_XawSme3dComputeTopShadowRGB" | $as_tr_sh`
 { $as_echo "$as_me:$LINENO: checking for XawSme3dComputeTopShadowRGB in -l$athena_variant" >&5
@@ -26906,9 +26808,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Lib'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   { $as_echo "$as_me:$LINENO: WARNING: Could not find a non-3d Athena widget library." >&5
 $as_echo "$as_me: WARNING: Could not find a non-3d Athena widget library." >&2;}
 else
@@ -26990,9 +26891,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Lib'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   athena_lib=$athena_variant
 else
               { $as_echo "$as_me:$LINENO: checking for XawSme3dComputeTopShadowRGB in -lXaw" >&5
@@ -27060,7 +26960,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB = yes; then
 
           athena_lib=Xaw;
           { $as_echo "$as_me:$LINENO: WARNING: Assuming that libXaw is actually $athena_variant." >&5
@@ -27208,7 +27108,7 @@
 $as_echo "$ac_cv_header_X11_Xaw_ThreeD_h" >&6; }
 
 fi
-if test "x$ac_cv_header_X11_Xaw_ThreeD_h" = x""yes; then
+if test $ac_cv_header_X11_Xaw_ThreeD_h = yes; then
   { $as_echo "$as_me:$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
@@ -27259,7 +27159,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw_XawInit_h" >&5
 $as_echo "$ac_cv_header_X11_Xaw_XawInit_h" >&6; }
-if test "x$ac_cv_header_X11_Xaw_XawInit_h" = x""yes; then
+if test $ac_cv_header_X11_Xaw_XawInit_h = yes; then
   athena_h_path=X11/Xaw
 else
   { $as_echo "$as_me:$LINENO: WARNING: Could not find a non-3d Athena header set." >&5
@@ -27324,9 +27224,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   as_ac_Header=`$as_echo "ac_cv_header_X11/$athena_variant/ThreeD.h" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   { $as_echo "$as_me:$LINENO: checking for X11/$athena_variant/ThreeD.h" >&5
@@ -27464,9 +27363,8 @@
 $as_echo "$ac_res" >&6; }
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   athena_h_path=X11/$athena_variant
 fi
 
@@ -27529,9 +27427,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   as_ac_Header=`$as_echo "ac_cv_header_$athena_variant/ThreeD.h" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   { $as_echo "$as_me:$LINENO: checking for $athena_variant/ThreeD.h" >&5
@@ -27669,9 +27566,8 @@
 $as_echo "$ac_res" >&6; }
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   athena_h_path=$athena_variant
 fi
 
@@ -27732,7 +27628,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw3d_XawInit_h" >&5
 $as_echo "$ac_cv_header_X11_Xaw3d_XawInit_h" >&6; }
-if test "x$ac_cv_header_X11_Xaw3d_XawInit_h" = x""yes; then
+if test $ac_cv_header_X11_Xaw3d_XawInit_h = yes; then
   if test "${ac_cv_header_X11_Xaw3d_ThreeD_h+set}" = set; then
   { $as_echo "$as_me:$LINENO: checking for X11/Xaw3d/ThreeD.h" >&5
 $as_echo_n "checking for X11/Xaw3d/ThreeD.h... " >&6; }
@@ -27865,7 +27761,7 @@
 $as_echo "$ac_cv_header_X11_Xaw3d_ThreeD_h" >&6; }
 
 fi
-if test "x$ac_cv_header_X11_Xaw3d_ThreeD_h" = x""yes; then
+if test $ac_cv_header_X11_Xaw3d_ThreeD_h = yes; then
 
             { $as_echo "$as_me:$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;}
@@ -27930,7 +27826,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_Xaw3d_XawInit_h" >&5
 $as_echo "$ac_cv_header_Xaw3d_XawInit_h" >&6; }
-if test "x$ac_cv_header_Xaw3d_XawInit_h" = x""yes; then
+if test $ac_cv_header_Xaw3d_XawInit_h = yes; then
   if test "${ac_cv_header_Xaw3d_ThreeD_h+set}" = set; then
   { $as_echo "$as_me:$LINENO: checking for Xaw3d/ThreeD.h" >&5
 $as_echo_n "checking for Xaw3d/ThreeD.h... " >&6; }
@@ -28063,7 +27959,7 @@
 $as_echo "$ac_cv_header_Xaw3d_ThreeD_h" >&6; }
 
 fi
-if test "x$ac_cv_header_Xaw3d_ThreeD_h" = x""yes; then
+if test $ac_cv_header_Xaw3d_ThreeD_h = yes; then
 
             { $as_echo "$as_me:$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;}
@@ -28210,7 +28106,7 @@
 $as_echo "$ac_cv_header_X11_Xaw_ThreeD_h" >&6; }
 
 fi
-if test "x$ac_cv_header_X11_Xaw_ThreeD_h" = x""yes; then
+if test $ac_cv_header_X11_Xaw_ThreeD_h = yes; then
 
           { $as_echo "$as_me:$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;}
@@ -28367,7 +28263,7 @@
 $as_echo "$ac_cv_header_Xm_Xm_h" >&6; }
 
 fi
-if test "x$ac_cv_header_Xm_Xm_h" = x""yes; then
+if test $ac_cv_header_Xm_Xm_h = yes; then
   { $as_echo "$as_me:$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
@@ -28433,7 +28329,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_Xm_XmStringCreate = yes; then
   have_motif=yes
 else
   have_motif=no
@@ -28892,9 +28788,8 @@
 $as_echo "$ac_res" >&6; }
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -28969,7 +28864,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_intl_strerror = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBINTL 1
 _ACEOF
@@ -29049,7 +28944,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_X11_XOpenIM = yes; then
   with_xim=xlib
 else
   with_xim=no
@@ -29121,7 +29016,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_Xm_XmImMbLookupString = yes; then
   with_xim=motif
 fi
 
@@ -29191,7 +29086,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_Xm_XmImMbLookupString = yes; then
   with_xim=motif
 fi
 
@@ -29294,7 +29189,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_X11_XmbDrawString = yes; then
   :
 else
   with_xfs=no
@@ -29445,7 +29340,7 @@
 $as_echo "$ac_cv_header_wnn_jllib_h" >&6; }
 
 fi
-if test "x$ac_cv_header_wnn_jllib_h" = x""yes; then
+if test $ac_cv_header_wnn_jllib_h = yes; then
   :
 else
   with_wnn=no
@@ -29584,7 +29479,7 @@
 $as_echo "$ac_cv_header_wnn_commonhd_h" >&6; }
 
 fi
-if test "x$ac_cv_header_wnn_commonhd_h" = x""yes; then
+if test $ac_cv_header_wnn_commonhd_h = yes; then
   :
 else
   with_wnn=no
@@ -29683,9 +29578,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -29759,7 +29653,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_crypt_crypt = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBCRYPT 1
 _ACEOF
@@ -29835,7 +29729,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_wnn_jl_dic_list_e = yes; then
   libwnn=wnn
 else
   { $as_echo "$as_me:$LINENO: checking for jl_dic_list_e in -lwnn4" >&5
@@ -29903,7 +29797,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_wnn4_jl_dic_list_e = yes; then
   libwnn=wnn4
 else
   { $as_echo "$as_me:$LINENO: checking for jl_dic_list_e in -lwnn6" >&5
@@ -29971,7 +29865,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_wnn6_jl_dic_list_e = yes; then
   libwnn=wnn6
 else
   { $as_echo "$as_me:$LINENO: checking for dic_list_e in -lwnn6_fromsrc" >&5
@@ -30039,7 +29933,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_wnn6_fromsrc_dic_list_e = yes; then
   libwnn=wnn6_fromsrc
 else
   with_wnn=no
@@ -30128,9 +30022,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Lib'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   with_wnn6=yes
 fi
 
@@ -30284,7 +30177,7 @@
 $as_echo "$ac_cv_header_canna_jrkanji_h" >&6; }
 
 fi
-if test "x$ac_cv_header_canna_jrkanji_h" = x""yes; then
+if test $ac_cv_header_canna_jrkanji_h = yes; then
   if test "${ac_cv_header_canna_RK_h+set}" = set; then
   { $as_echo "$as_me:$LINENO: checking for canna/RK.h" >&5
 $as_echo_n "checking for canna/RK.h... " >&6; }
@@ -30417,7 +30310,7 @@
 $as_echo "$ac_cv_header_canna_RK_h" >&6; }
 
 fi
-if test "x$ac_cv_header_canna_RK_h" = x""yes; then
+if test $ac_cv_header_canna_RK_h = yes; then
   have_canna=$ac_header_compiler
 fi
 
@@ -30507,7 +30400,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_RKC_RkBgnBun = yes; then
   :
 else
   have_canna=no
@@ -30578,7 +30471,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_canna_jrKanjiControl = yes; then
   :
 else
   have_canna=no
@@ -30683,7 +30576,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_i18n_layout_object_getvalue = yes; then
   libs_x="-li18n $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-li18n\" to \$libs_x"; fi
 fi
 
@@ -30893,9 +30786,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -31000,7 +30892,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_mprotect" >&5
 $as_echo "$ac_cv_func_mprotect" >&6; }
-if test "x$ac_cv_func_mprotect" = x""yes; then
+if test $ac_cv_func_mprotect = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_MPROTECT 1
 _ACEOF
@@ -31093,7 +30985,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_sigaction" >&5
 $as_echo "$ac_cv_func_sigaction" >&6; }
-if test "x$ac_cv_func_sigaction" = x""yes; then
+if test $ac_cv_func_sigaction = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_SIGACTION 1
 _ACEOF
@@ -31199,7 +31091,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_siginfo_si_addr" >&5
 $as_echo "$ac_cv_member_struct_siginfo_si_addr" >&6; }
-if test "x$ac_cv_member_struct_siginfo_si_addr" = x""yes; then
+if test $ac_cv_member_struct_siginfo_si_addr = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_STRUCT_SIGINFO_SI_ADDR 1
 _ACEOF
@@ -31303,7 +31195,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_member_siginfo_t_si_addr" >&5
 $as_echo "$ac_cv_member_siginfo_t_si_addr" >&6; }
-if test "x$ac_cv_member_siginfo_t_si_addr" = x""yes; then
+if test $ac_cv_member_siginfo_t_si_addr = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_SIGINFO_T_SI_ADDR 1
 _ACEOF
@@ -31399,7 +31291,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_signal" >&5
 $as_echo "$ac_cv_func_signal" >&6; }
-if test "x$ac_cv_func_signal" = x""yes; then
+if test $ac_cv_func_signal = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_SIGNAL 1
 _ACEOF
@@ -31503,7 +31395,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sigcontext_cr2" >&5
 $as_echo "$ac_cv_member_struct_sigcontext_cr2" >&6; }
-if test "x$ac_cv_member_struct_sigcontext_cr2" = x""yes; then
+if test $ac_cv_member_struct_sigcontext_cr2 = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_STRUCT_SIGCONTEXT_CR2 1
 _ACEOF
@@ -31629,9 +31521,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -31725,7 +31616,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_openpty" >&5
 $as_echo "$ac_cv_func_openpty" >&6; }
-if test "x$ac_cv_func_openpty" = x""yes; then
+if test $ac_cv_func_openpty = yes; then
   have_openpty=yes
 else
 
@@ -31794,7 +31685,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_util_openpty = yes; then
   have_openpty=yes need_libutil=yes
 fi
 
@@ -31946,9 +31837,8 @@
 $as_echo "$ac_res" >&6; }
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -32101,9 +31991,8 @@
 $as_echo "$ac_res" >&6; }
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -32252,9 +32141,8 @@
 $as_echo "$ac_res" >&6; }
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -32403,9 +32291,8 @@
 $as_echo "$ac_res" >&6; }
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -32557,9 +32444,8 @@
 $as_echo "$ac_res" >&6; }
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -32660,9 +32546,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -32810,9 +32695,8 @@
 $as_echo "$ac_res" >&6; }
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -32913,9 +32797,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -33065,9 +32948,8 @@
 $as_echo "$ac_res" >&6; }
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -33147,7 +33029,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_kstat_kstat_open = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBKSTAT 1
 _ACEOF
@@ -33296,9 +33178,8 @@
 $as_echo "$ac_res" >&6; }
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -33374,7 +33255,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_kvm_kvm_read = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBKVM 1
 _ACEOF
@@ -34102,9 +33983,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -34206,13 +34086,11 @@
 { $as_echo "$as_me:$LINENO: checking for working alloca in function calls" >&5
 $as_echo_n "checking for working alloca in function calls... " >&6; }
 if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -34318,13 +34196,11 @@
 { $as_echo "$as_me:$LINENO: checking for working scanf" >&5
 $as_echo_n "checking for working scanf... " >&6; }
 if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -34553,9 +34429,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -34628,13 +34503,11 @@
 $as_echo_n "checking for working mmap... " >&6; }
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -34915,7 +34788,7 @@
 $as_echo "$ac_cv_header_termios_h" >&6; }
 
 fi
-if test "x$ac_cv_header_termios_h" = x""yes; then
+if test $ac_cv_header_termios_h = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_TERMIOS 1
 _ACEOF
@@ -35061,7 +34934,7 @@
 $as_echo "$ac_cv_header_termio_h" >&6; }
 
 fi
-if test "x$ac_cv_header_termio_h" = x""yes; then
+if test $ac_cv_header_termio_h = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_TERMIO 1
 _ACEOF
@@ -35159,7 +35032,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5
 $as_echo "$ac_cv_func_socket" >&6; }
-if test "x$ac_cv_func_socket" = x""yes; then
+if test $ac_cv_func_socket = yes; then
   if test "${ac_cv_header_netinet_in_h+set}" = set; then
   { $as_echo "$as_me:$LINENO: checking for netinet/in.h" >&5
 $as_echo_n "checking for netinet/in.h... " >&6; }
@@ -35292,7 +35165,7 @@
 $as_echo "$ac_cv_header_netinet_in_h" >&6; }
 
 fi
-if test "x$ac_cv_header_netinet_in_h" = x""yes; then
+if test $ac_cv_header_netinet_in_h = yes; then
   if test "${ac_cv_header_arpa_inet_h+set}" = set; then
   { $as_echo "$as_me:$LINENO: checking for arpa/inet.h" >&5
 $as_echo_n "checking for arpa/inet.h... " >&6; }
@@ -35425,7 +35298,7 @@
 $as_echo "$ac_cv_header_arpa_inet_h" >&6; }
 
 fi
-if test "x$ac_cv_header_arpa_inet_h" = x""yes; then
+if test $ac_cv_header_arpa_inet_h = yes; then
 
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_SOCKETS 1
@@ -35640,7 +35513,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_msgget" >&5
 $as_echo "$ac_cv_func_msgget" >&6; }
-if test "x$ac_cv_func_msgget" = x""yes; then
+if test $ac_cv_func_msgget = yes; then
   if test "${ac_cv_header_sys_ipc_h+set}" = set; then
   { $as_echo "$as_me:$LINENO: checking for sys/ipc.h" >&5
 $as_echo_n "checking for sys/ipc.h... " >&6; }
@@ -35773,7 +35646,7 @@
 $as_echo "$ac_cv_header_sys_ipc_h" >&6; }
 
 fi
-if test "x$ac_cv_header_sys_ipc_h" = x""yes; then
+if test $ac_cv_header_sys_ipc_h = yes; then
   if test "${ac_cv_header_sys_msg_h+set}" = set; then
   { $as_echo "$as_me:$LINENO: checking for sys/msg.h" >&5
 $as_echo_n "checking for sys/msg.h... " >&6; }
@@ -35906,7 +35779,7 @@
 $as_echo "$ac_cv_header_sys_msg_h" >&6; }
 
 fi
-if test "x$ac_cv_header_sys_msg_h" = x""yes; then
+if test $ac_cv_header_sys_msg_h = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_SYSVIPC 1
 _ACEOF
@@ -36052,7 +35925,7 @@
 $as_echo "$ac_cv_header_dirent_h" >&6; }
 
 fi
-if test "x$ac_cv_header_dirent_h" = x""yes; then
+if test $ac_cv_header_dirent_h = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define SYSV_SYSTEM_DIR 1
 _ACEOF
@@ -36190,7 +36063,7 @@
 $as_echo "$ac_cv_header_sys_dir_h" >&6; }
 
 fi
-if test "x$ac_cv_header_sys_dir_h" = x""yes; then
+if test $ac_cv_header_sys_dir_h = yes; then
   :
 else
   cat >>confdefs.h <<\_ACEOF
@@ -36336,7 +36209,7 @@
 $as_echo "$ac_cv_header_nlist_h" >&6; }
 
 fi
-if test "x$ac_cv_header_nlist_h" = x""yes; then
+if test $ac_cv_header_nlist_h = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define NLIST_STRUCT 1
 _ACEOF
@@ -36486,7 +36359,7 @@
 $as_echo "$ac_cv_header_multimedia_audio_device_h" >&6; }
 
 fi
-if test "x$ac_cv_header_multimedia_audio_device_h" = x""yes; then
+if test $ac_cv_header_multimedia_audio_device_h = yes; 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\""
@@ -36590,7 +36463,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_audio_ALopenport = yes; then
   with_native_sound_lib="-laudio"
 fi
 
@@ -36668,7 +36541,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_Alib_AOpenAudio = yes; then
   with_native_sound_lib="-lAlib"
 fi
 
@@ -36836,9 +36709,8 @@
 $as_echo "$ac_res" >&6; }
 
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
         sound_found=yes
         case "${ac_cv_build}" in
@@ -36912,7 +36784,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_ossaudio__oss_ioctl = yes; then
   with_native_sound_lib=-lossaudio
 		 { $as_echo "$as_me:$LINENO: WARNING: Using NetBSD-deprecated -lossaudio" >&5
 $as_echo "$as_me: WARNING: Using NetBSD-deprecated -lossaudio" >&2;}
@@ -37092,7 +36964,7 @@
 $as_echo "$ac_cv_header_alsa_input_h" >&6; }
 
 fi
-if test "x$ac_cv_header_alsa_input_h" = x""yes; then
+if test $ac_cv_header_alsa_input_h = yes; then
 
     { $as_echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
 $as_echo_n "checking for snd_pcm_open in -lasound... " >&6; }
@@ -37159,7 +37031,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_asound_snd_pcm_open = yes; then
   have_alsa_sound=yes
 fi
 
@@ -37316,7 +37188,7 @@
 $as_echo "$ac_cv_header_audio_audiolib_h" >&6; }
 
 fi
-if test "x$ac_cv_header_audio_audiolib_h" = x""yes; then
+if test $ac_cv_header_audio_audiolib_h = yes; then
 
     { $as_echo "$as_me:$LINENO: checking for AuOpenServer in -laudio" >&5
 $as_echo_n "checking for AuOpenServer in -laudio... " >&6; }
@@ -37383,7 +37255,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_audio_AuOpenServer = yes; then
   have_nas_sound=yes
 fi
 
@@ -37555,7 +37427,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_esd_play_stream" >&5
 $as_echo "$ac_cv_func_esd_play_stream" >&6; }
-if test "x$ac_cv_func_esd_play_stream" = x""yes; then
+if test $ac_cv_func_esd_play_stream = yes; then
   have_esd_sound=yes
 else
   c_switch_site="$save_c_switch_site" LIBS="$save_LIBS"
@@ -37663,7 +37535,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_ncurses_tgetent = yes; then
   with_ncurses=yes
 else
   with_ncurses=no
@@ -37807,7 +37679,7 @@
 $as_echo "$ac_cv_header_ncurses_curses_h" >&6; }
 
 fi
-if test "x$ac_cv_header_ncurses_curses_h" = x""yes; then
+if test $ac_cv_header_ncurses_curses_h = yes; then
   curses_h_file=ncurses/curses.h
 fi
 
@@ -37944,7 +37816,7 @@
 $as_echo "$ac_cv_header_ncurses_term_h" >&6; }
 
 fi
-if test "x$ac_cv_header_ncurses_term_h" = x""yes; then
+if test $ac_cv_header_ncurses_term_h = yes; then
   term_h_file=ncurses/term.h
 fi
 
@@ -38089,7 +37961,7 @@
 $as_echo "$ac_cv_header_ncurses_curses_h" >&6; }
 
 fi
-if test "x$ac_cv_header_ncurses_curses_h" = x""yes; then
+if test $ac_cv_header_ncurses_curses_h = yes; then
   curses_h_file=ncurses/curses.h
 fi
 
@@ -38176,9 +38048,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Lib'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   LIBS="-l${lib} $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-l${lib}\" to \$LIBS"; fi; break
 fi
 
@@ -38256,7 +38127,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_curses_tgetent = yes; then
   LIBS="-lcurses $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lcurses\" to \$LIBS"; fi
 else
   { $as_echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
@@ -38324,7 +38195,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_termcap_tgetent = yes; 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
@@ -38479,7 +38350,7 @@
 $as_echo "$ac_cv_header_gpm_h" >&6; }
 
 fi
-if test "x$ac_cv_header_gpm_h" = x""yes; then
+if test $ac_cv_header_gpm_h = yes; then
 
       { $as_echo "$as_me:$LINENO: checking for Gpm_Open in -lgpm" >&5
 $as_echo_n "checking for Gpm_Open in -lgpm... " >&6; }
@@ -38546,7 +38417,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_gpm_Gpm_Open = yes; then
   have_gpm=yes
 fi
 
@@ -38715,7 +38586,7 @@
 $as_echo "$ac_cv_header_ndbm_h" >&6; }
 
 fi
-if test "x$ac_cv_header_ndbm_h" = x""yes; then
+if test $ac_cv_header_ndbm_h = yes; then
   :
 else
 
@@ -38794,7 +38665,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_gdbm_dbm_open = yes; then
 
    enable_database_gdbm=yes enable_database_dbm=no libdbm=-lgdbm
 else
@@ -38864,7 +38735,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_gdbm_compat_dbm_open = yes; then
 
        enable_database_gdbm=yes enable_database_dbm=no libdbm="-lgdbm_compat -lgdbm"
 else
@@ -38966,7 +38837,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_dbm_open" >&5
 $as_echo "$ac_cv_func_dbm_open" >&6; }
-if test "x$ac_cv_func_dbm_open" = x""yes; then
+if test $ac_cv_func_dbm_open = yes; then
   enable_database_dbm=yes libdbm=
 else
 
@@ -39035,7 +38906,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_dbm_dbm_open = yes; then
   enable_database_dbm=yes libdbm=-ldbm
 else
 
@@ -39150,7 +39021,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int8_t" >&5
 $as_echo "$ac_cv_type_u_int8_t" >&6; }
-if test "x$ac_cv_type_u_int8_t" = x""yes; then
+if test $ac_cv_type_u_int8_t = yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_U_INT8_T 1
@@ -39252,7 +39123,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int16_t" >&5
 $as_echo "$ac_cv_type_u_int16_t" >&6; }
-if test "x$ac_cv_type_u_int16_t" = x""yes; then
+if test $ac_cv_type_u_int16_t = yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_U_INT16_T 1
@@ -39354,7 +39225,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5
 $as_echo "$ac_cv_type_u_int32_t" >&6; }
-if test "x$ac_cv_type_u_int32_t" = x""yes; then
+if test $ac_cv_type_u_int32_t = yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_U_INT32_T 1
@@ -39590,9 +39461,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   enable_database_berkdb=yes need_libdb=no
 else
 
@@ -39664,9 +39534,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Lib'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   enable_database_berkdb=yes need_libdb=yes
 fi
 
@@ -39751,9 +39620,8 @@
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Lib'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   enable_database_berkdb=yes need_libdb=yes
 fi
 
@@ -39848,7 +39716,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_socks_SOCKSinit = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSOCKS 1
 _ACEOF
@@ -40004,7 +39872,7 @@
 $as_echo "$ac_cv_header_gmp_h" >&6; }
 
 fi
-if test "x$ac_cv_header_gmp_h" = x""yes; then
+if test $ac_cv_header_gmp_h = yes; then
 
     { $as_echo "$as_me:$LINENO: checking for __gmpz_init in -lgmp" >&5
 $as_echo_n "checking for __gmpz_init in -lgmp... " >&6; }
@@ -40071,7 +39939,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_gmp___gmpz_init = yes; then
   have_mpz_init=yes
 fi
 
@@ -40225,7 +40093,7 @@
 $as_echo "$ac_cv_header_mp_h" >&6; }
 
 fi
-if test "x$ac_cv_header_mp_h" = x""yes; then
+if test $ac_cv_header_mp_h = yes; then
 
       { $as_echo "$as_me:$LINENO: checking for mp_mfree in -lmp" >&5
 $as_echo_n "checking for mp_mfree in -lmp... " >&6; }
@@ -40292,7 +40160,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_mp_mp_mfree = yes; then
   have_mp_mfree=yes; break
 else
 
@@ -40361,7 +40229,7 @@
 fi
 { $as_echo "$as_me:$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 $ac_cv_lib_mp_mfree = yes; then
   have_mfree=yes; break
 fi
 
@@ -40465,7 +40333,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_mp_move" >&5
 $as_echo "$ac_cv_func_mp_move" >&6; }
-if test "x$ac_cv_func_mp_move" = x""yes; then
+if test $ac_cv_func_mp_move = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_MP_MOVE 1
 _ACEOF
@@ -40562,7 +40430,7 @@
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_move" >&5
 $as_echo "$ac_cv_func_move" >&6; }
-if test "x$ac_cv_func_move" = x""yes; then
+if test $ac_cv_func_move = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_MP_MOVE 1
 _ACEOF
@@ -40583,13 +40451,11 @@
 fi
 
 if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -41540,8 +41406,8 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -41611,7 +41477,6 @@
 
 
 
-
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
@@ -41934,7 +41799,7 @@
 # values after options handling.
 ac_log="
 This file was extended by XEmacs $as_me 21.5, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -41947,15 +41812,6 @@
 
 _ACEOF
 
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
@@ -41969,17 +41825,16 @@
 \`$as_me' instantiates files from templates according to the
 current configuration.
 
-Usage: $0 [OPTION]... [FILE]...
+Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
+  -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
+  --file=FILE[:TEMPLATE]
                    instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
+  --header=FILE[:TEMPLATE]
                    instantiate the configuration header FILE
 
 Configuration files:
@@ -41997,7 +41852,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 XEmacs config.status 21.5
-configured by $0, generated by GNU Autoconf 2.63,
+configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright (C) 2008 Free Software Foundation, Inc.
@@ -42208,8 +42063,7 @@
 $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
 
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
     break
   elif $ac_last_try; then
     { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -42414,9 +42268,9 @@
   }
   split(mac1, mac2, "(") #)
   macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
   if (D_is_set[macro]) {
     # Preserve the white space surrounding the "#".
+    prefix = substr(line, 1, index(line, defundef) - 1)
     print prefix "define", macro P[macro] D[macro]
     next
   } else {
@@ -42424,7 +42278,7 @@
     # in the case of _POSIX_SOURCE, which is predefined and required
     # on some systems where configure will not decide to define it.
     if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
+      print "/*", line, "*/"
       next
     }
   }
@@ -42448,8 +42302,8 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -42924,7 +42778,7 @@
   $ac_cs_success || { (exit 1); exit 1; }
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
+  { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
--- a/configure.ac	Tue Jul 28 23:24:15 2009 +0900
+++ b/configure.ac	Tue Jul 28 23:29:22 2009 +0900
@@ -1075,24 +1075,23 @@
 XE_EXPAND_VARIABLE(datadir,datadir_expanded)
 XE_EXPAND_VARIABLE(exec_prefix,exec_prefix_expanded)
 XE_EXPAND_VARIABLE(libdir,libdir_expanded)
-XE_EXPAND_VARIABLE(mandir,mandir_expanded)
 XE_EXPAND_VARIABLE(infodir,infodir_expanded)
 
-if test "x$datadir_expanded" != "x$prefix_expanded/share"
+if test "x$datadir" != "x\${datarootdir}"
 then
   AC_DEFINE(INFODIR_USER_DEFINED)
   AC_DEFINE(LISPDIR_USER_DEFINED)
   AC_DEFINE(ETCDIR_USER_DEFINED)
 fi
 
-if test "x$libdir_expanded" != "x$prefix_expanded/lib"
+if test "x$libdir" != "x\${exec_prefix}/lib"
 then
   AC_DEFINE(MODULEDIR_USER_DEFINED)
   AC_DEFINE(ARCHLIBDIR_USER_DEFINED)
   AC_DEFINE(DOCDIR_USER_DEFINED)
 fi
 
-if test "x$infodir_expanded" != "x${prefix_expanded}/share/info"
+if test "x$infodir" != "x\${datarootdir}/info"
 then
   AC_DEFINE(INFODIR_USER_DEFINED)
 else
@@ -5746,25 +5745,12 @@
 
 AC_SUBST(prefix)
 AC_SUBST(PREFIX_USER_DEFINED)
-dnl Yo, Stephen Bourne!  I want to marry you!
-PREFIX=$prefix
-while true; do
-  case "$PREFIX" in
-    *\$* ) eval "PREFIX=$PREFIX" ;;
-    *) break ;;
-  esac
-done
+XE_EXPAND_VARIABLE(prefix,PREFIX)
 AC_SUBST(PREFIX)
 
 AC_SUBST(exec_prefix)
 AC_SUBST(EXEC_PREFIX_USER_DEFINED)
-EXEC_PREFIX=$exec_prefix
-while true; do
-  case "$EXEC_PREFIX" in
-    *\$* ) eval "EXEC_PREFIX=$EXEC_PREFIX" ;;
-    *) break ;;
-  esac
-done
+XE_EXPAND_VARIABLE(exec_prefix,EXEC_PREFIX)
 AC_SUBST(EXEC_PREFIX)
 
 AC_SUBST(infodir)
--- a/lisp/ChangeLog	Tue Jul 28 23:24:15 2009 +0900
+++ b/lisp/ChangeLog	Tue Jul 28 23:29:22 2009 +0900
@@ -1,3 +1,13 @@
+2009-07-28  Mike Sperber  <mike@xemacs.org>
+
+	* startup.el (startup-setup-paths): Use `emacs-data-roots' instead
+	of `emacs-roots' where appropriate.
+
+2009-07-28  Mike Sperber  <mike@xemacs.org>
+
+	* startup.el (startup-setup-paths): Print a few more variables
+	upon --debug-paths.
+
 2009-07-18  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* files.el (find-file-create-switch-thunk): 
--- a/lisp/startup.el	Tue Jul 28 23:24:15 2009 +0900
+++ b/lisp/startup.el	Tue Jul 28 23:29:22 2009 +0900
@@ -1524,17 +1524,23 @@
 " inhibit-packages inhibit-site-lisp called-early)
 	   'external-debugging-output)
     (princ (format
-"emacs-roots:
+"invocation-directory: %S
+invocation-name: %S
+configure-prefix-directory: %S
+configure-exec-prefix-directory: %S
+emacs-roots:
 %S
 emacs-data-roots:
 %S
 user-init-directory: %S
 configure-package-path: %S
-" emacs-roots emacs-data-roots user-init-directory configure-package-path)
+" invocation-directory invocation-name
+  configure-prefix-directory configure-exec-prefix-directory
+  emacs-roots emacs-data-roots user-init-directory configure-package-path)
 	   'external-debugging-output)
     )
 
-  (setq lisp-directory (paths-find-lisp-directory emacs-roots))
+  (setq lisp-directory (paths-find-lisp-directory emacs-data-roots))
 
   (if debug-paths
       (princ (format "configure-lisp-directory and lisp-directory:\n%S\n%S\n"
@@ -1544,7 +1550,7 @@
   (if (featurep 'mule)
       (progn
 	(setq mule-lisp-directory
-	      (paths-find-mule-lisp-directory emacs-roots
+	      (paths-find-mule-lisp-directory emacs-data-roots
 					      lisp-directory))
 	(if debug-paths
 	    (princ (format "configure-mule-lisp-directory and mule-lisp-directory:\n%S\n%S\n"
@@ -1553,7 +1559,7 @@
     (setq mule-lisp-directory '()))
 
   (setq site-directory (and (null inhibit-site-lisp)
-			    (paths-find-site-lisp-directory emacs-roots)))
+			    (paths-find-site-lisp-directory emacs-data-roots)))
 
   (if (and debug-paths (null inhibit-site-lisp))
       (princ (format "configure-site-directory and site-directory:\n%S\n%S\n"
@@ -1597,7 +1603,7 @@
   (unless called-early
     (setq Info-directory-list
 	  (paths-construct-info-path
-	   emacs-roots
+	   emacs-data-roots
 	   early-package-hierarchies late-package-hierarchies last-package-hierarchies))
 
     (if debug-paths
@@ -1628,7 +1634,7 @@
 		       configure-doc-directory doc-directory)
 	       'external-debugging-output))
     
-    (setq data-directory (paths-find-data-directory emacs-roots))
+    (setq data-directory (paths-find-data-directory emacs-data-roots))
     
     (if debug-paths
 	(princ (format "configure-data-directory and data-directory:\n%S\n%S\n"