xemacs-beta: configure comparison

comparison configure @ 4669:2c1fa63dddbc

automatic merge

author	Stephen J. Turnbull <stephen@xemacs.org>
date	Tue, 28 Jul 2009 23:29:22 +0900
parents	24224362882c
children	0e1461b592ce

comparison

equal deleted inserted replaced

-:8b2a8ecf91cd
+:2c1fa63dddbc
 #! /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>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 #endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
-ac_subst_vars='LTLIBOBJS
+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
+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
-internal_makefile_list
+LTLIBOBJS'
-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
-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'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_compiler
 with_compiler
 fi
 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
 # Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 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
 { (exit 1); exit 1; }; }
 test -n "$ac_init_help" && exit $ac_status
 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.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 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 $@
 _ACEOF
 exec 5>>config.log
 for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
 eval ac_val=\$$ac_var
 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
+*_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;} ;;
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 esac
 case $ac_var in #(
 _ | IFS | as_nl) ;; #(
 BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
 *) $as_unset $ac_var ;;
 *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
 esac
 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
 $as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
 { (exit 1); exit 1; }; }
 case "$libdir_expanded" in
 *\$* ) eval "libdir_expanded=$libdir_expanded" ;;
 *) 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
 *\$* ) eval "infodir_expanded=$infodir_expanded" ;;
 *) break ;;
 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
 _ACEOF
 #define ETCDIR_USER_DEFINED 1
 _ACEOF
 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
 _ACEOF
 #define DOCDIR_USER_DEFINED 1
 _ACEOF
 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
 _ACEOF
 if test "x$ac_ct_CC" = x; then
 CC=""
 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:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+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
 fi
 else
 if test "x$ac_ct_CC" = x; then
 CC=""
 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:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+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
 fi
 fi
 fi
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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
 set X $ac_compile
 ac_compiler=$2
 $as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
 $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
 # Check that the compiler produces executables we can run.  If not, either
 cross_compiling=no
 else
 if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
 else
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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
 { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 	  break;;
 * ) break;;
 esac
 done
 else
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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
 { $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 done
 else
 $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
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
 :
 else
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
 xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
 $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=
 fi
 if test "x$ac_ct_CC" = x; then
 CC=""
 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:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+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
 fi
 else
 if test "x$ac_ct_CC" = x; then
 CC=""
 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:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+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
 fi
 fi
 fi
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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
 set X $ac_compile
 ac_compiler=$2
 if test "x$ac_ct_CC" = x; then
 CC=""
 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:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+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
 fi
 else
 if test "x$ac_ct_CC" = x; then
 CC=""
 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:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+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
 fi
 fi
 fi
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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
 set X $ac_compile
 ac_compiler=$2
 if test "x$ac_ct_CC" = x; then
 CC=""
 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:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+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
 fi
 else
 if test "x$ac_ct_CC" = x; then
 CC=""
 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:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+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
 fi
 fi
 fi
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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
 set X $ac_compile
 ac_compiler=$2
 fi
 CFLAGS="$xe_save_CFLAGS"
 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:$LINENO: error: cannot run test program while cross compiling
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 if test "$cross_compiling" = yes; then
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
 :
 else
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
 xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
 ;;
 esac
 if test "$cross_compiling" = yes; then
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 elif test -n "$ld_text_start_addr"; then
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 conftest$ac_exeext conftest.$ac_ext
 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
 fi
 if test "x$ac_ct_RANLIB" = x; then
 RANLIB=":"
 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:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+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
 fi
 else
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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
 _ACEOF
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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
 cat >>confdefs.h <<_ACEOF
 #define size_t unsigned int
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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
 cat >>confdefs.h <<_ACEOF
 #define pid_t int
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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
 cat >>confdefs.h <<_ACEOF
 #define mode_t int
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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
 cat >>confdefs.h <<_ACEOF
 #define off_t long int
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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
 cat >>confdefs.h <<_ACEOF
 #define ssize_t int
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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
 _ACEOF
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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
 _ACEOF
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 if test "${ac_cv_c_bigendian+set}" = set; then
 $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
 /* confdefs.h.  */
 _ACEOF
 _ACEOF
 ;; #(
 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
 $as_echo "$as_me: error: unknown endianness
 presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 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:$LINENO: error: cannot compute sizeof (short)
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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 ;;
 esac
 else
 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 ( 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:$LINENO: error: cannot compute sizeof (short)
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 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:$LINENO: error: cannot compute sizeof (int)
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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 ;;
 esac
 else
 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 ( 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:$LINENO: error: cannot compute sizeof (int)
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 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:$LINENO: error: cannot compute sizeof (long)
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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 ;;
 esac
 else
 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 ( 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:$LINENO: error: cannot compute sizeof (long)
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 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:$LINENO: error: cannot compute sizeof (long long)
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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 ;;
 esac
 else
 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 ( 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:$LINENO: error: cannot compute sizeof (long long)
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 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:$LINENO: error: cannot compute sizeof (void *)
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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 ;;
 esac
 else
 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 ( 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:$LINENO: error: cannot compute sizeof (void *)
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 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:$LINENO: error: cannot compute sizeof (double)
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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 ;;
 esac
 else
 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 ( 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:$LINENO: error: cannot compute sizeof (double)
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 conftest$ac_exeext conftest.$ac_ext
 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
 { $as_echo "$as_me:$LINENO: checking for sin in -lm" >&5
 $as_echo_n "checking for sin in -lm... " >&6; }
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 LIBS="-lm $LIBS"
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 LIBS="-lpthreads $LIBS"
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 { $as_echo "$as_me:$LINENO: checking for Imlib_init in -lImlib" >&5
 $as_echo_n "checking for Imlib_init in -lImlib... " >&6; }
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 for ac_func in gdk_imlib_init
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 { $as_echo "$as_me:$LINENO: checking for main in -lglade" >&5
 $as_echo_n "checking for main in -lglade... " >&6; }
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 { $as_echo "$as_me:$LINENO: checking for main in -lglade-gnome" >&5
 $as_echo_n "checking for main in -lglade-gnome... " >&6; }
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 if test "x$with_x" = xno; then
 # The user explicitly disabled X.
 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:$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: 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
 else
 # One or both of the vars are not set, and there is no cached value.
 case $ac_im_incroot in
 	/usr/include) ac_x_includes= ;;
 	*) 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
 cd ..
 rm -f -r conftest.dir
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 if test $ac_cv_lib_dnet_dnet_ntoa = no; then
 { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 if test $ac_cv_lib_nsl_gethostbyname = no; then
 	{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 LDFLAGS=$ac_save_LDFLAGS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_Xm_Xm_h" >&5
 $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
 $as_echo_n "(cached) " >&6
 else
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Intrinsic_h" >&5
 $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
 $as_echo "$as_me: error: Unable to find X11 header files." >&2;}
 { (exit 1); exit 1; }; }
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 if test "$have_lib_x11" != "yes"; then
 { $as_echo "$as_me:$LINENO: checking for XGetFontProperty in -lX11" >&5
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 $as_echo "$as_me: error: Unable to find X11 libraries." >&2;}
 { (exit 1); exit 1; }; }
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 { $as_echo "$as_me:$LINENO: checking for XtOpenDisplay in -lXt" >&5
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 $as_echo "$as_me: error: Unable to find X11 libraries." >&2;}
 { (exit 1); exit 1; }; }
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 }
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 if test "$unexec" = "unexaix.o" -a "$x11_release" = "6"; then
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 xft_includes_found=yes
 else
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 xft_includes_found=yes
 else
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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; }
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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; }
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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; }
 fi
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 if test "$with_msw" = "yes"; then
 cat >>confdefs.h <<\_ACEOF
 test "$enable_toolbars"   != "no" && enable_toolbars=msw
 test "$enable_dialogs"    != "no" && enable_dialogs=msw
 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:$LINENO: error: cannot run test program while cross compiling
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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
 _ACEOF
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xauth_h" >&5
 $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
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 }
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_dlfcn_h" >&5
 $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; }
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_dl_h" >&5
 $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; }
 	  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_ltdl_h" >&5
 $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; }
 	    ac_save_LIBS="$LIBS"
 	    LIBS="$LIBS -lltdl"
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 tt_c_h_file="${dir}tt_c.h"; break
 fi
 done
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 :
 fi
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_Dt_Dt_h" >&5
 $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
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 }
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_ldap_h" >&5
 $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
 fi
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_lber_h" >&5
 $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
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 test "$with_ldap" != "yes" && { { $as_echo "$as_me:$LINENO: checking for ldap_open in -lldap" >&5
 $as_echo_n "checking for ldap_open in -lldap... " >&6; }
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 }
 test "$with_ldap" != "yes" && { { $as_echo "$as_me:$LINENO: checking for ldap_open in -lldap" >&5
 $as_echo_n "checking for ldap_open in -lldap... " >&6; }
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 }
 test "$with_ldap" != "yes" && { { $as_echo "$as_me:$LINENO: checking for ldap_open in -lldap" >&5
 $as_echo_n "checking for ldap_open in -lldap... " >&6; }
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 }
 test "$with_ldap_lber" != "yes" && { { $as_echo "$as_me:$LINENO: checking for ber_pvt_opt_on in -llber" >&5
 $as_echo_n "checking for ber_pvt_opt_on in -llber... " >&6; }
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 }
 fi
 if test "$with_ldap" = "yes"; then
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 libpq_fe_h_file=${header_dir}libpq-fe.h; break
 fi
 done
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 unset ac_cv_lib_pq_PQconnectdb;
 { $as_echo "$as_me:$LINENO: checking for PQconnectdb in -lpq" >&5
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 #define HAVE_POSTGRESQLV7 1
 _ACEOF
 LDFLAGS=""$libpath_xpm" $LDFLAGS" &&  if test "$verbose" = "yes"; then echo "    Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
 { $as_echo "$as_me:$LINENO: checking for Xpm - no older than 3.4f" >&5
 $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:$LINENO: error: cannot run test program while cross compiling
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_compface_h" >&5
 $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
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 }
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 { $as_echo "$as_me:$LINENO: checking for inflate in -lz" >&5
 $as_echo_n "checking for inflate in -lz... " >&6; }
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 { $as_echo "$as_me:$LINENO: checking for inflate in -lgz" >&5
 $as_echo_n "checking for inflate in -lgz... " >&6; }
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
 $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
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 }
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 conftest$ac_exeext conftest.$ac_ext
 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
 fi
 }
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
 $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
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 }
 if test -z "$with_png"; then
 { $as_echo "$as_me:$LINENO: checking for workable png version information" >&5
 $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:$LINENO: error: cannot run test program while cross compiling
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
 $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
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 }
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_compface_h" >&5
 $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
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 }
 fi
 ac_res=`eval 'as_val=${'$as_ac_Lib'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_Lib'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""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
 $as_echo_n "checking for XawSme3dComputeTopShadowRGB in -l$athena_variant... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
 fi
 ac_res=`eval 'as_val=${'$as_ac_Lib'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_Lib'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""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
 athena_lib=$athena_variant
 fi
 fi
 ac_res=`eval 'as_val=${'$as_ac_Lib'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_Lib'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 athena_lib=$athena_variant
 else
 { $as_echo "$as_me:$LINENO: checking for XawSme3dComputeTopShadowRGB in -lXaw" >&5
 $as_echo_n "checking for XawSme3dComputeTopShadowRGB in -lXaw... " >&6; }
 if test "${ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB+set}" = set; then
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 $as_echo "$as_me: WARNING: Assuming that libXaw is actually $athena_variant." >&2;};
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw_ThreeD_h" >&5
 $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
 { $as_echo "$as_me:$LINENO: checking for X11/Xaw/XawInit.h" >&5
 $as_echo_n "checking for X11/Xaw/XawInit.h... " >&6; }
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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
 $as_echo "$as_me: WARNING: Could not find a non-3d Athena header set." >&2;}
 fi
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""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
 $as_echo_n "checking for X11/$athena_variant/ThreeD.h... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 athena_h_path=X11/$athena_variant
 fi
 fi
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""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
 $as_echo_n "checking for $athena_variant/ThreeD.h... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 athena_h_path=$athena_variant
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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; }
 if test "${ac_cv_header_X11_Xaw3d_ThreeD_h+set}" = set; then
 $as_echo_n "(cached) " >&6
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw3d_ThreeD_h" >&5
 $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;}
 athena_h_path=X11/Xaw3d
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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; }
 if test "${ac_cv_header_Xaw3d_ThreeD_h+set}" = set; then
 $as_echo_n "(cached) " >&6
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_Xaw3d_ThreeD_h" >&5
 $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;}
 athena_h_path=Xaw3d
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw_ThreeD_h" >&5
 $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;}
 athena_h_path=X11/Xaw
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_Xm_Xm_h" >&5
 $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
 $as_echo_n "(cached) " >&6
 else
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 LIBS="-lintl $LIBS"
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 elif test "$have_motif $have_lesstif $with_xim" = "yes no no"; then
 { $as_echo "$as_me:$LINENO: checking for XmImMbLookupString in -lXm" >&5
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi ;;
 esac
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_wnn_jllib_h" >&5
 $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
 fi
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_wnn_commonhd_h" >&5
 $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
 fi
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 LIBS="-lcrypt $LIBS"
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 $as_echo_n "checking for jl_dic_list_e in -lwnn4... " >&6; }
 if test "${ac_cv_lib_wnn4_jl_dic_list_e+set}" = set; then
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 $as_echo_n "checking for jl_dic_list_e in -lwnn6... " >&6; }
 if test "${ac_cv_lib_wnn6_jl_dic_list_e+set}" = set; then
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 $as_echo_n "checking for dic_list_e in -lwnn6_fromsrc... " >&6; }
 if test "${ac_cv_lib_wnn6_fromsrc_dic_list_e+set}" = set; then
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 fi
 ac_res=`eval 'as_val=${'$as_ac_Lib'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_Lib'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 with_wnn6=yes
 fi
 test "$with_wnn6" = "yes" && cat >>confdefs.h <<\_ACEOF
 #define WNN6 1
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_canna_jrkanji_h" >&5
 $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; }
 if test "${ac_cv_header_canna_RK_h+set}" = set; then
 $as_echo_n "(cached) " >&6
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_canna_RK_h" >&5
 $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
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 }
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 }
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 conftest$ac_exeext conftest.$ac_ext
 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
 have_vdb_mprotect=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 conftest$ac_exeext conftest.$ac_ext
 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
 have_vdb_sigaction=yes
 else
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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
 have_si_addr=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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
 have_si_addr=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 conftest$ac_exeext conftest.$ac_ext
 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
 have_vdb_signal=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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
 have_cr2=yes
 fi
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 conftest$ac_exeext conftest.$ac_ext
 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
 { $as_echo "$as_me:$LINENO: checking for openpty in -lutil" >&5
 $as_echo_n "checking for openpty in -lutil... " >&6; }
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 break
 fi
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 LIBS="-lkstat $LIBS"
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 LIBS="-lkvm $LIBS"
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
 _ACEOF
 fi
 { $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:$LINENO: error: cannot run test program while cross compiling
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 { $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:$LINENO: error: cannot run test program while cross compiling
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 { $as_echo "$as_me:$LINENO: checking for working mmap" >&5
 $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:$LINENO: error: cannot run test program while cross compiling
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_termios_h" >&5
 $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
 cat >>confdefs.h <<\_ACEOF
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_termio_h" >&5
 $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
 fi
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 conftest$ac_exeext conftest.$ac_ext
 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; }
 if test "${ac_cv_header_netinet_in_h+set}" = set; then
 $as_echo_n "(cached) " >&6
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5
 $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; }
 if test "${ac_cv_header_arpa_inet_h+set}" = set; then
 $as_echo_n "(cached) " >&6
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_arpa_inet_h" >&5
 $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
 _ACEOF
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 conftest$ac_exeext conftest.$ac_ext
 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; }
 if test "${ac_cv_header_sys_ipc_h+set}" = set; then
 $as_echo_n "(cached) " >&6
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5
 $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; }
 if test "${ac_cv_header_sys_msg_h+set}" = set; then
 $as_echo_n "(cached) " >&6
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_msg_h" >&5
 $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
 fi
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_dirent_h" >&5
 $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
 else
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_dir_h" >&5
 $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
 #define NONSYSTEM_DIR_LIBRARY 1
 _ACEOF
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_nlist_h" >&5
 $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
 fi
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_multimedia_audio_device_h" >&5
 $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\""
 fi
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 if test -n "$with_native_sound_lib"; then
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 if test -n "$with_native_sound_lib"; then
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
+if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 sound_found=yes
 case "${ac_cv_build}" in
 *netbsd* )
 	  # #### this is probably not the right way to do this
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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;}
 else
 sound_found=no
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_alsa_input_h" >&5
 $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; }
 if test "${ac_cv_lib_asound_snd_pcm_open+set}" = set; then
 $as_echo_n "(cached) " >&6
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_audio_audiolib_h" >&5
 $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; }
 if test "${ac_cv_lib_audio_AuOpenServer+set}" = set; then
 $as_echo_n "(cached) " >&6
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 conftest$ac_exeext conftest.$ac_ext
 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"
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_curses_h" >&5
 $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
 if test "${ac_cv_header_ncurses_term_h+set}" = set; then
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_term_h" >&5
 $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
 extra_objs="$extra_objs terminfo.o" &&  if test "$verbose" = "yes"; then
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_curses_h" >&5
 $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
 if test "$ac_cv_header_ncurses_curses_h" = "yes"
 fi
 ac_res=`eval 'as_val=${'$as_ac_Lib'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_Lib'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 LIBS="-l${lib} $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-l${lib}\" to \$LIBS"; fi; break
 fi
 	done
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 $as_echo_n "checking for tgetent in -ltermcap... " >&6; }
 if test "${ac_cv_lib_termcap_tgetent+set}" = set; then
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 echo "    xemacs will be linked with \"termcap.o\""
 fi
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_gpm_h" >&5
 $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; }
 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
 $as_echo_n "(cached) " >&6
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_ndbm_h" >&5
 $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
 test "$enable_database_gdbm" = "yes" -o \
 "$enable_database_dbm"  = "yes" && \
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 { $as_echo "$as_me:$LINENO: checking for dbm_open in -lgdbm_compat" >&5
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 if test "$enable_database_gdbm" = "yes"; then
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 conftest$ac_exeext conftest.$ac_ext
 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
 { $as_echo "$as_me:$LINENO: checking for dbm_open in -ldbm" >&5
 $as_echo_n "checking for dbm_open in -ldbm... " >&6; }
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 test "$enable_database_dbm" = "yes" && \
 { echo "Error:" "Required DBM support cannot be provided." >&2; exit 1; }
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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
 _ACEOF
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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
 _ACEOF
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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
 _ACEOF
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 enable_database_berkdb=yes need_libdb=no
 else
 as_ac_Lib=`$as_echo "ac_cv_lib_db_$dbfunc" | $as_tr_sh`
 { $as_echo "$as_me:$LINENO: checking for $dbfunc in -ldb" >&5
 fi
 ac_res=`eval 'as_val=${'$as_ac_Lib'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_Lib'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 enable_database_berkdb=yes need_libdb=yes
 fi
 fi
 fi
 ac_res=`eval 'as_val=${'$as_ac_Lib'}
 		 $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'}
+if test `eval 'as_val=${'$as_ac_Lib'}
-		 $as_echo "$as_val"'`
+		 $as_echo "$as_val"'` = yes; then
-if test "x$as_val" = x""yes; then
 enable_database_berkdb=yes need_libdb=yes
 fi
 fi
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 LIBS="-lsocks $LIBS"
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_gmp_h" >&5
 $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; }
 if test "${ac_cv_lib_gmp___gmpz_init+set}" = set; then
 $as_echo_n "(cached) " >&6
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_header_mp_h" >&5
 $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; }
 if test "${ac_cv_lib_mp_mp_mfree+set}" = set; then
 $as_echo_n "(cached) " >&6
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 	{ $as_echo "$as_me:$LINENO: checking for mfree in -lmp" >&5
 $as_echo_n "checking for mfree in -lmp... " >&6; }
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
 fi
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 conftest$ac_exeext conftest.$ac_ext
 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
 fi
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 conftest$ac_exeext conftest.$ac_ext
 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
 fi
 _ACEOF
 fi
 if test "$cross_compiling" = yes; then
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $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.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
 eval ac_val=\$$ac_var
 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
