emacs: configure comparison

comparison configure @ 109653:9cfca8c9fb07

Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings. * configure.in: Check for util.h. * src/bidi.c (bidi_dump_cached_states): Fix fprintf warning. * src/emacs.c: Include src/nsterm.h if HAVE_NS. * src/image.c (xpm_scan, xpm_make_color_table_v) (xpm_put_color_table_v, xpm_get_color_table_v) (xpm_make_color_table_h, xpm_put_color_table_h) (xpm_get_color_table_h, xpm_str_to_color_key, xpm_load_image) (xpm_load): Convert to ANSI C prototypes. * src/lisp.h (fmod_float): Declare. * src/menu.h (x_set_menu_bar_line): Declare. (free_menubar_widget_value_tree et.al): Add HAVE_NS for these functions. * src/window.c: Include menu.h. * src/nsfns.m (have_menus_p, ns_display_info_for_name) (x_set_cursor_type, ns_appkit_version_str) (ns_appkit_version_int, ns_do_applescript) (x_set_scroll_bar_default_width, x_sync, compute_tip_xy) (syms_of_nsfns): Convert to ANSI C prototypes. * src/nsfont.m (ns_fallback_entity, syms_of_nsfont): Convert to ANSI C prototypes. * src/nsimage.m (ns_load_image): Move NSTRACE after declarations. * src/nsmenu.m (popup_activated, name_is_separator) (syms_of_nsmenu): Convert to ANSI C prototypes. (runMenuAt): Prototypes and move declarations before code. * src/nsterm.h : Include sysselect.h. (x_sync, x_get_focus_frame, x_set_mouse_position) (x_set_mouse_pixel_position, x_make_frame_visible) (x_make_frame_invisible, x_iconify_frame, x_char_width, x_char_height) (x_pixel_width, x_pixel_height, x_set_frame_alpha, x_set_tool_bar_lines) (x_activate_menubar, free_frame_menubar, ns_init_paths, ns_select) (syms_of_nsterm, syms_of_nsfns, syms_of_nsmenu, syms_of_nsselect): Declare * src/process.c: Check HAVE_UTIL_H. Include src/nsterm.h if HAVE_NS. * src/nsterm.m (ns_init_paths, ns_alloc_autorelease_pool) (ns_ring_bell, ns_defined_color, hide_hourglass) (x_display_pixel_height, x_display_pixel_width, syms_of_nsterm): Convert to ANSI C prototypes. (x_set_window_size, ns_draw_fringe_bitmap, judge): Move declarations before code. * src/sysdep.c: Check HAVE_TERM_H * src/term.c: Check HAVE_SYS_IOCTL_H. * src/unexmacosx.c (print_region_list, print_regions) (build_region_list, find_emacs_zone_regions) (unexec_regions_merge, read_load_commands, dump_it) (unexec_init_emacs_zone): Convert to ANSI C prototypes. * src/xfaces.c (x_create_gc, x_free_gc): Convert to ANSI C prototypes.

author	Jan D <jan.h.d@swipnet.se>
date	Fri, 06 Aug 2010 12:12:41 +0200
parents	d8dbbecff672
children	b862722704f6

comparison

equal deleted inserted replaced

-:eb720d8ea1c6
+:9cfca8c9fb07
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.66 for emacs 24.0.50.
+# Generated by GNU Autoconf 2.65 for emacs 24.0.50.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Foundation, Inc.
+# 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 STATUS ERROR [LINENO LOG_FD]
+# as_fn_error 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=$1; test $as_status -eq 0 && as_status=1
+as_status=$?; test $as_status -eq 0 && as_status=1
-if test "$4"; then
+if test "$3"; then
-as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-$as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+$as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
 fi
-$as_echo "$as_me: error: $2" >&2
+$as_echo "$as_me: error: $1" >&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, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, 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
 emacs configure 24.0.50
