xemacs-beta: configure comparison

comparison configure @ 5474:4dee0387b9de

Merged with trunk.

author	Mats Lidell <matsl@xemacs.org>
date	Tue, 29 Mar 2011 00:02:47 +0200
parents	308d34e9f07d 3889ef128488
children	f2881cb841b4

comparison

equal deleted inserted replaced

-:ac37a5f7e5be
+:4dee0387b9de
 #! /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.66 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.
 #
 	  }
 	  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.
 -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 ;;
 *)
 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 \`..']
 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.66
-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.
 # 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 "test \"\${$3+set}\"" = set; 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 "test \"\${$3+set}\"" = set; 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; }
 $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 "test \"\${$3+set}\"" = set; then :
 $as_echo_n "(cached) " >&6
 else
 eval "$3=\$ac_header_compiler"
 fi
 eval ac_res=\$$3
 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 "test \"\${$3+set}\"" = set; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 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 "test \"\${$3+set}\"" = set; 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.
 $as_echo "$ac_res" >&6; }
 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; 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 "test \"\${$3+set}\"" = set; 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;
 }
 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 "test \"\${$3+set}\"" = set; then :
 $as_echo_n "(cached) " >&6
 else
 eval "$3=no"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 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 "test \"\${$4+set}\"" = set; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 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.66.  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. ##
 ## -------------------- ##
 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 :
 $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
 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; }
 $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; }
 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'
 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
 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
 		  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
 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
 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
 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
 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__;
 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 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
 { $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 "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; 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;;
 $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
 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
 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
 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
 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
 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
 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 "" >&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
 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
 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 :
 $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
 	@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_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 :
 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 "$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 :
 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}: 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 :
 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
 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
 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; }
 { $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
 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
 $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>
 $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) {
 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 "test \"\${$as_ac_Lib+set}\"" = set; 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 "test \"\${$as_ac_Lib+set}\"" = set; 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 "test \"\${$as_ac_Lib+set}\"" = set; 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 :
 #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
 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 "test \"\${$as_ac_Lib+set}\"" = set; 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
 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
 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
 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
 $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
 { $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 "$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>
 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
 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 "test \"\${$as_ac_Lib+set}\"" = set; 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
 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
 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 "test \"\${$as_ac_Lib+set}\"" = set; 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 "test \"\${$as_ac_Lib+set}\"" = set; 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 "$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
 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
 # 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.66.  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.66,
 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'
 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,
 test -n "$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
 # 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 "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
 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" \
-|| 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
 for ac_last_try in false false :; do
 ac_t=`sed -n "/$ac_delim/p" confdefs.h`
 if test -z "$ac_t"; 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=:
 	 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
 *) ac_sed_conf_input=$configure_input;;
 esac
 case $ac_tag in
 *:-:* | *:-) cat >"$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_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 \
-|| as_fn_error "could not create $ac_file" "$LINENO" 5
+|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
 { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
 { $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"
 case $ac_file in
 -) cat "$tmp/out" && rm -f "$tmp/out";;
 *) rm -f "$ac_file" && mv "$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"
 } >"$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
 { $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" \
-	|| 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" \
-|| 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 @ 5474:4dee0387b9de