xemacs-beta: configure comparison

comparison configure @ 5495:1f0b15040456

Merge.

author	Aidan Kehoe <kehoea@parhasard.net>
date	Sun, 01 May 2011 18:44:03 +0100
parents	861f2601a38b f5a0b32f4687
children	a142ad1a9140

comparison

equal deleted inserted replaced

-:861f2601a38b
+:1f0b15040456
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for XEmacs 21.5.
+# Generated by GNU Autoconf 2.68 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, 2009 Free Software Foundation,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Inc.
+# Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
 #
 # in the this directory.  You must have autoconf version 2.59.
 #
 # This file is part of XEmacs.
 #
-# XEmacs is free software; you can redistribute it and/or modify it
+# XEmacs is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
+# under the terms of the GNU General Public License as published by the
-# the Free Software Foundation; either version 2, or (at your
+# Free Software Foundation, either version 3 of the License, or (at your
 # option) any later version.
 #
-# XEmacs is distributed in the hope that it will be useful, but
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
-# WITHOUT ANY WARRANTY; without even the implied warranty of
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# General Public License for more details.
+# for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING.  If not, write to the Free
+# along with XEmacs.  If not, see <http://www.gnu.org/licenses/>.
-# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
 #
 # For usage, run `./configure --help'
 # For more detailed information on building and installing XEmacs,
 # read the file `INSTALL'.
 #
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
 IFS=" ""	$as_nl"
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
 *[\\/]* ) as_myself=$0 ;;
 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
 if test "x$CONFIG_SHELL" != x; then :
 # We cannot yet assume a decent shell, so we have to provide a
 	# neutralization value for shells without unset; and this also
 	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
 	BASH_ENV=/dev/null
 	ENV=/dev/null
 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 if test x$as_have_required = xno; then :
 $as_echo "$0: This script requires a shell more modern than all"
 $as_echo "$0: the shells that I found on your system."
 	  }
 	  s/.*/./; q'`
 test -d "$as_dir" && break
 done
 test -z "$as_dirs" || eval "mkdir $as_dirs"
-} || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+} || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 } # as_fn_mkdir_p
 # as_fn_append VAR VALUE
 # ----------------------
 as_val=`expr "$@" || test $? -eq 1`
 }
 fi # as_fn_arith
-# as_fn_error ERROR [LINENO LOG_FD]
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ---------------------------------
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-as_status=$?; test $as_status -eq 0 && as_status=1
+as_status=$1; test $as_status -eq 0 && as_status=1
-if test "$3"; then
+if test "$4"; then
-as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-$as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+$as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
 fi
-$as_echo "$as_me: error: $1" >&2
+$as_echo "$as_me: error: $2" >&2
 as_fn_exit $as_status
 } # as_fn_error
 if expr a : '\(a\)' >/dev/null 2>&1 &&
 test "X`expr 00001 : '.*\(...\)'`" = X001; then
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 #
 # Initializations.
 with_bignum
 enable_workshop
 with_workshop
 enable_sparcworks
 with_sparcworks
-enable_infodock
-with_infodock
 enable_debug
 with_debug
 enable_error_checking
 with_error_checking
 enable_assertions
 ac_prev=
 continue
 fi
 case $ac_option in
-*=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+*=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-*)	ac_optarg=yes ;;
+*=)   ac_optarg= ;;
+*)    ac_optarg=yes ;;
 esac
 # Accept the important Cygnus configure options, so we can diagnose typos.
 case $ac_dashdash$ac_option in
 -disable-* | --disable-*)
 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
 # Reject names that are not valid shell variable names.
 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-as_fn_error "invalid feature name: $ac_useropt"
+as_fn_error $? "invalid feature name: $ac_useropt"
 ac_useropt_orig=$ac_useropt
 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 case $ac_user_opts in
 *"
 "enable_$ac_useropt"
 -enable-* | --enable-*)
 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
 # Reject names that are not valid shell variable names.
 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-as_fn_error "invalid feature name: $ac_useropt"
+as_fn_error $? "invalid feature name: $ac_useropt"
 ac_useropt_orig=$ac_useropt
 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 case $ac_user_opts in
 *"
 "enable_$ac_useropt"
 -with-* | --with-*)
 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
 # Reject names that are not valid shell variable names.
 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-as_fn_error "invalid package name: $ac_useropt"
+as_fn_error $? "invalid package name: $ac_useropt"
 ac_useropt_orig=$ac_useropt
 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 case $ac_user_opts in
 *"
 "with_$ac_useropt"
 -without-* | --without-*)
 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
 # Reject names that are not valid shell variable names.
 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-as_fn_error "invalid package name: $ac_useropt"
+as_fn_error $? "invalid package name: $ac_useropt"
 ac_useropt_orig=$ac_useropt
 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 case $ac_user_opts in
 *"
 "with_$ac_useropt"
 ac_prev=x_libraries ;;
 -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
 x_libraries=$ac_optarg ;;
--*) as_fn_error "unrecognized option: \`$ac_option'
+-*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+Try \`$0 --help' for more information"
 ;;
 *=*)
 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
 # Reject names that are not valid shell variable names.
 case $ac_envvar in #(
 '' | [0-9]* | *[!_$as_cr_alnum]* )
-as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
 esac
 eval $ac_envvar=\$ac_optarg
 export $ac_envvar ;;
 *)
 # FIXME: should be removed in autoconf 3.0.
 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+: "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
 ;;
 esac
 done
 if test -n "$ac_prev"; then
 ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-as_fn_error "missing argument to $ac_option"
+as_fn_error $? "missing argument to $ac_option"
 fi
 if test -n "$ac_unrecognized_opts"; then
 case $enable_option_checking in
 no) ;;
-fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
 *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
 esac
 fi
 # Check all directory arguments for consistency.
 # Be sure to have absolute directory names.
 case $ac_val in
 [\\/$]* | ?:[\\/]* )  continue;;
 NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
 esac
-as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 # There might be people who depend on the old broken behavior: `$host'
 # used to hold the argument of --host etc.
 # FIXME: To remove some day.
 # FIXME: To remove some day.
 if test "x$host_alias" != x; then
 if test "x$build_alias" = x; then
 cross_compiling=maybe
-$as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+$as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-If a cross compiler is detected then cross compile mode will be used." >&2
+If a cross compiler is detected then cross compile mode will be used" >&2
 elif test "x$build_alias" != "x$host_alias"; then
 cross_compiling=yes
 fi
 fi
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-as_fn_error "working directory cannot be determined"
+as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-as_fn_error "pwd does not report name of working directory"
+as_fn_error $? "pwd does not report name of working directory"
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
 ac_srcdir_defaulted=yes
 else
 ac_srcdir_defaulted=no
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
 srcdir=.
 fi
 Configuration:
 -h, --help              display this help and exit
 --help=short        display options specific to this package
 --help=recursive    display the short help of all the included packages
 -V, --version           display version information and exit
--q, --quiet, --silent   do not print \`checking...' messages
+-q, --quiet, --silent   do not print \`checking ...' messages
 --cache-file=FILE   cache test results in FILE [disabled]
 -C, --config-cache      alias for \`--cache-file=config.cache'
 -n, --no-create         do not create output files
 --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 -------------------------
 --with-workshop         Support the Sun WorkShop (formerly Sparcworks)
 development environment.
 --with-sparcworks       Alias for --with-workshop
---with-infodock         Support the Infodock version of XEmacs. Infodock is
-a SourceForge project).
 Debugging options
 -----------------
 --with-debug            Enable additional debugging information. No
 --with-memory-usage-stats
 Enable LISP memory usage API.
 --with-quick-build      Speed up the build cycle by leaving out steps where
 XEmacs will still work (more or less) without them.
 Potentially dangerous if you don't know what you're
-doing. This (1) doesn't garbage-collect after
+doing. This (1) Doesn't garbage-collect after
-loading each file during dumping, (2) doesn't
+loading each file during dumping, (2) Doesn't
 automatically rebuild the DOC file (remove it by
 hand to get it rebuilt), (3) Removes config.h,
 lisp.h and associated files from the dependency
 lists, so changes to these files don't automatically
-cause all .c files to be rebuilt.
+cause all .c files to be rebuilt, (4) Doesn't check
+for Lisp shadows.
 --with-union-type       Use union definition of Lisp_Object type. Known to
 trigger bugs in some compilers.
 --with-quantify         Support performance debugging using Quantify.
 --with-purify           Support memory debugging using Purify.
 --with-valgrind         Support memory debugging using Valgrind.
 nonstandard directory <lib dir>
 LIBS        libraries to pass to the linker, e.g. -l<library>
 CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
 you have headers in a nonstandard directory <include dir>
 CPP         C preprocessor
-YACC        The `Yet Another C Compiler' implementation to use. Defaults to
+YACC        The `Yet Another Compiler Compiler' implementation to use.
-the first program found out of: `bison -y', `byacc', `yacc'.
+Defaults to the first program found out of: `bison -y', `byacc',
+`yacc'.
 YFLAGS      The list of arguments that will be passed by default to $YACC.
 This script will default YFLAGS to the empty string to avoid a
 default value of `-d' given by some make applications.
 XMKMF       Path to xmkmf, Makefile generator for X Window System
 CXX         C++ compiler command
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
 XEmacs configure 21.5
-generated by GNU Autoconf 2.65
+generated by GNU Autoconf 2.68
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 Configuration script for XEmacs.  Largely divergent from FSF.
 Guess values for system-dependent variables and create Makefiles.
 in the this directory.  You must have autoconf version 2.59.
 This file is part of XEmacs.
-XEmacs is free software; you can redistribute it and/or modify it
+XEmacs is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by
+under the terms of the GNU General Public License as published by the
-the Free Software Foundation; either version 2, or (at your
+Free Software Foundation, either version 3 of the License, or (at your
 option) any later version.
-XEmacs is distributed in the hope that it will be useful, but
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
-WITHOUT ANY WARRANTY; without even the implied warranty of
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-General Public License for more details.
+for more details.
 You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING.  If not, write to the Free
+along with XEmacs.  If not, see <http://www.gnu.org/licenses/>.
-Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
 For usage, run `./configure --help'
 For more detailed information on building and installing XEmacs,
 read the file `INSTALL'.
 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_retval=1
 fi
-eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 } # ac_fn_c_try_compile
 # ac_fn_c_try_cpp LINENO
 grep -v '^ *+' conftest.err >conftest.er1
 cat conftest.er1 >&5
 mv -f conftest.er1 conftest.err
 fi
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-test $ac_status = 0; } >/dev/null && {
+test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
 }; then :
 ac_retval=0
 else
 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 ac_retval=1
 fi
-eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 } # ac_fn_c_try_cpp
 # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
 # the include files in INCLUDES and setting the cache variable VAR
 # accordingly.
 ac_fn_c_check_header_mongrel ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
 $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 if ac_fn_c_try_cpp "$LINENO"; then :
 ac_header_preproc=yes
 else
 ac_header_preproc=no
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
 $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( cat <<\_ASBOX
+( $as_echo "## ------------------------------------- ##
-## ------------------------------------- ##
 ## Report this to xemacs-beta@xemacs.org ##
-## ------------------------------------- ##
+## ------------------------------------- ##"
-_ASBOX
 ) | sed "s/^/$as_me: WARNING:     /" >&2
 ;;
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 eval "$3=\$ac_header_compiler"
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 } # ac_fn_c_check_header_mongrel
 # ac_fn_c_try_run LINENO
 # ----------------------
 sed 's/^/| /' conftest.$ac_ext >&5
 ac_retval=$ac_status
 fi
 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 } # ac_fn_c_try_run
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 ac_fn_c_check_header_compile ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 } # ac_fn_c_check_header_compile
 # ac_fn_c_try_link LINENO
 # -----------------------
 # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
 # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
 # interfere with the next link command; also delete a directory that is
 # left behind by Apple's compiler.  We do this before executing the actions.
 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 } # ac_fn_c_try_link
 # ac_fn_c_check_func LINENO FUNC VAR
 ac_fn_c_check_func ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
 conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 } # ac_fn_c_check_func
-# ac_fn_c_check_decl LINENO SYMBOL VAR
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ------------------------------------
+# ---------------------------------------------
-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
 ac_fn_c_check_decl ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
+as_decl_name=`echo $2|sed 's/ *(.*//'`
-$as_echo_n "checking whether $2 is declared... " >&6; }
+as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
 main ()
 {
-#ifndef $2
+#ifndef $as_decl_name
-(void) $2;
+#ifdef __cplusplus
+(void) $as_decl_use;
+#else
+(void) $as_decl_name;
+#endif
 #endif
 ;
 return 0;
 }
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 } # ac_fn_c_check_decl
 # ac_fn_c_check_type LINENO TYPE VAR INCLUDES
 # -------------------------------------------
 ac_fn_c_check_type ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 eval "$3=no"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 } # ac_fn_c_check_type
 # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
 # ----------------------------------------------------
 ac_fn_c_check_member ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 $as_echo_n "checking for $2.$3... " >&6; }
-if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$4+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$4
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 } # ac_fn_c_check_member
 # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
 # --------------------------------------------
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 conftest.$ac_objext conftest.beam conftest.$ac_ext
 rm -f conftest.val
 fi
-eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 } # ac_fn_c_compute_int
 # ac_fn_cxx_try_compile LINENO
 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_retval=1
 fi
-eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 } # ac_fn_cxx_try_compile
 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.65.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 $ $0 $@
 _ACEOF
 exec 5>>config.log
 trap 'exit_status=$?
 # Save into config.log some information that might help in debugging.
 {
 echo
-cat <<\_ASBOX
+$as_echo "## ---------------- ##
-## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
+## ---------------- ##"
-_ASBOX
 echo
 # The following way of writing the cache mishandles newlines in values,
 (
 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
 esac |
 sort
 )
 echo
-cat <<\_ASBOX
+$as_echo "## ----------------- ##
-## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
+## ----------------- ##"
-_ASBOX
 echo
 for ac_var in $ac_subst_vars
 do
 eval ac_val=\$$ac_var
 case $ac_val in
 $as_echo "$ac_var='\''$ac_val'\''"
 done | sort
 echo
 if test -n "$ac_subst_files"; then
-cat <<\_ASBOX
+$as_echo "## ------------------- ##
-## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
+## ------------------- ##"
-_ASBOX
 echo
 for ac_var in $ac_subst_files
 do
 	eval ac_val=\$$ac_var
 	case $ac_val in
 done | sort
 echo
 fi
 if test -s confdefs.h; then
-cat <<\_ASBOX
+$as_echo "## ----------- ##
-## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
+## ----------- ##"
-_ASBOX
 echo
 cat confdefs.h
 echo
 fi
 test "$ac_signal" != 0 &&
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-ac_site_file1=$CONFIG_SITE
+# We do not want a PATH search for config.site.
+case $CONFIG_SITE in #((
+-*)  ac_site_file1=./$CONFIG_SITE;;
+*/*) ac_site_file1=$CONFIG_SITE;;
+*)   ac_site_file1=./$CONFIG_SITE;;
+esac
 elif test "x$prefix" != xNONE; then
 ac_site_file1=$prefix/share/config.site
 ac_site_file2=$prefix/etc/config.site
 else
 ac_site_file1=$ac_default_prefix/share/config.site
 test "x$ac_site_file" = xNONE && continue
 if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
 sed 's/^/| /' "$ac_site_file" >&5
-. "$ac_site_file"
+. "$ac_site_file" \
+|| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 done
 if test -r "$cache_file"; then
 # Some versions of bash will fail to source /dev/null (special files
 if $ac_cache_corrupted; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 { $as_echo "$as_me:${as_lineno-$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_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
 ## -------------------- ##
 if test "${with_sparcworks+set}" = set; then
 enableval="$with_sparcworks"
 withval="$with_sparcworks"
 fi;
-# If --with-infodock or --without-infodock were given then copy the value to the
-# equivalent enable_infodock variable.
-if test "${with_infodock+set}" = set; then
-enable_infodock="$with_infodock"
-fi;
-# If -enable-infodock or --disable-infodock were given then copy the value to the
-# equivalent with_infodock variable.
-if test "${enable_infodock+set}" = set; then
-with_infodock="$enable_infodock"
-fi;
-# Check whether --with-infodock or --without-infodock was given.
-if test "${with_infodock+set}" = set; then
-enableval="$with_infodock"
-withval="$with_infodock"
-fi;
 # If --with-debug or --without-debug were given then copy the value to the
 # equivalent enable_debug variable.
 if test "${with_debug+set}" = set; then
 enable_debug="$with_debug"
 $as_echo "#define LISPDIR_USER_DEFINED 1" >>confdefs.h
 $as_echo "#define ETCDIR_USER_DEFINED 1" >>confdefs.h
+$as_echo "#define LATE_PACKAGE_DIRECTORIES_USER_DEFINED 1" >>confdefs.h
 fi
 if test "x$libdir" != "x\${exec_prefix}/lib"
 then
 $as_echo "#define MODULEDIR_USER_DEFINED 1" >>confdefs.h
 with_sitelispdir='${datadir}/${inststaticdir}/site-lisp'
 inststaticdir='${PROGNAME}'
 instvardir='${PROGNAME}-${version}'
 sitemoduledir='${libdir}/${inststaticdir}/site-modules'
+with_late_packages='${datadir}/${PROGNAME}'
 statedir=$with_statedir
 vpath %.in $(srcdir)'
 fi
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-for ac_t in install-sh install.sh shtool; do
+if test -f "$ac_dir/install-sh"; then
-if test -f "$ac_dir/$ac_t"; then
+ac_aux_dir=$ac_dir
-ac_aux_dir=$ac_dir
+ac_install_sh="$ac_aux_dir/install-sh -c"
-ac_install_sh="$ac_aux_dir/$ac_t -c"
+break
-break 2
+elif test -f "$ac_dir/install.sh"; then
-fi
+ac_aux_dir=$ac_dir
-done
+ac_install_sh="$ac_aux_dir/install.sh -c"
+break
+elif test -f "$ac_dir/shtool"; then
+ac_aux_dir=$ac_dir
+ac_install_sh="$ac_aux_dir/shtool install -c"
+break
+fi
 done
 if test -z "$ac_aux_dir"; then
-as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 # These three variables are undocumented and unsupported,
 # and are intended to be withdrawn in a future Autoconf release.
 # They can cause serious problems if a builder's source tree is in a directory
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
 set x $ac_cv_build
 shift
 cat >>confdefs.h <<_ACEOF
 #define EMACS_VERSION "$version"
 _ACEOF
-if test "$with_infodock" = "yes"; then
+PROGNAME=xemacs
-if test ! -f ../../ID-INSTALL; then
+SHEBANG_PROGNAME=xemacs-script
-echo "Cannot build InfoDock without InfoDock sources"
-with_infodock=no
-fi
-fi
-if test "$with_infodock" = "yes"; then
-cat >>confdefs.h <<_ACEOF
-#define INFODOCK_MAJOR_VERSION $infodock_major_version
-_ACEOF
-cat >>confdefs.h <<_ACEOF
-#define INFODOCK_MINOR_VERSION $infodock_minor_version
-_ACEOF
-cat >>confdefs.h <<_ACEOF
-#define INFODOCK_BUILD_VERSION $infodock_build_version
-_ACEOF
-version=${infodock_major_version}.${infodock_minor_version}.${infodock_build_version}
-PROGNAME=infodock
-SHEBANG_PROGNAME=infodock-script
-CPPFLAGS="$CPPFLAGS -DINFODOCK"
-else
-PROGNAME=xemacs
-SHEBANG_PROGNAME=xemacs-script
-fi
 cat >>confdefs.h <<_ACEOF
 #define EMACS_PROGNAME "$PROGNAME"
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 ac_ct_CC=$CC
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_CC"; then
 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 if test -z "$CC"; then
 # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 do
 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_CC"; then
 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
+as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
+as_fn_error 77 "C compiler cannot create executables
-as_fn_error "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
-See \`config.log' for more details." "$LINENO" 5; }; }
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 esac
 done
 else
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
 else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
+as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
 $as_echo "$cross_compiling" >&6; }
 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
+as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
 $as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_save_c_werror_flag=$ac_c_werror_flag
 ac_c_werror_flag=yes
 ac_cv_prog_cc_g=no
 CFLAGS=
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
 CPP=
 fi
 if test -z "$CPP"; then
-if test "${ac_cv_prog_CPP+set}" = set; then :
+if ${ac_cv_prog_CPP+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 # Double quotes because CPP needs to be expanded
 for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
 do
 else
 # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 # OK, works on sane cases.  Now check whether nonexistent headers
 # can be detected and how.
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 else
 # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 break
 fi
 done
 else
 # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 # OK, works on sane cases.  Now check whether nonexistent headers
 # can be detected and how.
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 else
 # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 else
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 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'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -z "$GREP"; then
 ac_path_GREP_found=false
 # Loop through the user's path and test for each of PROGNAME-LIST
 done
 done
 done
 IFS=$as_save_IFS
 if test -z "$ac_cv_path_GREP"; then
-as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
 fi
 else
 ac_cv_path_GREP=$GREP
 fi
 GREP="$ac_cv_path_GREP"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
 then ac_cv_path_EGREP="$GREP -E"
 else
 done
 done
 done
 IFS=$as_save_IFS
 if test -z "$ac_cv_path_EGREP"; then
-as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
 fi
 else
 ac_cv_path_EGREP=$EGREP
 fi
 EGREP="$ac_cv_path_EGREP"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 		  inttypes.h stdint.h unistd.h
 do :
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-eval as_val=\$$as_ac_Header
+if eval test \"x\$"$as_ac_Header"\" = x"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
 done
 ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = x""yes; then :
+if test "x$ac_cv_header_minix_config_h" = xyes; then :
 MINIX=yes
 else
 MINIX=
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
+if ${ac_cv_safe_to_define___extensions__+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 ac_ct_CC=$CC
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_CC"; then
 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 if test -z "$CC"; then
 # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 do
 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_CC"; then
 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
+as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 test $ac_status = 0; }
 done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_save_c_werror_flag=$ac_c_werror_flag
 ac_c_werror_flag=yes
 ac_cv_prog_cc_g=no
 CFLAGS=
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 ac_ct_CC=$CC
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_CC"; then
 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 if test -z "$CC"; then
 # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 do
 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_CC"; then
 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
+as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 test $ac_status = 0; }
 done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_save_c_werror_flag=$ac_c_werror_flag
 ac_c_werror_flag=yes
 ac_cv_prog_cc_g=no
 CFLAGS=
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 ac_ct_CC=$CC
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_CC"; then
 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 if test -z "$CC"; then
 # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 do
 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_CC"; then
 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
+as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 test $ac_status = 0; }
 done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_save_c_werror_flag=$ac_c_werror_flag
 ac_c_werror_flag=yes
 ac_cv_prog_cc_g=no
 CFLAGS=
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 if test "$GCC" = "yes"; then
 if test "$cross_compiling" = yes; then :
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
+as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main () {
 return __GNUC__;
 fi
 if test "$cross_compiling" = yes; then :
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
+as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main () {
 return __GNUC_MINOR__;
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
 CPP=
 fi
 if test -z "$CPP"; then
-if test "${ac_cv_prog_CPP+set}" = set; then :
+if ${ac_cv_prog_CPP+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 # Double quotes because CPP needs to be expanded
 for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
 do
 else
 # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 # OK, works on sane cases.  Now check whether nonexistent headers
 # can be detected and how.
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 else
 # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 break
 fi
 done
 else
 # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 # OK, works on sane cases.  Now check whether nonexistent headers
 # can be detected and how.
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 else
 # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 else
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 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:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
+as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main () {
 #if defined __SUNPRO_C
 $as_echo "yes" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Don't use -O2 with gcc 2.8.1 and egcs 1.0 under SPARC architectures" >&5
 $as_echo "$as_me: WARNING: Don't use -O2 with gcc 2.8.1 and egcs 1.0 under SPARC architectures" >&2;}
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: without also using -fno-schedule-insns." >&5
 $as_echo "$as_me: WARNING: without also using -fno-schedule-insns." >&2;}
-as_fn_error "Aborting due to known problem" "$LINENO" 5
+as_fn_error $? "Aborting due to known problem" "$LINENO" 5
 ;;
 esac
 ;;
 esac
 ;;
 $as_echo "yes" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: There have been reports of egcs-1.1 not compiling XEmacs correctly on" >&5
 $as_echo "$as_me: WARNING: There have been reports of egcs-1.1 not compiling XEmacs correctly on" >&2;}
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Alpha Linux.  There have also been reports that egcs-1.0.3a is O.K." >&5
 $as_echo "$as_me: WARNING: Alpha Linux.  There have also been reports that egcs-1.0.3a is O.K." >&2;}
-as_fn_error "Aborting due to known problem" "$LINENO" 5
+as_fn_error $? "Aborting due to known problem" "$LINENO" 5
 ;;
 *:i*86*:2.7.2*)
 	case "$CFLAGS" in
 *-O2*|*-O3*)
 		case "$GCC_VERSION" in
 $as_echo "yes" >&6; }
 	        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using" >&5
 $as_echo "$as_me: WARNING: Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using" >&2;}
 	                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: -fno-strength-reduce." >&5
 $as_echo "$as_me: WARNING: -fno-strength-reduce." >&2;}
-	                as_fn_error "Aborting due to known problem" "$LINENO" 5
+	                as_fn_error $? "Aborting due to known problem" "$LINENO" 5
 	                        ;;
 	                esac
 	                ;;
 		esac
 	        case "$CFLAGS" in
 $as_echo "yes" >&6; }
 		    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using" >&5
 $as_echo "$as_me: WARNING: Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using" >&2;}
 		    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: -fno-caller-saves." >&5
 $as_echo "$as_me: WARNING: -fno-caller-saves." >&2;}
-	            as_fn_error "Aborting due to known problem" "$LINENO" 5
+	            as_fn_error $? "Aborting due to known problem" "$LINENO" 5
 		    ;;
 	        esac
 		;;
 	esac
 	;;
 for f in "/usr/lpp/X11/bin/smt.exp" "/usr/bin/X11/smt.exp"; do
 if test -r "$f"; then start_flags="${start_flags},-bI:${f}"; break; fi
 done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for terminateAndUnload in -lc" >&5
 $as_echo_n "checking for terminateAndUnload in -lc... " >&6; }
-if test "${ac_cv_lib_c_terminateAndUnload+set}" = set; then :
+if ${ac_cv_lib_c_terminateAndUnload+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_terminateAndUnload" >&5
 $as_echo "$ac_cv_lib_c_terminateAndUnload" >&6; }
-if test "x$ac_cv_lib_c_terminateAndUnload" = x""yes; then :
+if test "x$ac_cv_lib_c_terminateAndUnload" = xyes; then :
 libs_system="$libs_system -lC" &&  if test "$verbose" = "yes"; then echo "    Appending \"-lC\" to \$libs_system"; fi
 fi
 fi
 elif test -n "$ld_text_start_addr"; then
 else
 	doug_lea_malloc=no
 fi
 after_morecore_hook_exists=yes
 ac_fn_c_check_func "$LINENO" "malloc_set_state" "ac_cv_func_malloc_set_state"
-if test "x$ac_cv_func_malloc_set_state" = x""yes; then :
+if test "x$ac_cv_func_malloc_set_state" = xyes; then :
 else
 doug_lea_malloc=no
 fi
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
+if ${ac_cv_prog_AR+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$AR"; then
 ac_cv_prog_AR="$AR" # Let the user override the test.
 else
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$RANLIB"; then
 ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
 ac_ct_RANLIB=$RANLIB
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_RANLIB"; then
 ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_YACC+set}" = set; then :
+if ${ac_cv_prog_YACC+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$YACC"; then
 ac_cv_prog_YACC="$YACC" # Let the user override the test.
 else
 for ac_header in   a.out.h   elf.h   cygwin/version.h   fcntl.h   libgen.h   locale.h   wchar.h   mach/mach.h   sys/param.h   sys/pstat.h   sys/resource.h   sys/time.h   sys/timeb.h   sys/times.h   sys/un.h   sys/vlimit.h   ulimit.h
 do :
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
+if eval test \"x\$"$as_ac_Header"\" = x"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
 done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
 $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
-if test "${ac_cv_header_sys_wait_h+set}" = set; then :
+if ${ac_cv_header_sys_wait_h+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
 $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if test "${ac_cv_header_time+set}" = set; then :
+if ${ac_cv_header_time+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 "
-if test "x$ac_cv_have_decl_sys_siglist" = x""yes; then :
+if test "x$ac_cv_have_decl_sys_siglist" = xyes; then :
 ac_have_decl=1
 else
 ac_have_decl=0
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 for ac_func in utimes
 do :
 ac_fn_c_check_func "$LINENO" "utimes" "ac_cv_func_utimes"
-if test "x$ac_cv_func_utimes" = x""yes; then :
+if test "x$ac_cv_func_utimes" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_UTIMES 1
 _ACEOF
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
 $as_echo_n "checking return type of signal handlers... " >&6; }
-if test "${ac_cv_type_signal+set}" = set; then :
+if ${ac_cv_type_signal+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #define RETSIGTYPE $ac_cv_type_signal
 _ACEOF
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = x""yes; then :
+if test "x$ac_cv_type_size_t" = xyes; then :
 else
 cat >>confdefs.h <<_ACEOF
 #define size_t unsigned int
 _ACEOF
 fi
 ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = x""yes; then :
+if test "x$ac_cv_type_pid_t" = xyes; then :
 else
 cat >>confdefs.h <<_ACEOF
 #define pid_t int
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
 $as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-if test "${ac_cv_type_uid_t+set}" = set; then :
+if ${ac_cv_type_uid_t+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 $as_echo "#define gid_t int" >>confdefs.h
 fi
 ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-if test "x$ac_cv_type_mode_t" = x""yes; then :
+if test "x$ac_cv_type_mode_t" = xyes; then :
 else
 cat >>confdefs.h <<_ACEOF
 #define mode_t int
 _ACEOF
 fi
 ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-if test "x$ac_cv_type_off_t" = x""yes; then :
+if test "x$ac_cv_type_off_t" = xyes; then :
 else
 cat >>confdefs.h <<_ACEOF
 #define off_t long int
 _ACEOF
 fi
 ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
-if test "x$ac_cv_type_ssize_t" = x""yes; then :
+if test "x$ac_cv_type_ssize_t" = xyes; then :
 else
 cat >>confdefs.h <<_ACEOF
 #define ssize_t int
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
 $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if test "${ac_cv_struct_tm+set}" = set; then :
+if ${ac_cv_struct_tm+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include <sys/types.h>
 #include <$ac_cv_struct_tm>
 "
-if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then :
+if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_TM_TM_ZONE 1
 _ACEOF
 $as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h
 else
 ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
 "
-if test "x$ac_cv_have_decl_tzname" = x""yes; then :
+if test "x$ac_cv_have_decl_tzname" = xyes; then :
 ac_have_decl=1
 else
 ac_have_decl=0
 fi
 #define HAVE_DECL_TZNAME $ac_have_decl
 _ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
 $as_echo_n "checking for tzname... " >&6; }
-if test "${ac_cv_var_tzname+set}" = set; then :
+if ${ac_cv_var_tzname+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if test "${ac_cv_c_const+set}" = set; then :
+if ${ac_cv_c_const+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
 *@@@%%%=?*=@@@%%%*)
 eval ac_cv_prog_make_${ac_make}_set=yes;;
 *)
 eval ac_cv_prog_make_${ac_make}_set=no;;
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then :
+if ${ac_cv_c_bigendian+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_cv_c_bigendian=unknown
 # See if we're dealing with a universal compiler.
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 ;; #(
 *)
-as_fn_error "unknown endianness
+as_fn_error $? "unknown endianness
 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
 esac
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
 $as_echo_n "checking size of short... " >&6; }
-if test "${ac_cv_sizeof_short+set}" = set; then :
+if ${ac_cv_sizeof_short+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
 else
 if test "$ac_cv_type_short" = yes; then
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
+as_fn_error 77 "cannot compute sizeof (short)
-as_fn_error "cannot compute sizeof (short)
+See \`config.log' for more details" "$LINENO" 5; }
-See \`config.log' for more details." "$LINENO" 5; }; }
 else
 ac_cv_sizeof_short=0
 fi
 fi
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
 $as_echo_n "checking size of int... " >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then :
+if ${ac_cv_sizeof_int+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
 else
 if test "$ac_cv_type_int" = yes; then
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
+as_fn_error 77 "cannot compute sizeof (int)
-as_fn_error "cannot compute sizeof (int)
+See \`config.log' for more details" "$LINENO" 5; }
-See \`config.log' for more details." "$LINENO" 5; }; }
 else
 ac_cv_sizeof_int=0
 fi
 fi
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
 $as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then :
+if ${ac_cv_sizeof_long+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
 else
 if test "$ac_cv_type_long" = yes; then
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
+as_fn_error 77 "cannot compute sizeof (long)
-as_fn_error "cannot compute sizeof (long)
+See \`config.log' for more details" "$LINENO" 5; }
-See \`config.log' for more details." "$LINENO" 5; }; }
 else
 ac_cv_sizeof_long=0
 fi
 fi
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
 $as_echo_n "checking size of long long... " >&6; }
-if test "${ac_cv_sizeof_long_long+set}" = set; then :
+if ${ac_cv_sizeof_long_long+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
 else
 if test "$ac_cv_type_long_long" = yes; then
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
+as_fn_error 77 "cannot compute sizeof (long long)
-as_fn_error "cannot compute sizeof (long long)
+See \`config.log' for more details" "$LINENO" 5; }
-See \`config.log' for more details." "$LINENO" 5; }; }
 else
 ac_cv_sizeof_long_long=0
 fi
 fi
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
 $as_echo_n "checking size of void *... " >&6; }
-if test "${ac_cv_sizeof_void_p+set}" = set; then :
+if ${ac_cv_sizeof_void_p+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
 else
 if test "$ac_cv_type_void_p" = yes; then
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
+as_fn_error 77 "cannot compute sizeof (void *)
-as_fn_error "cannot compute sizeof (void *)
+See \`config.log' for more details" "$LINENO" 5; }
-See \`config.log' for more details." "$LINENO" 5; }; }
 else
 ac_cv_sizeof_void_p=0
 fi
 fi
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5
 $as_echo_n "checking size of double... " >&6; }
-if test "${ac_cv_sizeof_double+set}" = set; then :
+if ${ac_cv_sizeof_double+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double"        "$ac_includes_default"; then :
 else
 if test "$ac_cv_type_double" = yes; then
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
+as_fn_error 77 "cannot compute sizeof (double)
-as_fn_error "cannot compute sizeof (double)
+See \`config.log' for more details" "$LINENO" 5; }
-See \`config.log' for more details." "$LINENO" 5; }; }
 else
 ac_cv_sizeof_double=0
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5
 $as_echo_n "checking for long file names... " >&6; }
-if test "${ac_cv_sys_long_file_names+set}" = set; then :
+if ${ac_cv_sys_long_file_names+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_cv_sys_long_file_names=yes
 # Test for long file names in all the places we know might matter:
 #      .		the current directory, where building will happen
 fi
 ac_fn_c_check_func "$LINENO" "sin" "ac_cv_func_sin"
-if test "x$ac_cv_func_sin" = x""yes; then :
+if test "x$ac_cv_func_sin" = xyes; then :
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
 $as_echo_n "checking for sin in -lm... " >&6; }
-if test "${ac_cv_lib_m_sin+set}" = set; then :
+if ${ac_cv_lib_m_sin+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5
 $as_echo "$ac_cv_lib_m_sin" >&6; }
-if test "x$ac_cv_lib_m_sin" = x""yes; then :
+if test "x$ac_cv_lib_m_sin" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
 _ACEOF
 LIBS="-lm $LIBS"
 conftest$ac_exeext conftest.$ac_ext
 for ac_func in mkstemp
 do :
 ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp"
-if test "x$ac_cv_func_mkstemp" = x""yes; then :
+if test "x$ac_cv_func_mkstemp" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_MKSTEMP 1
 _ACEOF
 fi
 $as_echo "" >&6; }
 for ac_func in lockf flock
 do :
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
+if eval test \"x\$"$as_ac_var"\" = x"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:${as_lineno-$LINENO}: result: ${GTK_CFLAGS}" >&5
 $as_echo "${GTK_CFLAGS}" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgdk_imlib" >&5
 $as_echo_n "checking for main in -lgdk_imlib... " >&6; }
-if test "${ac_cv_lib_gdk_imlib_main+set}" = set; then :
+if ${ac_cv_lib_gdk_imlib_main+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgdk_imlib  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdk_imlib_main" >&5
 $as_echo "$ac_cv_lib_gdk_imlib_main" >&6; }
-if test "x$ac_cv_lib_gdk_imlib_main" = x""yes; then :
+if test "x$ac_cv_lib_gdk_imlib_main" = xyes; then :
 libs_gtk="-lgdk_imlib $libs_gtk" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lgdk_imlib\" to \$libs_gtk"; fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Imlib_init in -lImlib" >&5
 $as_echo_n "checking for Imlib_init in -lImlib... " >&6; }
-if test "${ac_cv_lib_Imlib_Imlib_init+set}" = set; then :
+if ${ac_cv_lib_Imlib_Imlib_init+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lImlib  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Imlib_Imlib_init" >&5
 $as_echo "$ac_cv_lib_Imlib_Imlib_init" >&6; }
-if test "x$ac_cv_lib_Imlib_Imlib_init" = x""yes; then :
+if test "x$ac_cv_lib_Imlib_Imlib_init" = xyes; then :
 libs_gtk="$libs_gtk -lImlib" &&  if test "$verbose" = "yes"; then echo "    Appending \"-lImlib\" to \$libs_gtk"; fi
 fi
 for ac_func in gdk_imlib_init
 do :
 ac_fn_c_check_func "$LINENO" "gdk_imlib_init" "ac_cv_func_gdk_imlib_init"
-if test "x$ac_cv_func_gdk_imlib_init" = x""yes; then :
+if test "x$ac_cv_func_gdk_imlib_init" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_GDK_IMLIB_INIT 1
 _ACEOF
 fi
 LDFLAGS="${LDFLAGS} ${GTK_LIBS}"
 for ac_header in glade/glade.h glade.h
 do :
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
+if eval test \"x\$"$as_ac_Header"\" = x"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
 done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lxml" >&5
 $as_echo_n "checking for main in -lxml... " >&6; }
-if test "${ac_cv_lib_xml_main+set}" = set; then :
+if ${ac_cv_lib_xml_main+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lxml  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml_main" >&5
 $as_echo "$ac_cv_lib_xml_main" >&6; }
-if test "x$ac_cv_lib_xml_main" = x""yes; then :
+if test "x$ac_cv_lib_xml_main" = xyes; then :
 libs_gtk="-lxml $libs_gtk" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lxml\" to \$libs_gtk"; fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lglade" >&5
 $as_echo_n "checking for main in -lglade... " >&6; }
-if test "${ac_cv_lib_glade_main+set}" = set; then :
+if ${ac_cv_lib_glade_main+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lglade  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_glade_main" >&5
 $as_echo "$ac_cv_lib_glade_main" >&6; }
-if test "x$ac_cv_lib_glade_main" = x""yes; then :
+if test "x$ac_cv_lib_glade_main" = xyes; then :
 libs_gtk="-lglade $libs_gtk" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lglade\" to \$libs_gtk"; fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lglade-gnome" >&5
 $as_echo_n "checking for main in -lglade-gnome... " >&6; }
-if test "${ac_cv_lib_glade_gnome_main+set}" = set; then :
+if ${ac_cv_lib_glade_gnome_main+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lglade-gnome  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_glade_gnome_main" >&5
 $as_echo "$ac_cv_lib_glade_gnome_main" >&6; }
-if test "x$ac_cv_lib_glade_gnome_main" = x""yes; then :
+if test "x$ac_cv_lib_glade_gnome_main" = xyes; then :
 libs_gtk="-lglade-gnome $libs_gtk" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lglade-gnome\" to \$libs_gtk"; fi
 fi
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end 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_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
+*\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
-*,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
+*,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 # One or both of the vars are not set, and there is no cached value.
 ac_x_includes=no ac_x_libraries=no
 rm -f -r conftest.dir
 	@echo usrlibdir='${USRLIBDIR}'
 libdir:
 	@echo libdir='${LIBDIR}'
 _ACEOF
 if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 for ac_var in incroot usrlibdir libdir; do
 eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
 done
 # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
 for ac_extension in a so sl dylib la dll; do
 ac_x_includes=$ac_dir
 break
 fi
 done
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 fi # $ac_x_includes = no
 if test "$ac_x_libraries" = no; then
 # Check for the libraries.
 # See if we find them without any special options.
 if ac_fn_c_try_link "$LINENO"; then :
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
+if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 if test $ac_cv_lib_dnet_dnet_ntoa = no; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
+if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 fi
 fi
 # The nsl library prevents programs from opening the X display
 # on Irix 5.2, according to T.E. Dickey.
 # The functions gethostbyname, getservbyname, and inet_addr are
 # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
 ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-if test "x$ac_cv_func_gethostbyname" = x""yes; then :
+if test "x$ac_cv_func_gethostbyname" = xyes; then :
 fi
 if test $ac_cv_func_gethostbyname = no; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
+if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
+if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
 X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 if test $ac_cv_lib_nsl_gethostbyname = no; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
+if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
+if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
 X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi
 fi
 fi
 # on later versions), says Simon Leinen: it contains gethostby*
 # variants that don't use the name server (or something).  -lsocket
 # must be given before -lnsl if both are needed.  We assume that
 # if connect needs -lnsl, so does gethostbyname.
 ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-if test "x$ac_cv_func_connect" = x""yes; then :
+if test "x$ac_cv_func_connect" = xyes; then :
 fi
 if test $ac_cv_func_connect = no; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
 $as_echo_n "checking for connect in -lsocket... " >&6; }
-if test "${ac_cv_lib_socket_connect+set}" = set; then :
+if ${ac_cv_lib_socket_connect+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
 $as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = x""yes; then :
+if test "x$ac_cv_lib_socket_connect" = xyes; then :
 X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi
 fi
 # Guillermo Gomez says -lposix is necessary on A/UX.
 ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
-if test "x$ac_cv_func_remove" = x""yes; then :
+if test "x$ac_cv_func_remove" = xyes; then :
 fi
 if test $ac_cv_func_remove = no; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
 $as_echo_n "checking for remove in -lposix... " >&6; }
-if test "${ac_cv_lib_posix_remove+set}" = set; then :
+if ${ac_cv_lib_posix_remove+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
 $as_echo "$ac_cv_lib_posix_remove" >&6; }
-if test "x$ac_cv_lib_posix_remove" = x""yes; then :
+if test "x$ac_cv_lib_posix_remove" = xyes; then :
 X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
 fi
 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
 ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
-if test "x$ac_cv_func_shmat" = x""yes; then :
+if test "x$ac_cv_func_shmat" = xyes; then :
 fi
 if test $ac_cv_func_shmat = no; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
 $as_echo_n "checking for shmat in -lipc... " >&6; }
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
+if ${ac_cv_lib_ipc_shmat+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
 $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
+if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
 X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 fi
 fi
 # These have to be linked with before -lX11, unlike the other
 # libraries we check for below, so use a different variable.
 # John Interrante, Karl Berry
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
+if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
 X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
 LDFLAGS=$ac_save_LDFLAGS
 MAKE_SUBDIR="$MAKE_SUBDIR lwlib" &&  if test "$verbose" = "yes"; then echo "    Appending \"lwlib\" to \$MAKE_SUBDIR"; fi
 SRC_SUBDIR_DEPS="$SRC_SUBDIR_DEPS lwlib" &&  if test "$verbose" = "yes"; then echo "    Appending \"lwlib\" to \$SRC_SUBDIR_DEPS"; fi
 ac_fn_c_check_header_mongrel "$LINENO" "Xm/Xm.h" "ac_cv_header_Xm_Xm_h" "$ac_includes_default"
-if test "x$ac_cv_header_Xm_Xm_h" = x""yes; then :
+if test "x$ac_cv_header_Xm_Xm_h" = xyes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmStringFree in -lXm" >&5
 $as_echo_n "checking for XmStringFree in -lXm... " >&6; }
-if test "${ac_cv_lib_Xm_XmStringFree+set}" = set; then :
+if ${ac_cv_lib_Xm_XmStringFree+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_XmStringFree" >&5
 $as_echo "$ac_cv_lib_Xm_XmStringFree" >&6; }
-if test "x$ac_cv_lib_Xm_XmStringFree" = x""yes; then :
+if test "x$ac_cv_lib_Xm_XmStringFree" = xyes; then :
 got_motif=yes
 fi
 fi
 esac
 done
 fi
 ac_fn_c_check_header_mongrel "$LINENO" "X11/Intrinsic.h" "ac_cv_header_X11_Intrinsic_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Intrinsic_h" = x""yes; then :
+if test "x$ac_cv_header_X11_Intrinsic_h" = xyes; then :
 else
-as_fn_error "Unable to find X11 header files." "$LINENO" 5
+as_fn_error $? "Unable to find X11 header files." "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5
 $as_echo_n "checking for XOpenDisplay in -lX11... " >&6; }
-if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then :
+if ${ac_cv_lib_X11_XOpenDisplay+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 $as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; }
-if test "x$ac_cv_lib_X11_XOpenDisplay" = x""yes; then :
+if test "x$ac_cv_lib_X11_XOpenDisplay" = xyes; then :
 have_lib_x11=yes
 fi
 if test "$have_lib_x11" != "yes"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XGetFontProperty in -lX11" >&5
 $as_echo_n "checking for XGetFontProperty in -lX11... " >&6; }
-if test "${ac_cv_lib_X11_XGetFontProperty+set}" = set; then :
+if ${ac_cv_lib_X11_XGetFontProperty+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 -b i486-linuxaout $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XGetFontProperty" >&5
 $as_echo "$ac_cv_lib_X11_XGetFontProperty" >&6; }
-if test "x$ac_cv_lib_X11_XGetFontProperty" = x""yes; then :
+if test "x$ac_cv_lib_X11_XGetFontProperty" = xyes; then :
 ld_switch_x_site="-b i486-linuxaout $ld_switch_x_site"
 else
-as_fn_error "Unable to find X11 libraries." "$LINENO" 5
+as_fn_error $? "Unable to find X11 libraries." "$LINENO" 5
 fi
 fi
 libs_x="-lX11"
 test "$verbose" = "yes" && echo "    Setting libs_x to \"-lX11\""
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeSelectInput in -lXext" >&5
 $as_echo_n "checking for XShapeSelectInput in -lXext... " >&6; }
-if test "${ac_cv_lib_Xext_XShapeSelectInput+set}" = set; then :
+if ${ac_cv_lib_Xext_XShapeSelectInput+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeSelectInput" >&5
 $as_echo "$ac_cv_lib_Xext_XShapeSelectInput" >&6; }
-if test "x$ac_cv_lib_Xext_XShapeSelectInput" = x""yes; then :
+if test "x$ac_cv_lib_Xext_XShapeSelectInput" = xyes; then :
 libs_x="-lXext $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lXext\" to \$libs_x"; fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XtOpenDisplay in -lXt" >&5
 $as_echo_n "checking for XtOpenDisplay in -lXt... " >&6; }
-if test "${ac_cv_lib_Xt_XtOpenDisplay+set}" = set; then :
+if ${ac_cv_lib_Xt_XtOpenDisplay+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xt_XtOpenDisplay" >&5
 $as_echo "$ac_cv_lib_Xt_XtOpenDisplay" >&6; }
-if test "x$ac_cv_lib_Xt_XtOpenDisplay" = x""yes; then :
+if test "x$ac_cv_lib_Xt_XtOpenDisplay" = xyes; then :
 libs_x="-lXt $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lXt\" to \$libs_x"; fi
 else
-as_fn_error "Unable to find X11 libraries." "$LINENO" 5
+as_fn_error $? "Unable to find X11 libraries." "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the version of X11 being used" >&5
 $as_echo_n "checking the version of X11 being used... " >&6; }
 for ac_func in XConvertCase XtRegisterDrawable
 do :
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
+if eval test \"x\$"$as_ac_var"\" = x"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
 for ac_header in X11/Xlocale.h X11/Xfuncproto.h
 do :
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
+if eval test \"x\$"$as_ac_Header"\" = x"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
 for ac_func in XRegisterIMInstantiateCallback
 do :
 ac_fn_c_check_func "$LINENO" "XRegisterIMInstantiateCallback" "ac_cv_func_XRegisterIMInstantiateCallback"
-if test "x$ac_cv_func_XRegisterIMInstantiateCallback" = x""yes; then :
+if test "x$ac_cv_func_XRegisterIMInstantiateCallback" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_XREGISTERIMINSTANTIATECALLBACK 1
 _ACEOF
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
 $as_echo_n "checking for XmuReadBitmapDataFromFile in -lXmu... " >&6; }
-if test "${ac_cv_lib_Xmu_XmuReadBitmapDataFromFile+set}" = set; then :
+if ${ac_cv_lib_Xmu_XmuReadBitmapDataFromFile+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXmu  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xmu_XmuReadBitmapDataFromFile" >&5
 $as_echo "$ac_cv_lib_Xmu_XmuReadBitmapDataFromFile" >&6; }
-if test "x$ac_cv_lib_Xmu_XmuReadBitmapDataFromFile" = x""yes; then :
+if test "x$ac_cv_lib_Xmu_XmuReadBitmapDataFromFile" = xyes; then :
 with_xmu=yes
 else
 with_xmu=no
 fi
 if test "$with_xmu" = "no"; then
-as_fn_error "We're sorry, but we thought there were no systems without Xmu by now.
+as_fn_error $? "We're sorry, but we thought there were no systems without Xmu by now.
 You cannot build this version of XEmacs for X11 without Xmu.  Please report
 this to xemacs-beta@xemacs.org.  As a workaround, revert to XEmacs 21.5.29." "$LINENO" 5
 else
 libs_x="-lXmu $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lXmu\" to \$libs_x"; fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXbsd" >&5
 $as_echo_n "checking for main in -lXbsd... " >&6; }
-if test "${ac_cv_lib_Xbsd_main+set}" = set; then :
+if ${ac_cv_lib_Xbsd_main+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXbsd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xbsd_main" >&5
 $as_echo "$ac_cv_lib_Xbsd_main" >&6; }
-if test "x$ac_cv_lib_Xbsd_main" = x""yes; then :
+if test "x$ac_cv_lib_Xbsd_main" = xyes; then :
 libs_x="-lXbsd $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lXbsd\" to \$libs_x"; fi
 fi
 if test "$unexec" = "unexaix.o" -a "$x11_release" = "6"; then
 	xft_includes_found=yes
 else
 for ac_header in freetype/config/ftheader.h
 do :
 ac_fn_c_check_header_mongrel "$LINENO" "freetype/config/ftheader.h" "ac_cv_header_freetype_config_ftheader_h" "$ac_includes_default"
-if test "x$ac_cv_header_freetype_config_ftheader_h" = x""yes; then :
+if test "x$ac_cv_header_freetype_config_ftheader_h" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_FREETYPE_CONFIG_FTHEADER_H 1
 _ACEOF
 xft_includes_found=yes
 else
 	    save_c_switch_site="$c_switch_site"
 	    c_switch_site="$c_switch_site -I${freetype_include_top}"
 	    for ac_header in freetype/config/ftheader.h
 do :
 ac_fn_c_check_header_mongrel "$LINENO" "freetype/config/ftheader.h" "ac_cv_header_freetype_config_ftheader_h" "$ac_includes_default"
-if test "x$ac_cv_header_freetype_config_ftheader_h" = x""yes; then :
+if test "x$ac_cv_header_freetype_config_ftheader_h" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_FREETYPE_CONFIG_FTHEADER_H 1
 _ACEOF
 xft_includes_found=yes
 else
 if test "$xft_includes_found" != "yes"; then
 { echo "Error:" "Unable to find headers for --with-xft" >&2; exit 1; }
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRenderQueryExtension in -lXrender" >&5
 $as_echo_n "checking for XRenderQueryExtension in -lXrender... " >&6; }
-if test "${ac_cv_lib_Xrender_XRenderQueryExtension+set}" = set; then :
+if ${ac_cv_lib_Xrender_XRenderQueryExtension+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXrender  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderQueryExtension" >&5
 $as_echo "$ac_cv_lib_Xrender_XRenderQueryExtension" >&6; }
-if test "x$ac_cv_lib_Xrender_XRenderQueryExtension" = x""yes; then :
+if test "x$ac_cv_lib_Xrender_XRenderQueryExtension" = xyes; then :
 libs_x="-lXrender $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lXrender\" to \$libs_x"; fi
 else
 { echo "Error:" "Unable to find libXrender for --with-xft" >&2; exit 1; }
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FcPatternCreate in -lfontconfig" >&5
 $as_echo_n "checking for FcPatternCreate in -lfontconfig... " >&6; }
-if test "${ac_cv_lib_fontconfig_FcPatternCreate+set}" = set; then :
+if ${ac_cv_lib_fontconfig_FcPatternCreate+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfontconfig  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fontconfig_FcPatternCreate" >&5
 $as_echo "$ac_cv_lib_fontconfig_FcPatternCreate" >&6; }
-if test "x$ac_cv_lib_fontconfig_FcPatternCreate" = x""yes; then :
+if test "x$ac_cv_lib_fontconfig_FcPatternCreate" = xyes; then :
 libs_x="-lfontconfig $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lfontconfig\" to \$libs_x"; fi
 else
 { echo "Error:" "Unable to find libfontconfig for --with-xft" >&2; exit 1; }
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XftFontOpen in -lXft" >&5
 $as_echo_n "checking for XftFontOpen in -lXft... " >&6; }
-if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then :
+if ${ac_cv_lib_Xft_XftFontOpen+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXft  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xft_XftFontOpen" >&5
 $as_echo "$ac_cv_lib_Xft_XftFontOpen" >&6; }
-if test "x$ac_cv_lib_Xft_XftFontOpen" = x""yes; then :
+if test "x$ac_cv_lib_Xft_XftFontOpen" = xyes; then :
 libs_x="-lXft $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lXft\" to \$libs_x"; fi
 else
 { echo "Error:" "Unable to find libXft for --with-xft" >&2; exit 1; }
 fi
 for ac_func in FcConfigGetRescanInterval
 do :
 ac_fn_c_check_func "$LINENO" "FcConfigGetRescanInterval" "ac_cv_func_FcConfigGetRescanInterval"
-if test "x$ac_cv_func_FcConfigGetRescanInterval" = x""yes; then :
+if test "x$ac_cv_func_FcConfigGetRescanInterval" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_FCCONFIGGETRESCANINTERVAL 1
 _ACEOF
 fi
 done
 for ac_func in FcConfigSetRescanInterval
 do :
 ac_fn_c_check_func "$LINENO" "FcConfigSetRescanInterval" "ac_cv_func_FcConfigSetRescanInterval"
-if test "x$ac_cv_func_FcConfigSetRescanInterval" = x""yes; then :
+if test "x$ac_cv_func_FcConfigSetRescanInterval" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_FCCONFIGSETRESCANINTERVAL 1
 _ACEOF
 fi
 $as_echo_n "checking for MS-Windows... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
 $as_echo "" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgdi32" >&5
 $as_echo_n "checking for main in -lgdi32... " >&6; }
-if test "${ac_cv_lib_gdi32_main+set}" = set; then :
+if ${ac_cv_lib_gdi32_main+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgdi32  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdi32_main" >&5
 $as_echo "$ac_cv_lib_gdi32_main" >&6; }
-if test "x$ac_cv_lib_gdi32_main" = x""yes; then :
+if test "x$ac_cv_lib_gdi32_main" = xyes; then :
 with_msw=yes
 fi
 if test "$with_msw" = "yes"; then
 $as_echo "#define HAVE_MS_WINDOWS 1" >>confdefs.h
 test "$with_widgets"    != "no" && with_widgets=msw
 fi
 if test "$cross_compiling" = yes; then :
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
+as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <fcntl.h>
 int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 ac_fn_c_check_header_compile "$LINENO" "X11/extensions/shape.h" "ac_cv_header_X11_extensions_shape_h" "
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 "
-if test "x$ac_cv_header_X11_extensions_shape_h" = x""yes; then :
+if test "x$ac_cv_header_X11_extensions_shape_h" = xyes; then :
 $as_echo "#define HAVE_BALLOON_HELP 1" >>confdefs.h
 fi
 $as_echo "no" >&6; }
 fi
 test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
 test -z "$with_xauth" && { ac_fn_c_check_header_mongrel "$LINENO" "X11/Xauth.h" "ac_cv_header_X11_Xauth_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xauth_h" = x""yes; then :
+if test "x$ac_cv_header_X11_Xauth_h" = xyes; then :
 else
 with_xauth=no
 fi
 }
 test -z "$with_xauth" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauGetAuthByAddr in -lXau" >&5
 $as_echo_n "checking for XauGetAuthByAddr in -lXau... " >&6; }
-if test "${ac_cv_lib_Xau_XauGetAuthByAddr+set}" = set; then :
+if ${ac_cv_lib_Xau_XauGetAuthByAddr+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXau  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xau_XauGetAuthByAddr" >&5
 $as_echo "$ac_cv_lib_Xau_XauGetAuthByAddr" >&6; }
-if test "x$ac_cv_lib_Xau_XauGetAuthByAddr" = x""yes; then :
+if test "x$ac_cv_lib_Xau_XauGetAuthByAddr" = xyes; then :
 :
 else
 with_xauth=no
 fi
 }
 $as_echo "#define HAVE_DYLD 1" >>confdefs.h
 ;;
 * )
 ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5
 $as_echo_n "checking for dlopen in -lc... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 if test "$have_dl" = "yes"; then
 	$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
 else
 		ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
-if test "x$ac_cv_header_dl_h" = x""yes; then :
+if test "x$ac_cv_header_dl_h" = xyes; then :
 	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -lc" >&5
 $as_echo_n "checking for shl_load in -lc... " >&6; }
 	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 	if test "$have_dl" = "yes"; then
 	  $as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h
 	else
 	  	  ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
-if test "x$ac_cv_header_ltdl_h" = x""yes; then :
+if test "x$ac_cv_header_ltdl_h" = xyes; then :
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lt_dlinit in -lltdl" >&5
 $as_echo_n "checking for lt_dlinit in -lltdl... " >&6; }
 	    ac_save_LIBS="$LIBS"
 	    LIBS="$LIBS -lltdl"
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 if test -z "$LTLD" -a "$cc_produces_so" = no; then
-as_fn_error "no acceptable linker found in \$PATH" "$LINENO" 5
+as_fn_error $? "no acceptable linker found in \$PATH" "$LINENO" 5
 exit 1
 fi
 fi
 ld_dynamic_link_flags=
 test -n "$libdl" && LIBS="-l${libdl} $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-l${libdl}\" to \$LIBS"; fi
 for ac_func in dlerror _dlerror
 do :
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
+if eval test \"x\$"$as_ac_var"\" = x"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
 if test "$with_tooltalk" != "no" ; then
 for dir in "" "Tt/" "desktop/" ; do
 as_ac_Header=`$as_echo "ac_cv_header_${dir}tt_c.h" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "${dir}tt_c.h" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-if test "x$as_val" = x""yes; then :
 tt_c_h_file="${dir}tt_c.h"; break
 fi
 done
 fi
 if test "$with_tooltalk" != "no" ; then
 for extra_libs in "" "-lI18N -lce" "-lcxx"; do
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tt_message_create in -ltt" >&5
 $as_echo_n "checking for tt_message_create in -ltt... " >&6; }
-if test "${ac_cv_lib_tt_tt_message_create+set}" = set; then :
+if ${ac_cv_lib_tt_tt_message_create+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltt $extra_libs $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tt_tt_message_create" >&5
 $as_echo "$ac_cv_lib_tt_tt_message_create" >&6; }
-if test "x$ac_cv_lib_tt_tt_message_create" = x""yes; then :
+if test "x$ac_cv_lib_tt_tt_message_create" = xyes; then :
 tt_libs="-ltt $extra_libs"; break
 else
 :
 fi
 libs_x="$tt_libs $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"$tt_libs\" to \$libs_x"; fi
 fi
 test -z "$with_cde" && { ac_fn_c_check_header_mongrel "$LINENO" "Dt/Dt.h" "ac_cv_header_Dt_Dt_h" "$ac_includes_default"
-if test "x$ac_cv_header_Dt_Dt_h" = x""yes; then :
+if test "x$ac_cv_header_Dt_Dt_h" = xyes; then :
 else
 with_cde=no
 fi
 }
 test -z "$with_cde" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DtDndDragStart in -lDtSvc" >&5
 $as_echo_n "checking for DtDndDragStart in -lDtSvc... " >&6; }
-if test "${ac_cv_lib_DtSvc_DtDndDragStart+set}" = set; then :
+if ${ac_cv_lib_DtSvc_DtDndDragStart+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lDtSvc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_DtSvc_DtDndDragStart" >&5
 $as_echo "$ac_cv_lib_DtSvc_DtDndDragStart" >&6; }
-if test "x$ac_cv_lib_DtSvc_DtDndDragStart" = x""yes; then :
+if test "x$ac_cv_lib_DtSvc_DtDndDragStart" = xyes; then :
 :
 else
 with_cde=no
 fi
 }
 $as_echo_n "checking for LDAP... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
 $as_echo "" >&6; }
 ldap_libs=
 test -z "$with_ldap" && { ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default"
-if test "x$ac_cv_header_ldap_h" = x""yes; then :
+if test "x$ac_cv_header_ldap_h" = xyes; then :
 else
 with_ldap=no
 fi
 }
 test -z "$with_ldap" && { ac_fn_c_check_header_mongrel "$LINENO" "lber.h" "ac_cv_header_lber_h" "$ac_includes_default"
-if test "x$ac_cv_header_lber_h" = x""yes; then :
+if test "x$ac_cv_header_lber_h" = xyes; then :
 else
 with_ldap=no
 fi
 }
 if test "$with_ldap" != "no"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_search in -lldap" >&5
 $as_echo_n "checking for ldap_search in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_ldap_search+set}" = set; then :
+if ${ac_cv_lib_ldap_ldap_search+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lldap  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_search" >&5
 $as_echo "$ac_cv_lib_ldap_ldap_search" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_search" = x""yes; then :
+if test "x$ac_cv_lib_ldap_ldap_search" = xyes; then :
 with_ldap=yes
 fi
 test "$with_ldap" != "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_open in -lldap" >&5
 $as_echo_n "checking for ldap_open in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_ldap_open+set}" = set; then :
+if ${ac_cv_lib_ldap_ldap_open+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lldap -llber $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_open" >&5
 $as_echo "$ac_cv_lib_ldap_ldap_open" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_open" = x""yes; then :
+if test "x$ac_cv_lib_ldap_ldap_open" = xyes; then :
 with_ldap=yes with_ldap_lber=yes
 fi
 }
 test "$with_ldap" != "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_open in -lldap" >&5
 $as_echo_n "checking for ldap_open in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_ldap_open+set}" = set; then :
+if ${ac_cv_lib_ldap_ldap_open+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lldap -llber -lkrb $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_open" >&5
 $as_echo "$ac_cv_lib_ldap_ldap_open" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_open" = x""yes; then :
+if test "x$ac_cv_lib_ldap_ldap_open" = xyes; then :
 with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes
 fi
 }
 test "$with_ldap" != "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_open in -lldap" >&5
 $as_echo_n "checking for ldap_open in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_ldap_open+set}" = set; then :
+if ${ac_cv_lib_ldap_ldap_open+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lldap -llber -lkrb -ldes $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_open" >&5
 $as_echo "$ac_cv_lib_ldap_ldap_open" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_open" = x""yes; then :
+if test "x$ac_cv_lib_ldap_ldap_open" = xyes; then :
 with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes with_ldap_des=yes
 fi
 }
 test "$with_ldap_lber" != "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_pvt_opt_on in -llber" >&5
 $as_echo_n "checking for ber_pvt_opt_on in -llber... " >&6; }
-if test "${ac_cv_lib_lber_ber_pvt_opt_on+set}" = set; then :
+if ${ac_cv_lib_lber_ber_pvt_opt_on+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-llber  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lber_ber_pvt_opt_on" >&5
 $as_echo "$ac_cv_lib_lber_ber_pvt_opt_on" >&6; }
-if test "x$ac_cv_lib_lber_ber_pvt_opt_on" = x""yes; then :
+if test "x$ac_cv_lib_lber_ber_pvt_opt_on" = xyes; then :
 with_ldap_lber=yes
 fi
 }
 fi
 if test "$with_ldap" = "yes"; then
 save_LIBS="$LIBS" LIBS="$LIBS $ldap_libs"
 for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result
 do :
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
+if eval test \"x\$"$as_ac_var"\" = x"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 "" >&6; }
 for header_dir in "" "pgsql/" "postgresql/"; do
 as_ac_Header=`$as_echo "ac_cv_header_${header_dir}libpq-fe.h" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "${header_dir}libpq-fe.h" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-if test "x$as_val" = x""yes; then :
 libpq_fe_h_file=${header_dir}libpq-fe.h; break
 fi
 done
 pq_libs=
 extra_libs=
 if test -n "$libpq_fe_h_file"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQconnectdb in -lpq" >&5
 $as_echo_n "checking for PQconnectdb in -lpq... " >&6; }
-if test "${ac_cv_lib_pq_PQconnectdb+set}" = set; then :
+if ${ac_cv_lib_pq_PQconnectdb+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQconnectdb" >&5
 $as_echo "$ac_cv_lib_pq_PQconnectdb" >&6; }
-if test "x$ac_cv_lib_pq_PQconnectdb" = x""yes; then :
+if test "x$ac_cv_lib_pq_PQconnectdb" = xyes; then :
 pq_libs="-lpq"
 else
 unset ac_cv_lib_pq_PQconnectdb;
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQconnectdb in -lpq" >&5
 $as_echo_n "checking for PQconnectdb in -lpq... " >&6; }
-if test "${ac_cv_lib_pq_PQconnectdb+set}" = set; then :
+if ${ac_cv_lib_pq_PQconnectdb+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq -lcrypto -lssl $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQconnectdb" >&5
 $as_echo "$ac_cv_lib_pq_PQconnectdb" >&6; }
-if test "x$ac_cv_lib_pq_PQconnectdb" = x""yes; then :
+if test "x$ac_cv_lib_pq_PQconnectdb" = xyes; then :
 pq_libs="-lpq -lcrypto -lssl"
 fi
 fi
 with_postgresql=yes
 $as_echo "#define HAVE_POSTGRESQL 1" >>confdefs.h
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQconnectStart in -lpq" >&5
 $as_echo_n "checking for PQconnectStart in -lpq... " >&6; }
-if test "${ac_cv_lib_pq_PQconnectStart+set}" = set; then :
+if ${ac_cv_lib_pq_PQconnectStart+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq $extra_libs $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQconnectStart" >&5
 $as_echo "$ac_cv_lib_pq_PQconnectStart" >&6; }
-if test "x$ac_cv_lib_pq_PQconnectStart" = x""yes; then :
+if test "x$ac_cv_lib_pq_PQconnectStart" = xyes; then :
 with_postgresqlv7=yes;
 $as_echo "#define HAVE_POSTGRESQLV7 1" >>confdefs.h
 else
 $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:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
+as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define XPM_NUMBERS
 #include <X11/xpm.h>
 fi
 fi
 test -z "$with_xface" && { ac_fn_c_check_header_mongrel "$LINENO" "compface.h" "ac_cv_header_compface_h" "$ac_includes_default"
-if test "x$ac_cv_header_compface_h" = x""yes; then :
+if test "x$ac_cv_header_compface_h" = xyes; then :
 else
 with_xface=no
 fi
 }
 test -z "$with_xface" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UnGenFace in -lcompface" >&5
 $as_echo_n "checking for UnGenFace in -lcompface... " >&6; }
-if test "${ac_cv_lib_compface_UnGenFace+set}" = set; then :
+if ${ac_cv_lib_compface_UnGenFace+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcompface  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_compface_UnGenFace" >&5
 $as_echo "$ac_cv_lib_compface_UnGenFace" >&6; }
-if test "x$ac_cv_lib_compface_UnGenFace" = x""yes; then :
+if test "x$ac_cv_lib_compface_UnGenFace" = xyes; then :
 :
 else
 with_xface=no
 fi
 }
 libs_x="-lcompface $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lcompface\" to \$libs_x"; fi
 fi
 test -z "$with_gif" && { ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
-if test "x$ac_cv_header_gif_lib_h" = x""yes; then :
+if test "x$ac_cv_header_gif_lib_h" = xyes; then :
 else
 with_gif=no
 fi
 }
 if test "$with_gif" != "no"; then
 with_gif="yes"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lgif" >&5
 $as_echo_n "checking for EGifPutExtensionLast in -lgif... " >&6; }
-if test "${ac_cv_lib_gif_EGifPutExtensionLast+set}" = set; then :
+if ${ac_cv_lib_gif_EGifPutExtensionLast+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgif  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5
 $as_echo "$ac_cv_lib_gif_EGifPutExtensionLast" >&6; }
-if test "x$ac_cv_lib_gif_EGifPutExtensionLast" = x""yes; then :
+if test "x$ac_cv_lib_gif_EGifPutExtensionLast" = xyes; then :
 libs_x="-lgif $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lgif\" to \$libs_x"; fi
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lungif" >&5
 $as_echo_n "checking for EGifPutExtensionLast in -lungif... " >&6; }
-if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then :
+if ${ac_cv_lib_ungif_EGifPutExtensionLast+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lungif  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
 $as_echo "$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; }
-if test "x$ac_cv_lib_ungif_EGifPutExtensionLast" = x""yes; then :
+if test "x$ac_cv_lib_ungif_EGifPutExtensionLast" = xyes; then :
 libs_x="-lungif $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lungif\" to \$libs_x"; fi
 else
 with_gif=no
 fi
 fi
 if test "$with_png $with_tiff" != "no no"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lc" >&5
 $as_echo_n "checking for inflate in -lc... " >&6; }
-if test "${ac_cv_lib_c_inflate+set}" = set; then :
+if ${ac_cv_lib_c_inflate+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_inflate" >&5
 $as_echo "$ac_cv_lib_c_inflate" >&6; }
-if test "x$ac_cv_lib_c_inflate" = x""yes; then :
+if test "x$ac_cv_lib_c_inflate" = xyes; then :
 :
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5
 $as_echo_n "checking for inflate in -lz... " >&6; }
-if test "${ac_cv_lib_z_inflate+set}" = set; then :
+if ${ac_cv_lib_z_inflate+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5
 $as_echo "$ac_cv_lib_z_inflate" >&6; }
-if test "x$ac_cv_lib_z_inflate" = x""yes; then :
+if test "x$ac_cv_lib_z_inflate" = xyes; then :
 libs_x="-lz $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lz\" to \$libs_x"; fi
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lgz" >&5
 $as_echo_n "checking for inflate in -lgz... " >&6; }
-if test "${ac_cv_lib_gz_inflate+set}" = set; then :
+if ${ac_cv_lib_gz_inflate+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgz  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gz_inflate" >&5
 $as_echo "$ac_cv_lib_gz_inflate" >&6; }
-if test "x$ac_cv_lib_gz_inflate" = x""yes; then :
+if test "x$ac_cv_lib_gz_inflate" = xyes; then :
 libs_x="-lgz $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lgz\" to \$libs_x"; fi
 fi
 fi
 fi
 fi
 test -z "$with_jpeg" && { ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
-if test "x$ac_cv_header_jpeglib_h" = x""yes; then :
+if test "x$ac_cv_header_jpeglib_h" = xyes; then :
 else
 with_jpeg=no
 fi
 }
 test -z "$with_jpeg" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_destroy_decompress in -ljpeg" >&5
 $as_echo_n "checking for jpeg_destroy_decompress in -ljpeg... " >&6; }
-if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then :
+if ${ac_cv_lib_jpeg_jpeg_destroy_decompress+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljpeg  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5
 $as_echo "$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; }
-if test "x$ac_cv_lib_jpeg_jpeg_destroy_decompress" = x""yes; then :
+if test "x$ac_cv_lib_jpeg_jpeg_destroy_decompress" = xyes; then :
 :
 else
 with_jpeg=no
 fi
 }
 libs_x="-ljpeg $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-ljpeg\" to \$libs_x"; fi
 fi
 png_problem=""
 test -z "$with_png" && { ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
-if test "x$ac_cv_func_pow" = x""yes; then :
+if test "x$ac_cv_func_pow" = xyes; then :
 else
 with_png=no
 fi
 }
 test -z "$with_png" && { ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
-if test "x$ac_cv_header_png_h" = x""yes; then :
+if test "x$ac_cv_header_png_h" = xyes; then :
 else
 with_png=no
 fi
 }
 test -z "$with_png" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_image in -lpng" >&5
 $as_echo_n "checking for png_read_image in -lpng... " >&6; }
-if test "${ac_cv_lib_png_png_read_image+set}" = set; then :
+if ${ac_cv_lib_png_png_read_image+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpng -lz $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_read_image" >&5
 $as_echo "$ac_cv_lib_png_png_read_image" >&6; }
-if test "x$ac_cv_lib_png_png_read_image" = x""yes; then :
+if test "x$ac_cv_lib_png_png_read_image" = xyes; then :
 :
 else
 with_png=no
 fi
 }
 $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:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
+as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <png.h>
 int main(int c, char **v) {
 libs_x="-lpng $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lpng\" to \$libs_x"; fi
 fi
 test -z "$with_tiff" && { ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
-if test "x$ac_cv_header_tiffio_h" = x""yes; then :
+if test "x$ac_cv_header_tiffio_h" = xyes; then :
 else
 with_tiff=no
 fi
 }
 test -z "$with_tiff" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFClientOpen in -ltiff" >&5
 $as_echo_n "checking for TIFFClientOpen in -ltiff... " >&6; }
-if test "${ac_cv_lib_tiff_TIFFClientOpen+set}" = set; then :
+if ${ac_cv_lib_tiff_TIFFClientOpen+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltiff -lz $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFClientOpen" >&5
 $as_echo "$ac_cv_lib_tiff_TIFFClientOpen" >&6; }
-if test "x$ac_cv_lib_tiff_TIFFClientOpen" = x""yes; then :
+if test "x$ac_cv_lib_tiff_TIFFClientOpen" = xyes; then :
 :
 else
 with_tiff=no
 fi
 }
 fi
 if test "$with_gtk" = "yes"; then
 test -z "$with_xface" && { ac_fn_c_check_header_mongrel "$LINENO" "compface.h" "ac_cv_header_compface_h" "$ac_includes_default"
-if test "x$ac_cv_header_compface_h" = x""yes; then :
+if test "x$ac_cv_header_compface_h" = xyes; then :
 else
 with_xface=no
 fi
 }
 test -z "$with_xface" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UnGenFace in -lcompface" >&5
 $as_echo_n "checking for UnGenFace in -lcompface... " >&6; }
-if test "${ac_cv_lib_compface_UnGenFace+set}" = set; then :
+if ${ac_cv_lib_compface_UnGenFace+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcompface  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_compface_UnGenFace" >&5
 $as_echo "$ac_cv_lib_compface_UnGenFace" >&6; }
-if test "x$ac_cv_lib_compface_UnGenFace" = x""yes; then :
+if test "x$ac_cv_lib_compface_UnGenFace" = xyes; then :
 :
 else
 with_xface=no
 fi
 }
 if test "$athena_3d" = "no"; then
 as_ac_Lib=`$as_echo "ac_cv_lib_$athena_variant''_XawScrollbarSetThumb" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
 $as_echo_n "checking for XawScrollbarSetThumb in -l$athena_variant... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$as_ac_Lib+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$athena_variant  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Lib
+if eval test \"x\$"$as_ac_Lib"\" = x"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:${as_lineno-$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 :
+if eval \${$as_ac_Lib+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$athena_variant  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Lib
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-if test "x$as_val" = x""yes; then :
 { $as_echo "$as_me:${as_lineno-$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
 else
 as_ac_Lib=`$as_echo "ac_cv_lib_$athena_variant''_XawSme3dComputeTopShadowRGB" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawSme3dComputeTopShadowRGB in -l$athena_variant" >&5
 $as_echo_n "checking for XawSme3dComputeTopShadowRGB in -l$athena_variant... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$as_ac_Lib+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$athena_variant  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Lib
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-if test "x$as_val" = x""yes; then :
 athena_lib=$athena_variant
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawSme3dComputeTopShadowRGB in -lXaw" >&5
 $as_echo_n "checking for XawSme3dComputeTopShadowRGB in -lXaw... " >&6; }
-if test "${ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB+set}" = set; then :
+if ${ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXaw  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB" >&5
 $as_echo "$ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB" >&6; }
-if test "x$ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB" = x""yes; then :
+if test "x$ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB" = xyes; then :
 athena_lib=Xaw;
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming that libXaw is actually $athena_variant." >&5
 $as_echo "$as_me: WARNING: Assuming that libXaw is actually $athena_variant." >&2;};
 fi
 if test "$athena_3d" = "no"; then
 ac_fn_c_check_header_mongrel "$LINENO" "X11/Xaw/ThreeD.h" "ac_cv_header_X11_Xaw_ThreeD_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xaw_ThreeD_h" = x""yes; then :
+if test "x$ac_cv_header_X11_Xaw_ThreeD_h" = xyes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a non-3d Athena header set." >&5
 $as_echo "$as_me: WARNING: Could not find a non-3d Athena header set." >&2;}
 else
 ac_fn_c_check_header_compile "$LINENO" "X11/Xaw/XawInit.h" "ac_cv_header_X11_Xaw_XawInit_h" "
 #include <X11/Intrinsic.h>
 "
-if test "x$ac_cv_header_X11_Xaw_XawInit_h" = x""yes; then :
+if test "x$ac_cv_header_X11_Xaw_XawInit_h" = xyes; then :
 athena_h_path=X11/Xaw
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a non-3d Athena header set." >&5
 $as_echo "$as_me: WARNING: Could not find a non-3d Athena header set." >&2;}
 fi
 #include <X11/Xfuncproto.h>
 #endif
 #include <X11/Intrinsic.h>
 "
-eval as_val=\$$as_ac_Header
+if eval test \"x\$"$as_ac_Header"\" = x"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`
 ac_fn_c_check_header_mongrel "$LINENO" "X11/$athena_variant/ThreeD.h" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-if test "x$as_val" = x""yes; then :
 athena_h_path=X11/$athena_variant
 fi
 fi
 #include <X11/Xfuncproto.h>
 #endif
 #include <X11/Intrinsic.h>
 "
-eval as_val=\$$as_ac_Header
+if eval test \"x\$"$as_ac_Header"\" = x"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`
 ac_fn_c_check_header_mongrel "$LINENO" "$athena_variant/ThreeD.h" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-if test "x$as_val" = x""yes; then :
 athena_h_path=$athena_variant
 fi
 fi
 #include <X11/Xfuncproto.h>
 #endif
 #include <X11/Intrinsic.h>
 "
-if test "x$ac_cv_header_X11_Xaw3d_XawInit_h" = x""yes; then :
+if test "x$ac_cv_header_X11_Xaw3d_XawInit_h" = xyes; then :
 ac_fn_c_check_header_mongrel "$LINENO" "X11/Xaw3d/ThreeD.h" "ac_cv_header_X11_Xaw3d_ThreeD_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xaw3d_ThreeD_h" = x""yes; then :
+if test "x$ac_cv_header_X11_Xaw3d_ThreeD_h" = xyes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming that X11/Xaw3d headers are suitable for $athena_variant." >&5
 $as_echo "$as_me: WARNING: Assuming that X11/Xaw3d headers are suitable for $athena_variant." >&2;}
 athena_h_path=X11/Xaw3d
 #include <X11/Xfuncproto.h>
 #endif
 #include <X11/Intrinsic.h>
 "
-if test "x$ac_cv_header_Xaw3d_XawInit_h" = x""yes; then :
+if test "x$ac_cv_header_Xaw3d_XawInit_h" = xyes; then :
 ac_fn_c_check_header_mongrel "$LINENO" "Xaw3d/ThreeD.h" "ac_cv_header_Xaw3d_ThreeD_h" "$ac_includes_default"
-if test "x$ac_cv_header_Xaw3d_ThreeD_h" = x""yes; then :
+if test "x$ac_cv_header_Xaw3d_ThreeD_h" = xyes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming that Xaw3d headers are suitable for $athena_variant." >&5
 $as_echo "$as_me: WARNING: Assuming that Xaw3d headers are suitable for $athena_variant." >&2;}
 athena_h_path=Xaw3d
 fi
 if test -z "$athena_h_path"; then
 ac_fn_c_check_header_mongrel "$LINENO" "X11/Xaw/ThreeD.h" "ac_cv_header_X11_Xaw_ThreeD_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xaw_ThreeD_h" = x""yes; then :
+if test "x$ac_cv_header_X11_Xaw_ThreeD_h" = xyes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming that X11/Xaw headers are suitable for $athena_variant." >&5
 $as_echo "$as_me: WARNING: Assuming that X11/Xaw headers are suitable for $athena_variant." >&2;}
 athena_h_path=X11/Xaw
 else
 have_xaw=no
 fi
 if test "$with_x11" = "yes"; then
 ac_fn_c_check_header_mongrel "$LINENO" "Xm/Xm.h" "ac_cv_header_Xm_Xm_h" "$ac_includes_default"
-if test "x$ac_cv_header_Xm_Xm_h" = x""yes; then :
+if test "x$ac_cv_header_Xm_Xm_h" = xyes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmStringCreate in -lXm" >&5
 $as_echo_n "checking for XmStringCreate in -lXm... " >&6; }
-if test "${ac_cv_lib_Xm_XmStringCreate+set}" = set; then :
+if ${ac_cv_lib_Xm_XmStringCreate+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_XmStringCreate" >&5
 $as_echo "$ac_cv_lib_Xm_XmStringCreate" >&6; }
-if test "x$ac_cv_lib_Xm_XmStringCreate" = x""yes; then :
+if test "x$ac_cv_lib_Xm_XmStringCreate" = xyes; then :
 have_motif=yes
 else
 have_motif=no
 fi
 for ac_header in libintl.h
 do :
 ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
-if test "x$ac_cv_header_libintl_h" = x""yes; then :
+if test "x$ac_cv_header_libintl_h" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBINTL_H 1
 _ACEOF
 fi
 done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strerror in -lintl" >&5
 $as_echo_n "checking for strerror in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_strerror+set}" = set; then :
+if ${ac_cv_lib_intl_strerror+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strerror" >&5
 $as_echo "$ac_cv_lib_intl_strerror" >&6; }
-if test "x$ac_cv_lib_intl_strerror" = x""yes; then :
+if test "x$ac_cv_lib_intl_strerror" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBINTL 1
 _ACEOF
 LIBS="-lintl $LIBS"
 case "$with_xim" in "" | "yes" )
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XIM" >&5
 $as_echo_n "checking for XIM... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenIM in -lX11" >&5
 $as_echo_n "checking for XOpenIM in -lX11... " >&6; }
-if test "${ac_cv_lib_X11_XOpenIM+set}" = set; then :
+if ${ac_cv_lib_X11_XOpenIM+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenIM" >&5
 $as_echo "$ac_cv_lib_X11_XOpenIM" >&6; }
-if test "x$ac_cv_lib_X11_XOpenIM" = x""yes; then :
+if test "x$ac_cv_lib_X11_XOpenIM" = xyes; then :
 with_xim=xlib
 else
 with_xim=no
 fi
 if test "$need_motif $have_lesstif" = "yes no"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmImMbLookupString in -lXm" >&5
 $as_echo_n "checking for XmImMbLookupString in -lXm... " >&6; }
-if test "${ac_cv_lib_Xm_XmImMbLookupString+set}" = set; then :
+if ${ac_cv_lib_Xm_XmImMbLookupString+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_XmImMbLookupString" >&5
 $as_echo "$ac_cv_lib_Xm_XmImMbLookupString" >&6; }
-if test "x$ac_cv_lib_Xm_XmImMbLookupString" = x""yes; then :
+if test "x$ac_cv_lib_Xm_XmImMbLookupString" = xyes; then :
 with_xim=motif
 fi
 elif test "$have_motif $have_lesstif $with_xim" = "yes no no"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmImMbLookupString in -lXm" >&5
 $as_echo_n "checking for XmImMbLookupString in -lXm... " >&6; }
-if test "${ac_cv_lib_Xm_XmImMbLookupString+set}" = set; then :
+if ${ac_cv_lib_Xm_XmImMbLookupString+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_XmImMbLookupString" >&5
 $as_echo "$ac_cv_lib_Xm_XmImMbLookupString" >&6; }
-if test "x$ac_cv_lib_Xm_XmImMbLookupString" = x""yes; then :
+if test "x$ac_cv_lib_Xm_XmImMbLookupString" = xyes; then :
 with_xim=motif
 fi
 fi ;;
 esac
 if test "$with_xfs" = "yes" ; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XFontSet" >&5
 $as_echo_n "checking for XFontSet... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmbDrawString in -lX11" >&5
 $as_echo_n "checking for XmbDrawString in -lX11... " >&6; }
-if test "${ac_cv_lib_X11_XmbDrawString+set}" = set; then :
+if ${ac_cv_lib_X11_XmbDrawString+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XmbDrawString" >&5
 $as_echo "$ac_cv_lib_X11_XmbDrawString" >&6; }
-if test "x$ac_cv_lib_X11_XmbDrawString" = x""yes; then :
+if test "x$ac_cv_lib_X11_XmbDrawString" = xyes; then :
 :
 else
 with_xfs=no
 fi
 fi
 fi
 fi
 test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
 test -z "$with_wnn" && { ac_fn_c_check_header_mongrel "$LINENO" "wnn/jllib.h" "ac_cv_header_wnn_jllib_h" "$ac_includes_default"
-if test "x$ac_cv_header_wnn_jllib_h" = x""yes; then :
+if test "x$ac_cv_header_wnn_jllib_h" = xyes; then :
 else
 with_wnn=no
 fi
 }
 test -z "$with_wnn" && { ac_fn_c_check_header_mongrel "$LINENO" "wnn/commonhd.h" "ac_cv_header_wnn_commonhd_h" "$ac_includes_default"
-if test "x$ac_cv_header_wnn_commonhd_h" = x""yes; then :
+if test "x$ac_cv_header_wnn_commonhd_h" = xyes; then :
 else
 with_wnn=no
 fi
 }
 if test "$with_wnn" != "no"; then
 for ac_func in crypt
 do :
 ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt"
-if test "x$ac_cv_func_crypt" = x""yes; then :
+if test "x$ac_cv_func_crypt" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_CRYPT 1
 _ACEOF
 fi
 done
 test "$ac_cv_func_crypt" != "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
 $as_echo_n "checking for crypt in -lcrypt... " >&6; }
-if test "${ac_cv_lib_crypt_crypt+set}" = set; then :
+if ${ac_cv_lib_crypt_crypt+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
 $as_echo "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = x""yes; then :
+if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBCRYPT 1
 _ACEOF
 LIBS="-lcrypt $LIBS"
 }
 fi
 if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jl_dic_list_e in -lwnn" >&5
 $as_echo_n "checking for jl_dic_list_e in -lwnn... " >&6; }
-if test "${ac_cv_lib_wnn_jl_dic_list_e+set}" = set; then :
+if ${ac_cv_lib_wnn_jl_dic_list_e+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwnn  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wnn_jl_dic_list_e" >&5
 $as_echo "$ac_cv_lib_wnn_jl_dic_list_e" >&6; }
-if test "x$ac_cv_lib_wnn_jl_dic_list_e" = x""yes; then :
+if test "x$ac_cv_lib_wnn_jl_dic_list_e" = xyes; then :
 libwnn=wnn
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jl_dic_list_e in -lwnn4" >&5
 $as_echo_n "checking for jl_dic_list_e in -lwnn4... " >&6; }
-if test "${ac_cv_lib_wnn4_jl_dic_list_e+set}" = set; then :
+if ${ac_cv_lib_wnn4_jl_dic_list_e+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwnn4  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wnn4_jl_dic_list_e" >&5
 $as_echo "$ac_cv_lib_wnn4_jl_dic_list_e" >&6; }
-if test "x$ac_cv_lib_wnn4_jl_dic_list_e" = x""yes; then :
+if test "x$ac_cv_lib_wnn4_jl_dic_list_e" = xyes; then :
 libwnn=wnn4
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jl_dic_list_e in -lwnn6" >&5
 $as_echo_n "checking for jl_dic_list_e in -lwnn6... " >&6; }
-if test "${ac_cv_lib_wnn6_jl_dic_list_e+set}" = set; then :
+if ${ac_cv_lib_wnn6_jl_dic_list_e+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwnn6  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wnn6_jl_dic_list_e" >&5
 $as_echo "$ac_cv_lib_wnn6_jl_dic_list_e" >&6; }
-if test "x$ac_cv_lib_wnn6_jl_dic_list_e" = x""yes; then :
+if test "x$ac_cv_lib_wnn6_jl_dic_list_e" = xyes; then :
 libwnn=wnn6
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dic_list_e in -lwnn6_fromsrc" >&5
 $as_echo_n "checking for dic_list_e in -lwnn6_fromsrc... " >&6; }
-if test "${ac_cv_lib_wnn6_fromsrc_dic_list_e+set}" = set; then :
+if ${ac_cv_lib_wnn6_fromsrc_dic_list_e+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwnn6_fromsrc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wnn6_fromsrc_dic_list_e" >&5
 $as_echo "$ac_cv_lib_wnn6_fromsrc_dic_list_e" >&6; }
-if test "x$ac_cv_lib_wnn6_fromsrc_dic_list_e" = x""yes; then :
+if test "x$ac_cv_lib_wnn6_fromsrc_dic_list_e" = xyes; then :
 libwnn=wnn6_fromsrc
 else
 with_wnn=no
 fi
 libs_x="-l$libwnn $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-l$libwnn\" to \$libs_x"; fi
 if test "$with_wnn6" != "no"; then
 as_ac_Lib=`$as_echo "ac_cv_lib_$libwnn''_jl_fi_dic_list" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jl_fi_dic_list in -l$libwnn" >&5
 $as_echo_n "checking for jl_fi_dic_list in -l$libwnn... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$as_ac_Lib+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$libwnn  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Lib
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-if test "x$as_val" = x""yes; then :
 with_wnn6=yes
 fi
 test "$with_wnn6" = "yes" && $as_echo "#define WNN6 1" >>confdefs.h
 $as_unset ac_cv_header_canna_jrkanji_h
 $as_unset ac_cv_header_canna_RK_h
 # using $ac_header_compiler is a hack, but autoconf doesn't let us
 # get at this information otherwise :-(
 ac_fn_c_check_header_mongrel "$LINENO" "canna/jrkanji.h" "ac_cv_header_canna_jrkanji_h" "$ac_includes_default"
-if test "x$ac_cv_header_canna_jrkanji_h" = x""yes; then :
+if test "x$ac_cv_header_canna_jrkanji_h" = xyes; then :
 ac_fn_c_check_header_mongrel "$LINENO" "canna/RK.h" "ac_cv_header_canna_RK_h" "$ac_includes_default"
-if test "x$ac_cv_header_canna_RK_h" = x""yes; then :
+if test "x$ac_cv_header_canna_RK_h" = xyes; then :
 have_canna=$ac_header_compiler
 fi
 fi
 fi
 fi
 test "$have_canna" = "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RkBgnBun in -lRKC" >&5
 $as_echo_n "checking for RkBgnBun in -lRKC... " >&6; }
-if test "${ac_cv_lib_RKC_RkBgnBun+set}" = set; then :
+if ${ac_cv_lib_RKC_RkBgnBun+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lRKC  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_RKC_RkBgnBun" >&5
 $as_echo "$ac_cv_lib_RKC_RkBgnBun" >&6; }
-if test "x$ac_cv_lib_RKC_RkBgnBun" = x""yes; then :
+if test "x$ac_cv_lib_RKC_RkBgnBun" = xyes; then :
 :
 else
 have_canna=no
 fi
 }
 test "$have_canna" = "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jrKanjiControl in -lcanna" >&5
 $as_echo_n "checking for jrKanjiControl in -lcanna... " >&6; }
-if test "${ac_cv_lib_canna_jrKanjiControl+set}" = set; then :
+if ${ac_cv_lib_canna_jrKanjiControl+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcanna  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_canna_jrKanjiControl" >&5
 $as_echo "$ac_cv_lib_canna_jrKanjiControl" >&6; }
-if test "x$ac_cv_lib_canna_jrKanjiControl" = x""yes; then :
+if test "x$ac_cv_lib_canna_jrKanjiControl" = xyes; then :
 :
 else
 have_canna=no
 fi
 }
 if test "$need_motif" = "yes" ; then
 libs_x="-lXm $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lXm\" to \$libs_x"; fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for layout_object_getvalue in -li18n" >&5
 $as_echo_n "checking for layout_object_getvalue in -li18n... " >&6; }
-if test "${ac_cv_lib_i18n_layout_object_getvalue+set}" = set; then :
+if ${ac_cv_lib_i18n_layout_object_getvalue+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-li18n  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_i18n_layout_object_getvalue" >&5
 $as_echo "$ac_cv_lib_i18n_layout_object_getvalue" >&6; }
-if test "x$ac_cv_lib_i18n_layout_object_getvalue" = x""yes; then :
+if test "x$ac_cv_lib_i18n_layout_object_getvalue" = xyes; then :
 libs_x="-li18n $libs_x" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-li18n\" to \$libs_x"; fi
 fi
 if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then
 case "$opsys" in
 *cygwin* ) for ac_func in cygwin_conv_path
 do :
 ac_fn_c_check_func "$LINENO" "cygwin_conv_path" "ac_cv_func_cygwin_conv_path"
-if test "x$ac_cv_func_cygwin_conv_path" = x""yes; then :
+if test "x$ac_cv_func_cygwin_conv_path" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_CYGWIN_CONV_PATH 1
 _ACEOF
 fi
 for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen
 do :
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
+if eval test \"x\$"$as_ac_var"\" = x"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
 esac
 fi
 if test "$check_vdb_posix" = "yes" ; then
 ac_fn_c_check_func "$LINENO" "mprotect" "ac_cv_func_mprotect"
-if test "x$ac_cv_func_mprotect" = x""yes; then :
+if test "x$ac_cv_func_mprotect" = xyes; then :
 $as_echo "#define HAVE_MPROTECT 1" >>confdefs.h
 have_vdb_mprotect=yes
 fi
 ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction"
-if test "x$ac_cv_func_sigaction" = x""yes; then :
+if test "x$ac_cv_func_sigaction" = xyes; then :
 $as_echo "#define HAVE_SIGACTION 1" >>confdefs.h
 have_vdb_sigaction=yes
 else
 have_vdb_sigaction=no
 fi
 ac_fn_c_check_member "$LINENO" "struct siginfo" "si_addr" "ac_cv_member_struct_siginfo_si_addr" "#include <signal.h>
 "
-if test "x$ac_cv_member_struct_siginfo_si_addr" = x""yes; then :
+if test "x$ac_cv_member_struct_siginfo_si_addr" = xyes; then :
 $as_echo "#define HAVE_STRUCT_SIGINFO_SI_ADDR 1" >>confdefs.h
 have_si_addr=yes
 fi
 ac_fn_c_check_member "$LINENO" "siginfo_t" "si_addr" "ac_cv_member_siginfo_t_si_addr" "#include <signal.h>
 "
-if test "x$ac_cv_member_siginfo_t_si_addr" = x""yes; then :
+if test "x$ac_cv_member_siginfo_t_si_addr" = xyes; then :
 $as_echo "#define HAVE_SIGINFO_T_SI_ADDR 1" >>confdefs.h
 have_si_addr=yes
 fi
 if test "$have_si_addr" != "yes" ; then
 have_vdb_sigaction=no
 fi
 ac_fn_c_check_func "$LINENO" "signal" "ac_cv_func_signal"
-if test "x$ac_cv_func_signal" = x""yes; then :
+if test "x$ac_cv_func_signal" = xyes; then :
 $as_echo "#define HAVE_SIGNAL 1" >>confdefs.h
 have_vdb_signal=yes
 fi
 ac_fn_c_check_member "$LINENO" "struct sigcontext" "cr2" "ac_cv_member_struct_sigcontext_cr2" "#include <signal.h>
 "
-if test "x$ac_cv_member_struct_sigcontext_cr2" = x""yes; then :
+if test "x$ac_cv_member_struct_sigcontext_cr2" = xyes; then :
 $as_echo "#define HAVE_STRUCT_SIGCONTEXT_CR2 1" >>confdefs.h
 have_cr2=yes
 fi
 for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp
 do :
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
+if eval test \"x\$"$as_ac_var"\" = x"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
 done
 ac_fn_c_check_func "$LINENO" "openpty" "ac_cv_func_openpty"
-if test "x$ac_cv_func_openpty" = x""yes; then :
+if test "x$ac_cv_func_openpty" = xyes; then :
 have_openpty=yes
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5
 $as_echo_n "checking for openpty in -lutil... " >&6; }
-if test "${ac_cv_lib_util_openpty+set}" = set; then :
+if ${ac_cv_lib_util_openpty+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5
 $as_echo "$ac_cv_lib_util_openpty" >&6; }
-if test "x$ac_cv_lib_util_openpty" = x""yes; then :
+if test "x$ac_cv_lib_util_openpty" = xyes; then :
 have_openpty=yes need_libutil=yes
 fi
 fi
 for ac_header in libutil.h util.h
 do :
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
+if eval test \"x\$"$as_ac_Header"\" = x"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
 case "$opsys" in
 hpux*) for ac_header in sys/ptyio.h
 do :
 ac_fn_c_check_header_mongrel "$LINENO" "sys/ptyio.h" "ac_cv_header_sys_ptyio_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_ptyio_h" = x""yes; then :
+if test "x$ac_cv_header_sys_ptyio_h" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_PTYIO_H 1
 _ACEOF
 fi
 done
 ;;
 *) for ac_header in pty.h
 do :
 ac_fn_c_check_header_mongrel "$LINENO" "pty.h" "ac_cv_header_pty_h" "$ac_includes_default"
-if test "x$ac_cv_header_pty_h" = x""yes; then :
+if test "x$ac_cv_header_pty_h" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_PTY_H 1
 _ACEOF
 fi
 done
 test "$ac_cv_header_pty_h" = "no" && for ac_header in sys/pty.h
 do :
 ac_fn_c_check_header_mongrel "$LINENO" "sys/pty.h" "ac_cv_header_sys_pty_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_pty_h" = x""yes; then :
+if test "x$ac_cv_header_sys_pty_h" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_PTY_H 1
 _ACEOF
 fi
 esac
 for ac_header in stropts.h
 do :
 ac_fn_c_check_header_mongrel "$LINENO" "stropts.h" "ac_cv_header_stropts_h" "$ac_includes_default"
-if test "x$ac_cv_header_stropts_h" = x""yes; then :
+if test "x$ac_cv_header_stropts_h" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STROPTS_H 1
 _ACEOF
 fi
 if test "$ac_cv_header_stropts_h" = "yes"; then
 for ac_func in isastream
 do :
 ac_fn_c_check_func "$LINENO" "isastream" "ac_cv_func_isastream"
-if test "x$ac_cv_func_isastream" = x""yes; then :
+if test "x$ac_cv_func_isastream" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_ISASTREAM 1
 _ACEOF
 fi
 done
 for ac_header in strtio.h
 do :
 ac_fn_c_check_header_mongrel "$LINENO" "strtio.h" "ac_cv_header_strtio_h" "$ac_includes_default"
-if test "x$ac_cv_header_strtio_h" = x""yes; then :
+if test "x$ac_cv_header_strtio_h" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRTIO_H 1
 _ACEOF
 fi
 fi
 for ac_func in getloadavg
 do :
 ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg"
-if test "x$ac_cv_func_getloadavg" = x""yes; then :
+if test "x$ac_cv_func_getloadavg" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_GETLOADAVG 1
 _ACEOF
 fi
 if test "$ac_cv_func_getloadavg" = "yes"; then
 for ac_header in sys/loadavg.h
 do :
 ac_fn_c_check_header_mongrel "$LINENO" "sys/loadavg.h" "ac_cv_header_sys_loadavg_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_loadavg_h" = x""yes; then :
+if test "x$ac_cv_header_sys_loadavg_h" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_LOADAVG_H 1
 _ACEOF
 fi
 echo "    xemacs will be linked with \"getloadavg.o\""
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kstat_open in -lkstat" >&5
 $as_echo_n "checking for kstat_open in -lkstat... " >&6; }
-if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then :
+if ${ac_cv_lib_kstat_kstat_open+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkstat  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kstat_kstat_open" >&5
 $as_echo "$ac_cv_lib_kstat_kstat_open" >&6; }
-if test "x$ac_cv_lib_kstat_kstat_open" = x""yes; then :
+if test "x$ac_cv_lib_kstat_kstat_open" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBKSTAT 1
 _ACEOF
 LIBS="-lkstat $LIBS"
 fi
 for ac_header in kstat.h
 do :
 ac_fn_c_check_header_mongrel "$LINENO" "kstat.h" "ac_cv_header_kstat_h" "$ac_includes_default"
-if test "x$ac_cv_header_kstat_h" = x""yes; then :
+if test "x$ac_cv_header_kstat_h" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_KSTAT_H 1
 _ACEOF
 fi
 done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_read in -lkvm" >&5
 $as_echo_n "checking for kvm_read in -lkvm... " >&6; }
-if test "${ac_cv_lib_kvm_kvm_read+set}" = set; then :
+if ${ac_cv_lib_kvm_kvm_read+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkvm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kvm_kvm_read" >&5
 $as_echo "$ac_cv_lib_kvm_kvm_read" >&6; }
-if test "x$ac_cv_lib_kvm_kvm_read" = x""yes; then :
+if test "x$ac_cv_lib_kvm_kvm_read" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBKVM 1
 _ACEOF
 LIBS="-lkvm $LIBS"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether localtime caches TZ" >&5
 $as_echo_n "checking whether localtime caches TZ... " >&6; }
-if test "${emacs_cv_localtime_cache+set}" = set; then :
+if ${emacs_cv_localtime_cache+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test "$ac_cv_func_tzset" = "yes"; then
 if test "$cross_compiling" = yes; then :
 # If we have tzset, assume the worst when cross-compiling.
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then :
+if ${ac_cv_c_inline+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 if test "$__DECC" != "yes"; then
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
 $as_echo_n "checking for working alloca.h... " >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then :
+if ${ac_cv_working_alloca_h+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <alloca.h>
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
 $as_echo_n "checking for alloca... " >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then :
+if ${ac_cv_func_alloca_works+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __GNUC__
 #  else
 #   ifdef _AIX
 #pragma alloca
 #   else
 #    ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
+void *alloca (size_t);
 #    endif
 #   endif
 #  endif
 # endif
 #endif
 $as_echo "#define C_ALLOCA 1" >>confdefs.h
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if test "${ac_cv_os_cray+set}" = set; then :
+if ${ac_cv_os_cray+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #if defined CRAY && ! defined CRAY2
 $as_echo "$ac_cv_os_cray" >&6; }
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-if test "x$as_val" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
 _ACEOF
 done
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
 $as_echo_n "checking stack direction for C alloca... " >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then :
+if ${ac_cv_c_stack_direction+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test "$cross_compiling" = yes; then :
 ac_cv_c_stack_direction=0
 else
 { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
+as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #if defined (__CYGWIN__)
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working scanf" >&5
 $as_echo_n "checking for working scanf... " >&6; }
 if test "$cross_compiling" = yes; then :
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
+as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int
 $as_echo "#define CYGWIN_SCANF_BUG 1" >>confdefs.h
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strcoll" >&5
 $as_echo_n "checking for working strcoll... " >&6; }
-if test "${ac_cv_func_strcoll_works+set}" = set; then :
+if ${ac_cv_func_strcoll_works+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test "$cross_compiling" = yes; then :
 ac_cv_func_strcoll_works=no
 else
 for ac_func in getpgrp
 do :
 ac_fn_c_check_func "$LINENO" "getpgrp" "ac_cv_func_getpgrp"
-if test "x$ac_cv_func_getpgrp" = x""yes; then :
+if test "x$ac_cv_func_getpgrp" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_GETPGRP 1
 _ACEOF
 fi
 done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpgrp requires zero arguments" >&5
 $as_echo_n "checking whether getpgrp requires zero arguments... " >&6; }
-if test "${ac_cv_func_getpgrp_void+set}" = set; then :
+if ${ac_cv_func_getpgrp_void+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 # Use it with a single arg.
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
 $as_echo_n "checking for working mmap... " >&6; }
 if test "$cross_compiling" = yes; then :
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
+as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 #include <unistd.h>
 fi
 test "$with_rel_alloc" = "yes" && $as_echo "#define REL_ALLOC 1" >>confdefs.h
 ac_fn_c_check_header_mongrel "$LINENO" "termios.h" "ac_cv_header_termios_h" "$ac_includes_default"
-if test "x$ac_cv_header_termios_h" = x""yes; then :
+if test "x$ac_cv_header_termios_h" = xyes; then :
 $as_echo "#define HAVE_TERMIOS 1" >>confdefs.h
 $as_echo "#define SIGNALS_VIA_CHARACTERS 1" >>confdefs.h
 $as_echo "#define NO_TERMIO 1" >>confdefs.h
 else
 ac_fn_c_check_header_mongrel "$LINENO" "termio.h" "ac_cv_header_termio_h" "$ac_includes_default"
-if test "x$ac_cv_header_termio_h" = x""yes; then :
+if test "x$ac_cv_header_termio_h" = xyes; then :
 $as_echo "#define HAVE_TERMIO 1" >>confdefs.h
 fi
 ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
-if test "x$ac_cv_func_socket" = x""yes; then :
+if test "x$ac_cv_func_socket" = xyes; then :
 ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default"
-if test "x$ac_cv_header_netinet_in_h" = x""yes; then :
+if test "x$ac_cv_header_netinet_in_h" = xyes; then :
 ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default"
-if test "x$ac_cv_header_arpa_inet_h" = x""yes; then :
+if test "x$ac_cv_header_arpa_inet_h" = xyes; then :
 $as_echo "#define HAVE_SOCKETS 1" >>confdefs.h
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sun_len member in struct sockaddr_un" >&5
 $as_echo_n "checking for sun_len member in struct sockaddr_un... " >&6; }
 fi
 ac_fn_c_check_func "$LINENO" "msgget" "ac_cv_func_msgget"
-if test "x$ac_cv_func_msgget" = x""yes; then :
+if test "x$ac_cv_func_msgget" = xyes; then :
 ac_fn_c_check_header_mongrel "$LINENO" "sys/ipc.h" "ac_cv_header_sys_ipc_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_ipc_h" = x""yes; then :
+if test "x$ac_cv_header_sys_ipc_h" = xyes; then :
 ac_fn_c_check_header_mongrel "$LINENO" "sys/msg.h" "ac_cv_header_sys_msg_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_msg_h" = x""yes; then :
+if test "x$ac_cv_header_sys_msg_h" = xyes; then :
 $as_echo "#define HAVE_SYSVIPC 1" >>confdefs.h
 fi
 fi
 ac_fn_c_check_header_mongrel "$LINENO" "dirent.h" "ac_cv_header_dirent_h" "$ac_includes_default"
-if test "x$ac_cv_header_dirent_h" = x""yes; then :
+if test "x$ac_cv_header_dirent_h" = xyes; then :
 $as_echo "#define SYSV_SYSTEM_DIR 1" >>confdefs.h
 else
 ac_fn_c_check_header_mongrel "$LINENO" "sys/dir.h" "ac_cv_header_sys_dir_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_dir_h" = x""yes; then :
+if test "x$ac_cv_header_sys_dir_h" = xyes; then :
 else
 $as_echo "#define NONSYSTEM_DIR_LIBRARY 1" >>confdefs.h
 fi
 fi
 ac_fn_c_check_header_mongrel "$LINENO" "nlist.h" "ac_cv_header_nlist_h" "$ac_includes_default"
-if test "x$ac_cv_header_nlist_h" = x""yes; then :
+if test "x$ac_cv_header_nlist_h" = xyes; then :
 $as_echo "#define NLIST_STRUCT 1" >>confdefs.h
 fi
 test -n "$with_native_sound_lib" && with_sound_native=yes
 if test "$with_sound_native" != "no"; then
 if test -n "$with_native_sound_lib"; then
 ac_fn_c_check_header_mongrel "$LINENO" "multimedia/audio_device.h" "ac_cv_header_multimedia_audio_device_h" "$ac_includes_default"
-if test "x$ac_cv_header_multimedia_audio_device_h" = x""yes; then :
+if test "x$ac_cv_header_multimedia_audio_device_h" = xyes; then :
 sound_found=yes sound_cflags=""
 extra_objs="$extra_objs sunplay.o" &&  if test "$verbose" = "yes"; then
 echo "    xemacs will be linked with \"sunplay.o\""
 fi
 fi
 case "$ac_cv_build" in
 *-sgi-* )
 if test -z "$with_native_sound_lib"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALopenport in -laudio" >&5
 $as_echo_n "checking for ALopenport in -laudio... " >&6; }
-if test "${ac_cv_lib_audio_ALopenport+set}" = set; then :
+if ${ac_cv_lib_audio_ALopenport+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-laudio  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audio_ALopenport" >&5
 $as_echo "$ac_cv_lib_audio_ALopenport" >&6; }
-if test "x$ac_cv_lib_audio_ALopenport" = x""yes; then :
+if test "x$ac_cv_lib_audio_ALopenport" = xyes; then :
 with_native_sound_lib="-laudio"
 fi
 fi
 if test -n "$with_native_sound_lib"; then
 fi ;;
 hppa*-hp-hpux* )
 if test -z "$with_native_sound_lib"; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AOpenAudio in -lAlib" >&5
 $as_echo_n "checking for AOpenAudio in -lAlib... " >&6; }
-if test "${ac_cv_lib_Alib_AOpenAudio+set}" = set; then :
+if ${ac_cv_lib_Alib_AOpenAudio+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lAlib  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Alib_AOpenAudio" >&5
 $as_echo "$ac_cv_lib_Alib_AOpenAudio" >&6; }
-if test "x$ac_cv_lib_Alib_AOpenAudio" = x""yes; then :
+if test "x$ac_cv_lib_Alib_AOpenAudio" = xyes; then :
 with_native_sound_lib="-lAlib"
 fi
 fi
 if test -n "$with_native_sound_lib"; then
 if test -z "$sound_found"; then
 for dir in "machine" "sys" "linux"; do
 as_ac_Header=`$as_echo "ac_cv_header_${dir}/soundcard.h" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "${dir}/soundcard.h" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
+if eval test \"x\$"$as_ac_Header"\" = x"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
 	  # we should port to native NetBSD stuff
 	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _oss_ioctl in -lossaudio" >&5
 $as_echo_n "checking for _oss_ioctl in -lossaudio... " >&6; }
-if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then :
+if ${ac_cv_lib_ossaudio__oss_ioctl+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lossaudio  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
 $as_echo "$ac_cv_lib_ossaudio__oss_ioctl" >&6; }
-if test "x$ac_cv_lib_ossaudio__oss_ioctl" = x""yes; then :
+if test "x$ac_cv_lib_ossaudio__oss_ioctl" = xyes; then :
 with_native_sound_lib=-lossaudio
 		 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using NetBSD-deprecated -lossaudio" >&5
 $as_echo "$as_me: WARNING: Using NetBSD-deprecated -lossaudio" >&2;}
 else
 sound_found=no
 test -n "$with_native_sound_lib" && LIBS="$with_native_sound_lib $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"$with_native_sound_lib\" to \$LIBS"; fi
 fi
 if test "$with_sound_alsa" != "no"; then
 ac_fn_c_check_header_mongrel "$LINENO" "alsa/input.h" "ac_cv_header_alsa_input_h" "$ac_includes_default"
-if test "x$ac_cv_header_alsa_input_h" = x""yes; then :
+if test "x$ac_cv_header_alsa_input_h" = xyes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_open in -lasound" >&5
 $as_echo_n "checking for snd_pcm_open in -lasound... " >&6; }
-if test "${ac_cv_lib_asound_snd_pcm_open+set}" = set; then :
+if ${ac_cv_lib_asound_snd_pcm_open+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lasound  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_open" >&5
 $as_echo "$ac_cv_lib_asound_snd_pcm_open" >&6; }
-if test "x$ac_cv_lib_asound_snd_pcm_open" = x""yes; then :
+if test "x$ac_cv_lib_asound_snd_pcm_open" = xyes; then :
 have_alsa_sound=yes
 fi
 fi
 fi
 fi
 if test "$with_sound_nas" != "no"; then
 ac_fn_c_check_header_mongrel "$LINENO" "audio/audiolib.h" "ac_cv_header_audio_audiolib_h" "$ac_includes_default"
-if test "x$ac_cv_header_audio_audiolib_h" = x""yes; then :
+if test "x$ac_cv_header_audio_audiolib_h" = xyes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AuOpenServer in -laudio" >&5
 $as_echo_n "checking for AuOpenServer in -laudio... " >&6; }
-if test "${ac_cv_lib_audio_AuOpenServer+set}" = set; then :
+if ${ac_cv_lib_audio_AuOpenServer+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-laudio  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audio_AuOpenServer" >&5
 $as_echo "$ac_cv_lib_audio_AuOpenServer" >&6; }
-if test "x$ac_cv_lib_audio_AuOpenServer" = x""yes; then :
+if test "x$ac_cv_lib_audio_AuOpenServer" = xyes; then :
 have_nas_sound=yes
 fi
 fi
 if test "$with_sound_esd" != "no"; then
 # Extract the first word of "esd-config", so it can be a program name with args.
 set dummy esd-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_have_esd_config+set}" = set; then :
+if ${ac_cv_prog_have_esd_config+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$have_esd_config"; then
 ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test.
 else
 if test "$have_esd_config" = "yes"; then
 save_c_switch_site="$c_switch_site" save_LIBS="$LIBS"
 c_switch_site="$c_switch_site `esd-config --cflags`" &&  if test "$verbose" = "yes"; then echo "    Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi
 LIBS="`esd-config --libs` $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"`esd-config --libs`\" to \$LIBS"; fi
 ac_fn_c_check_func "$LINENO" "esd_play_stream" "ac_cv_func_esd_play_stream"
-if test "x$ac_cv_func_esd_play_stream" = x""yes; then :
+if test "x$ac_cv_func_esd_play_stream" = xyes; then :
 have_esd_sound=yes
 else
 c_switch_site="$save_c_switch_site" LIBS="$save_LIBS"
 fi
 if test -z "$with_ncurses"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
 $as_echo_n "checking for tgetent in -lncurses... " >&6; }
-if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then :
+if ${ac_cv_lib_ncurses_tgetent+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lncurses  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
 $as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
-if test "x$ac_cv_lib_ncurses_tgetent" = x""yes; then :
+if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
 with_ncurses=yes
 else
 with_ncurses=no
 fi
 fi
 if test "$with_ncurses" = "yes"; then
 $as_echo "#define HAVE_NCURSES 1" >>confdefs.h
 ac_fn_c_check_header_mongrel "$LINENO" "ncurses/curses.h" "ac_cv_header_ncurses_curses_h" "$ac_includes_default"
-if test "x$ac_cv_header_ncurses_curses_h" = x""yes; then :
+if test "x$ac_cv_header_ncurses_curses_h" = xyes; then :
 curses_h_file=ncurses/curses.h
 fi
 ac_fn_c_check_header_mongrel "$LINENO" "ncurses/term.h" "ac_cv_header_ncurses_term_h" "$ac_includes_default"
-if test "x$ac_cv_header_ncurses_term_h" = x""yes; then :
+if test "x$ac_cv_header_ncurses_term_h" = xyes; then :
 term_h_file=ncurses/term.h
 fi
 extra_objs="$extra_objs terminfo.o" &&  if test "$verbose" = "yes"; then
 if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then
 save_c_switch_site="$c_switch_site"
 c_switch_site="$c_switch_site -I/usr/include/ncurses"
 ac_fn_c_check_header_mongrel "$LINENO" "ncurses/curses.h" "ac_cv_header_ncurses_curses_h" "$ac_includes_default"
-if test "x$ac_cv_header_ncurses_curses_h" = x""yes; then :
+if test "x$ac_cv_header_ncurses_curses_h" = xyes; then :
 curses_h_file=ncurses/curses.h
 fi
 if test "$ac_cv_header_ncurses_curses_h" = "yes"
 else
 	for lib in curses termlib termcap; do
 	  as_ac_Lib=`$as_echo "ac_cv_lib_$lib''_tgetent" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l$lib" >&5
 $as_echo_n "checking for tgetent in -l$lib... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$as_ac_Lib+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$lib  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Lib
+if eval test \"x\$"$as_ac_Lib"\" = x"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
 if test -n "$libs_termcap"; then
 	LIBS="$libs_termcap $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"$libs_termcap\" to \$LIBS"; fi
 else
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5
 $as_echo_n "checking for tgetent in -lcurses... " >&6; }
-if test "${ac_cv_lib_curses_tgetent+set}" = set; then :
+if ${ac_cv_lib_curses_tgetent+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_tgetent" >&5
 $as_echo "$ac_cv_lib_curses_tgetent" >&6; }
-if test "x$ac_cv_lib_curses_tgetent" = x""yes; then :
+if test "x$ac_cv_lib_curses_tgetent" = xyes; then :
 LIBS="-lcurses $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lcurses\" to \$LIBS"; fi
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
 $as_echo_n "checking for tgetent in -ltermcap... " >&6; }
-if test "${ac_cv_lib_termcap_tgetent+set}" = set; then :
+if ${ac_cv_lib_termcap_tgetent+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
 $as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
-if test "x$ac_cv_lib_termcap_tgetent" = x""yes; then :
+if test "x$ac_cv_lib_termcap_tgetent" = xyes; then :
 LIBS="-ltermcap $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-ltermcap\" to \$LIBS"; fi
 else
 extra_objs="$extra_objs termcap.o" &&  if test "$verbose" = "yes"; then
 echo "    xemacs will be linked with \"termcap.o\""
 fi
 _ACEOF
 if test "$with_gpm" != "no"; then
 ac_fn_c_check_header_mongrel "$LINENO" "gpm.h" "ac_cv_header_gpm_h" "$ac_includes_default"
-if test "x$ac_cv_header_gpm_h" = x""yes; then :
+if test "x$ac_cv_header_gpm_h" = xyes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Gpm_Open in -lgpm" >&5
 $as_echo_n "checking for Gpm_Open in -lgpm... " >&6; }
-if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then :
+if ${ac_cv_lib_gpm_Gpm_Open+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gpm_Gpm_Open" >&5
 $as_echo "$ac_cv_lib_gpm_Gpm_Open" >&6; }
-if test "x$ac_cv_lib_gpm_Gpm_Open" = x""yes; then :
+if test "x$ac_cv_lib_gpm_Gpm_Open" = xyes; then :
 have_gpm=yes
 fi
 fi
 ndbm_h_file=""
 for ac_header in ndbm.h gdbm/ndbm.h
 do :
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
+if eval test \"x\$"$as_ac_Header"\" = x"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
 ndbm_h_file=$ac_header; break;
 fi
 fi
 if test "$with_database_gdbm" != "no"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -lgdbm" >&5
 $as_echo_n "checking for dbm_open in -lgdbm... " >&6; }
-if test "${ac_cv_lib_gdbm_dbm_open+set}" = set; then :
+if ${ac_cv_lib_gdbm_dbm_open+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgdbm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_dbm_open" >&5
 $as_echo "$ac_cv_lib_gdbm_dbm_open" >&6; }
-if test "x$ac_cv_lib_gdbm_dbm_open" = x""yes; then :
+if test "x$ac_cv_lib_gdbm_dbm_open" = xyes; then :
 with_database_gdbm=yes with_database_dbm=no libdbm=-lgdbm
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -lgdbm_compat" >&5
 $as_echo_n "checking for dbm_open in -lgdbm_compat... " >&6; }
-if test "${ac_cv_lib_gdbm_compat_dbm_open+set}" = set; then :
+if ${ac_cv_lib_gdbm_compat_dbm_open+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgdbm_compat -lgdbm $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_compat_dbm_open" >&5
 $as_echo "$ac_cv_lib_gdbm_compat_dbm_open" >&6; }
-if test "x$ac_cv_lib_gdbm_compat_dbm_open" = x""yes; then :
+if test "x$ac_cv_lib_gdbm_compat_dbm_open" = xyes; then :
 with_database_gdbm=yes with_database_dbm=no libdbm="-lgdbm_compat -lgdbm"
 else
 if test "$with_database_gdbm" = "yes"; then
 fi
 if test "$with_database_dbm" != "no"; then
 ac_fn_c_check_func "$LINENO" "dbm_open" "ac_cv_func_dbm_open"
-if test "x$ac_cv_func_dbm_open" = x""yes; then :
+if test "x$ac_cv_func_dbm_open" = xyes; then :
 with_database_dbm=yes libdbm=
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -ldbm" >&5
 $as_echo_n "checking for dbm_open in -ldbm... " >&6; }
-if test "${ac_cv_lib_dbm_dbm_open+set}" = set; then :
+if ${ac_cv_lib_dbm_dbm_open+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dbm_dbm_open" >&5
 $as_echo "$ac_cv_lib_dbm_dbm_open" >&6; }
-if test "x$ac_cv_lib_dbm_dbm_open" = x""yes; then :
+if test "x$ac_cv_lib_dbm_dbm_open" = xyes; then :
 with_database_dbm=yes libdbm=-ldbm
 else
 test "$with_database_dbm" = "yes" && \
 { echo "Error:" "Required DBM support cannot be provided." >&2; exit 1; }
 do
 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
+if ${ac_cv_prog_CXX+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$CXX"; then
 ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 if test -n "$ac_ct_CXX"; then
 ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
 test $ac_status = 0; }
 done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
+if ${ac_cv_prog_cxx_g+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_save_cxx_werror_flag=$ac_cxx_werror_flag
 ac_cxx_werror_flag=yes
 ac_cv_prog_cxx_g=no
 fi
 $as_unset ndbm_h_file
 fi
 ac_fn_c_check_type "$LINENO" "u_int8_t" "ac_cv_type_u_int8_t" "$ac_includes_default"
-if test "x$ac_cv_type_u_int8_t" = x""yes; then :
+if test "x$ac_cv_type_u_int8_t" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_U_INT8_T 1
 _ACEOF
 fi
 ac_fn_c_check_type "$LINENO" "u_int16_t" "ac_cv_type_u_int16_t" "$ac_includes_default"
-if test "x$ac_cv_type_u_int16_t" = x""yes; then :
+if test "x$ac_cv_type_u_int16_t" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_U_INT16_T 1
 _ACEOF
 fi
 ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "$ac_includes_default"
-if test "x$ac_cv_type_u_int32_t" = x""yes; then :
+if test "x$ac_cv_type_u_int32_t" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_U_INT32_T 1
 _ACEOF
 fi
 rm -f conftest*
 as_ac_var=`$as_echo "ac_cv_func_$dbfunc" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$dbfunc" "$as_ac_var"
-eval as_val=\$$as_ac_var
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-if test "x$as_val" = x""yes; then :
 with_database_berkdb=yes need_libdb=no
 else
 as_ac_Lib=`$as_echo "ac_cv_lib_db_$dbfunc" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dbfunc in -ldb" >&5
 $as_echo_n "checking for $dbfunc in -ldb... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$as_ac_Lib+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldb  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Lib
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-if test "x$as_val" = x""yes; then :
 with_database_berkdb=yes need_libdb=yes
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"db_create is really $dbfunc\"" >&5
 $as_echo "$as_me: WARNING: \"db_create is really $dbfunc\"" >&2;}
 as_ac_Lib=`$as_echo "ac_cv_lib_db_$dbfunc" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dbfunc in -ldb" >&5
 $as_echo_n "checking for $dbfunc in -ldb... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$as_ac_Lib+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldb  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Lib
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-if test "x$as_val" = x""yes; then :
 with_database_berkdb=yes need_libdb=yes
 fi
 fi
 fi
 if test "$with_socks" = "yes"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOCKSinit in -lsocks" >&5
 $as_echo_n "checking for SOCKSinit in -lsocks... " >&6; }
-if test "${ac_cv_lib_socks_SOCKSinit+set}" = set; then :
+if ${ac_cv_lib_socks_SOCKSinit+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocks  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socks_SOCKSinit" >&5
 $as_echo "$ac_cv_lib_socks_SOCKSinit" >&6; }
-if test "x$ac_cv_lib_socks_SOCKSinit" = x""yes; then :
+if test "x$ac_cv_lib_socks_SOCKSinit" = xyes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSOCKS 1
 _ACEOF
 LIBS="-lsocks $LIBS"
 LIBS="-Bstatic -lut -Bdynamic $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-Bstatic -lut -Bdynamic\" to \$LIBS"; fi
 fi
 if test "$with_bignum" = "gmp"; then
 ac_fn_c_check_header_mongrel "$LINENO" "gmp.h" "ac_cv_header_gmp_h" "$ac_includes_default"
-if test "x$ac_cv_header_gmp_h" = x""yes; then :
+if test "x$ac_cv_header_gmp_h" = xyes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmpz_init in -lgmp" >&5
 $as_echo_n "checking for __gmpz_init in -lgmp... " >&6; }
-if test "${ac_cv_lib_gmp___gmpz_init+set}" = set; then :
+if ${ac_cv_lib_gmp___gmpz_init+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgmp  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_init" >&5
 $as_echo "$ac_cv_lib_gmp___gmpz_init" >&6; }
-if test "x$ac_cv_lib_gmp___gmpz_init" = x""yes; then :
+if test "x$ac_cv_lib_gmp___gmpz_init" = xyes; then :
 have_mpz_init=yes
 fi
 fi
 { echo "Error:" "Required GMP numeric support cannot be provided." >&2; exit 1; }
 fi
 elif test "$with_bignum" = "mp"; then
 for library in "" "-lcrypto"; do
 ac_fn_c_check_header_mongrel "$LINENO" "mp.h" "ac_cv_header_mp_h" "$ac_includes_default"
-if test "x$ac_cv_header_mp_h" = x""yes; then :
+if test "x$ac_cv_header_mp_h" = xyes; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mp_mfree in -lmp" >&5
 $as_echo_n "checking for mp_mfree in -lmp... " >&6; }
-if test "${ac_cv_lib_mp_mp_mfree+set}" = set; then :
+if ${ac_cv_lib_mp_mp_mfree+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmp $library $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mp_mp_mfree" >&5
 $as_echo "$ac_cv_lib_mp_mp_mfree" >&6; }
-if test "x$ac_cv_lib_mp_mp_mfree" = x""yes; then :
+if test "x$ac_cv_lib_mp_mp_mfree" = xyes; then :
 have_mp_mfree=yes; break
 else
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mfree in -lmp" >&5
 $as_echo_n "checking for mfree in -lmp... " >&6; }
-if test "${ac_cv_lib_mp_mfree+set}" = set; then :
+if ${ac_cv_lib_mp_mfree+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmp $library $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mp_mfree" >&5
 $as_echo "$ac_cv_lib_mp_mfree" >&6; }
-if test "x$ac_cv_lib_mp_mfree" = x""yes; then :
+if test "x$ac_cv_lib_mp_mfree" = xyes; then :
 have_mfree=yes; break
 fi
 fi
 LIBS="$LIBS -lmp" &&  if test "$verbose" = "yes"; then echo "    Appending \"-lmp\" to \$LIBS"; fi
 if test "$library" != ""; then
 LIBS="$LIBS $library" &&  if test "$verbose" = "yes"; then echo "    Appending \"$library\" to \$LIBS"; fi
 fi
 ac_fn_c_check_func "$LINENO" "mp_move" "ac_cv_func_mp_move"
-if test "x$ac_cv_func_mp_move" = x""yes; then :
+if test "x$ac_cv_func_mp_move" = xyes; then :
 $as_echo "#define HAVE_MP_MOVE 1" >>confdefs.h
 fi
 elif test "$have_mfree" = "yes"; then
 LIBS="$LIBS -lmp" &&  if test "$verbose" = "yes"; then echo "    Appending \"-lmp\" to \$LIBS"; fi
 if test "$library" != ""; then
 LIBS="$LIBS $library" &&  if test "$verbose" = "yes"; then echo "    Appending \"$library\" to \$LIBS"; fi
 fi
 ac_fn_c_check_func "$LINENO" "move" "ac_cv_func_move"
-if test "x$ac_cv_func_move" = x""yes; then :
+if test "x$ac_cv_func_move" = xyes; then :
 $as_echo "#define HAVE_MP_MOVE 1" >>confdefs.h
 fi
 else
 fi
 if test "$cross_compiling" = yes; then :
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
+as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(int c,char **v){return 0;}
 _ACEOF
 t end
 s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
 :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 if test -w "$cache_file"; then
-test "x$cache_file" != "x/dev/null" &&
+if test "x$cache_file" != "x/dev/null"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-cat confcache >$cache_file
+if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+else
+case $cache_file in #(
+*/* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+*)
+	  mv -f confcache "$cache_file" ;;
+	esac
+fi
+fi
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
 fi
 fi
 DEFS=-DHAVE_CONFIG_H
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
 # 1. Remove the extension, and $U if already installed.
 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
 ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
 # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
 LTLIBOBJS=$ac_ltlibobjs
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
 IFS=" ""	$as_nl"
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
 *[\\/]* ) as_myself=$0 ;;
 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# as_fn_error ERROR [LINENO LOG_FD]
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ---------------------------------
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-as_status=$?; test $as_status -eq 0 && as_status=1
+as_status=$1; test $as_status -eq 0 && as_status=1
-if test "$3"; then
+if test "$4"; then
-as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-$as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+$as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
 fi