-generated by GNU Autoconf 2.66
+generated by GNU Autoconf 2.65
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
 exit
 fi
 # 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 eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+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: proceeding with the compiler's result" >&2;}
 ;;
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+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 eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 $as_echo "$ac_res" >&6; }
 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 } # ac_fn_c_check_header_compile
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ac_fn_c_check_decl LINENO SYMBOL VAR
-# ---------------------------------------------
+# ------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
-# accordingly.
 ac_fn_c_check_decl ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-as_decl_name=`echo $2|sed 's/ *(.*//'`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
-as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+$as_echo_n "checking whether $2 is declared... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-$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 $as_decl_name
+#ifndef $2
-#ifdef __cplusplus
+(void) $2;
-(void) $as_decl_use;
-#else
-(void) $as_decl_name;
-#endif
 #endif
 ;
 return 0;
 }
 ac_fn_c_check_header_preproc ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <$2>
 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 eval "test \"\${$4+set}\"" = set; then :
+if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
 $as_echo_n "(cached) " >&6
 else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 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 eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+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.
 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 eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
 $as_echo_n "(cached) " >&6
 else
 eval "$3=no"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 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 emacs $as_me 24.0.50, which was
-generated by GNU Autoconf 2.66.  Invocation command line was
+generated by GNU Autoconf 2.65.  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
-$as_echo "## ---------------- ##
+cat <<\_ASBOX
+## ---------------- ##
 ## 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
-$as_echo "## ----------------- ##
+cat <<\_ASBOX
+## ----------------- ##
 ## 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
-$as_echo "## ------------------- ##
+cat <<\_ASBOX
+## ------------------- ##
 ## 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
-$as_echo "## ----------- ##
+cat <<\_ASBOX
+## ----------- ##
 ## 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
-# We do not want a PATH search for config.site.
+ac_site_file1=$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. ##
 ## -------------------- ##
 	    a | at | ath | athe | athen | athena )	val=athena ;;
 	    m | mo | mot | moti | motif )	val=motif ;;
 	    g | gt | gtk  )	val=gtk ;;
 	    gtk3  )	val=gtk3 ;;
 	    * )