+*_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;} ;;
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 esac
 case $ac_var in #(
 _ | IFS | as_nl) ;; #(
 BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
 *) $as_unset $ac_var ;;
 LTLIBOBJS=$ac_ltlibobjs
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 { $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
 # Save the log message, to keep $[0] and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # 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
 CONFIG_LINKS    = $CONFIG_LINKS
 CONFIG_COMMANDS = $CONFIG_COMMANDS
 on `(hostname || uname -n) 2>/dev/null | sed 1q`
 "
 _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"
 config_headers="$ac_config_headers"
 config_commands="$ac_config_commands"
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$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
+-q, --quiet      do not print progress messages
-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]
 instantiate the configuration file FILE
 --header=FILE[:TEMPLATE]
 instantiate the configuration header FILE
 Configuration files:
 $config_files
 _ACEOF
 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.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 . ./conf$$subs.sh ||
 { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 $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 `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
-if test $ac_delim_n = $ac_delim_num; then
 break
 elif $ac_last_try; then
 { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
 { (exit 1); exit 1; }; }
 defundef = substr(arg[1], 2)
 mac1 = arg[2]
 }
 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 {
 # Replace #undef with comments.  This is necessary, for example,
 # 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
 }
 }
 }
 { print }
 case $ac_tag in
 :[FHLC]) ac_mode=$ac_tag; continue;;
 esac
 case $ac_mode$ac_tag in
 :[FHL]*:*);;
-:L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+:L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+$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;;
 esac
 ac_save_IFS=$IFS
 # Use ||, not &&, to avoid exiting from the if with $? = 1, which
 # would make configure fail if this is the last instruction.
 $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:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
 fi

Mercurial > hg > xemacs-beta

comparison configure @ 4669:2c1fa63dddbc