-$as_echo "$as_me: error: $1" >&2
+$as_echo "$as_me: error: $2" >&2
 as_fn_exit $as_status
 } # as_fn_error
 # as_fn_set_status STATUS
 	  }
 	  s/.*/./; q'`
 test -d "$as_dir" && break
 done
 test -z "$as_dirs" || eval "mkdir $as_dirs"
-} || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+} || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 } # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
 as_mkdir_p='mkdir -p "$as_dir"'
 # 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.65.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 CONFIG_FILES    = $CONFIG_FILES
 CONFIG_HEADERS  = $CONFIG_HEADERS
 CONFIG_LINKS    = $CONFIG_LINKS
 CONFIG_COMMANDS = $CONFIG_COMMANDS
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 XEmacs config.status 21.5
-configured by $0, generated by GNU Autoconf 2.65,
+configured by $0, generated by GNU Autoconf 2.68,
 with options \\"\$ac_cs_config\\"
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 # The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
 case $1 in
---*=*)
+--*=?*)
 ac_option=`expr "X$1" : 'X\([^=]*\)='`
 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+ac_shift=:
+;;
+--*=)
+ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ac_optarg=
 ac_shift=:
 ;;
 *)
 ac_option=$1
 ac_optarg=$2
 debug=: ;;
 --file | --fil | --fi | --f )
 $ac_shift
 case $ac_optarg in
 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+'') as_fn_error $? "missing file argument" ;;
 esac
 as_fn_append CONFIG_FILES " '$ac_optarg'"
 ac_need_defaults=false;;
 --header | --heade | --head | --hea )
 $ac_shift
 esac
 as_fn_append CONFIG_HEADERS " '$ac_optarg'"
 ac_need_defaults=false;;
 --he | --h)
 # Conflict between --help and --header
