[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r102297: Merge from emacs-23
|
From: |
Stefan Monnier |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r102297: Merge from emacs-23 |
|
Date: |
Tue, 09 Nov 2010 15:07:10 -0500 |
|
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 102297 [merge]
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2010-11-09 15:07:10 -0500
message:
Merge from emacs-23
modified:
.dir-locals.el
ChangeLog
configure
configure.in
doc/emacs/ChangeLog
doc/emacs/msdog.texi
doc/misc/ChangeLog
etc/NEWS.23
lisp/ChangeLog
lisp/Makefile.in
lisp/dired.el
lisp/emacs-lisp/cl-loaddefs.el
lisp/files.el
lisp/international/mule-cmds.el
lisp/locate.el
lisp/ls-lisp.el
lisp/minibuffer.el
lisp/net/tramp.el
lisp/progmodes/python.el
lisp/progmodes/tcl.el
lisp/progmodes/verilog-mode.el
lisp/server.el
lisp/vc/vc-mtn.el
oldXMenu/ChangeLog
oldXMenu/XDelAssoc.c
oldXMenu/XMakeAssoc.c
src/ChangeLog
src/config.in
src/image.c
src/xfns.c
src/xterm.c
src/xterm.h
=== modified file '.dir-locals.el'
--- a/.dir-locals.el 2010-10-05 02:40:34 +0000
+++ b/.dir-locals.el 2010-11-09 20:07:10 +0000
@@ -2,6 +2,8 @@
(sentence-end-double-space . t)
(fill-column . 70)))
(c-mode . ((c-file-style . "GNU")))
+ (log-edit-mode . ((log-edit-rewrite-fixes
+ " (bug#\\([0-9]+\\))" . "debbugs:\\1")))
(change-log-mode . ((add-log-time-zone-rule . t)
(fill-column . 74)
(bug-reference-url-format . "http://debbugs.gnu.org/%s";)
=== modified file 'ChangeLog'
--- a/ChangeLog 2010-11-06 10:31:56 +0000
+++ b/ChangeLog 2010-11-09 20:07:10 +0000
@@ -1,3 +1,11 @@
+2010-11-09 Stefan Monnier <address@hidden>
+
+ * .dir-locals.el (log-edit-mode): Set log-edit-rewrite-fixes.
+
+2010-11-09 Michael Albinus <address@hidden>
+
+ * configure.in: Don't write a warning for D-Bus anymore.
+
2010-11-06 Andreas Schwab <address@hidden>
* configure.in: Fix indentation.
=== modified file 'configure'
--- a/configure 2010-11-06 10:31:56 +0000
+++ b/configure 2010-11-09 20:07:10 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for emacs 24.0.50.
+# Generated by GNU Autoconf 2.67 for emacs 24.0.50.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -89,7 +89,6 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -215,18 +214,11 @@
# We cannot yet assume a decent shell, so we have to provide a
# neutralization value for shells without unset; and this also
# works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
BASH_ENV=/dev/null
ENV=/dev/null
(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
if test x$as_have_required = xno; then :
@@ -1262,7 +1254,7 @@
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : "${build_alias=$ac_option} ${host_alias=$ac_option}
${target_alias=$ac_option}"
+ : ${build_alias=$ac_option} ${host_alias=$ac_option}
${target_alias=$ac_option}
;;
esac
@@ -1633,7 +1625,7 @@
if $ac_init_version; then
cat <<\_ACEOF
emacs configure 24.0.50
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
@@ -1679,7 +1671,7 @@
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
@@ -1725,7 +1717,7 @@
# interfere with the next link command; also delete a directory that is
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_link
@@ -1762,7 +1754,7 @@
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
@@ -1775,10 +1767,10 @@
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval \${$3+:} false; 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 eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@ -1841,7 +1833,7 @@
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@ -1850,7 +1842,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
} # ac_fn_c_check_header_mongrel
@@ -1891,7 +1883,7 @@
ac_retval=$ac_status
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_run
@@ -1905,7 +1897,7 @@
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 \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1923,7 +1915,7 @@
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
} # ac_fn_c_check_header_compile
@@ -1938,7 +1930,7 @@
as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is
declared" >&5
$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1969,7 +1961,7 @@
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
} # ac_fn_c_check_decl
@@ -1981,7 +1973,7 @@
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 \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1998,7 +1990,7 @@
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
} # ac_fn_c_check_header_preproc
@@ -2011,7 +2003,7 @@
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 \${$4+:} false; then :
+if eval "test \"\${$4+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2055,7 +2047,7 @@
eval ac_res=\$$4
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
} # ac_fn_c_check_member
@@ -2067,7 +2059,7 @@
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 \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2122,7 +2114,7 @@
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
} # ac_fn_c_check_func
@@ -2135,7 +2127,7 @@
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 \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
eval "$3=no"
@@ -2176,7 +2168,7 @@
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
} # ac_fn_c_check_type
cat >config.log <<_ACEOF
@@ -2184,7 +2176,7 @@
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.68. Invocation command line was
+generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2442,7 +2434,7 @@
|| { { $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; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
done
@@ -3000,7 +2992,7 @@
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"
@@ -3148,7 +3140,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
+if test "${ac_cv_build+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
@@ -3164,7 +3156,7 @@
$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='-'
@@ -3182,7 +3174,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
+if test "${ac_cv_host+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
@@ -3197,7 +3189,7 @@
$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='-'
@@ -3515,7 +3507,7 @@
set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3555,7 +3547,7 @@
set dummy gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -3608,7 +3600,7 @@
set dummy ${ac_tool_prefix}cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3648,7 +3640,7 @@
set dummy cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3707,7 +3699,7 @@
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3751,7 +3743,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -3806,7 +3798,7 @@
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
-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
@@ -3921,7 +3913,7 @@
{ { $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
-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; }
@@ -3964,7 +3956,7 @@
{ { $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
-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
@@ -4023,7 +4015,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
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
@@ -4034,7 +4026,7 @@
ac_clean_files=$ac_clean_files_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files"
>&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
+if test "${ac_cv_objext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4075,7 +4067,7 @@
{ { $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
-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
@@ -4085,7 +4077,7 @@
ac_objext=$OBJEXT
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU
C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4122,7 +4114,7 @@
ac_save_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
@@ -4200,7 +4192,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO
C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
@@ -4308,7 +4300,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using a Sun
C compiler" >&5
$as_echo_n "checking whether we are using a Sun C compiler... " >&6; }
-if ${emacs_cv_sunpro_c+:} false; then :
+if test "${emacs_cv_sunpro_c+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4377,7 +4369,7 @@
CPP=
fi
if test -z "$CPP"; then
- if ${ac_cv_prog_CPP+:} false; then :
+ if test "${ac_cv_prog_CPP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
@@ -4493,7 +4485,7 @@
{ { $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
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
ac_ext=c
@@ -4505,7 +4497,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long
lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
+if test "${ac_cv_path_GREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
@@ -4568,7 +4560,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
+if test "${ac_cv_path_EGREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4635,7 +4627,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
+if test "${ac_cv_header_stdc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4764,7 +4756,7 @@
ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h"
"ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = xyes; then :
+if test "x$ac_cv_header_minix_config_h" = x""yes; then :
MINIX=yes
else
MINIX=
@@ -4786,7 +4778,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to
define __EXTENSIONS__" >&5
$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if ${ac_cv_safe_to_define___extensions__+:} false; then :
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4966,7 +4958,7 @@
CPP=
fi
if test -z "$CPP"; then
- if ${ac_cv_prog_CPP+:} false; then :
+ if test "${ac_cv_prog_CPP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
@@ -5082,7 +5074,7 @@
{ { $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
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
ac_ext=c
@@ -5108,7 +5100,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible
install" >&5
$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
+if test "${ac_cv_path_install+set}" = set; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5190,7 +5182,7 @@
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
@@ -5230,7 +5222,7 @@
set dummy ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
@@ -5285,7 +5277,7 @@
## is running in i386 mode, we can help them out.
if test "$machine" = "amdx86-64"; then
ac_fn_c_check_decl "$LINENO" "i386" "ac_cv_have_decl_i386"
"$ac_includes_default"
-if test "x$ac_cv_have_decl_i386" = xyes; then :
+if test "x$ac_cv_have_decl_i386" = x""yes; then :
fi
@@ -5300,7 +5292,7 @@
set dummy install-info; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INSTALL_INFO+:} false; then :
+if test "${ac_cv_path_INSTALL_INFO+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $INSTALL_INFO in
@@ -5340,7 +5332,7 @@
set dummy install-info; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INSTALL_INFO+:} false; then :
+if test "${ac_cv_path_INSTALL_INFO+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $INSTALL_INFO in
@@ -5380,7 +5372,7 @@
set dummy install-info; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INSTALL_INFO+:} false; then :
+if test "${ac_cv_path_INSTALL_INFO+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $INSTALL_INFO in
@@ -5421,7 +5413,7 @@
set dummy gzip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GZIP_PROG+:} false; then :
+if test "${ac_cv_path_GZIP_PROG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $GZIP_PROG in
@@ -5464,7 +5456,7 @@
set dummy makeinfo; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MAKEINFO+:} false; then :
+if test "${ac_cv_path_MAKEINFO+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MAKEINFO in
@@ -5665,7 +5657,7 @@
C_SWITCH_MACHINE=
if test "$machine" = "alpha"; then
ac_fn_c_check_decl "$LINENO" "__ELF__" "ac_cv_have_decl___ELF__"
"$ac_includes_default"
-if test "x$ac_cv_have_decl___ELF__" = xyes; then :
+if test "x$ac_cv_have_decl___ELF__" = x""yes; then :
fi
@@ -5735,7 +5727,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler
options needed for large files" >&5
$as_echo_n "checking for special C compiler options needed for large files...
" >&6; }
-if ${ac_cv_sys_largefile_CC+:} false; then :
+if test "${ac_cv_sys_largefile_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_sys_largefile_CC=no
@@ -5786,7 +5778,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS
value needed for large files" >&5
$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... "
>&6; }
-if ${ac_cv_sys_file_offset_bits+:} false; then :
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
$as_echo_n "(cached) " >&6
else
while :; do
@@ -5855,7 +5847,7 @@
if test $ac_cv_sys_file_offset_bits = unknown; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value
needed for large files" >&5
$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if ${ac_cv_sys_large_files+:} false; then :
+if test "${ac_cv_sys_large_files+set}" = set; then :
$as_echo_n "(cached) " >&6
else
while :; do
@@ -6023,7 +6015,7 @@
# Emulation library used on NetBSD.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _oss_ioctl in
-lossaudio" >&5
$as_echo_n "checking for _oss_ioctl in -lossaudio... " >&6; }
-if ${ac_cv_lib_ossaudio__oss_ioctl+:} false; then :
+if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -6057,7 +6049,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_ossaudio__oss_ioctl" >&5
$as_echo "$ac_cv_lib_ossaudio__oss_ioctl" >&6; }
-if test "x$ac_cv_lib_ossaudio__oss_ioctl" = xyes; then :
+if test "x$ac_cv_lib_ossaudio__oss_ioctl" = x""yes; then :
LIBSOUND=-lossaudio
else
LIBSOUND=
@@ -6074,7 +6066,7 @@
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -6278,7 +6270,7 @@
for ac_header in term.h
do :
ac_fn_c_check_header_preproc "$LINENO" "term.h" "ac_cv_header_term_h"
-if test "x$ac_cv_header_term_h" = xyes; then :
+if test "x$ac_cv_header_term_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_TERM_H 1
_ACEOF
@@ -6289,7 +6281,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
+if test "${ac_cv_header_stdc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6401,7 +6393,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and
sys/time.h may both be included" >&5
$as_echo_n "checking whether time.h and sys/time.h may both be included... "
>&6; }
-if ${ac_cv_header_time+:} false; then :
+if test "${ac_cv_header_time+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6435,7 +6427,7 @@
fi
ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist"
"$ac_includes_default"
-if test "x$ac_cv_have_decl_sys_siglist" = xyes; then :
+if test "x$ac_cv_have_decl_sys_siglist" = x""yes; then :
ac_have_decl=1
else
ac_have_decl=0
@@ -6448,7 +6440,7 @@
if test $ac_cv_have_decl_sys_siglist != yes; then
# For Tru64, at least:
ac_fn_c_check_decl "$LINENO" "__sys_siglist" "ac_cv_have_decl___sys_siglist"
"$ac_includes_default"
-if test "x$ac_cv_have_decl___sys_siglist" = xyes; then :
+if test "x$ac_cv_have_decl___sys_siglist" = x""yes; then :
ac_have_decl=1
else
ac_have_decl=0
@@ -6466,7 +6458,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is
POSIX.1 compatible" >&5
$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
-if ${ac_cv_header_sys_wait_h+:} false; then :
+if test "${ac_cv_header_sys_wait_h+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6508,7 +6500,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct utimbuf" >&5
$as_echo_n "checking for struct utimbuf... " >&6; }
-if ${emacs_cv_struct_utimbuf+:} false; then :
+if test "${emacs_cv_struct_utimbuf+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6551,7 +6543,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal
handlers" >&5
$as_echo_n "checking return type of signal handlers... " >&6; }
-if ${ac_cv_type_signal+:} false; then :
+if test "${ac_cv_type_signal+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6585,7 +6577,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for speed_t" >&5
$as_echo_n "checking for speed_t... " >&6; }
-if ${emacs_cv_speed_t+:} false; then :
+if test "${emacs_cv_speed_t+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6616,7 +6608,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timeval" >&5
$as_echo_n "checking for struct timeval... " >&6; }
-if ${emacs_cv_struct_timeval+:} false; then :
+if test "${emacs_cv_struct_timeval+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6657,7 +6649,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct exception" >&5
$as_echo_n "checking for struct exception... " >&6; }
-if ${emacs_cv_struct_exception+:} false; then :
+if test "${emacs_cv_struct_exception+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6690,7 +6682,7 @@
for ac_header in sys/socket.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "sys/socket.h"
"ac_cv_header_sys_socket_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_socket_h" = xyes; then :
+if test "x$ac_cv_header_sys_socket_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SYS_SOCKET_H 1
_ACEOF
@@ -6706,7 +6698,7 @@
#include <sys/socket.h>
#endif
"
-if test "x$ac_cv_header_net_if_h" = xyes; then :
+if test "x$ac_cv_header_net_if_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_NET_IF_H 1
_ACEOF
@@ -6718,7 +6710,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in
sys/time.h or time.h" >&5
$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if ${ac_cv_struct_tm+:} false; then :
+if test "${ac_cv_struct_tm+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6755,7 +6747,7 @@
#include <$ac_cv_struct_tm>
"
-if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
+if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_TM_TM_ZONE 1
@@ -6771,7 +6763,7 @@
else
ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include
<time.h>
"
-if test "x$ac_cv_have_decl_tzname" = xyes; then :
+if test "x$ac_cv_have_decl_tzname" = x""yes; then :
ac_have_decl=1
else
ac_have_decl=0
@@ -6783,7 +6775,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
$as_echo_n "checking for tzname... " >&6; }
-if ${ac_cv_var_tzname+:} false; then :
+if test "${ac_cv_var_tzname+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6820,7 +6812,7 @@
ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff"
"ac_cv_member_struct_tm_tm_gmtoff" "#include <time.h>
"
-if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes; then :
+if test "x$ac_cv_member_struct_tm_tm_gmtoff" = x""yes; then :
$as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h
@@ -6834,7 +6826,7 @@
#include <net/if.h>
#endif
"
-if test "x$ac_cv_member_struct_ifreq_ifr_flags" = xyes; then :
+if test "x$ac_cv_member_struct_ifreq_ifr_flags" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_IFREQ_IFR_FLAGS 1
@@ -6850,7 +6842,7 @@
#include <net/if.h>
#endif
"
-if test "x$ac_cv_member_struct_ifreq_ifr_hwaddr" = xyes; then :
+if test "x$ac_cv_member_struct_ifreq_ifr_hwaddr" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_IFREQ_IFR_HWADDR 1
@@ -6866,7 +6858,7 @@
#include <net/if.h>
#endif
"
-if test "x$ac_cv_member_struct_ifreq_ifr_netmask" = xyes; then :
+if test "x$ac_cv_member_struct_ifreq_ifr_netmask" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_IFREQ_IFR_NETMASK 1
@@ -6882,7 +6874,7 @@
#include <net/if.h>
#endif
"
-if test "x$ac_cv_member_struct_ifreq_ifr_broadaddr" = xyes; then :
+if test "x$ac_cv_member_struct_ifreq_ifr_broadaddr" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_IFREQ_IFR_BROADADDR 1
@@ -6898,7 +6890,7 @@
#include <net/if.h>
#endif
"
-if test "x$ac_cv_member_struct_ifreq_ifr_addr" = xyes; then :
+if test "x$ac_cv_member_struct_ifreq_ifr_addr" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_IFREQ_IFR_ADDR 1
@@ -6927,7 +6919,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5
$as_echo_n "checking for working volatile... " >&6; }
-if ${ac_cv_c_volatile+:} false; then :
+if test "${ac_cv_c_volatile+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6961,7 +6953,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming
const" >&5
$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
+if test "${ac_cv_c_const+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7041,7 +7033,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for void * support" >&5
$as_echo_n "checking for void * support... " >&6; }
-if ${emacs_cv_void_star+:} false; then :
+if test "${emacs_cv_void_star+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7074,7 +7066,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is
bigendian" >&5
$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
+if test "${ac_cv_c_bigendian+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_c_bigendian=unknown
@@ -7293,7 +7285,7 @@
;; #(
*)
as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
@@ -7301,7 +7293,7 @@
$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 \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -7389,7 +7381,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5
$as_echo_n "checking for long file names... " >&6; }
-if ${ac_cv_sys_long_file_names+:} false; then :
+if test "${ac_cv_sys_long_file_names+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_sys_long_file_names=yes
@@ -7445,8 +7437,8 @@
have_x=disabled
else
case $x_includes,$x_libraries in #(
- *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO"
5;; #(
- *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
+ *\'*) 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.
@@ -7729,7 +7721,7 @@
TEMACS_LDFLAGS2=
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" = xyes; then :
+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
@@ -7811,7 +7803,7 @@
set dummy X; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_HAVE_XSERVER+:} false; then :
+if test "${ac_cv_prog_HAVE_XSERVER+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$HAVE_XSERVER"; then
@@ -7870,14 +7862,14 @@
GNU_MALLOC=yes
doug_lea_malloc=yes
ac_fn_c_check_func "$LINENO" "malloc_get_state" "ac_cv_func_malloc_get_state"
-if test "x$ac_cv_func_malloc_get_state" = xyes; then :
+if test "x$ac_cv_func_malloc_get_state" = x""yes; then :
else
doug_lea_malloc=no
fi
ac_fn_c_check_func "$LINENO" "malloc_set_state" "ac_cv_func_malloc_set_state"
-if test "x$ac_cv_func_malloc_set_state" = xyes; then :
+if test "x$ac_cv_func_malloc_set_state" = x""yes; then :
else
doug_lea_malloc=no
@@ -7885,7 +7877,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether
__after_morecore_hook exists" >&5
$as_echo_n "checking whether __after_morecore_hook exists... " >&6; }
-if ${emacs_cv_var___after_morecore_hook+:} false; then :
+if test "${emacs_cv_var___after_morecore_hook+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7990,7 +7982,7 @@
for ac_func in getpagesize
do :
ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
-if test "x$ac_cv_func_getpagesize" = xyes; then :
+if test "x$ac_cv_func_getpagesize" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_GETPAGESIZE 1
_ACEOF
@@ -8000,7 +7992,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
$as_echo_n "checking for working mmap... " >&6; }
-if ${ac_cv_func_mmap_fixed_mapped+:} false; then :
+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -8175,7 +8167,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -8209,7 +8201,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDNET 1
_ACEOF
@@ -8221,7 +8213,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXbsd" >&5
$as_echo_n "checking for main in -lXbsd... " >&6; }
-if ${ac_cv_lib_Xbsd_main+:} false; then :
+if test "${ac_cv_lib_Xbsd_main+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -8249,14 +8241,14 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xbsd_main" >&5
$as_echo "$ac_cv_lib_Xbsd_main" >&6; }
-if test "x$ac_cv_lib_Xbsd_main" = xyes; then :
+if test "x$ac_cv_lib_Xbsd_main" = x""yes; then :
LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cma_open in -lpthreads"
>&5
$as_echo_n "checking for cma_open in -lpthreads... " >&6; }
-if ${ac_cv_lib_pthreads_cma_open+:} false; then :
+if test "${ac_cv_lib_pthreads_cma_open+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -8290,7 +8282,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_cma_open"
>&5
$as_echo "$ac_cv_lib_pthreads_cma_open" >&6; }
-if test "x$ac_cv_lib_pthreads_cma_open" = xyes; then :
+if test "x$ac_cv_lib_pthreads_cma_open" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPTHREADS 1
_ACEOF
@@ -8317,7 +8309,7 @@
aix*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -bbigtoc option" >&5
$as_echo_n "checking for -bbigtoc option... " >&6; }
-if ${gdb_cv_bigtoc+:} false; then :
+if test "${gdb_cv_bigtoc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -8491,7 +8483,7 @@
if test "${window_system}" = "x11"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking X11 version 6" >&5
$as_echo_n "checking X11 version 6... " >&6; }
- if ${emacs_cv_x11_version_6+:} false; then :
+ if test "${emacs_cv_x11_version_6+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8556,7 +8548,7 @@
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -8667,7 +8659,7 @@
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -8766,7 +8758,7 @@
for ac_func in MagickExportImagePixels
do :
ac_fn_c_check_func "$LINENO" "MagickExportImagePixels"
"ac_cv_func_MagickExportImagePixels"
-if test "x$ac_cv_func_MagickExportImagePixels" = xyes; then :
+if test "x$ac_cv_func_MagickExportImagePixels" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_MAGICKEXPORTIMAGEPIXELS 1
_ACEOF
@@ -8792,7 +8784,7 @@
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -8898,7 +8890,7 @@
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -9003,7 +8995,7 @@
for ac_func in gtk_main
do :
ac_fn_c_check_func "$LINENO" "gtk_main" "ac_cv_func_gtk_main"
-if test "x$ac_cv_func_gtk_main" = xyes; then :
+if test "x$ac_cv_func_gtk_main" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_GTK_MAIN 1
_ACEOF
@@ -9013,7 +9005,7 @@
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
@@ -9051,7 +9043,7 @@
ac_fn_c_check_decl "$LINENO" "GTK_TYPE_FILE_SELECTION"
"ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" "$ac_includes_default
#include <gtk/gtk.h>
"
-if test "x$ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" = xyes; then :
+if test "x$ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" = x""yes; then :
HAVE_GTK_FILE_SELECTION=yes
else
HAVE_GTK_FILE_SELECTION=no
@@ -9061,7 +9053,7 @@
for ac_func in gtk_file_selection_new
do :
ac_fn_c_check_func "$LINENO" "gtk_file_selection_new"
"ac_cv_func_gtk_file_selection_new"
-if test "x$ac_cv_func_gtk_file_selection_new" = xyes; then :
+if test "x$ac_cv_func_gtk_file_selection_new" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_GTK_FILE_SELECTION_NEW 1
_ACEOF
@@ -9075,7 +9067,7 @@
for ac_header in pthread.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h"
"$ac_includes_default"
-if test "x$ac_cv_header_pthread_h" = xyes; then :
+if test "x$ac_cv_header_pthread_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_PTHREAD_H 1
_ACEOF
@@ -9087,7 +9079,7 @@
if test "$ac_cv_header_pthread_h"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in
-lpthread" >&5
$as_echo_n "checking for pthread_self in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_self+:} false; then :
+if test "${ac_cv_lib_pthread_pthread_self+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -9121,7 +9113,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_pthread_pthread_self" >&5
$as_echo "$ac_cv_lib_pthread_pthread_self" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_self" = xyes; then :
+if test "x$ac_cv_lib_pthread_pthread_self" = x""yes; then :
HAVE_GTK_AND_PTHREAD=yes
fi
@@ -9164,7 +9156,7 @@
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -9259,7 +9251,7 @@
for ac_func in dbus_watch_get_unix_fd
do :
ac_fn_c_check_func "$LINENO" "dbus_watch_get_unix_fd"
"ac_cv_func_dbus_watch_get_unix_fd"
-if test "x$ac_cv_func_dbus_watch_get_unix_fd" = xyes; then :
+if test "x$ac_cv_func_dbus_watch_get_unix_fd" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_DBUS_WATCH_GET_UNIX_FD 1
_ACEOF
@@ -9281,7 +9273,7 @@
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -9380,7 +9372,7 @@
if test "${with_selinux}" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lgetfilecon in
-lselinux" >&5
$as_echo_n "checking for lgetfilecon in -lselinux... " >&6; }
-if ${ac_cv_lib_selinux_lgetfilecon+:} false; then :
+if test "${ac_cv_lib_selinux_lgetfilecon+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -9414,7 +9406,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_selinux_lgetfilecon" >&5
$as_echo "$ac_cv_lib_selinux_lgetfilecon" >&6; }
-if test "x$ac_cv_lib_selinux_lgetfilecon" = xyes; then :
+if test "x$ac_cv_lib_selinux_lgetfilecon" = x""yes; then :
HAVE_LIBSELINUX=yes
else
HAVE_LIBSELINUX=no
@@ -9438,7 +9430,7 @@
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -9540,7 +9532,7 @@
if test "$with_xaw3d" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xaw3d" >&5
$as_echo_n "checking for xaw3d... " >&6; }
- if ${emacs_cv_xaw3d+:} false; then :
+ if test "${emacs_cv_xaw3d+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9582,7 +9574,7 @@
$as_echo "no" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libXaw" >&5
$as_echo_n "checking for libXaw... " >&6; }
- if ${emacs_cv_xaw+:} false; then :
+ if test "${emacs_cv_xaw+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9628,7 +9620,7 @@
if test "${USE_X_TOOLKIT}" != "none"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking X11 toolkit version" >&5
$as_echo_n "checking X11 toolkit version... " >&6; }
- if ${emacs_cv_x11_toolkit_version_6+:} false; then :
+ if test "${emacs_cv_x11_toolkit_version_6+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9679,7 +9671,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for
XmuConvertStandardSelection in -lXmu" >&5
$as_echo_n "checking for XmuConvertStandardSelection in -lXmu... " >&6; }
-if ${ac_cv_lib_Xmu_XmuConvertStandardSelection+:} false; then :
+if test "${ac_cv_lib_Xmu_XmuConvertStandardSelection+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -9713,7 +9705,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_Xmu_XmuConvertStandardSelection" >&5
$as_echo "$ac_cv_lib_Xmu_XmuConvertStandardSelection" >&6; }
-if test "x$ac_cv_lib_Xmu_XmuConvertStandardSelection" = xyes; then :
+if test "x$ac_cv_lib_Xmu_XmuConvertStandardSelection" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBXMU 1
_ACEOF
@@ -9740,7 +9732,7 @@
if test "${USE_X_TOOLKIT}" != "none"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension
in -lXext" >&5
$as_echo_n "checking for XShapeQueryExtension in -lXext... " >&6; }
-if ${ac_cv_lib_Xext_XShapeQueryExtension+:} false; then :
+if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -9774,7 +9766,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_Xext_XShapeQueryExtension" >&5
$as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
-if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = xyes; then :
+if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBXEXT 1
_ACEOF
@@ -9790,7 +9782,7 @@
if test "${USE_X_TOOLKIT}" = "MOTIF"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif version 2.1" >&5
$as_echo_n "checking for Motif version 2.1... " >&6; }
-if ${emacs_cv_motif_version_2_1+:} false; then :
+if test "${emacs_cv_motif_version_2_1+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9820,7 +9812,7 @@
if test $emacs_cv_motif_version_2_1 = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpCreateContext in
-lXp" >&5
$as_echo_n "checking for XpCreateContext in -lXp... " >&6; }
-if ${ac_cv_lib_Xp_XpCreateContext+:} false; then :
+if test "${ac_cv_lib_Xp_XpCreateContext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -9854,14 +9846,14 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_Xp_XpCreateContext" >&5
$as_echo "$ac_cv_lib_Xp_XpCreateContext" >&6; }
-if test "x$ac_cv_lib_Xp_XpCreateContext" = xyes; then :
+if test "x$ac_cv_lib_Xp_XpCreateContext" = x""yes; then :
LIBXP=-lXp
fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LessTif where some
systems put it" >&5
$as_echo_n "checking for LessTif where some systems put it... " >&6; }
-if ${emacs_cv_lesstif+:} false; then :
+if test "${emacs_cv_lesstif+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# We put this in CFLAGS temporarily to precede other -I options
@@ -10020,7 +10012,7 @@
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -10122,7 +10114,7 @@
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -10214,7 +10206,7 @@
HAVE_XRENDER=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for
XRenderQueryExtension in -lXrender" >&5
$as_echo_n "checking for XRenderQueryExtension in -lXrender... " >&6; }
-if ${ac_cv_lib_Xrender_XRenderQueryExtension+:} false; then :
+if test "${ac_cv_lib_Xrender_XRenderQueryExtension+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10248,7 +10240,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_Xrender_XRenderQueryExtension" >&5
$as_echo "$ac_cv_lib_Xrender_XRenderQueryExtension" >&6; }
-if test "x$ac_cv_lib_Xrender_XRenderQueryExtension" = xyes; then :
+if test "x$ac_cv_lib_Xrender_XRenderQueryExtension" = x""yes; then :
HAVE_XRENDER=yes
fi
@@ -10261,10 +10253,10 @@
XFT_LIBS="-lXrender $XFT_LIBS"
LIBS="$XFT_LIBS $LIBS"
ac_fn_c_check_header_mongrel "$LINENO" "X11/Xft/Xft.h"
"ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xft_Xft_h" = xyes; then :
+if test "x$ac_cv_header_X11_Xft_Xft_h" = x""yes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XftFontOpen in -lXft"
>&5
$as_echo_n "checking for XftFontOpen in -lXft... " >&6; }
-if ${ac_cv_lib_Xft_XftFontOpen+:} false; then :
+if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10298,7 +10290,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xft_XftFontOpen"
>&5
$as_echo "$ac_cv_lib_Xft_XftFontOpen" >&6; }
-if test "x$ac_cv_lib_Xft_XftFontOpen" = xyes; then :
+if test "x$ac_cv_lib_Xft_XftFontOpen" = x""yes; then :
HAVE_XFT=yes
fi
@@ -10347,7 +10339,7 @@
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -10440,7 +10432,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for
OTF_get_variation_glyphs in -lotf" >&5
$as_echo_n "checking for OTF_get_variation_glyphs in -lotf... " >&6; }
-if ${ac_cv_lib_otf_OTF_get_variation_glyphs+:} false; then :
+if test "${ac_cv_lib_otf_OTF_get_variation_glyphs+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10474,7 +10466,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_otf_OTF_get_variation_glyphs" >&5
$as_echo "$ac_cv_lib_otf_OTF_get_variation_glyphs" >&6; }
-if test "x$ac_cv_lib_otf_OTF_get_variation_glyphs" = xyes; then :
+if test "x$ac_cv_lib_otf_OTF_get_variation_glyphs" = x""yes; then :
HAVE_OTF_GET_VARIATION_GLYPHS=yes
else
HAVE_OTF_GET_VARIATION_GLYPHS=no
@@ -10499,7 +10491,7 @@
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -10617,10 +10609,10 @@
if test "${HAVE_X11}" = "yes"; then
if test "${with_xpm}" != "no"; then
ac_fn_c_check_header_mongrel "$LINENO" "X11/xpm.h"
"ac_cv_header_X11_xpm_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_xpm_h" = xyes; then :
+if test "x$ac_cv_header_X11_xpm_h" = x""yes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmReadFileToPixmap in
-lXpm" >&5
$as_echo_n "checking for XpmReadFileToPixmap in -lXpm... " >&6; }
-if ${ac_cv_lib_Xpm_XpmReadFileToPixmap+:} false; then :
+if test "${ac_cv_lib_Xpm_XpmReadFileToPixmap+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10654,7 +10646,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5
$as_echo "$ac_cv_lib_Xpm_XpmReadFileToPixmap" >&6; }
-if test "x$ac_cv_lib_Xpm_XpmReadFileToPixmap" = xyes; then :
+if test "x$ac_cv_lib_Xpm_XpmReadFileToPixmap" = x""yes; then :
HAVE_XPM=yes
fi
@@ -10706,10 +10698,10 @@
if test "${HAVE_X11}" = "yes"; then
if test "${with_jpeg}" != "no"; then
ac_fn_c_check_header_mongrel "$LINENO" "jerror.h"
"ac_cv_header_jerror_h" "$ac_includes_default"
-if test "x$ac_cv_header_jerror_h" = xyes; then :
+if test "x$ac_cv_header_jerror_h" = x""yes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_destroy_compress
in -ljpeg" >&5
$as_echo_n "checking for jpeg_destroy_compress in -ljpeg... " >&6; }
-if ${ac_cv_lib_jpeg_jpeg_destroy_compress+:} false; then :
+if test "${ac_cv_lib_jpeg_jpeg_destroy_compress+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10743,7 +10735,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_jpeg_jpeg_destroy_compress" >&5
$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_compress" >&6; }
-if test "x$ac_cv_lib_jpeg_jpeg_destroy_compress" = xyes; then :
+if test "x$ac_cv_lib_jpeg_jpeg_destroy_compress" = x""yes; then :
HAVE_JPEG=yes
fi
@@ -10802,7 +10794,7 @@
if test "$ac_cv_header_png_h" = yes || test "$ac_cv_header_libpng_png_h" =
yes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_get_channels
in -lpng" >&5
$as_echo_n "checking for png_get_channels in -lpng... " >&6; }
-if ${ac_cv_lib_png_png_get_channels+:} false; then :
+if test "${ac_cv_lib_png_png_get_channels+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10836,7 +10828,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_png_png_get_channels" >&5
$as_echo "$ac_cv_lib_png_png_get_channels" >&6; }
-if test "x$ac_cv_lib_png_png_get_channels" = xyes; then :
+if test "x$ac_cv_lib_png_png_get_channels" = x""yes; then :
HAVE_PNG=yes
fi
@@ -10858,13 +10850,13 @@
if test "${HAVE_X11}" = "yes"; then
if test "${with_tiff}" != "no"; then
ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h"
"$ac_includes_default"
-if test "x$ac_cv_header_tiffio_h" = xyes; then :
+if test "x$ac_cv_header_tiffio_h" = x""yes; then :
tifflibs="-lz -lm"
# At least one tiff package requires the jpeg library.
if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFGetVersion in
-ltiff" >&5
$as_echo_n "checking for TIFFGetVersion in -ltiff... " >&6; }
-if ${ac_cv_lib_tiff_TIFFGetVersion+:} false; then :
+if test "${ac_cv_lib_tiff_TIFFGetVersion+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10898,7 +10890,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_tiff_TIFFGetVersion" >&5
$as_echo "$ac_cv_lib_tiff_TIFFGetVersion" >&6; }
-if test "x$ac_cv_lib_tiff_TIFFGetVersion" = xyes; then :
+if test "x$ac_cv_lib_tiff_TIFFGetVersion" = x""yes; then :
HAVE_TIFF=yes
fi
@@ -10921,12 +10913,12 @@
LIBGIF=
if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no"; then
ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h"
"$ac_includes_default"
-if test "x$ac_cv_header_gif_lib_h" = xyes; then :
+if test "x$ac_cv_header_gif_lib_h" = x""yes; then :
# EGifPutExtensionLast only exists from version libungif-4.1.0b1.
# Earlier versions can crash Emacs.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast
in -lgif" >&5
$as_echo_n "checking for EGifPutExtensionLast in -lgif... " >&6; }
-if ${ac_cv_lib_gif_EGifPutExtensionLast+:} false; then :
+if test "${ac_cv_lib_gif_EGifPutExtensionLast+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10960,7 +10952,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_gif_EGifPutExtensionLast" >&5
$as_echo "$ac_cv_lib_gif_EGifPutExtensionLast" >&6; }
-if test "x$ac_cv_lib_gif_EGifPutExtensionLast" = xyes; then :
+if test "x$ac_cv_lib_gif_EGifPutExtensionLast" = x""yes; then :
HAVE_GIF=yes
else
HAVE_GIF=maybe
@@ -10976,7 +10968,7 @@
# If gif_lib.h but no libgif, try libungif.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast
in -lungif" >&5
$as_echo_n "checking for EGifPutExtensionLast in -lungif... " >&6; }
-if ${ac_cv_lib_ungif_EGifPutExtensionLast+:} false; then :
+if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11010,7 +11002,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_ungif_EGifPutExtensionLast" >&5
$as_echo "$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; }
-if test "x$ac_cv_lib_ungif_EGifPutExtensionLast" = xyes; then :
+if test "x$ac_cv_lib_ungif_EGifPutExtensionLast" = x""yes; then :
HAVE_GIF=yes
else
HAVE_GIF=no
@@ -11057,10 +11049,10 @@
MOUSE_SUPPORT=
if test "${with_gpm}" != "no"; then
ac_fn_c_check_header_mongrel "$LINENO" "gpm.h" "ac_cv_header_gpm_h"
"$ac_includes_default"
-if test "x$ac_cv_header_gpm_h" = xyes; then :
+if test "x$ac_cv_header_gpm_h" = x""yes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Gpm_Open in -lgpm" >&5
$as_echo_n "checking for Gpm_Open in -lgpm... " >&6; }
-if ${ac_cv_lib_gpm_Gpm_Open+:} false; then :
+if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11094,7 +11086,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gpm_Gpm_Open" >&5
$as_echo "$ac_cv_lib_gpm_Gpm_Open" >&6; }
-if test "x$ac_cv_lib_gpm_Gpm_Open" = xyes; then :
+if test "x$ac_cv_lib_gpm_Gpm_Open" = x""yes; then :
HAVE_GPM=yes
fi
@@ -11114,7 +11106,7 @@
ac_fn_c_check_header_mongrel "$LINENO" "malloc/malloc.h"
"ac_cv_header_malloc_malloc_h" "$ac_includes_default"
-if test "x$ac_cv_header_malloc_malloc_h" = xyes; then :
+if test "x$ac_cv_header_malloc_malloc_h" = x""yes; then :
$as_echo "#define HAVE_MALLOC_MALLOC_H 1" >>confdefs.h
@@ -11159,10 +11151,10 @@
LIBXSM=
if test "${HAVE_X11}" = "yes"; then
ac_fn_c_check_header_mongrel "$LINENO" "X11/SM/SMlib.h"
"ac_cv_header_X11_SM_SMlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_SM_SMlib_h" = xyes; then :
+if test "x$ac_cv_header_X11_SM_SMlib_h" = x""yes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SmcOpenConnection in
-lSM" >&5
$as_echo_n "checking for SmcOpenConnection in -lSM... " >&6; }
-if ${ac_cv_lib_SM_SmcOpenConnection+:} false; then :
+if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11196,7 +11188,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_SM_SmcOpenConnection" >&5
$as_echo "$ac_cv_lib_SM_SmcOpenConnection" >&6; }
-if test "x$ac_cv_lib_SM_SmcOpenConnection" = xyes; then :
+if test "x$ac_cv_lib_SM_SmcOpenConnection" = x""yes; then :
HAVE_X_SM=yes
fi
@@ -11227,7 +11219,7 @@
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -11318,7 +11310,7 @@
LIBS="$LIBXML2_LIBS $LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for htmlReadMemory in
-lxml2" >&5
$as_echo_n "checking for htmlReadMemory in -lxml2... " >&6; }
-if ${ac_cv_lib_xml2_htmlReadMemory+:} false; then :
+if test "${ac_cv_lib_xml2_htmlReadMemory+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11352,7 +11344,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_xml2_htmlReadMemory" >&5
$as_echo "$ac_cv_lib_xml2_htmlReadMemory" >&6; }
-if test "x$ac_cv_lib_xml2_htmlReadMemory" = xyes; then :
+if test "x$ac_cv_lib_xml2_htmlReadMemory" = x""yes; then :
HAVE_LIBXML2=yes
else
HAVE_LIBXML2=no
@@ -11374,7 +11366,7 @@
# If netdb.h doesn't declare h_errno, we must declare it by hand.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether netdb declares
h_errno" >&5
$as_echo_n "checking whether netdb declares h_errno... " >&6; }
-if ${emacs_cv_netdb_declares_h_errno+:} false; then :
+if test "${emacs_cv_netdb_declares_h_errno+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11404,22 +11396,11 @@
fi
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t"
"$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
$as_echo_n "checking for working alloca.h... " >&6; }
-if ${ac_cv_working_alloca_h+:} false; then :
+if test "${ac_cv_working_alloca_h+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11452,7 +11433,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
$as_echo_n "checking for alloca... " >&6; }
-if ${ac_cv_func_alloca_works+:} false; then :
+if test "${ac_cv_func_alloca_works+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11471,7 +11452,7 @@
#pragma alloca
# else
# ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca (size_t);
+char *alloca ();
# endif
# endif
# endif
@@ -11515,7 +11496,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs
Cray hooks" >&5
$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if ${ac_cv_os_cray+:} false; then :
+if test "${ac_cv_os_cray+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11556,7 +11537,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C
alloca" >&5
$as_echo_n "checking stack direction for C alloca... " >&6; }
-if ${ac_cv_c_stack_direction+:} false; then :
+if test "${ac_cv_c_stack_direction+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -11613,7 +11594,7 @@
# 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_n "checking for sqrt in -lm... " >&6; }
-if ${ac_cv_lib_m_sqrt+:} false; then :
+if test "${ac_cv_lib_m_sqrt+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11647,7 +11628,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5
$as_echo "$ac_cv_lib_m_sqrt" >&6; }
-if test "x$ac_cv_lib_m_sqrt" = xyes; then :
+if test "x$ac_cv_lib_m_sqrt" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
_ACEOF
@@ -11661,7 +11642,7 @@
# have the same check as for liblockfile below.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for maillock in -lmail" >&5
$as_echo_n "checking for maillock in -lmail... " >&6; }
-if ${ac_cv_lib_mail_maillock+:} false; then :
+if test "${ac_cv_lib_mail_maillock+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11695,7 +11676,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mail_maillock" >&5
$as_echo "$ac_cv_lib_mail_maillock" >&6; }
-if test "x$ac_cv_lib_mail_maillock" = xyes; then :
+if test "x$ac_cv_lib_mail_maillock" = x""yes; then :
have_mail=yes
else
have_mail=no
@@ -11712,7 +11693,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for maillock in -llockfile"
>&5
$as_echo_n "checking for maillock in -llockfile... " >&6; }
-if ${ac_cv_lib_lockfile_maillock+:} false; then :
+if test "${ac_cv_lib_lockfile_maillock+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11746,7 +11727,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lockfile_maillock"
>&5
$as_echo "$ac_cv_lib_lockfile_maillock" >&6; }
-if test "x$ac_cv_lib_lockfile_maillock" = xyes; then :
+if test "x$ac_cv_lib_lockfile_maillock" = x""yes; then :
have_lockfile=yes
else
have_lockfile=no
@@ -11766,7 +11747,7 @@
set dummy liblockfile.so; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_liblockfile+:} false; then :
+if test "${ac_cv_prog_liblockfile+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$liblockfile"; then
@@ -11810,7 +11791,7 @@
for ac_func in touchlock
do :
ac_fn_c_check_func "$LINENO" "touchlock" "ac_cv_func_touchlock"
-if test "x$ac_cv_func_touchlock" = xyes; then :
+if test "x$ac_cv_func_touchlock" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_TOUCHLOCK 1
_ACEOF
@@ -11821,7 +11802,7 @@
for ac_header in maillock.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "maillock.h"
"ac_cv_header_maillock_h" "$ac_includes_default"
-if test "x$ac_cv_header_maillock_h" = xyes; then :
+if test "x$ac_cv_header_maillock_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_MAILLOCK_H 1
_ACEOF
@@ -11903,7 +11884,7 @@
for ac_header in sys/un.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "sys/un.h" "ac_cv_header_sys_un_h"
"$ac_includes_default"
-if test "x$ac_cv_header_sys_un_h" = xyes; then :
+if test "x$ac_cv_header_sys_un_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SYS_UN_H 1
_ACEOF
@@ -11936,7 +11917,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5
$as_echo_n "checking for working mktime... " >&6; }
-if ${ac_cv_func_working_mktime+:} false; then :
+if test "${ac_cv_func_working_mktime+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -12173,7 +12154,7 @@
# Check for getloadavg, but be sure not to touch the cache variable.
(ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg"
-if test "x$ac_cv_func_getloadavg" = xyes; then :
+if test "x$ac_cv_func_getloadavg" = x""yes; then :
exit 0
else
exit 1
@@ -12184,7 +12165,7 @@
for ac_func in pstat_getdynamic
do :
ac_fn_c_check_func "$LINENO" "pstat_getdynamic" "ac_cv_func_pstat_getdynamic"
-if test "x$ac_cv_func_pstat_getdynamic" = xyes; then :
+if test "x$ac_cv_func_pstat_getdynamic" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_PSTAT_GETDYNAMIC 1
_ACEOF
@@ -12196,7 +12177,7 @@
# Solaris has libkstat which does not require root.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kstat_open in -lkstat"
>&5
$as_echo_n "checking for kstat_open in -lkstat... " >&6; }
-if ${ac_cv_lib_kstat_kstat_open+:} false; then :
+if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -12230,7 +12211,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kstat_kstat_open"
>&5
$as_echo "$ac_cv_lib_kstat_kstat_open" >&6; }
-if test "x$ac_cv_lib_kstat_kstat_open" = xyes; then :
+if test "x$ac_cv_lib_kstat_kstat_open" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKSTAT 1
_ACEOF
@@ -12248,7 +12229,7 @@
if test $ac_have_func = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for elf_begin in -lelf" >&5
$as_echo_n "checking for elf_begin in -lelf... " >&6; }
-if ${ac_cv_lib_elf_elf_begin+:} false; then :
+if test "${ac_cv_lib_elf_elf_begin+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -12282,7 +12263,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elf_elf_begin" >&5
$as_echo "$ac_cv_lib_elf_elf_begin" >&6; }
-if test "x$ac_cv_lib_elf_elf_begin" = xyes; then :
+if test "x$ac_cv_lib_elf_elf_begin" = x""yes; then :
LIBS="-lelf $LIBS"
fi
@@ -12290,7 +12271,7 @@
if test $ac_have_func = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_open in -lkvm" >&5
$as_echo_n "checking for kvm_open in -lkvm... " >&6; }
-if ${ac_cv_lib_kvm_kvm_open+:} false; then :
+if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -12324,14 +12305,14 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kvm_kvm_open" >&5
$as_echo "$ac_cv_lib_kvm_kvm_open" >&6; }
-if test "x$ac_cv_lib_kvm_kvm_open" = xyes; then :
+if test "x$ac_cv_lib_kvm_kvm_open" = x""yes; then :
LIBS="-lkvm $LIBS"
fi
# Check for the 4.4BSD definition of getloadavg.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getloadavg in -lutil"
>&5
$as_echo_n "checking for getloadavg in -lutil... " >&6; }
-if ${ac_cv_lib_util_getloadavg+:} false; then :
+if test "${ac_cv_lib_util_getloadavg+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -12365,7 +12346,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_getloadavg"
>&5
$as_echo "$ac_cv_lib_util_getloadavg" >&6; }
-if test "x$ac_cv_lib_util_getloadavg" = xyes; then :
+if test "x$ac_cv_lib_util_getloadavg" = x""yes; then :
LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes
fi
@@ -12378,7 +12359,7 @@
LIBS="-L/usr/local/lib $LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getloadavg in
-lgetloadavg" >&5
$as_echo_n "checking for getloadavg in -lgetloadavg... " >&6; }
-if ${ac_cv_lib_getloadavg_getloadavg+:} false; then :
+if test "${ac_cv_lib_getloadavg_getloadavg+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -12412,7 +12393,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_getloadavg_getloadavg" >&5
$as_echo "$ac_cv_lib_getloadavg_getloadavg" >&6; }
-if test "x$ac_cv_lib_getloadavg_getloadavg" = xyes; then :
+if test "x$ac_cv_lib_getloadavg_getloadavg" = x""yes; then :
LIBS="-lgetloadavg $LIBS"
else
LIBS=$ac_getloadavg_LIBS
@@ -12425,7 +12406,7 @@
for ac_func in getloadavg
do :
ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg"
-if test "x$ac_cv_func_getloadavg" = xyes; then :
+if test "x$ac_cv_func_getloadavg" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_GETLOADAVG 1
_ACEOF
@@ -12443,14 +12424,14 @@
# Figure out what our getloadavg.c needs.
ac_have_func=no
ac_fn_c_check_header_mongrel "$LINENO" "sys/dg_sys_info.h"
"ac_cv_header_sys_dg_sys_info_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_dg_sys_info_h" = xyes; then :
+if test "x$ac_cv_header_sys_dg_sys_info_h" = x""yes; then :
ac_have_func=yes
$as_echo "#define DGUX 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dg_sys_info in -ldgc"
>&5
$as_echo_n "checking for dg_sys_info in -ldgc... " >&6; }
-if ${ac_cv_lib_dgc_dg_sys_info+:} false; then :
+if test "${ac_cv_lib_dgc_dg_sys_info+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -12484,7 +12465,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dgc_dg_sys_info"
>&5
$as_echo "$ac_cv_lib_dgc_dg_sys_info" >&6; }
-if test "x$ac_cv_lib_dgc_dg_sys_info" = xyes; then :
+if test "x$ac_cv_lib_dgc_dg_sys_info" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDGC 1
_ACEOF
@@ -12498,7 +12479,7 @@
ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h"
"$ac_includes_default"
-if test "x$ac_cv_header_locale_h" = xyes; then :
+if test "x$ac_cv_header_locale_h" = x""yes; then :
fi
@@ -12506,7 +12487,7 @@
for ac_func in setlocale
do :
ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale"
-if test "x$ac_cv_func_setlocale" = xyes; then :
+if test "x$ac_cv_func_setlocale" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SETLOCALE 1
_ACEOF
@@ -12518,8 +12499,7 @@
# We cannot check for <dwarf.h>, because Solaris 2 does not use dwarf (it
# uses stabs), but it is still SVR4. We cannot check for <elf.h> because
# Irix 4.0.5F has the header but not the library.
-if test $ac_have_func = no && test "$ac_cv_lib_elf_elf_begin" = yes \
- && test "$ac_cv_lib_kvm_kvm_open" = yes; then
+if test $ac_have_func = no && test "$ac_cv_lib_elf_elf_begin" = yes; then
ac_have_func=yes
$as_echo "#define SVR4 1" >>confdefs.h
@@ -12528,7 +12508,7 @@
if test $ac_have_func = no; then
ac_fn_c_check_header_mongrel "$LINENO" "inq_stats/cpustats.h"
"ac_cv_header_inq_stats_cpustats_h" "$ac_includes_default"
-if test "x$ac_cv_header_inq_stats_cpustats_h" = xyes; then :
+if test "x$ac_cv_header_inq_stats_cpustats_h" = x""yes; then :
ac_have_func=yes
$as_echo "#define UMAX 1" >>confdefs.h
@@ -12543,7 +12523,7 @@
if test $ac_have_func = no; then
ac_fn_c_check_header_mongrel "$LINENO" "sys/cpustats.h"
"ac_cv_header_sys_cpustats_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_cpustats_h" = xyes; then :
+if test "x$ac_cv_header_sys_cpustats_h" = x""yes; then :
ac_have_func=yes; $as_echo "#define UMAX 1" >>confdefs.h
fi
@@ -12555,7 +12535,7 @@
for ac_header in mach/mach.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "mach/mach.h"
"ac_cv_header_mach_mach_h" "$ac_includes_default"
-if test "x$ac_cv_header_mach_mach_h" = xyes; then :
+if test "x$ac_cv_header_mach_mach_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_MACH_MACH_H 1
_ACEOF
@@ -12569,13 +12549,13 @@
for ac_header in nlist.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "nlist.h" "ac_cv_header_nlist_h"
"$ac_includes_default"
-if test "x$ac_cv_header_nlist_h" = xyes; then :
+if test "x$ac_cv_header_nlist_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_NLIST_H 1
_ACEOF
ac_fn_c_check_member "$LINENO" "struct nlist" "n_un.n_name"
"ac_cv_member_struct_nlist_n_un_n_name" "#include <nlist.h>
"
-if test "x$ac_cv_member_struct_nlist_n_un_n_name" = xyes; then :
+if test "x$ac_cv_member_struct_nlist_n_un_n_name" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_NLIST_N_UN_N_NAME 1
@@ -12598,7 +12578,7 @@
# Some definitions of getloadavg require that the program be installed setgid.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getloadavg requires
setgid" >&5
$as_echo_n "checking whether getloadavg requires setgid... " >&6; }
-if ${ac_cv_func_getloadavg_setgid+:} false; then :
+if test "${ac_cv_func_getloadavg_setgid+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12631,7 +12611,7 @@
if test $ac_cv_func_getloadavg_setgid = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking group of /dev/kmem" >&5
$as_echo_n "checking group of /dev/kmem... " >&6; }
-if ${ac_cv_group_kmem+:} false; then :
+if test "${ac_cv_group_kmem+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# On Solaris, /dev/kmem is a symlink. Get info on the real file.
@@ -12659,7 +12639,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value
needed for large files" >&5
$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... "
>&6; }
-if ${ac_cv_sys_largefile_source+:} false; then :
+if test "${ac_cv_sys_largefile_source+set}" = set; then :
$as_echo_n "(cached) " >&6
else
while :; do
@@ -12752,7 +12732,7 @@
for ac_header in getopt.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "getopt.h" "ac_cv_header_getopt_h"
"$ac_includes_default"
-if test "x$ac_cv_header_getopt_h" = xyes; then :
+if test "x$ac_cv_header_getopt_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_GETOPT_H 1
_ACEOF
@@ -12767,7 +12747,7 @@
for ac_func in getopt_long_only
do :
ac_fn_c_check_func "$LINENO" "getopt_long_only" "ac_cv_func_getopt_long_only"
-if test "x$ac_cv_func_getopt_long_only" = xyes; then :
+if test "x$ac_cv_func_getopt_long_only" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_GETOPT_LONG_ONLY 1
_ACEOF
@@ -12782,7 +12762,7 @@
if test -z "$GETOPT_H"; then
ac_fn_c_check_decl "$LINENO" "optreset" "ac_cv_have_decl_optreset"
"#include <getopt.h>
"
-if test "x$ac_cv_have_decl_optreset" = xyes; then :
+if test "x$ac_cv_have_decl_optreset" = x""yes; then :
GETOPT_H=getopt.h
fi
@@ -12791,13 +12771,13 @@
if test -z "$GETOPT_H"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working GNU getopt
function" >&5
$as_echo_n "checking for working GNU getopt function... " >&6; }
-if ${gl_cv_func_gnu_getopt+:} false; then :
+if test "${gl_cv_func_gnu_getopt+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
ac_fn_c_check_decl "$LINENO" "getopt_clip"
"ac_cv_have_decl_getopt_clip" "#include <getopt.h>
"
-if test "x$ac_cv_have_decl_getopt_clip" = xyes; then :
+if test "x$ac_cv_have_decl_getopt_clip" = x""yes; then :
gl_cv_func_gnu_getopt=no
else
gl_cv_func_gnu_getopt=yes
@@ -12858,7 +12838,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpgrp requires
zero arguments" >&5
$as_echo_n "checking whether getpgrp requires zero arguments... " >&6; }
-if ${ac_cv_func_getpgrp_void+:} false; then :
+if test "${ac_cv_func_getpgrp_void+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# Use it with a single arg.
@@ -12893,7 +12873,7 @@
for ac_func in strftime
do :
ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
-if test "x$ac_cv_func_strftime" = xyes; then :
+if test "x$ac_cv_func_strftime" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRFTIME 1
_ACEOF
@@ -12902,7 +12882,7 @@
# strftime is in -lintl on SCO UNIX.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5
$as_echo_n "checking for strftime in -lintl... " >&6; }
-if ${ac_cv_lib_intl_strftime+:} false; then :
+if test "${ac_cv_lib_intl_strftime+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -12936,7 +12916,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5
$as_echo "$ac_cv_lib_intl_strftime" >&6; }
-if test "x$ac_cv_lib_intl_strftime" = xyes; then :
+if test "x$ac_cv_lib_intl_strftime" = x""yes; then :
$as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
LIBS="-lintl $LIBS"
@@ -12950,7 +12930,7 @@
for ac_func in grantpt
do :
ac_fn_c_check_func "$LINENO" "grantpt" "ac_cv_func_grantpt"
-if test "x$ac_cv_func_grantpt" = xyes; then :
+if test "x$ac_cv_func_grantpt" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_GRANTPT 1
_ACEOF
@@ -12963,7 +12943,7 @@
for ac_func in getpt
do :
ac_fn_c_check_func "$LINENO" "getpt" "ac_cv_func_getpt"
-if test "x$ac_cv_func_getpt" = xyes; then :
+if test "x$ac_cv_func_getpt" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_GETPT 1
_ACEOF
@@ -12980,7 +12960,7 @@
have_tputs_et_al=true
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing
tputs" >&5
$as_echo_n "checking for library containing tputs... " >&6; }
-if ${ac_cv_search_tputs+:} false; then :
+if test "${ac_cv_search_tputs+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
@@ -13014,11 +12994,11 @@
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
- if ${ac_cv_search_tputs+:} false; then :
+ if test "${ac_cv_search_tputs+set}" = set; then :
break
fi
done
-if ${ac_cv_search_tputs+:} false; then :
+if test "${ac_cv_search_tputs+set}" = set; then :
else
ac_cv_search_tputs=no
@@ -13077,7 +13057,7 @@
freebsd)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether FreeBSD is new
enough to use terminfo" >&5
$as_echo_n "checking whether FreeBSD is new enough to use terminfo... " >&6; }
- if ${emacs_cv_freebsd_terminfo+:} false; then :
+ if test "${emacs_cv_freebsd_terminfo+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13219,16 +13199,16 @@
if test "$with_hesiod" != no ; then
# Don't set $LIBS here -- see comments above. FIXME which comments?
ac_fn_c_check_func "$LINENO" "res_send" "ac_cv_func_res_send"
-if test "x$ac_cv_func_res_send" = xyes; then :
+if test "x$ac_cv_func_res_send" = x""yes; then :
else
ac_fn_c_check_func "$LINENO" "__res_send" "ac_cv_func___res_send"
-if test "x$ac_cv_func___res_send" = xyes; then :
+if test "x$ac_cv_func___res_send" = x""yes; then :
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_send in -lresolv"
>&5
$as_echo_n "checking for res_send in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_res_send+:} false; then :
+if test "${ac_cv_lib_resolv_res_send+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13262,12 +13242,12 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_send"
>&5
$as_echo "$ac_cv_lib_resolv_res_send" >&6; }
-if test "x$ac_cv_lib_resolv_res_send" = xyes; then :
+if test "x$ac_cv_lib_resolv_res_send" = x""yes; then :
resolv=yes
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_send in
-lresolv" >&5
$as_echo_n "checking for __res_send in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv___res_send+:} false; then :
+if test "${ac_cv_lib_resolv___res_send+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13301,7 +13281,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_send"
>&5
$as_echo "$ac_cv_lib_resolv___res_send" >&6; }
-if test "x$ac_cv_lib_resolv___res_send" = xyes; then :
+if test "x$ac_cv_lib_resolv___res_send" = x""yes; then :
resolv=yes
fi
@@ -13317,12 +13297,12 @@
RESOLVLIB=
fi
ac_fn_c_check_func "$LINENO" "hes_getmailhost" "ac_cv_func_hes_getmailhost"
-if test "x$ac_cv_func_hes_getmailhost" = xyes; then :
+if test "x$ac_cv_func_hes_getmailhost" = x""yes; then :
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hes_getmailhost in
-lhesiod" >&5
$as_echo_n "checking for hes_getmailhost in -lhesiod... " >&6; }
-if ${ac_cv_lib_hesiod_hes_getmailhost+:} false; then :
+if test "${ac_cv_lib_hesiod_hes_getmailhost+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13356,7 +13336,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_hesiod_hes_getmailhost" >&5
$as_echo "$ac_cv_lib_hesiod_hes_getmailhost" >&6; }
-if test "x$ac_cv_lib_hesiod_hes_getmailhost" = xyes; then :
+if test "x$ac_cv_lib_hesiod_hes_getmailhost" = x""yes; then :
hesiod=yes
else
:
@@ -13395,7 +13375,7 @@
if test "${with_kerberos}" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for com_err in -lcom_err"
>&5
$as_echo_n "checking for com_err in -lcom_err... " >&6; }
-if ${ac_cv_lib_com_err_com_err+:} false; then :
+if test "${ac_cv_lib_com_err_com_err+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13429,7 +13409,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_com_err_com_err"
>&5
$as_echo "$ac_cv_lib_com_err_com_err" >&6; }
-if test "x$ac_cv_lib_com_err_com_err" = xyes; then :
+if test "x$ac_cv_lib_com_err_com_err" = x""yes; then :
have_com_err=yes
else
have_com_err=no
@@ -13444,7 +13424,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mit_des_cbc_encrypt in
-lcrypto" >&5
$as_echo_n "checking for mit_des_cbc_encrypt in -lcrypto... " >&6; }
-if ${ac_cv_lib_crypto_mit_des_cbc_encrypt+:} false; then :
+if test "${ac_cv_lib_crypto_mit_des_cbc_encrypt+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13478,7 +13458,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_crypto_mit_des_cbc_encrypt" >&5
$as_echo "$ac_cv_lib_crypto_mit_des_cbc_encrypt" >&6; }
-if test "x$ac_cv_lib_crypto_mit_des_cbc_encrypt" = xyes; then :
+if test "x$ac_cv_lib_crypto_mit_des_cbc_encrypt" = x""yes; then :
have_crypto=yes
else
have_crypto=no
@@ -13493,7 +13473,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mit_des_cbc_encrypt in
-lk5crypto" >&5
$as_echo_n "checking for mit_des_cbc_encrypt in -lk5crypto... " >&6; }
-if ${ac_cv_lib_k5crypto_mit_des_cbc_encrypt+:} false; then :
+if test "${ac_cv_lib_k5crypto_mit_des_cbc_encrypt+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13527,7 +13507,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&5
$as_echo "$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&6; }
-if test "x$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" = xyes; then :
+if test "x$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" = x""yes; then :
have_k5crypto=yes
else
have_k5crypto=no
@@ -13542,7 +13522,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_init_context in
-lkrb5" >&5
$as_echo_n "checking for krb5_init_context in -lkrb5... " >&6; }
-if ${ac_cv_lib_krb5_krb5_init_context+:} false; then :
+if test "${ac_cv_lib_krb5_krb5_init_context+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13576,7 +13556,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_krb5_krb5_init_context" >&5
$as_echo "$ac_cv_lib_krb5_krb5_init_context" >&6; }
-if test "x$ac_cv_lib_krb5_krb5_init_context" = xyes; then :
+if test "x$ac_cv_lib_krb5_krb5_init_context" = x""yes; then :
have_krb5=yes
else
have_krb5=no
@@ -13592,7 +13572,7 @@
if test "${with_kerberos5}" = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_cbc_encrypt in
-ldes425" >&5
$as_echo_n "checking for des_cbc_encrypt in -ldes425... " >&6; }
-if ${ac_cv_lib_des425_des_cbc_encrypt+:} false; then :
+if test "${ac_cv_lib_des425_des_cbc_encrypt+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13626,7 +13606,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_des425_des_cbc_encrypt" >&5
$as_echo "$ac_cv_lib_des425_des_cbc_encrypt" >&6; }
-if test "x$ac_cv_lib_des425_des_cbc_encrypt" = xyes; then :
+if test "x$ac_cv_lib_des425_des_cbc_encrypt" = x""yes; then :
have_des425=yes
else
have_des425=no
@@ -13641,7 +13621,7 @@
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_cbc_encrypt in
-ldes" >&5
$as_echo_n "checking for des_cbc_encrypt in -ldes... " >&6; }
-if ${ac_cv_lib_des_des_cbc_encrypt+:} false; then :
+if test "${ac_cv_lib_des_des_cbc_encrypt+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13675,7 +13655,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_des_des_cbc_encrypt" >&5
$as_echo "$ac_cv_lib_des_des_cbc_encrypt" >&6; }
-if test "x$ac_cv_lib_des_des_cbc_encrypt" = xyes; then :
+if test "x$ac_cv_lib_des_des_cbc_encrypt" = x""yes; then :
have_des=yes
else
have_des=no
@@ -13691,7 +13671,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_get_cred in
-lkrb4" >&5
$as_echo_n "checking for krb_get_cred in -lkrb4... " >&6; }
-if ${ac_cv_lib_krb4_krb_get_cred+:} false; then :
+if test "${ac_cv_lib_krb4_krb_get_cred+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13725,7 +13705,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb4_krb_get_cred"
>&5
$as_echo "$ac_cv_lib_krb4_krb_get_cred" >&6; }
-if test "x$ac_cv_lib_krb4_krb_get_cred" = xyes; then :
+if test "x$ac_cv_lib_krb4_krb_get_cred" = x""yes; then :
have_krb4=yes
else
have_krb4=no
@@ -13740,7 +13720,7 @@
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_get_cred in
-lkrb" >&5
$as_echo_n "checking for krb_get_cred in -lkrb... " >&6; }
-if ${ac_cv_lib_krb_krb_get_cred+:} false; then :
+if test "${ac_cv_lib_krb_krb_get_cred+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13774,7 +13754,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb_krb_get_cred"
>&5
$as_echo "$ac_cv_lib_krb_krb_get_cred" >&6; }
-if test "x$ac_cv_lib_krb_krb_get_cred" = xyes; then :
+if test "x$ac_cv_lib_krb_krb_get_cred" = x""yes; then :
have_krb=yes
else
have_krb=no
@@ -13794,13 +13774,13 @@
for ac_header in krb5.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "krb5.h" "ac_cv_header_krb5_h"
"$ac_includes_default"
-if test "x$ac_cv_header_krb5_h" = xyes; then :
+if test "x$ac_cv_header_krb5_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_H 1
_ACEOF
ac_fn_c_check_member "$LINENO" "krb5_error" "text"
"ac_cv_member_krb5_error_text" "#include <krb5.h>
"
-if test "x$ac_cv_member_krb5_error_text" = xyes; then :
+if test "x$ac_cv_member_krb5_error_text" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_ERROR_TEXT 1
@@ -13810,7 +13790,7 @@
fi
ac_fn_c_check_member "$LINENO" "krb5_error" "e_text"
"ac_cv_member_krb5_error_e_text" "#include <krb5.h>
"
-if test "x$ac_cv_member_krb5_error_e_text" = xyes; then :
+if test "x$ac_cv_member_krb5_error_e_text" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_ERROR_E_TEXT 1
@@ -13827,7 +13807,7 @@
for ac_header in des.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "des.h" "ac_cv_header_des_h"
"$ac_includes_default"
-if test "x$ac_cv_header_des_h" = xyes; then :
+if test "x$ac_cv_header_des_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_DES_H 1
_ACEOF
@@ -13836,7 +13816,7 @@
for ac_header in kerberosIV/des.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "kerberosIV/des.h"
"ac_cv_header_kerberosIV_des_h" "$ac_includes_default"
-if test "x$ac_cv_header_kerberosIV_des_h" = xyes; then :
+if test "x$ac_cv_header_kerberosIV_des_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_KERBEROSIV_DES_H 1
_ACEOF
@@ -13845,7 +13825,7 @@
for ac_header in kerberos/des.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "kerberos/des.h"
"ac_cv_header_kerberos_des_h" "$ac_includes_default"
-if test "x$ac_cv_header_kerberos_des_h" = xyes; then :
+if test "x$ac_cv_header_kerberos_des_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_KERBEROS_DES_H 1
_ACEOF
@@ -13865,7 +13845,7 @@
for ac_header in krb.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "krb.h" "ac_cv_header_krb_h"
"$ac_includes_default"
-if test "x$ac_cv_header_krb_h" = xyes; then :
+if test "x$ac_cv_header_krb_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB_H 1
_ACEOF
@@ -13874,7 +13854,7 @@
for ac_header in kerberosIV/krb.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "kerberosIV/krb.h"
"ac_cv_header_kerberosIV_krb_h" "$ac_includes_default"
-if test "x$ac_cv_header_kerberosIV_krb_h" = xyes; then :
+if test "x$ac_cv_header_kerberosIV_krb_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_KERBEROSIV_KRB_H 1
_ACEOF
@@ -13883,7 +13863,7 @@
for ac_header in kerberos/krb.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "kerberos/krb.h"
"ac_cv_header_kerberos_krb_h" "$ac_includes_default"
-if test "x$ac_cv_header_kerberos_krb_h" = xyes; then :
+if test "x$ac_cv_header_kerberos_krb_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_KERBEROS_KRB_H 1
_ACEOF
@@ -13904,7 +13884,7 @@
for ac_header in com_err.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "com_err.h" "ac_cv_header_com_err_h"
"$ac_includes_default"
-if test "x$ac_cv_header_com_err_h" = xyes; then :
+if test "x$ac_cv_header_com_err_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_COM_ERR_H 1
_ACEOF
@@ -13925,7 +13905,7 @@
# to return localized messages.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
$as_echo_n "checking for dgettext in -lintl... " >&6; }
-if ${ac_cv_lib_intl_dgettext+:} false; then :
+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -13959,7 +13939,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
-if test "x$ac_cv_lib_intl_dgettext" = xyes; then :
+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBINTL 1
_ACEOF
@@ -13971,7 +13951,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether localtime caches TZ"
>&5
$as_echo_n "checking whether localtime caches TZ... " >&6; }
-if ${emacs_cv_localtime_cache+:} false; then :
+if test "${emacs_cv_localtime_cache+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test x$ac_cv_func_tzset = xyes; then
@@ -14030,7 +14010,7 @@
for ac_func in gettimeofday
do :
ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
-if test "x$ac_cv_func_gettimeofday" = xyes; then :
+if test "x$ac_cv_func_gettimeofday" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_GETTIMEOFDAY 1
_ACEOF
@@ -14041,7 +14021,7 @@
if test $ac_cv_func_gettimeofday = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday can
accept two arguments" >&5
$as_echo_n "checking whether gettimeofday can accept two arguments... " >&6; }
-if ${emacs_cv_gettimeofday_two_arguments+:} false; then :
+if test "${emacs_cv_gettimeofday_two_arguments+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14085,7 +14065,7 @@
ok_so_far=yes
ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
-if test "x$ac_cv_func_socket" = xyes; then :
+if test "x$ac_cv_func_socket" = x""yes; then :
else
ok_so_far=no
@@ -14093,7 +14073,7 @@
if test $ok_so_far = yes; then
ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h"
"ac_cv_header_netinet_in_h" "$ac_includes_default"
-if test "x$ac_cv_header_netinet_in_h" = xyes; then :
+if test "x$ac_cv_header_netinet_in_h" = x""yes; then :
else
ok_so_far=no
@@ -14103,7 +14083,7 @@
fi
if test $ok_so_far = yes; then
ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h"
"ac_cv_header_arpa_inet_h" "$ac_includes_default"
-if test "x$ac_cv_header_arpa_inet_h" = xyes; then :
+if test "x$ac_cv_header_arpa_inet_h" = x""yes; then :
else
ok_so_far=no
@@ -14120,7 +14100,7 @@
for ac_header in sys/ioctl.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "sys/ioctl.h"
"ac_cv_header_sys_ioctl_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_ioctl_h" = xyes; then :
+if test "x$ac_cv_header_sys_ioctl_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SYS_IOCTL_H 1
_ACEOF
@@ -14150,7 +14130,7 @@
fi
ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = xyes; then :
+if test "x$ac_cv_type_pid_t" = x""yes; then :
else
@@ -14163,7 +14143,7 @@
for ac_header in vfork.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h"
"$ac_includes_default"
-if test "x$ac_cv_header_vfork_h" = xyes; then :
+if test "x$ac_cv_header_vfork_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_VFORK_H 1
_ACEOF
@@ -14187,7 +14167,7 @@
if test "x$ac_cv_func_fork" = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
$as_echo_n "checking for working fork... " >&6; }
-if ${ac_cv_func_fork_works+:} false; then :
+if test "${ac_cv_func_fork_works+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -14240,7 +14220,7 @@
if test "x$ac_cv_func_vfork" = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
$as_echo_n "checking for working vfork... " >&6; }
-if ${ac_cv_func_vfork_works+:} false; then :
+if test "${ac_cv_func_vfork_works+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -14376,7 +14356,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET"
>&5
$as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
-if ${emacs_cv_langinfo_codeset+:} false; then :
+if test "${emacs_cv_langinfo_codeset+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14408,7 +14388,7 @@
fi
ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t"
"$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+if test "x$ac_cv_type_size_t" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SIZE_T 1
@@ -14420,7 +14400,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
$as_echo_n "checking for mbstate_t... " >&6; }
-if ${ac_cv_type_mbstate_t+:} false; then :
+if test "${ac_cv_type_mbstate_t+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14456,7 +14436,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C restrict keyword" >&5
$as_echo_n "checking for C restrict keyword... " >&6; }
-if ${emacs_cv_c_restrict+:} false; then :
+if test "${emacs_cv_c_restrict+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14510,7 +14490,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C restricted array
declarations" >&5
$as_echo_n "checking for C restricted array declarations... " >&6; }
-if ${emacs_cv_c_restrict_arr+:} false; then :
+if test "${emacs_cv_c_restrict_arr+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14550,7 +14530,7 @@
&& 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.
@@ -15019,11 +14999,6 @@
echo
fi
-if test "$HAVE_DBUS" = yes && test "${opsys}" != "gnu-linux"; then
- echo "D-Bus integration has been tested for GNU/Linux only."
- echo
-fi
-
# Remove any trailing slashes in these variables.
test "${prefix}" != NONE &&
@@ -15099,21 +15074,10 @@
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
- if test "x$cache_file" != "x/dev/null"; then
+ test "x$cache_file" != "x/dev/null" &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
- if test ! -f "$cache_file" || test -h "$cache_file"; then
- cat confcache >"$cache_file"
- else
- case $cache_file in #(
- */* | ?:*)
- mv -f confcache "$cache_file"$$ &&
- mv -f "$cache_file"$$ "$cache_file" ;; #(
- *)
- mv -f confcache "$cache_file" ;;
- esac
- fi
- fi
+ cat confcache >$cache_file
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache
$cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -15146,7 +15110,7 @@
-: "${CONFIG_STATUS=./config.status}"
+: ${CONFIG_STATUS=./config.status}
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -15247,7 +15211,6 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -15555,7 +15518,7 @@
# values after options handling.
ac_log="
This file was extended by emacs $as_me 24.0.50, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -15621,7 +15584,7 @@
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.68,
+configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -15761,7 +15724,7 @@
"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
@@ -15784,10 +15747,9 @@
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- tmp= ac_tmp=
+ tmp=
trap 'exit_status=$?
- : "${ac_tmp:=$tmp}"
- { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
trap 'as_fn_exit 1' 1 2 13 15
}
@@ -15795,13 +15757,12 @@
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -d "$tmp"
+ test -n "$tmp" && test -d "$tmp"
} ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -15840,13 +15801,13 @@
ac_cs_awk_cr=$ac_cr
fi
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
_ACEOF
# Create commands to substitute file output variables.
{
echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" &&
- echo 'cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&' &&
+ echo 'cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&' &&
echo "$ac_subst_files" | sed 's/.*/F["&"]="$&"/' &&
echo "_ACAWK" &&
echo "_ACEOF"
@@ -15879,7 +15840,7 @@
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
_ACEOF
sed -n '
h
@@ -15927,7 +15888,7 @@
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
for (key in S) S_is_set[key] = 1
FS = ""
\$ac_cs_awk_pipe_init
@@ -15965,7 +15926,7 @@
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
|| as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
@@ -15999,7 +15960,7 @@
# No need to generate them if there are no CONFIG_HEADERS.
# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+cat >"$tmp/defines.awk" <<\_ACAWK ||
BEGIN {
_ACEOF
@@ -16011,8 +15972,8 @@
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
- ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_tt"; then
+ 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
@@ -16113,7 +16074,7 @@
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
@@ -16132,7 +16093,7 @@
for ac_f
do
case $ac_f in
- -) ac_f="$ac_tmp/stdin";;
+ -) ac_f="$tmp/stdin";;
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be
DOS-style,
# because $ac_f cannot contain `:'.
@@ -16141,7 +16102,7 @@
[\\/$]*) 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 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'"
@@ -16167,8 +16128,8 @@
esac
case $ac_tag in
- *:-:* | *:-) cat >"$ac_tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ *:-:* | *:-) cat >"$tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -16300,25 +16261,24 @@
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" |
if $ac_cs_awk_getline; then
- $AWK -f "$ac_tmp/subs.awk"
+ $AWK -f "$tmp/subs.awk"
else
- $AWK -f "$ac_tmp/subs.awk" | $SHELL
-fi \
- >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ $AWK -f "$tmp/subs.awk" | $SHELL
+fi >$tmp/out \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
- "$ac_tmp/out"`; test -z "$ac_out"; } &&
+ { 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
$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;}
- rm -f "$ac_tmp/stdin"
+ rm -f "$tmp/stdin"
case $ac_file in
- -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
- *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+ -) 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
;;
@@ -16329,20 +16289,20 @@
if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
- } >"$ac_tmp/config.h" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+ } >"$tmp/config.h" \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+ 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 "$ac_tmp/config.h" "$ac_file" \
+ mv "$tmp/config.h" "$ac_file" \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
|| as_fn_error $? "could not create -" "$LINENO" 5
fi
;;
=== modified file 'configure.in'
--- a/configure.in 2010-11-06 10:31:56 +0000
+++ b/configure.in 2010-11-09 20:07:10 +0000
@@ -3737,11 +3737,6 @@
echo
fi
-if test "$HAVE_DBUS" = yes && test "${opsys}" != "gnu-linux"; then
- echo "D-Bus integration has been tested for GNU/Linux only."
- echo
-fi
-
# Remove any trailing slashes in these variables.
[test "${prefix}" != NONE &&
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2010-10-14 14:32:27 +0000
+++ b/doc/emacs/ChangeLog 2010-11-09 20:07:10 +0000
@@ -1,3 +1,8 @@
+2010-11-09 Eli Zaretskii <address@hidden>
+
+ * msdog.texi (Windows HOME): Add information regarding startup
+ directory when invoking Emacs from a desktop shortcut. (bug#7300)
+
2010-10-11 Glenn Morris <address@hidden>
* Makefile.in (MAKEINFO): Add explicit -I$srcdir.
=== modified file 'doc/emacs/msdog.texi'
--- a/doc/emacs/msdog.texi 2010-06-23 02:46:43 +0000
+++ b/doc/emacs/msdog.texi 2010-11-06 10:23:33 +0000
@@ -31,7 +31,8 @@
* Text and Binary:: Text files use CRLF to terminate lines.
* Windows Files:: File-name conventions on Windows.
* ls in Lisp:: Emulation of @code{ls} for Dired.
-* Windows HOME:: Where Emacs looks for your @file{.emacs}.
+* Windows HOME:: Where Emacs looks for your @file{.emacs} and
+ where it starts up.
* Windows Keyboard:: Windows-specific keyboard features.
* Windows Mouse:: Windows-specific mouse features.
* Windows Processes:: Running subprocesses on Windows.
@@ -329,7 +330,7 @@
@end ifnottex
@node Windows HOME
address@hidden HOME Directory on MS-Windows
address@hidden HOME and Startup Directories on MS-Windows
@cindex @code{HOME} directory on MS-Windows
The Windows equivalent of the @code{HOME} directory is the
@@ -371,6 +372,13 @@
@file{_emacs} as a fallback, if such a file exists in the home
directory, whereas @file{.emacs} does not.
address@hidden start directory, MS-Windows
address@hidden directory where Emacs starts on MS-Windows
+ If you use a Windows desktop shortcut to start Emacs, it starts in
+the directory specified by the shortcut. To control where that is,
+right-click on the shortcut, select ``Properties'', and in the
+``Shortcut'' tab modify the ``Start in'' field to your liking.
+
@node Windows Keyboard
@section Keyboard Usage on MS-Windows
@cindex keyboard, MS-Windows
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog 2010-11-04 22:18:09 +0000
+++ b/doc/misc/ChangeLog 2010-11-09 20:07:10 +0000
@@ -1,3 +1,7 @@
+2010-11-09 Jay Belanger <address@hidden>
+
+ * calc.texi: Use emacsver.texi to determine Emacs version.
+
2010-11-04 Lars Magne Ingebrigtsen <address@hidden>
* gnus.texi (Customizing the IMAP Connection): Remove nnir mention,
=== modified file 'etc/NEWS.23'
--- a/etc/NEWS.23 2010-10-14 14:32:27 +0000
+++ b/etc/NEWS.23 2010-11-09 20:07:10 +0000
@@ -41,7 +41,10 @@
* New Modes and Packages in Emacs 23.3
-
+** smie.el is a generic navigation and indentation engine.
+It takes a simple BNF description of the grammar, and provides both
+sexp-style navigation (jumping over begin..end pairs) as well as
+indentation, which can be adjusted via ad-hoc indentation rules.
* Incompatible Lisp Changes in Emacs 23.3
@@ -51,7 +54,7 @@
** `e' and `pi' are now called `float-e' and `float-pi'.
The old names are obsolete.
** The use of unintern without an obarray arg is declared obsolete.
-
+** The function `princ-list' is declared obsolete.
** New function byte-to-string, like char-to-string but for bytes.
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2010-11-09 08:00:46 +0000
+++ b/lisp/ChangeLog 2010-11-09 20:07:10 +0000
@@ -1,5 +1,65 @@
2010-11-09 Glenn Morris <address@hidden>
+ * progmodes/tcl.el (tcl-hairy-scan-for-comment): Doc fix.
+
+2010-11-09 Stefan Monnier <address@hidden>
+
+ * minibuffer.el (minibuffer-completion-help): Specify the end of the
+ completion field (bug#7211).
+
+ * progmodes/python.el (python-font-lock-syntactic-keywords): (bug#7322)
+ Fix handling of backslash escapes.
+ (python-quote-syntax): Adjust accordingly.
+
+2010-11-09 Richard Levitte <address@hidden> (tiny change)
+2010-11-09 Richard Levitte <address@hidden> (tiny patch)
+
+ * vc-mtn.el (vc-mtn-working-revision, vc-mtn-after-dir-status)
+ (vc-mtn-workfile-branch): Adjust to new output format.
+
+2010-11-09 Stefan Monnier <address@hidden>
+
+ * international/mule-cmds.el (princ-list): Mark as obsolete.
+
+2010-11-09 Stefan Monnier <address@hidden>
+
+ * emacs-lisp/smie.el: New package.
+
+2010-11-09 Michael Albinus <address@hidden>
+
+ * files.el (backup-by-copying-when-mismatch):
+ Set `permanent-local' property.
+
+ * net/tramp.el (tramp-handle-insert-file-contents): Do not set
+ `permanent-local' property for `backup-by-copying-when-mismatch'.
+
+2010-11-09 Eli Zaretskii <address@hidden>
+
+ * ls-lisp.el (insert-directory): Doc fix. (bug#7285)
+
+2010-11-09 Wilson Snyder <address@hidden>
+
+ * progmodes/verilog-mode.el (verilog-insert-one-definition)
+ (verilog-read-decls, verilog-read-sub-decls-sig): Fix AUTOWIRE and
+ AUTOINOUT for SV style multidimensional arrays, bug294.
+ Reported by Eric Mastromarchi.
+ (verilog-preprocess): Use with-current-buffer and
+ font-lock-fontify-buffer to cleanup style issues.
+
+2010-11-09 Glenn Morris <address@hidden>
+
+ * locate.el (locate, locate-mode): Doc fixes.
+
+2010-11-09 Chong Yidong <address@hidden>
+
+ * server.el (server-start): New arg INHIBIT-PROMPT prevents asking
+ user for confirmation.
+ (server-force-stop): Use it.
+ (server-start): Use server-force-stop for kill-emacs-hook, to
+ avoid user interaction while killing Emacs.
+
+2010-11-09 Glenn Morris <address@hidden>
+
* progmodes/meta-mode.el: Remove leading `*' from defcustom docs.
(meta-indent-line): Simplify.
=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in 2010-10-13 03:23:47 +0000
+++ b/lisp/Makefile.in 2010-11-09 20:07:10 +0000
@@ -180,6 +180,7 @@
els=`echo $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3)
$(lisptagsfiles4) | sed -e "s,$(lisp)/[^ ]*loaddefs[^ ]*,," -e
"s,$(lisp)/ldefs-boot[^ ]*,,"`; \
${ETAGS} -o $@ $$els
+ $(lisp)/emacs-lisp/smie.elc \
# The src/Makefile.in has its own set of dependencies and when they decide
# that one Lisp file needs to be re-compiled, we had better recompile it as
# well, otherwise every subsequent make will again call us, until we finally
=== modified file 'lisp/dired.el'
--- a/lisp/dired.el 2010-11-06 20:23:42 +0000
+++ b/lisp/dired.el 2010-11-09 20:07:10 +0000
@@ -3539,7 +3539,7 @@
;;;;;; dired-run-shell-command dired-do-shell-command
dired-do-async-shell-command
;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown
;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories
dired-backup-diff
-;;;;;; dired-diff) "dired-aux" "dired-aux.el"
"416d272299fd4774c47c2f677ee640a4")
+;;;;;; dired-diff) "dired-aux" "dired-aux.el"
"1628b7a7d379fb4da8ae4bf29faad4b5")
;;; Generated autoloads from dired-aux.el
(autoload 'dired-diff "dired-aux" "\
=== modified file 'lisp/emacs-lisp/cl-loaddefs.el'
--- a/lisp/emacs-lisp/cl-loaddefs.el 2010-11-06 09:33:22 +0000
+++ b/lisp/emacs-lisp/cl-loaddefs.el 2010-11-09 20:07:10 +0000
@@ -282,7 +282,7 @@
;;;;;; do-all-symbols do-symbols dotimes dolist do* do loop return-from
;;;;;; return block etypecase typecase ecase case load-time-value
;;;;;; eval-when destructuring-bind function* defmacro* defun* gentemp
-;;;;;; gensym) "cl-macs" "cl-macs.el" "82f8370745a60dc26536a0237cba893f")
+;;;;;; gensym) "cl-macs" "cl-macs.el" "979862b54946a5fcbbccdd90fa3f84d8")
;;; Generated autoloads from cl-macs.el
(autoload 'gensym "cl-macs" "\
=== modified file 'lisp/files.el'
--- a/lisp/files.el 2010-10-29 06:51:36 +0000
+++ b/lisp/files.el 2010-11-09 20:07:10 +0000
@@ -124,6 +124,7 @@
This variable is relevant only if `backup-by-copying' is nil."
:type 'boolean
:group 'backup)
+(put 'backup-by-copying-when-mismatch 'permanent-local t)
(defcustom backup-by-copying-when-privileged-mismatch 200
"Non-nil means create backups by copying to preserve a privileged owner.
=== modified file 'lisp/international/mule-cmds.el'
--- a/lisp/international/mule-cmds.el 2010-09-01 07:13:21 +0000
+++ b/lisp/international/mule-cmds.el 2010-11-09 20:07:10 +0000
@@ -2033,10 +2033,11 @@
"Do various unibyte-mode setups for language environment LANGUAGE-NAME."
(set-display-table-and-terminal-coding-system language-name))
-(defsubst princ-list (&rest args)
+(defun princ-list (&rest args)
"Print all arguments with `princ', then print \"\\n\"."
(while args (princ (car args)) (setq args (cdr args)))
(princ "\n"))
+(make-obsolete 'princ-list "use mapc and princ instead" "23.3")
(put 'describe-specified-language-support 'apropos-inhibit t)
=== modified file 'lisp/locate.el'
--- a/lisp/locate.el 2010-05-20 22:55:11 +0000
+++ b/lisp/locate.el 2010-11-09 20:07:10 +0000
@@ -270,7 +270,7 @@
(defun locate (search-string &optional filter arg)
"Run the program `locate', putting results in `*Locate*' buffer.
Pass it SEARCH-STRING as argument. Interactively, prompt for SEARCH-STRING.
-With prefix arg, prompt for the exact shell command to run instead.
+With prefix arg ARG, prompt for the exact shell command to run instead.
This program searches for those file names in a database that match
SEARCH-STRING and normally outputs all matching absolute file names,
@@ -286,7 +286,8 @@
The main use of FILTER is to implement `locate-with-filter'. See
the docstring of that function for its meaning.
-ARG is the interactive prefix arg."
+After preparing the results buffer, this runs `dired-mode-hook' and
+then `locate-post-command-hook'."
(interactive
(list
(locate-prompt-for-search-string)
@@ -300,8 +301,7 @@
(locate-cmd-args (cdr locate-cmd-list))
(run-locate-command
(or (and arg (not locate-prompt-for-command))
- (and (not arg) locate-prompt-for-command)))
- )
+ (and (not arg) locate-prompt-for-command))))
;; Find the Locate buffer
(save-window-excursion
@@ -323,16 +323,13 @@
(and filter
(locate-filter-output filter))
- (locate-do-setup search-string)
- ))
+ (locate-do-setup search-string)))
(and (not (string-equal (buffer-name) locate-buffer-name))
(pop-to-buffer locate-buffer-name))
(run-hooks 'dired-mode-hook)
(dired-next-line 3) ;move to first matching file.
- (run-hooks 'locate-post-command-hook)
- )
- )
+ (run-hooks 'locate-post-command-hook)))
;;;###autoload
(defun locate-with-filter (search-string filter &optional arg)
@@ -447,6 +444,7 @@
\\<locate-mode-map>\
In that buffer, you can use almost all the usual dired bindings.
\\[locate-find-directory] visits the directory of the file on the current line.
+This function runs `locate-mode-hook' before returning.
Operating on listed files works, but does not always
automatically update the buffer as in ordinary Dired.
@@ -687,5 +685,4 @@
(provide 'locate)
-;; arch-tag: 60c4d098-b5d5-4b3c-a3e0-51a2e9f43898
;;; locate.el ends here
=== modified file 'lisp/ls-lisp.el'
--- a/lisp/ls-lisp.el 2010-10-14 14:32:27 +0000
+++ b/lisp/ls-lisp.el 2010-11-09 20:07:10 +0000
@@ -220,7 +220,8 @@
supports ordinary shell wildcards if `ls-lisp-support-shell-wildcards'
is non-nil; otherwise, it interprets wildcards as regular expressions
to match file names. It does not support all `ls' switches -- those
-that work are: A a c i r S s t u U X g G B C R n and F partly."
+that work are: A a B C c F G g h i n R r S s t U u X. The l switch
+is assumed to be always present and cannot be turned off."
(if ls-lisp-use-insert-directory-program
(funcall original-insert-directory
file switches wildcard full-directory-p)
=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el 2010-10-28 02:22:29 +0000
+++ b/lisp/minibuffer.el 2010-11-09 20:07:10 +0000
@@ -42,7 +42,7 @@
;; provide the start info but not the end info in
;; completion-base-position.
;; - quoting is problematic. E.g. the double-dollar quoting used in
-;; substitie-in-file-name (and hence read-file-name-internal) bumps
+;; substitute-in-file-name (and hence read-file-name-internal) bumps
;; into various bugs:
;; - choose-completion doesn't know how to quote the text it inserts.
;; E.g. it fails to double the dollars in file-name completion, or
@@ -1133,6 +1133,7 @@
(interactive)
(message "Making completion list...")
(lexical-let* ((start (field-beginning))
+ (end (field-end))
(string (field-string))
(completions (completion-all-completions
string
@@ -1164,10 +1165,12 @@
completions)))
(with-current-buffer standard-output
(set (make-local-variable 'completion-base-position)
- ;; FIXME: We should provide the END part as well, but
- ;; currently completion-all-completions does not give
- ;; us the necessary information.
- (list (+ start base-size) nil)))
+ (list (+ start base-size)
+ ;; FIXME: We should pay attention to completion
+ ;; boundaries here, but currently
+ ;; completion-all-completions does not give us the
+ ;; necessary information.
+ end)))
(display-completion-list completions)))
;; If there are no completions, or if the current input is already the
=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2010-10-31 14:40:01 +0000
+++ b/lisp/net/tramp.el 2010-11-09 20:07:10 +0000
@@ -2864,8 +2864,7 @@
(set-buffer-modified-p nil)
;; For root, preserve owner and group when editing files.
(when (string-equal (file-remote-p filename 'user) "root")
- (set (make-local-variable 'backup-by-copying-when-mismatch) t)
- (put 'backup-by-copying-when-mismatch 'permanent-local t)))
+ (set (make-local-variable 'backup-by-copying-when-mismatch) t)))
(when (and (stringp local-copy)
(or remote-copy (null tramp-temp-buffer-file-name)))
(delete-file local-copy))
=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el 2010-11-06 20:23:42 +0000
+++ b/lisp/progmodes/python.el 2010-11-09 20:07:10 +0000
@@ -171,21 +171,9 @@
;; string delimiters. Fixme: Is there a better way?
;; First avoid a sequence preceded by an odd number of backslashes.
(syntax-propertize-rules
- (;; (rx (not (any ?\\))
- ;; ?\\ (* (and ?\\ ?\\))
- ;; (group (syntax string-quote))
- ;; (backref 1)
- ;; (group (backref 1)))
- ;; ?Backrefs don't work in syntax-propertize-rules!
- "[^\\]\\\\\\(\\\\\\\\\\)*\\(?:''\\('\\)\\|\"\"\\(?2:\"\\)\\)"
- (2 "\"")) ; dummy
- (;; (rx (optional (group (any "uUrR"))) ; prefix gets syntax property
- ;; (optional (any "rR")) ; possible second prefix
- ;; (group (syntax string-quote)) ; maybe gets property
- ;; (backref 2) ; per first quote
- ;; (group (backref 2))) ; maybe gets property
- ;; ?Backrefs don't work in syntax-propertize-rules!
- "\\([RUru]\\)?[Rr]?\\(?:\\('\\)'\\('\\)\\|\\(?2:\"\\)\"\\(?3:\"\\)\\)"
+ (;; ?Backrefs don't work in syntax-propertize-rules!
+ (concat "\\(?:\\([RUru]\\)[Rr]?\\|^\\|[^\\]\\(?:\\\\.\\)*\\)" ;Prefix.
+ "\\(?:\\('\\)'\\('\\)\\|\\(?2:\"\\)\"\\(?3:\"\\)\\)")
(3 (ignore (python-quote-syntax))))
;; This doesn't really help.
;;((rx (and ?\\ (group ?\n))) (1 " "))
=== modified file 'lisp/progmodes/tcl.el'
--- a/lisp/progmodes/tcl.el 2010-11-09 05:33:07 +0000
+++ b/lisp/progmodes/tcl.el 2010-11-09 20:07:10 +0000
@@ -607,15 +607,11 @@
(set (make-local-variable 'dabbrev-abbrev-skip-leading-regexp) "[$!]")
(set (make-local-variable 'dabbrev-abbrev-char-regexp) "\\sw\\|\\s_")
- ;; This can only be set to t in Emacs 19 and XEmacs.
- ;; Emacs 18 and Epoch lose.
(set (make-local-variable 'parse-sexp-ignore-comments) t)
;; XEmacs has defun-prompt-regexp, but I don't believe
;; that it works for end-of-defun -- only for
;; beginning-of-defun.
(set (make-local-variable 'defun-prompt-regexp) tcl-omit-ws-regexp)
- ;; The following doesn't work in Lucid Emacs 19.6, but maybe
- ;; it will appear in later versions.
(set (make-local-variable 'add-log-current-defun-function)
'tcl-add-log-defun)
@@ -1201,11 +1197,7 @@
"Determine if point is in a comment.
Returns a list of the form `(FLAG . STATE)'. STATE can be used
as input to future invocations. FLAG is nil if not in comment,
-t otherwise. If in comment, leaves point at beginning of comment.
-
-This function does not work in Emacs 18.
-See also `tcl-simple-scan-for-comment', a
-simpler version that is often right, and works in Emacs 18."
+t otherwise. If in comment, leaves point at beginning of comment."
(let ((bol (save-excursion
(goto-char end)
(line-beginning-position)))
=== modified file 'lisp/progmodes/verilog-mode.el'
--- a/lisp/progmodes/verilog-mode.el 2010-11-07 01:50:52 +0000
+++ b/lisp/progmodes/verilog-mode.el 2010-11-09 20:07:10 +0000
@@ -124,9 +124,9 @@
;;; Code:
;; This variable will always hold the version number of the mode
-(defconst verilog-mode-version "647"
+(defconst verilog-mode-version "650"
"Version of this Verilog mode.")
-(defconst verilog-mode-release-date "2010-10-20-GNU"
+(defconst verilog-mode-release-date "2010-11-05-GNU"
"Release date of this Verilog mode.")
(defconst verilog-mode-release-emacs t
"If non-nil, this version of Verilog mode was released with Emacs itself.")
@@ -4551,16 +4551,18 @@
default nil nil
'verilog-preprocess-history default)))))
(unless command (setq command (verilog-expand-command verilog-preprocessor)))
- (let* ((dir (file-name-directory (or filename buffer-file-name)))
+ (let* ((fontlocked (and (boundp 'font-lock-mode) font-lock-mode))
+ (dir (file-name-directory (or filename buffer-file-name)))
(file (file-name-nondirectory (or filename buffer-file-name)))
(cmd (concat "cd " dir "; " command " " file)))
(with-output-to-temp-buffer "*Verilog-Preprocessed*"
- (save-excursion
- (set-buffer "*Verilog-Preprocessed*")
+ (with-current-buffer (get-buffer "*Verilog-Preprocessed*")
(insert (concat "// " cmd "\n"))
(shell-command cmd "*Verilog-Preprocessed*")
(verilog-mode)
- (font-lock-mode)))))
+ ;; Without this force, it takes a few idle seconds
+ ;; to get the color, which is very jarring
+ (when fontlocked (font-lock-fontify-buffer))))))
;;
@@ -7266,7 +7268,10 @@
((looking-at "\\s-*\\(\\[[^]]+\\]\\)")
(goto-char (match-end 0))
(cond (newsig ; Memory, not just width. Patch last signal added's
memory (nth 3)
- (setcar (cdr (cdr (cdr newsig))) (match-string 1)))
+ (setcar (cdr (cdr (cdr newsig)))
+ (if (verilog-sig-memory newsig)
+ (concat (verilog-sig-memory newsig) (match-string
1))
+ (match-string 1))))
(vec ;; Multidimensional
(setq multidim (cons vec multidim))
(setq vec (verilog-string-replace-matches
@@ -7404,7 +7409,9 @@
(cons (verilog-sig-new
sig
(if dotname (verilog-sig-bits portdata) vec)
- (concat "To/From " comment) nil nil
+ (concat "To/From " comment)
+ (verilog-sig-memory portdata)
+ nil
(verilog-sig-signed portdata)
(verilog-sig-type portdata)
multidim nil)
@@ -7415,7 +7422,9 @@
(cons (verilog-sig-new
sig
(if dotname (verilog-sig-bits portdata) vec)
- (concat "From " comment) nil nil
+ (concat "From " comment)
+ (verilog-sig-memory portdata)
+ nil
(verilog-sig-signed portdata)
(verilog-sig-type portdata)
multidim nil)
@@ -7426,7 +7435,9 @@
(cons (verilog-sig-new
sig
(if dotname (verilog-sig-bits portdata) vec)
- (concat "To " comment) nil nil
+ (concat "To " comment)
+ (verilog-sig-memory portdata)
+ nil
(verilog-sig-signed portdata)
(verilog-sig-type portdata)
multidim nil)
@@ -7436,7 +7447,9 @@
(cons (verilog-sig-new
sig
(if dotname (verilog-sig-bits portdata) vec)
- (concat "To/From " comment) nil nil
+ (concat "To/From " comment)
+ (verilog-sig-memory portdata)
+ nil
(verilog-sig-signed portdata)
(verilog-sig-type portdata)
multidim nil)
@@ -7448,7 +7461,9 @@
(cons (verilog-sig-new
sig
(if dotname (verilog-sig-bits portdata) vec)
- (concat "To/From " comment) nil nil
+ (concat "To/From " comment)
+ (verilog-sig-memory portdata)
+ nil
(verilog-sig-signed portdata)
(verilog-sig-type portdata)
multidim nil)
@@ -8862,7 +8877,9 @@
(indent-to (max 24 (+ indent-pt 16)))
(unless (= (char-syntax (preceding-char)) ?\ )
(insert " ")) ; Need space between "]name" if indent-to did nothing
- (insert (verilog-sig-name sig)))
+ (insert (verilog-sig-name sig))
+ (when (verilog-sig-memory sig)
+ (insert " " (verilog-sig-memory sig))))
(defun verilog-insert-definition (sigs direction indent-pt v2k &optional
dont-sort)
"Print out a definition for a list of SIGS of the given DIRECTION,
=== modified file 'lisp/server.el'
--- a/lisp/server.el 2010-10-27 06:42:15 +0000
+++ b/lisp/server.el 2010-11-09 20:07:10 +0000
@@ -498,7 +498,7 @@
(error "The directory `%s' is unsafe" dir)))))
;;;###autoload
-(defun server-start (&optional leave-dead)
+(defun server-start (&optional leave-dead inhibit-prompt)
"Allow this Emacs process to be a server for client processes.
This starts a server communications subprocess through which
client \"editors\" can send your editing commands to this Emacs
@@ -508,7 +508,10 @@
Optional argument LEAVE-DEAD (interactively, a prefix arg) means just
kill any existing server communications subprocess.
-If a server is already running, the server is not started.
+If a server is already running, restart it. If clients are
+running, ask the user for confirmation first, unless optional
+argument INHIBIT-PROMPT is non-nil.
+
To force-start a server, do \\[server-force-delete] and then
\\[server-start]."
(interactive "P")
@@ -516,12 +519,14 @@
;; Ask the user before deleting existing clients---except
;; when we can't get user input, which may happen when
;; doing emacsclient --eval "(kill-emacs)" in daemon mode.
- (if (and (daemonp)
- (null (cdr (frame-list)))
- (eq (selected-frame) terminal-frame))
- leave-dead
- (yes-or-no-p
- "The current server still has clients; delete them? ")))
+ (cond
+ ((and (daemonp)
+ (null (cdr (frame-list)))
+ (eq (selected-frame) terminal-frame))
+ leave-dead)
+ (inhibit-prompt t)
+ (t (yes-or-no-p
+ "The current server still has clients; delete them? "))))
(let* ((server-dir (if server-use-tcp server-auth-dir server-socket-dir))
(server-file (expand-file-name server-name server-dir)))
(when server-process
@@ -560,7 +565,7 @@
(add-hook 'delete-frame-functions 'server-handle-delete-frame)
(add-hook 'kill-buffer-query-functions
'server-kill-buffer-query-function)
(add-hook 'kill-emacs-query-functions
'server-kill-emacs-query-function)
- (add-hook 'kill-emacs-hook (lambda () (server-mode -1))) ;Cleanup
upon exit.
+ (add-hook 'kill-emacs-hook 'server-force-stop) ;Cleanup upon exit.
(setq server-process
(apply #'make-network-process
:name server-name
@@ -601,6 +606,11 @@
" " (number-to-string (emacs-pid)) ; Kept for
compatibility
"\n" auth-key)))))))))
+(defun server-force-stop ()
+ "Kill all connections to the current server.
+This function is meant to be called from `kill-emacs-hook'."
+ (server-start nil t))
+
;;;###autoload
(defun server-force-delete (&optional name)
"Unconditionally delete connection file for server NAME.
=== modified file 'lisp/vc/vc-mtn.el'
--- a/lisp/vc/vc-mtn.el 2010-11-01 03:16:48 +0000
+++ b/lisp/vc/vc-mtn.el 2010-11-09 20:07:10 +0000
@@ -110,7 +110,7 @@
(defun vc-mtn-after-dir-status (update-function)
(let (result)
(goto-char (point-min))
- (re-search-forward "Current branch: \\(.*\\)\nChanges against parent
\\(.*\\)" nil t)
+ (re-search-forward "\\(?:Current b\\|B\\)ranch: *\\(.*\\)\n?\nChanges
against parent \\(.*\\)" nil t)
(while (re-search-forward
"^ \\(?:\\(patched \\)\\|\\(added \\)\\)\\(.*\\)$" nil t)
(cond ((match-end 1) (push (list (match-string 3) 'edited) result))
@@ -129,7 +129,7 @@
(with-temp-buffer
(vc-mtn-command t 0 file "status")
(goto-char (point-min))
- (re-search-forward "Current branch: \\(.*\\)\nChanges against parent
\\(.*\\)")
+ (re-search-forward "\\(?:Current b\\|B\\)ranch: *\\(.*\\)\n?\nChanges
against parent \\(.*\\)")
(match-string 2))))
(defun vc-mtn-workfile-branch (file)
@@ -139,7 +139,7 @@
(with-temp-buffer
(vc-mtn-command t 0 file "status")
(goto-char (point-min))
- (re-search-forward "Current branch: \\(.*\\)\nChanges against parent
\\(.*\\)")
+ (re-search-forward "\\(?:Current b\\|B\\)ranch: *\\(.*\\)\n?\nChanges
against parent \\(.*\\)")
(match-string 1))))
(defun vc-mtn-workfile-unchanged-p (file)
=== modified file 'oldXMenu/ChangeLog'
--- a/oldXMenu/ChangeLog 2010-07-24 11:53:19 +0000
+++ b/oldXMenu/ChangeLog 2010-11-09 20:07:10 +0000
@@ -1,3 +1,9 @@
+2010-11-09 Elias Pipping <address@hidden> (tiny change)
+
+ Make Emacs compile with clang (bug#7309).
+ * XMakeAssoc.c (XMakeAssoc):
+ * XDelAssoc.c (XDeleteAssoc): Declare the return type.
+
2010-07-12 Dan Nicolaescu <address@hidden>
* XMenu.h: Include <stdlib.h>.
=== modified file 'oldXMenu/XDelAssoc.c'
--- a/oldXMenu/XDelAssoc.c 2010-07-04 05:57:11 +0000
+++ b/oldXMenu/XDelAssoc.c 2010-11-09 20:07:10 +0000
@@ -17,6 +17,7 @@
* an XId. An association may be removed only once. Redundant
* deletes are meaningless (but cause no problems).
*/
+void
XDeleteAssoc(register Display *dpy, register XAssocTable *table, register XID
x_id)
{
int hash;
=== modified file 'oldXMenu/XMakeAssoc.c'
--- a/oldXMenu/XMakeAssoc.c 2010-07-04 05:57:11 +0000
+++ b/oldXMenu/XMakeAssoc.c 2010-11-09 20:07:10 +0000
@@ -26,6 +26,7 @@
* meaningless (but cause no problems). The queue in each association
* bucket is sorted (lowest XId to highest XId).
*/
+void
XMakeAssoc(register Display *dpy, register XAssocTable *table, register XID
x_id, register caddr_t data)
{
int hash;
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-11-07 11:25:55 +0000
+++ b/src/ChangeLog 2010-11-09 20:07:10 +0000
@@ -1,3 +1,26 @@
+2010-11-09 Eli Zaretskii <address@hidden>
+
+ * xfns.c (x_real_positions): Fix declaration-after-statement
+ problem.
+
+2010-11-09 Chong Yidong <address@hidden>
+
+ * image.c (free_image): Don't garbage the frame here, since this
+ function can be called while redisplaying (Bug#7210).
+ (uncache_image): Garbage the frame here (Bug#6426).
+
+2010-11-09 Jan Dj??rv <address@hidden>
+
+ * xfns.c (x_real_positions): Only use _NET_FRAME_EXTENTS if our
+ parent is the root window. Check this after traversing window tree.
+
+ * xterm.c (x_term_init): Initialize Xatom_net_frame_extents.
+
+ * xterm.h (struct x_display_info): Xatom_net_frame_extents is new.
+
+ * xfns.c (x_real_positions): Try to get _NET_FRAME_EXTENTS first
+ before traversing window tree (Bug#5721).
+
2010-11-07 Jan Dj??rv <address@hidden>
* xfns.c (set_machine_and_pid_properties): Let X set WM_CLIENT_MACHINE.
=== modified file 'src/config.in'
--- a/src/config.in 2010-11-06 10:31:56 +0000
+++ b/src/config.in 2010-11-09 20:07:10 +0000
@@ -1059,9 +1059,6 @@
/* Define to `int' if <sys/types.h> does not define. */
#undef pid_t
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
-
/* Define to any substitute for sys_siglist. */
#undef sys_siglist
=== modified file 'src/image.c'
--- a/src/image.c 2010-11-03 20:08:48 +0000
+++ b/src/image.c 2010-11-09 20:07:10 +0000
@@ -1049,10 +1049,6 @@
/* Free resources, then free IMG. */
img->type->free (f, img);
xfree (img);
-
- /* As display glyphs may still be referring to the image ID, we
- must garbage the frame (Bug#6426). */
- SET_FRAME_GARBAGED (f);
}
}
@@ -1471,7 +1467,12 @@
{
struct image *img = search_image_cache (f, spec, sxhash (spec, 0));
if (img)
- free_image (f, img);
+ {
+ free_image (f, img);
+ /* As display glyphs may still be referring to the image ID, we
+ must garbage the frame (Bug#6426). */
+ SET_FRAME_GARBAGED (f);
+ }
}
=== modified file 'src/xfns.c'
--- a/src/xfns.c 2010-11-07 11:25:55 +0000
+++ b/src/xfns.c 2010-11-09 20:07:10 +0000
@@ -519,12 +519,20 @@
int real_x = 0, real_y = 0;
int had_errors = 0;
Window win = f->output_data.x->parent_desc;
+ Atom actual_type;
+ unsigned long actual_size, bytes_remaining;
+ int i, rc, actual_format;
+ struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
+ long max_len = 400;
+ Display *dpy = FRAME_X_DISPLAY (f);
+ unsigned char *tmp_data = NULL;
+ Atom target_type = XA_CARDINAL;
BLOCK_INPUT;
- x_catch_errors (FRAME_X_DISPLAY (f));
+ x_catch_errors (dpy);
- if (win == FRAME_X_DISPLAY_INFO (f)->root_window)
+ if (win == dpyinfo->root_window)
win = FRAME_OUTER_WINDOW (f);
/* This loop traverses up the containment tree until we hit the root
@@ -609,6 +617,33 @@
had_errors = x_had_errors_p (FRAME_X_DISPLAY (f));
}
+
+ if (dpyinfo->root_window == f->output_data.x->parent_desc)
+ {
+ /* Try _NET_FRAME_EXTENTS if our parent is the root window. */
+ rc = XGetWindowProperty (dpy, win, dpyinfo->Xatom_net_frame_extents,
+ 0, max_len, False, target_type,
+ &actual_type, &actual_format, &actual_size,
+ &bytes_remaining, &tmp_data);
+
+ if (rc == Success && actual_type == target_type && !x_had_errors_p (dpy)
+ && actual_size == 4 && actual_format == 32)
+ {
+ int ign;
+ Window rootw;
+ long *fe = (long *)tmp_data;
+
+ XGetGeometry (FRAME_X_DISPLAY (f), win,
+ &rootw, &real_x, &real_y, &ign, &ign, &ign, &ign);
+ outer_x = -fe[0];
+ outer_y = -fe[2];
+ real_x -= fe[0];
+ real_y -= fe[2];
+ }
+ }
+
+ if (tmp_data) XFree (tmp_data);
+
x_uncatch_errors ();
UNBLOCK_INPUT;
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2010-11-06 08:28:31 +0000
+++ b/src/xterm.c 2010-11-09 20:07:10 +0000
@@ -10278,6 +10278,8 @@
= XInternAtom (dpyinfo->display, "_NET_WM_ICON_NAME", False);
dpyinfo->Xatom_net_wm_name
= XInternAtom (dpyinfo->display, "_NET_WM_NAME", False);
+ dpyinfo->Xatom_net_frame_extents
+ = XInternAtom (dpyinfo->display, "_NET_FRAME_EXTENTS", False);
dpyinfo->x_dnd_atoms_size = 8;
dpyinfo->x_dnd_atoms_length = 0;
=== modified file 'src/xterm.h'
--- a/src/xterm.h 2010-10-31 18:50:02 +0000
+++ b/src/xterm.h 2010-11-09 20:07:10 +0000
@@ -337,10 +337,10 @@
Window net_supported_window;
Atom Xatom_net_window_type, Xatom_net_window_type_tooltip;
- /* Atoms dealing with maximization and fullscreen */
+ /* Atoms dealing with EWMH (i.e. _NET_...) */
Atom Xatom_net_wm_state, Xatom_net_wm_state_fullscreen_atom,
Xatom_net_wm_state_maximized_horz, Xatom_net_wm_state_maximized_vert,
- Xatom_net_wm_state_sticky;
+ Xatom_net_wm_state_sticky, Xatom_net_frame_extents;
/* XSettings atoms and windows. */
Atom Xatom_xsettings_sel, Xatom_xsettings_prop, Xatom_xsettings_mgr;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r102297: Merge from emacs-23,
Stefan Monnier <=