-as_fn_error $? "\`--with-x-toolkit=$withval' is invalid;
+as_fn_error "\`--with-x-toolkit=$withval' is invalid;
 this option's value should be \`yes', \`no', \`lucid', \`athena', \`motif', \`gtk' or
 \`gtk3'.  \`yes' and \`gtk' are synonyms. \`athena' and \`lucid' are synonyms." "$LINENO" 5
 	    ;;
 	  esac
 	  with_x_toolkit=$val
 	stringbytes) 	ac_gc_check_stringbytes=1 ;;
 	stringoverrun) 	ac_gc_check_string_overrun=1 ;;
 	stringfreelist) ac_gc_check_string_free_list=1 ;;
 	xmallocoverrun)	ac_xmalloc_overrun=1 ;;
 	conslist)	ac_gc_check_cons_list=1 ;;
-	*)	as_fn_error $? "unknown check category $check" "$LINENO" 5 ;;
+	*)	as_fn_error "unknown check category $check" "$LINENO" 5 ;;
 	esac
 done
 IFS="$ac_save_IFS"
 if test x$ac_enable_checking != x ; then
 ### Canonicalize the configuration name.
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-if test -f "$ac_dir/install-sh"; then
+for ac_t in install-sh install.sh shtool; do
-ac_aux_dir=$ac_dir
+if test -f "$ac_dir/$ac_t"; then
-ac_install_sh="$ac_aux_dir/install-sh -c"
+ac_aux_dir=$ac_dir
-break
+ac_install_sh="$ac_aux_dir/$ac_t -c"
-elif test -f "$ac_dir/install.sh"; then
+break 2
-ac_aux_dir=$ac_dir
+fi
-ac_install_sh="$ac_aux_dir/install.sh -c"
+done
-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
 else
 if test "x$host_alias" = x; then
 ac_cv_host=$ac_cv_build
 else
 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
 set x $ac_cv_host
 shift
 fi
 if test $unported = yes; then
-as_fn_error $? "Emacs hasn't been ported to \`${canonical}' systems.
+as_fn_error "Emacs hasn't been ported to \`${canonical}' systems.
 Check \`etc/MACHINES' for recognized configuration names." "$LINENO" 5
 fi
 machfile="m/${machine}.h"
 opsysfile="s/${opsys}.h"
 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_error 77 "C compiler cannot create executables
+{ as_fn_set_status 77
-See \`config.log' for more details" "$LINENO" 5; }
+as_fn_error "C compiler cannot create executables
+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
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 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
 "
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+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 $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
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ## with pre-built manuals, from a Bazaar checkout.
 if test "$MAKEINFO" = "no"; then
 if test "x${with_makeinfo}" = "xno"; then
 MAKEINFO=off
 elif test ! -e $srcdir/info/emacs; then
-as_fn_error $? "You do not seem to have makeinfo >= 4.6, and your
+as_fn_error "You do not seem to have makeinfo >= 4.6, and your
 source tree does not seem to have pre-built manuals in the \`info' directory.
 Either install a suitable version of makeinfo, or re-run configure
 with the \`--without-makeinfo' option to build without the manuals. " "$LINENO" 5
 fi
 fi
 ## GNU libc, __malloc_initialized would normally be resolved to the
 ## shared library's .bss section, which is fatal.
 if test "x$GCC" = "xyes"; then
 C_SWITCH_MACHINE="-fno-common"
 else
-as_fn_error $? "What gives?  Fix me if DEC Unix supports ELF now." "$LINENO" 5
+as_fn_error "What gives?  Fix me if DEC Unix supports ELF now." "$LINENO" 5
 fi
 else
 UNEXEC_OBJ=unexalpha.o
 fi
 fi
 else
 ## Some platforms don't use any of these files, so it is not
 ## appropriate to put this test outside the if block.
 test -e $CRT_DIR/crtn.o || test -e $CRT_DIR/crt0.o || \
-as_fn_error $? "crt*.o not found in specified location." "$LINENO" 5
+as_fn_error "crt*.o not found in specified location." "$LINENO" 5
 fi
 # Sound support for GNU/Linux and the free BSDs.
 for ac_header in machine/soundcard.h sys/soundcard.h soundcard.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"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+if test "x$as_val" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 have_sound_header=yes
 fi
 else
 emacs_alsa_subdir=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 if test "$emacs_alsa_subdir" != yes; then
-as_fn_error $? "pkg-config found alsa, but it does not compile.  See config.log for error messages." "$LINENO" 5
+as_fn_error "pkg-config found alsa, but it does not compile.  See config.log for error messages." "$LINENO" 5
 fi
 ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
 fi
 CFLAGS="$SAVE_CFLAGS"
 for ac_header in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
 linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
 stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \
 sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
-sys/utsname.h pwd.h utmp.h dirent.h
+sys/utsname.h pwd.h utmp.h dirent.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"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+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 eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+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;;
 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
 fi
 ac_fn_c_check_header_mongrel "$LINENO" "AppKit/AppKit.h" "ac_cv_header_AppKit_AppKit_h" "$ac_includes_default"
 if test "x$ac_cv_header_AppKit_AppKit_h" = x""yes; then :
 HAVE_NS=yes
 else
-as_fn_error $? "\`--with-ns' was specified, but the include
+as_fn_error "\`--with-ns' was specified, but the include
 files are missing or cannot be compiled." "$LINENO" 5
 fi
 NS_HAVE_NSINTEGER=yes
 if test "$HAVE_XSERVER" = true ||
 test -n "$DISPLAY" ||
 test "`echo /usr/lib/libX11.*`" != "/usr/lib/libX11.*"; then
-as_fn_error $? "You seem to be running X, but no X development libraries
+as_fn_error "You seem to be running X, but no X development libraries
 were found.  You should install the relevant development files for X
 and for the toolkit you want, such as Gtk+, Lesstif or Motif.  Also make
 sure you have development files for image handling, i.e.
 tiff, gif, jpeg, png and xpm.
 If you are sure you want Emacs compiled without X window support, pass
 for ac_header in $ac_header_list
 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
 "
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+if test "x$as_val" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 int
 main ()
 {
 char *data, *data2, *data3;
-const char *cdata2;
 int i, pagesize;
 int fd, fd2;
 pagesize = getpagesize ();
 /* Next, check that the tail of a page is zero-filled.  File must have
 non-zero length, otherwise we risk SIGBUS for entire page.  */
 fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
 if (fd2 < 0)
 return 4;
-cdata2 = "";
+data2 = "";
-if (write (fd2, cdata2, 1) != 1)
+if (write (fd2, data2, 1) != 1)
 return 5;
-data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
+data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
 if (data2 == MAP_FAILED)
 return 6;
 for (i = 0; i < pagesize; ++i)
 if (*(data2 + i))
 return 7;
 for ac_func in XrmSetDatabase XScreenResourceString \
 XScreenNumberOfScreen XSetWMProtocols
 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"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+if test "x$as_val" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 else
 pkg_check_gtk=no
 fi
 if test "$pkg_check_gtk" = "no" && test "$USE_X_TOOLKIT" != "maybe"; then
-as_fn_error $? "$GTK_PKG_ERRORS" "$LINENO" 5
+as_fn_error "$GTK_PKG_ERRORS" "$LINENO" 5
 fi
 fi
 if test "$pkg_check_gtk" != "yes"; then
 HAVE_GTK=no
 else
 pkg_check_gtk=no
 fi
 if test "$pkg_check_gtk" = "no" && test "$USE_X_TOOLKIT" != "maybe"; then
-as_fn_error $? "$GTK_PKG_ERRORS" "$LINENO" 5
+as_fn_error "$GTK_PKG_ERRORS" "$LINENO" 5
 fi
 fi
 fi
 GTK_OBJ=
 fi
 done
 if test "${GTK_COMPILES}" != "yes"; then
 if test "$USE_X_TOOLKIT" != "maybe"; then
-as_fn_error $? "Gtk+ wanted, but it does not compile, see config.log.  Maybe some x11-devel files missing?" "$LINENO" 5;
+as_fn_error "Gtk+ wanted, but it does not compile, see config.log.  Maybe some x11-devel files missing?" "$LINENO" 5;
 fi
 else
 HAVE_GTK=yes
 $as_echo "#define USE_GTK 1" >>confdefs.h
 gtk_widget_get_mapped gtk_adjustment_get_page_size \
 gtk_orientable_set_orientation
 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"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+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: yes; using Lucid toolkit" >&5
 $as_echo "yes; using Lucid toolkit" >&6; }
 USE_X_TOOLKIT=LUCID
 LUCID_LIBW=-lXaw
 elif test x"${USE_X_TOOLKIT}" = xLUCID; then
-as_fn_error $? "Lucid toolkit requires X11/Xaw include files" "$LINENO" 5
+as_fn_error "Lucid toolkit requires X11/Xaw include files" "$LINENO" 5
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; do not use toolkit by default" >&5
 $as_echo "no; do not use toolkit by default" >&6; }
 USE_X_TOOLKIT=none
 fi
 # in /usr/include/libpng.
 for ac_header in png.h libpng/png.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"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+if test "x$as_val" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 MISSING="$MISSING libgif/libungif" && WITH_NO="$WITH_NO --with-gif=no"
 test "${with_tiff}" != "no" && test "${HAVE_TIFF}" != "yes" &&
 MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no"
 if test "X${MISSING}" != X; then
-as_fn_error $? "The following required libraries were not found:
+as_fn_error "The following required libraries were not found:
 $MISSING
 Maybe some development libraries/packages are missing?
 If you don't want to link with them give
 $WITH_NO
 as options to configure" "$LINENO" 5
 $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"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+if test "x$as_val" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
 _ACEOF
 fi
 if test x"$ac_cv_func_alloca_works" != xyes; then
-as_fn_error $? "a system implementation of alloca is required " "$LINENO" 5
+as_fn_error "a system implementation of alloca is required " "$LINENO" 5
 fi
 # fmod, logb, and frexp are found in -lm on most systems.
 # On HPUX 9.01, -lm does not contain logb, so check for sqrt.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5
 $as_echo "no" >&6; }
 fi
 if test $ac_cv_prog_liblockfile = yes; then
-as_fn_error $? "Shared liblockfile found but can't link against it.
+as_fn_error "Shared liblockfile found but can't link against it.
 This probably means that movemail could lose mail.
 There may be a \`development' package to install containing liblockfile." "$LINENO" 5
 fi
 fi
 for ac_func in touchlock
 memset memcmp difftime memcpy mempcpy mblen mbrlen posix_memalign \
 cfmakeraw cfsetspeed isnan copysign __executable_start
 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"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+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 $ac_func_list
 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"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+if test "x$as_val" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 static time_t time_t_max;
 static time_t time_t_min;
 /* Values we'll use to set the TZ environment variable.  */
-static const char *tz_strings[] = {
+static char *tz_strings[] = {
-(const char *) 0, "TZ=GMT0", "TZ=JST-9",
+(char *) 0, "TZ=GMT0", "TZ=JST-9",
 "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00"
 };
 #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
 /* Return 0 if mktime fails to convert a date in the spring-forward gap.
 /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
 instead of "TZ=America/Vancouver" in order to detect the bug even
 on systems that don't support the Olson extension, or don't have the
 full zoneinfo tables installed.  */
-putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0");
+putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
 tm.tm_year = 98;
 tm.tm_mon = 3;
 tm.tm_mday = 5;
 tm.tm_hour = 2;
 tm.tm_isdst = -1;
 return mktime (&tm) != (time_t) -1;
 }
 static int
-mktime_test1 (time_t now)
+mktime_test1 (now)
+time_t now;
 {
 struct tm *lt;
 return ! (lt = localtime (&now)) || mktime (lt) == now;
 }
 static int
-mktime_test (time_t now)
+mktime_test (now)
+time_t now;
 {
 return (mktime_test1 (now)
 	  && mktime_test1 ((time_t) (time_t_max - now))
 	  && mktime_test1 ((time_t) (time_t_min + now)));
 }
 mktime (&tm);
 return tm.tm_mon == 2 && tm.tm_mday == 31;
 }
 static int
-bigtime_test (int j)
+bigtime_test (j)
+int j;
 {
 struct tm tm;
 time_t now;
 tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = j;
 now = mktime (&tm);
 /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
 instead of "TZ=America/Vancouver" in order to detect the bug even
 on systems that don't support the Olson extension, or don't have the
 full zoneinfo tables installed.  */
-putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0");
+putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
 t = mktime (&tm);
 /* Check that the result is either a failure, or close enough
 to the correct answer that we can assume the discrepancy is
 delta = time_t_max / 997; /* a suitable prime number */
 for (i = 0; i < N_STRINGS; i++)
 {
 if (tz_strings[i])
-	putenv ((char*) tz_strings[i]);
+	putenv (tz_strings[i]);
 for (t = 0; t <= time_t_max - delta; t += delta)
 	if (! mktime_test (t))
 	  return 1;
 if (! (mktime_test ((time_t) 1)
 ac_have_func=no # yes means we've found a way to get the load average.
 # Make sure getloadavg.c is where it belongs, at configure-time.
 test -f "$srcdir/$ac_config_libobj_dir/getloadavg.c" ||
-as_fn_error $? "$srcdir/$ac_config_libobj_dir/getloadavg.c is missing" "$LINENO" 5
+as_fn_error "$srcdir/$ac_config_libobj_dir/getloadavg.c is missing" "$LINENO" 5
 ac_save_LIBS=$LIBS
 # Check for getloadavg, but be sure not to touch the cache variable.
 (ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg"
 else
 have_tputs_et_al=false
 fi
 if test "$have_tputs_et_al" != true; then
-as_fn_error $? "I couldn't find termcap functions (tputs and friends).
+as_fn_error "I couldn't find termcap functions (tputs and friends).
 Maybe some development libraries/packages are missing?  Try installing
 libncurses-dev(el), libterminfo-dev(el) or similar." "$LINENO" 5
 fi
 # Must define this when any termcap library is found.
 for ac_func in fork vfork
 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"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+if test "x$as_val" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 ## Hack to detect a buggy GCC version.
 if test "x$GCC" = xyes \
 && test x"`$CC --version 2> /dev/null | grep 'gcc.* 4.5.0'`" != x \
 && test x"`echo $CFLAGS | grep '\-O[23]'`" != x \
 && test x"`echo $CFLAGS | grep '\-fno-optimize-sibling-calls'`" = x; then
-as_fn_error $? "GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'." "$LINENO" 5
+as_fn_error "GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'." "$LINENO" 5
 fi
 #### Find out which version of Emacs this is.
 version=`grep 'const char emacs_version' ${srcdir}/src/emacs.c \
 	 | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
 if test x"${version}" = x; then