-as_fn_error "ambiguous option: \`$1'
+as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
 --help | --hel | -h )
 $as_echo "$ac_cs_usage"; exit ;;
 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
 | -silent | --silent | --silen | --sile | --sil | --si | --s)
 ac_cs_silent=: ;;
 # This is an error.
--*) as_fn_error "unrecognized option: \`$1'
+-*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 *) as_fn_append ac_config_targets " $1"
 ac_need_defaults=false ;;
 "src/xemacs.def.in") CONFIG_FILES="$CONFIG_FILES src/xemacs.def.in" ;;
 "lib-src/config.values") CONFIG_FILES="$CONFIG_FILES lib-src/config.values" ;;
 "lib-src/ellcc.h") CONFIG_FILES="$CONFIG_FILES lib-src/ellcc.h" ;;
 "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
 esac
 done
 # If the user did not use the arguments to specify the items to instantiate,
 # Hook for its removal unless debugging.
 # Note that there is a small window in which the directory will not be cleaned:
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-tmp=
+tmp= ac_tmp=
 trap 'exit_status=$?
-{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+: "${ac_tmp:=$tmp}"
+{ test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
 trap 'as_fn_exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 {
 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-test -n "$tmp" && test -d "$tmp"
+test -d "$tmp"
 }  ||
 {
 tmp=./conf$$-$RANDOM
 (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
 # This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 if test "x$ac_cr" = x; then
 eval ac_cr=\$\'\\r\'
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-ac_cs_awk_cr='\r'
+ac_cs_awk_cr='\\r'
 else
 ac_cs_awk_cr=$ac_cr
 fi
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 {
 echo "cat >conf$$subs.awk <<_ACEOF" &&
 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
 echo "_ACEOF"
 } >conf$$subs.sh ||
-as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
 . ./conf$$subs.sh ||
-as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
 if test $ac_delim_n = $ac_delim_num; then
 break
 elif $ac_last_try; then
-as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 else
 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
 fi
 done
 rm -f conf$$subs.sh
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
 s/^/S["/; s/!.*/"]=/
 p
 }
 ' >>$CONFIG_STATUS || ac_write_fail=1
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
 for (key in S) S_is_set[key] = 1
 FS = ""
 }
 {
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
 cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-|| as_fn_error "could not setup config files machinery" "$LINENO" 5
+|| as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-s/:*\$(srcdir):*/:/
+h
-s/:*\${srcdir}:*/:/
+s///
-s/:*@srcdir@:*/:/
+s/^/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # Set up the scripts for CONFIG_HEADERS section.
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 # Transform confdefs.h into an awk script `defines.awk', embedded as
 # here-document in config.status, that substitutes the proper values into
 # Create a delimiter string that does not exist in confdefs.h, to ease
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-if test -z "$ac_t"; then
+if test -z "$ac_tt"; then
 break
 elif $ac_last_try; then
-as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
 else
 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
 fi
 done
 }
 { print }
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-as_fn_error "could not setup config headers machinery" "$LINENO" 5
+as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
 shift
 case $ac_tag in
 :[FHLC]) ac_mode=$ac_tag; continue;;
 esac
 case $ac_mode$ac_tag in
 :[FHL]*:*);;