-as_fn_error $? "can't find current emacs version in \`${srcdir}/src/emacs.c'." "$LINENO" 5
+as_fn_error "can't find current emacs version in \`${srcdir}/src/emacs.c'." "$LINENO" 5
 fi
 if test x"${version}" != x"$PACKAGE_VERSION"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: version mismatch between \`${srcdir}/configure.in' and \`${srcdir}/src/emacs.c'." >&5
 $as_echo "$as_me: WARNING: version mismatch between \`${srcdir}/configure.in' and \`${srcdir}/src/emacs.c'." >&2;}
 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
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# as_fn_error 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=$1; test $as_status -eq 0 && as_status=1
+as_status=$?; test $as_status -eq 0 && as_status=1
-if test "$4"; then
+if test "$3"; then
-as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-$as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+$as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
 fi
-$as_echo "$as_me: error: $2" >&2
+$as_echo "$as_me: error: $1" >&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 emacs $as_me 24.0.50, which was
-generated by GNU Autoconf 2.66.  Invocation command line was
+generated by GNU Autoconf 2.65.  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="\\
 emacs config.status 24.0.50
-configured by $0, generated by GNU Autoconf 2.66,
+configured by $0, generated by GNU Autoconf 2.65,
 with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 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 ;;
 "lwlib/Makefile") CONFIG_FILES="$CONFIG_FILES lwlib/Makefile" ;;
 "lisp/Makefile") CONFIG_FILES="$CONFIG_FILES lisp/Makefile" ;;
 "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;;
 "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 "$ac_subst_files" | sed 's/.*/F["&"]="$&"/' &&
 echo "_ACAWK" &&
 echo "_ACEOF"
 } >conf$$files.sh &&
 . ./conf$$files.sh ||
-as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 rm -f conf$$files.sh
 {
 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 sole $(srcdir),
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# ${srcdir} and @srcdir@ 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[	 ]*=/{
-h
+s/:*\$(srcdir):*/:/
-s///
+s/:*\${srcdir}:*/:/
-s/^/:/
+s/:*@srcdir@:*/:/
-s/[	 ]*$/:/
+s/^\([^=]*=[	 ]*\):*/\1/
-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 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error "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" ||
 if $ac_cs_awk_getline; then
 $AWK -f "$tmp/subs.awk"
 else
 $AWK -f "$tmp/subs.awk" | $SHELL
 fi >$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 1
+$ac_cs_success || as_fn_exit $?
 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 > emacs

comparison configure @ 109653:9cfca8c9fb07