-:L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+:L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
 :[FH]-) ac_tag=-:-;;
 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
 esac
 ac_save_IFS=$IFS
 IFS=:
 :[FH])
 ac_file_inputs=
 for ac_f
 do
 case $ac_f in
--) ac_f="$tmp/stdin";;
+-) ac_f="$ac_tmp/stdin";;
 *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
 	 test -f "$ac_f" ||
 	   case $ac_f in
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
 esac
 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
 as_fn_append ac_file_inputs " '$ac_f'"
 done
 sed 's/[\\\\&|]/\\\\&/g'`;; #(
 *) ac_sed_conf_input=$configure_input;;
 esac
 case $ac_tag in
-*:-:* | *:-) cat >"$tmp/stdin" \
+*:-:* | *:-) cat >"$ac_tmp/stdin" \
-|| as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+|| as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
 esac
 ;;
 esac
 ac_dir=`$as_dirname -- "$ac_file" ||
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-|| as_fn_error "could not create $ac_file" "$LINENO" 5
+>$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+{ ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-{ ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+{ ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+"$ac_tmp/out"`; test -z "$ac_out"; } &&
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
-rm -f "$tmp/stdin"
+rm -f "$ac_tmp/stdin"
 case $ac_file in
--) cat "$tmp/out" && rm -f "$tmp/out";;
+-) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+*) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
 esac \
-|| as_fn_error "could not create $ac_file" "$LINENO" 5
+|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
 ;;
 :H)
 #
 # CONFIG_HEADER
 #
 if test x"$ac_file" != x-; then
 {
 $as_echo "/* $configure_input  */" \
-&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+&& eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-} >"$tmp/config.h" \
+} >"$ac_tmp/config.h" \
-|| as_fn_error "could not create $ac_file" "$LINENO" 5
+|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
 else
 rm -f "$ac_file"
-mv "$tmp/config.h" "$ac_file" \
+mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
 fi
 else
 $as_echo "/* $configure_input  */" \
-&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+&& eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-|| as_fn_error "could not create -" "$LINENO" 5
+|| as_fn_error $? "could not create -" "$LINENO" 5
 fi
 ;;
 :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
 $as_echo "$as_me: executing $ac_file commands" >&6;}
 as_fn_exit 0
 _ACEOF
 ac_clean_files=$ac_clean_files_save
 test $ac_write_fail = 0 ||
-as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
 # Unfortunately, on DOS this fails, as config.log is still kept open
 exec 5>/dev/null
 $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
 exec 5>>config.log
 # Use ||, not &&, to avoid exiting from the if with $? = 1, which
 # would make configure fail if this is the last instruction.
-$ac_cs_success || as_fn_exit $?
+$ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi

Mercurial > hg > xemacs-beta

comparison configure @ 5495:1f0b15040456