aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-04-09 11:42:31 -0700
committerPaul Eggert2011-04-09 11:42:31 -0700
commit762f8d96719ba3e8a0e79d8bb99fe8e119fafb3a (patch)
tree7b2fe40a89bf327ea8b9ad8265a6b6f27cacd2a7
parenteb3f1cc8dfe6a96505f1c5f9174b2712998cb52f (diff)
parent8546720e6f25eb988e8215de6678798053031440 (diff)
downloademacs-762f8d96719ba3e8a0e79d8bb99fe8e119fafb3a.tar.gz
emacs-762f8d96719ba3e8a0e79d8bb99fe8e119fafb3a.zip
Merge from mainline.
Diffstat
-rw-r--r--ChangeLog6
-rw-r--r--autogen/aclocal.m44
-rwxr-xr-xautogen/config.guess142
-rw-r--r--autogen/config.in3
-rwxr-xr-xautogen/config.sub30
-rwxr-xr-xautogen/configure1205
-rwxr-xr-xautogen/update_autogen5
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/display.texi16
-rw-r--r--doc/lispref/ChangeLog15
-rw-r--r--doc/lispref/buffers.texi159
-rw-r--r--doc/lispref/minibuf.texi34
-rw-r--r--doc/lispref/positions.texi99
-rw-r--r--etc/ChangeLog4
-rw-r--r--etc/NEWS6
-rw-r--r--etc/NEWS.237
-rw-r--r--lisp/ChangeLog118
-rw-r--r--lisp/bs.el4
-rw-r--r--lisp/cus-face.el2
-rw-r--r--lisp/doc-view.el76
-rw-r--r--lisp/emacs-lisp/cconv.el4
-rw-r--r--lisp/emacs-lisp/package.el460
-rw-r--r--lisp/emacs-lisp/tabulated-list.el355
-rw-r--r--lisp/files.el55
-rw-r--r--lisp/follow.el2
-rw-r--r--lisp/gnus/ChangeLog49
-rw-r--r--lisp/gnus/gnus-registry.el196
-rw-r--r--lisp/gnus/gnus-start.el6
-rw-r--r--lisp/gnus/registry.el20
-rw-r--r--lisp/help.el9
-rw-r--r--lisp/ls-lisp.el10
-rw-r--r--lisp/man.el3
-rw-r--r--lisp/net/browse-url.el3
-rw-r--r--lisp/net/rlogin.el70
-rw-r--r--lisp/play/morse.el2
-rw-r--r--lisp/replace.el25
-rw-r--r--lisp/saveplace.el2
-rw-r--r--lisp/simple.el90
-rw-r--r--lisp/vc/log-edit.el17
-rw-r--r--lisp/vc/vc-annotate.el2
-rw-r--r--src/ChangeLog85
-rw-r--r--src/ccl.c2
-rw-r--r--src/coding.c95
-rw-r--r--src/coding.h2
-rw-r--r--src/editfns.c2
-rw-r--r--src/fileio.c2
-rw-r--r--src/ftfont.c4
-rw-r--r--src/keyboard.c223
-rw-r--r--src/lisp.h8
-rw-r--r--src/print.c23
-rw-r--r--src/process.c245
-rw-r--r--src/search.c28
-rw-r--r--src/term.c3
-rw-r--r--src/window.c3
-rw-r--r--src/xdisp.c22
-rw-r--r--src/xmenu.c34
-rw-r--r--src/xml.c2
-rw-r--r--src/xselect.c76
-rw-r--r--src/xterm.c7
59 files changed, 2277 insertions, 1908 deletions
diff --git a/ChangeLog b/ChangeLog
index ea5b106a895..b766dbed7dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
12011-04-08 Paul Eggert <eggert@cs.ucla.edu> 12011-04-09 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * lib/allocator.c: New file, automatically generated by gnulib. 3 * lib/allocator.c: New file, automatically generated by gnulib.
4 4
52011-04-07 Glenn Morris <rgm@gnu.org>
6
7 * autogen/update_autogen: Ignore comment diffs in ldefs-boot.el.
8
52011-04-06 Eli Zaretskii <eliz@gnu.org> 92011-04-06 Eli Zaretskii <eliz@gnu.org>
6 10
7 * lib/makefile.w32-in ($(BLD)/careadlinkat.$(O), GNULIBOBJS): 11 * lib/makefile.w32-in ($(BLD)/careadlinkat.$(O), GNULIBOBJS):
diff --git a/autogen/aclocal.m4 b/autogen/aclocal.m4
index 2424769381e..6cf66104e03 100644
--- a/autogen/aclocal.m4
+++ b/autogen/aclocal.m4
@@ -13,8 +13,8 @@
13 13
14m4_ifndef([AC_AUTOCONF_VERSION], 14m4_ifndef([AC_AUTOCONF_VERSION],
15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl 15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
16m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, 16m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
17[m4_warning([this file was generated for autoconf 2.68. 17[m4_warning([this file was generated for autoconf 2.65.
18You have another version of autoconf. It may work, but is not guaranteed to. 18You have another version of autoconf. It may work, but is not guaranteed to.
19If you have problems, you may need to regenerate the build system entirely. 19If you have problems, you may need to regenerate the build system entirely.
20To do so, use the procedure documented by the package, typically `autoreconf'.])]) 20To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff --git a/autogen/config.guess b/autogen/config.guess
index dc84c68ef79..e3a2116a7dc 100755
--- a/autogen/config.guess
+++ b/autogen/config.guess
@@ -4,7 +4,7 @@
4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
5# Free Software Foundation, Inc. 5# Free Software Foundation, Inc.
6 6
7timestamp='2009-11-20' 7timestamp='2009-06-10'
8 8
9# This file is free software; you can redistribute it and/or modify it 9# This file is free software; you can redistribute it and/or modify it
10# under the terms of the GNU General Public License as published by 10# under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@ timestamp='2009-11-20'
27# the same distribution terms that you use for the rest of that program. 27# the same distribution terms that you use for the rest of that program.
28 28
29 29
30# Originally written by Per Bothner. Please send patches (context 30# Originally written by Per Bothner <per@bothner.com>.
31# diff format) to <config-patches@gnu.org> and include a ChangeLog 31# Please send patches to <config-patches@gnu.org>. Submit a context
32# entry. 32# diff and a properly formatted ChangeLog entry.
33# 33#
34# This script attempts to guess a canonical system name similar to 34# This script attempts to guess a canonical system name similar to
35# config.sub. If it succeeds, it prints the system name on stdout, and 35# config.sub. If it succeeds, it prints the system name on stdout, and
36# exits with 0. Otherwise, it exits with 1. 36# exits with 0. Otherwise, it exits with 1.
37# 37#
38# You can get the latest version of this script from: 38# The plan is that this can be called by configure scripts if you
39# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD 39# don't specify an explicit build system type.
40 40
41me=`echo "$0" | sed -e 's,.*/,,'` 41me=`echo "$0" | sed -e 's,.*/,,'`
42 42
@@ -333,9 +333,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
333 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) 333 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
334 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 334 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
335 exit ;; 335 exit ;;
336 i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
337 echo i386-pc-auroraux${UNAME_RELEASE}
338 exit ;;
339 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) 336 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
340 eval $set_cc_for_build 337 eval $set_cc_for_build
341 SUN_ARCH="i386" 338 SUN_ARCH="i386"
@@ -810,12 +807,12 @@ EOF
810 i*:PW*:*) 807 i*:PW*:*)
811 echo ${UNAME_MACHINE}-pc-pw32 808 echo ${UNAME_MACHINE}-pc-pw32
812 exit ;; 809 exit ;;
813 *:Interix*:*) 810 *:Interix*:[3456]*)
814 case ${UNAME_MACHINE} in 811 case ${UNAME_MACHINE} in
815 x86) 812 x86)
816 echo i586-pc-interix${UNAME_RELEASE} 813 echo i586-pc-interix${UNAME_RELEASE}
817 exit ;; 814 exit ;;
818 authenticamd | genuineintel | EM64T) 815 EM64T | authenticamd | genuineintel)
819 echo x86_64-unknown-interix${UNAME_RELEASE} 816 echo x86_64-unknown-interix${UNAME_RELEASE}
820 exit ;; 817 exit ;;
821 IA64) 818 IA64)
@@ -857,20 +854,6 @@ EOF
857 i*86:Minix:*:*) 854 i*86:Minix:*:*)
858 echo ${UNAME_MACHINE}-pc-minix 855 echo ${UNAME_MACHINE}-pc-minix
859 exit ;; 856 exit ;;
860 alpha:Linux:*:*)
861 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
862 EV5) UNAME_MACHINE=alphaev5 ;;
863 EV56) UNAME_MACHINE=alphaev56 ;;
864 PCA56) UNAME_MACHINE=alphapca56 ;;
865 PCA57) UNAME_MACHINE=alphapca56 ;;
866 EV6) UNAME_MACHINE=alphaev6 ;;
867 EV67) UNAME_MACHINE=alphaev67 ;;
868 EV68*) UNAME_MACHINE=alphaev68 ;;
869 esac
870 objdump --private-headers /bin/sh | grep -q ld.so.1
871 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
872 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
873 exit ;;
874 arm*:Linux:*:*) 857 arm*:Linux:*:*)
875 eval $set_cc_for_build 858 eval $set_cc_for_build
876 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ 859 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -893,17 +876,6 @@ EOF
893 frv:Linux:*:*) 876 frv:Linux:*:*)
894 echo frv-unknown-linux-gnu 877 echo frv-unknown-linux-gnu
895 exit ;; 878 exit ;;
896 i*86:Linux:*:*)
897 LIBC=gnu
898 eval $set_cc_for_build
899 sed 's/^ //' << EOF >$dummy.c
900 #ifdef __dietlibc__
901 LIBC=dietlibc
902 #endif
903EOF
904 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
905 echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
906 exit ;;
907 ia64:Linux:*:*) 879 ia64:Linux:*:*)
908 echo ${UNAME_MACHINE}-unknown-linux-gnu 880 echo ${UNAME_MACHINE}-unknown-linux-gnu
909 exit ;; 881 exit ;;
@@ -929,18 +901,39 @@ EOF
929 #endif 901 #endif
930 #endif 902 #endif
931EOF 903EOF
932 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` 904 eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
905 /^CPU/{
906 s: ::g
907 p
908 }'`"
933 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } 909 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
934 ;; 910 ;;
935 or32:Linux:*:*) 911 or32:Linux:*:*)
936 echo or32-unknown-linux-gnu 912 echo or32-unknown-linux-gnu
937 exit ;; 913 exit ;;
914 ppc:Linux:*:*)
915 echo powerpc-unknown-linux-gnu
916 exit ;;
917 ppc64:Linux:*:*)
918 echo powerpc64-unknown-linux-gnu
919 exit ;;
920 alpha:Linux:*:*)
921 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
922 EV5) UNAME_MACHINE=alphaev5 ;;
923 EV56) UNAME_MACHINE=alphaev56 ;;
924 PCA56) UNAME_MACHINE=alphapca56 ;;
925 PCA57) UNAME_MACHINE=alphapca56 ;;
926 EV6) UNAME_MACHINE=alphaev6 ;;
927 EV67) UNAME_MACHINE=alphaev67 ;;
928 EV68*) UNAME_MACHINE=alphaev68 ;;
929 esac
930 objdump --private-headers /bin/sh | grep -q ld.so.1
931 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
932 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
933 exit ;;
938 padre:Linux:*:*) 934 padre:Linux:*:*)
939 echo sparc-unknown-linux-gnu 935 echo sparc-unknown-linux-gnu
940 exit ;; 936 exit ;;
941 parisc64:Linux:*:* | hppa64:Linux:*:*)
942 echo hppa64-unknown-linux-gnu
943 exit ;;
944 parisc:Linux:*:* | hppa:Linux:*:*) 937 parisc:Linux:*:* | hppa:Linux:*:*)
945 # Look for CPU level 938 # Look for CPU level
946 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in 939 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -949,11 +942,8 @@ EOF
949 *) echo hppa-unknown-linux-gnu ;; 942 *) echo hppa-unknown-linux-gnu ;;
950 esac 943 esac
951 exit ;; 944 exit ;;
952 ppc64:Linux:*:*) 945 parisc64:Linux:*:* | hppa64:Linux:*:*)
953 echo powerpc64-unknown-linux-gnu 946 echo hppa64-unknown-linux-gnu
954 exit ;;
955 ppc:Linux:*:*)
956 echo powerpc-unknown-linux-gnu
957 exit ;; 947 exit ;;
958 s390:Linux:*:* | s390x:Linux:*:*) 948 s390:Linux:*:* | s390x:Linux:*:*)
959 echo ${UNAME_MACHINE}-ibm-linux 949 echo ${UNAME_MACHINE}-ibm-linux
@@ -976,6 +966,58 @@ EOF
976 xtensa*:Linux:*:*) 966 xtensa*:Linux:*:*)
977 echo ${UNAME_MACHINE}-unknown-linux-gnu 967 echo ${UNAME_MACHINE}-unknown-linux-gnu
978 exit ;; 968 exit ;;
969 i*86:Linux:*:*)
970 # The BFD linker knows what the default object file format is, so
971 # first see if it will tell us. cd to the root directory to prevent
972 # problems with other programs or directories called `ld' in the path.
973 # Set LC_ALL=C to ensure ld outputs messages in English.
974 ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
975 | sed -ne '/supported targets:/!d
976 s/[ ][ ]*/ /g
977 s/.*supported targets: *//
978 s/ .*//
979 p'`
980 case "$ld_supported_targets" in
981 elf32-i386)
982 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
983 ;;
984 esac
985 # Determine whether the default compiler is a.out or elf
986 eval $set_cc_for_build
987 sed 's/^ //' << EOF >$dummy.c
988 #include <features.h>
989 #ifdef __ELF__
990 # ifdef __GLIBC__
991 # if __GLIBC__ >= 2
992 LIBC=gnu
993 # else
994 LIBC=gnulibc1
995 # endif
996 # else
997 LIBC=gnulibc1
998 # endif
999 #else
1000 #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
1001 LIBC=gnu
1002 #else
1003 LIBC=gnuaout
1004 #endif
1005 #endif
1006 #ifdef __dietlibc__
1007 LIBC=dietlibc
1008 #endif
1009EOF
1010 eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
1011 /^LIBC/{
1012 s: ::g
1013 p
1014 }'`"
1015 test x"${LIBC}" != x && {
1016 echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
1017 exit
1018 }
1019 test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
1020 ;;
979 i*86:DYNIX/ptx:4*:*) 1021 i*86:DYNIX/ptx:4*:*)
980 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. 1022 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
981 # earlier versions are messed up and put the nodename in both 1023 # earlier versions are messed up and put the nodename in both
@@ -1205,16 +1247,6 @@ EOF
1205 *:Darwin:*:*) 1247 *:Darwin:*:*)
1206 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown 1248 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1207 case $UNAME_PROCESSOR in 1249 case $UNAME_PROCESSOR in
1208 i386)
1209 eval $set_cc_for_build
1210 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1211 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1212 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1213 grep IS_64BIT_ARCH >/dev/null
1214 then
1215 UNAME_PROCESSOR="x86_64"
1216 fi
1217 fi ;;
1218 unknown) UNAME_PROCESSOR=powerpc ;; 1250 unknown) UNAME_PROCESSOR=powerpc ;;
1219 esac 1251 esac
1220 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} 1252 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
diff --git a/autogen/config.in b/autogen/config.in
index 6d1aeaa8b78..f2ea751e2f8 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -1209,9 +1209,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1209# define __restrict__ 1209# define __restrict__
1210#endif 1210#endif
1211 1211
1212/* Define to `unsigned int' if <sys/types.h> does not define. */
1213#undef size_t
1214
1215/* type to use in place of socklen_t if not defined */ 1212/* type to use in place of socklen_t if not defined */
1216#undef socklen_t 1213#undef socklen_t
1217 1214
diff --git a/autogen/config.sub b/autogen/config.sub
index 2a55a50751c..eb0389a693f 100755
--- a/autogen/config.sub
+++ b/autogen/config.sub
@@ -4,7 +4,7 @@
4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
5# Free Software Foundation, Inc. 5# Free Software Foundation, Inc.
6 6
7timestamp='2009-11-20' 7timestamp='2009-06-11'
8 8
9# This file is (in principle) common to ALL GNU software. 9# This file is (in principle) common to ALL GNU software.
10# The presence of a machine in this file suggests that SOME GNU software 10# The presence of a machine in this file suggests that SOME GNU software
@@ -32,16 +32,13 @@ timestamp='2009-11-20'
32 32
33 33
34# Please send patches to <config-patches@gnu.org>. Submit a context 34# Please send patches to <config-patches@gnu.org>. Submit a context
35# diff and a properly formatted GNU ChangeLog entry. 35# diff and a properly formatted ChangeLog entry.
36# 36#
37# Configuration subroutine to validate and canonicalize a configuration type. 37# Configuration subroutine to validate and canonicalize a configuration type.
38# Supply the specified configuration type as an argument. 38# Supply the specified configuration type as an argument.
39# If it is invalid, we print an error message on stderr and exit with code 1. 39# If it is invalid, we print an error message on stderr and exit with code 1.
40# Otherwise, we print the canonical config type on stdout and succeed. 40# Otherwise, we print the canonical config type on stdout and succeed.
41 41
42# You can get the latest version of this script from:
43# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
44
45# This file is supposed to be the same for all GNU packages 42# This file is supposed to be the same for all GNU packages
46# and recognize all the CPU types, system types and aliases 43# and recognize all the CPU types, system types and aliases
47# that are meaningful with *any* GNU software. 44# that are meaningful with *any* GNU software.
@@ -152,7 +149,7 @@ case $os in
152 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ 149 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
153 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ 150 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
154 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ 151 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
155 -apple | -axis | -knuth | -cray | -microblaze) 152 -apple | -axis | -knuth | -cray)
156 os= 153 os=
157 basic_machine=$1 154 basic_machine=$1
158 ;; 155 ;;
@@ -287,7 +284,6 @@ case $basic_machine in
287 | pdp10 | pdp11 | pj | pjl \ 284 | pdp10 | pdp11 | pj | pjl \
288 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ 285 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
289 | pyramid \ 286 | pyramid \
290 | rx \
291 | score \ 287 | score \
292 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ 288 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
293 | sh64 | sh64le \ 289 | sh64 | sh64le \
@@ -295,14 +291,13 @@ case $basic_machine in
295 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ 291 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
296 | spu | strongarm \ 292 | spu | strongarm \
297 | tahoe | thumb | tic4x | tic80 | tron \ 293 | tahoe | thumb | tic4x | tic80 | tron \
298 | ubicom32 \
299 | v850 | v850e \ 294 | v850 | v850e \
300 | we32k \ 295 | we32k \
301 | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ 296 | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
302 | z8k | z80) 297 | z8k | z80)
303 basic_machine=$basic_machine-unknown 298 basic_machine=$basic_machine-unknown
304 ;; 299 ;;
305 m6811 | m68hc11 | m6812 | m68hc12 | picochip) 300 m6811 | m68hc11 | m6812 | m68hc12)
306 # Motorola 68HC11/12. 301 # Motorola 68HC11/12.
307 basic_machine=$basic_machine-unknown 302 basic_machine=$basic_machine-unknown
308 os=-none 303 os=-none
@@ -345,7 +340,7 @@ case $basic_machine in
345 | lm32-* \ 340 | lm32-* \
346 | m32c-* | m32r-* | m32rle-* \ 341 | m32c-* | m32r-* | m32rle-* \
347 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ 342 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
348 | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ 343 | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
349 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ 344 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
350 | mips16-* \ 345 | mips16-* \
351 | mips64-* | mips64el-* \ 346 | mips64-* | mips64el-* \
@@ -373,7 +368,7 @@ case $basic_machine in
373 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ 368 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
374 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ 369 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
375 | pyramid-* \ 370 | pyramid-* \
376 | romp-* | rs6000-* | rx-* \ 371 | romp-* | rs6000-* \
377 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ 372 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
378 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ 373 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
379 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ 374 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -382,7 +377,6 @@ case $basic_machine in
382 | tahoe-* | thumb-* \ 377 | tahoe-* | thumb-* \
383 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ 378 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
384 | tron-* \ 379 | tron-* \
385 | ubicom32-* \
386 | v850-* | v850e-* | vax-* \ 380 | v850-* | v850e-* | vax-* \
387 | we32k-* \ 381 | we32k-* \
388 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ 382 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -732,9 +726,6 @@ case $basic_machine in
732 basic_machine=ns32k-utek 726 basic_machine=ns32k-utek
733 os=-sysv 727 os=-sysv
734 ;; 728 ;;
735 microblaze)
736 basic_machine=microblaze-xilinx
737 ;;
738 mingw32) 729 mingw32)
739 basic_machine=i386-pc 730 basic_machine=i386-pc
740 os=-mingw32 731 os=-mingw32
@@ -1256,9 +1247,6 @@ case $os in
1256 # First match some system type aliases 1247 # First match some system type aliases
1257 # that might get confused with valid system types. 1248 # that might get confused with valid system types.
1258 # -solaris* is a basic system type, with this one exception. 1249 # -solaris* is a basic system type, with this one exception.
1259 -auroraux)
1260 os=-auroraux
1261 ;;
1262 -solaris1 | -solaris1.*) 1250 -solaris1 | -solaris1.*)
1263 os=`echo $os | sed -e 's|solaris1|sunos4|'` 1251 os=`echo $os | sed -e 's|solaris1|sunos4|'`
1264 ;; 1252 ;;
@@ -1280,8 +1268,8 @@ case $os in
1280 # -sysv* is not here because it comes later, after sysvr4. 1268 # -sysv* is not here because it comes later, after sysvr4.
1281 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ 1269 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1282 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ 1270 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1283 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ 1271 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
1284 | -sym* | -kopensolaris* \ 1272 | -kopensolaris* \
1285 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ 1273 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1286 | -aos* | -aros* \ 1274 | -aos* | -aros* \
1287 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ 1275 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1302,7 +1290,7 @@ case $os in
1302 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ 1290 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1303 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ 1291 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1304 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ 1292 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1305 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) 1293 | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
1306 # Remember, each alternative MUST END IN *, to match a version number. 1294 # Remember, each alternative MUST END IN *, to match a version number.
1307 ;; 1295 ;;
1308 -qnx*) 1296 -qnx*)
diff --git a/autogen/configure b/autogen/configure
index 6ce5e85e000..563c729f18e 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -1,11 +1,11 @@
1#! /bin/sh 1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles. 2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.68 for emacs 24.0.50. 3# Generated by GNU Autoconf 2.65 for emacs 24.0.50.
4# 4#
5# 5#
6# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 6# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
7# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software 7# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
8# Foundation, Inc. 8# Inc.
9# 9#
10# 10#
11# This configure script is free software; the Free Software Foundation 11# This configure script is free software; the Free Software Foundation
@@ -89,7 +89,6 @@ fi
89IFS=" "" $as_nl" 89IFS=" "" $as_nl"
90 90
91# Find who we are. Look in the path if we contain no directory separator. 91# Find who we are. Look in the path if we contain no directory separator.
92as_myself=
93case $0 in #(( 92case $0 in #((
94 *[\\/]* ) as_myself=$0 ;; 93 *[\\/]* ) as_myself=$0 ;;
95 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 94 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -215,18 +214,11 @@ IFS=$as_save_IFS
215 # We cannot yet assume a decent shell, so we have to provide a 214 # We cannot yet assume a decent shell, so we have to provide a
216 # neutralization value for shells without unset; and this also 215 # neutralization value for shells without unset; and this also
217 # works around shells that cannot unset nonexistent variables. 216 # works around shells that cannot unset nonexistent variables.
218 # Preserve -v and -x to the replacement shell.
219 BASH_ENV=/dev/null 217 BASH_ENV=/dev/null
220 ENV=/dev/null 218 ENV=/dev/null
221 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 219 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
222 export CONFIG_SHELL 220 export CONFIG_SHELL
223 case $- in # (((( 221 exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
224 *v*x* | *x*v* ) as_opts=-vx ;;
225 *v* ) as_opts=-v ;;
226 *x* ) as_opts=-x ;;
227 * ) as_opts= ;;
228 esac
229 exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
230fi 222fi
231 223
232 if test x$as_have_required = xno; then : 224 if test x$as_have_required = xno; then :
@@ -324,7 +316,7 @@ $as_echo X"$as_dir" |
324 test -d "$as_dir" && break 316 test -d "$as_dir" && break
325 done 317 done
326 test -z "$as_dirs" || eval "mkdir $as_dirs" 318 test -z "$as_dirs" || eval "mkdir $as_dirs"
327 } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" 319 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
328 320
329 321
330} # as_fn_mkdir_p 322} # as_fn_mkdir_p
@@ -364,19 +356,19 @@ else
364fi # as_fn_arith 356fi # as_fn_arith
365 357
366 358
367# as_fn_error STATUS ERROR [LINENO LOG_FD] 359# as_fn_error ERROR [LINENO LOG_FD]
368# ---------------------------------------- 360# ---------------------------------
369# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 361# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
370# provided, also output the error to LOG_FD, referencing LINENO. Then exit the 362# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
371# script with STATUS, using 1 if that was 0. 363# script with status $?, using 1 if that was 0.
372as_fn_error () 364as_fn_error ()
373{ 365{
374 as_status=$1; test $as_status -eq 0 && as_status=1 366 as_status=$?; test $as_status -eq 0 && as_status=1
375 if test "$4"; then 367 if test "$3"; then
376 as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 368 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
377 $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 369 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
378 fi 370 fi
379 $as_echo "$as_me: error: $2" >&2 371 $as_echo "$as_me: error: $1" >&2
380 as_fn_exit $as_status 372 as_fn_exit $as_status
381} # as_fn_error 373} # as_fn_error
382 374
@@ -538,7 +530,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
538exec 6>&1 530exec 6>&1
539 531
540# Name of the host. 532# Name of the host.
541# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, 533# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
542# so uname gets run too. 534# so uname gets run too.
543ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` 535ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
544 536
@@ -1321,9 +1313,8 @@ do
1321 fi 1313 fi
1322 1314
1323 case $ac_option in 1315 case $ac_option in
1324 *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 1316 *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
1325 *=) ac_optarg= ;; 1317 *) ac_optarg=yes ;;
1326 *) ac_optarg=yes ;;
1327 esac 1318 esac
1328 1319
1329 # Accept the important Cygnus configure options, so we can diagnose typos. 1320 # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1368,7 +1359,7 @@ do
1368 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` 1359 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
1369 # Reject names that are not valid shell variable names. 1360 # Reject names that are not valid shell variable names.
1370 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1361 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1371 as_fn_error $? "invalid feature name: $ac_useropt" 1362 as_fn_error "invalid feature name: $ac_useropt"
1372 ac_useropt_orig=$ac_useropt 1363 ac_useropt_orig=$ac_useropt
1373 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1364 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1374 case $ac_user_opts in 1365 case $ac_user_opts in
@@ -1394,7 +1385,7 @@ do
1394 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` 1385 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
1395 # Reject names that are not valid shell variable names. 1386 # Reject names that are not valid shell variable names.
1396 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1387 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1397 as_fn_error $? "invalid feature name: $ac_useropt" 1388 as_fn_error "invalid feature name: $ac_useropt"
1398 ac_useropt_orig=$ac_useropt 1389 ac_useropt_orig=$ac_useropt
1399 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1390 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1400 case $ac_user_opts in 1391 case $ac_user_opts in
@@ -1598,7 +1589,7 @@ do
1598 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` 1589 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
1599 # Reject names that are not valid shell variable names. 1590 # Reject names that are not valid shell variable names.
1600 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1591 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1601 as_fn_error $? "invalid package name: $ac_useropt" 1592 as_fn_error "invalid package name: $ac_useropt"
1602 ac_useropt_orig=$ac_useropt 1593 ac_useropt_orig=$ac_useropt
1603 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1594 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1604 case $ac_user_opts in 1595 case $ac_user_opts in
@@ -1614,7 +1605,7 @@ do
1614 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` 1605 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
1615 # Reject names that are not valid shell variable names. 1606 # Reject names that are not valid shell variable names.
1616 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1607 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1617 as_fn_error $? "invalid package name: $ac_useropt" 1608 as_fn_error "invalid package name: $ac_useropt"
1618 ac_useropt_orig=$ac_useropt 1609 ac_useropt_orig=$ac_useropt
1619 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1610 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1620 case $ac_user_opts in 1611 case $ac_user_opts in
@@ -1644,8 +1635,8 @@ do
1644 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) 1635 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
1645 x_libraries=$ac_optarg ;; 1636 x_libraries=$ac_optarg ;;
1646 1637
1647 -*) as_fn_error $? "unrecognized option: \`$ac_option' 1638 -*) as_fn_error "unrecognized option: \`$ac_option'
1648Try \`$0 --help' for more information" 1639Try \`$0 --help' for more information."
1649 ;; 1640 ;;
1650 1641
1651 *=*) 1642 *=*)
@@ -1653,7 +1644,7 @@ Try \`$0 --help' for more information"
1653 # Reject names that are not valid shell variable names. 1644 # Reject names that are not valid shell variable names.
1654 case $ac_envvar in #( 1645 case $ac_envvar in #(
1655 '' | [0-9]* | *[!_$as_cr_alnum]* ) 1646 '' | [0-9]* | *[!_$as_cr_alnum]* )
1656 as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; 1647 as_fn_error "invalid variable name: \`$ac_envvar'" ;;
1657 esac 1648 esac
1658 eval $ac_envvar=\$ac_optarg 1649 eval $ac_envvar=\$ac_optarg
1659 export $ac_envvar ;; 1650 export $ac_envvar ;;
@@ -1663,7 +1654,7 @@ Try \`$0 --help' for more information"
1663 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 1654 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
1664 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && 1655 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1665 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 1656 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
1666 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" 1657 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
1667 ;; 1658 ;;
1668 1659
1669 esac 1660 esac
@@ -1671,13 +1662,13 @@ done
1671 1662
1672if test -n "$ac_prev"; then 1663if test -n "$ac_prev"; then
1673 ac_option=--`echo $ac_prev | sed 's/_/-/g'` 1664 ac_option=--`echo $ac_prev | sed 's/_/-/g'`
1674 as_fn_error $? "missing argument to $ac_option" 1665 as_fn_error "missing argument to $ac_option"
1675fi 1666fi
1676 1667
1677if test -n "$ac_unrecognized_opts"; then 1668if test -n "$ac_unrecognized_opts"; then
1678 case $enable_option_checking in 1669 case $enable_option_checking in
1679 no) ;; 1670 no) ;;
1680 fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; 1671 fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
1681 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; 1672 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
1682 esac 1673 esac
1683fi 1674fi
@@ -1700,7 +1691,7 @@ do
1700 [\\/$]* | ?:[\\/]* ) continue;; 1691 [\\/$]* | ?:[\\/]* ) continue;;
1701 NONE | '' ) case $ac_var in *prefix ) continue;; esac;; 1692 NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
1702 esac 1693 esac
1703 as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" 1694 as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
1704done 1695done
1705 1696
1706# There might be people who depend on the old broken behavior: `$host' 1697# There might be people who depend on the old broken behavior: `$host'
@@ -1714,8 +1705,8 @@ target=$target_alias
1714if test "x$host_alias" != x; then 1705if test "x$host_alias" != x; then
1715 if test "x$build_alias" = x; then 1706 if test "x$build_alias" = x; then
1716 cross_compiling=maybe 1707 cross_compiling=maybe
1717 $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. 1708 $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
1718 If a cross compiler is detected then cross compile mode will be used" >&2 1709 If a cross compiler is detected then cross compile mode will be used." >&2
1719 elif test "x$build_alias" != "x$host_alias"; then 1710 elif test "x$build_alias" != "x$host_alias"; then
1720 cross_compiling=yes 1711 cross_compiling=yes
1721 fi 1712 fi
@@ -1730,9 +1721,9 @@ test "$silent" = yes && exec 6>/dev/null
1730ac_pwd=`pwd` && test -n "$ac_pwd" && 1721ac_pwd=`pwd` && test -n "$ac_pwd" &&
1731ac_ls_di=`ls -di .` && 1722ac_ls_di=`ls -di .` &&
1732ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || 1723ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
1733 as_fn_error $? "working directory cannot be determined" 1724 as_fn_error "working directory cannot be determined"
1734test "X$ac_ls_di" = "X$ac_pwd_ls_di" || 1725test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
1735 as_fn_error $? "pwd does not report name of working directory" 1726 as_fn_error "pwd does not report name of working directory"
1736 1727
1737 1728
1738# Find the source files, if location was not specified. 1729# Find the source files, if location was not specified.
@@ -1771,11 +1762,11 @@ else
1771fi 1762fi
1772if test ! -r "$srcdir/$ac_unique_file"; then 1763if test ! -r "$srcdir/$ac_unique_file"; then
1773 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." 1764 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
1774 as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" 1765 as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
1775fi 1766fi
1776ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" 1767ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
1777ac_abs_confdir=`( 1768ac_abs_confdir=`(
1778 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" 1769 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
1779 pwd)` 1770 pwd)`
1780# When building in place, set srcdir=. 1771# When building in place, set srcdir=.
1781if test "$ac_abs_confdir" = "$ac_pwd"; then 1772if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1815,7 +1806,7 @@ Configuration:
1815 --help=short display options specific to this package 1806 --help=short display options specific to this package
1816 --help=recursive display the short help of all the included packages 1807 --help=recursive display the short help of all the included packages
1817 -V, --version display version information and exit 1808 -V, --version display version information and exit
1818 -q, --quiet, --silent do not print \`checking ...' messages 1809 -q, --quiet, --silent do not print \`checking...' messages
1819 --cache-file=FILE cache test results in FILE [disabled] 1810 --cache-file=FILE cache test results in FILE [disabled]
1820 -C, --config-cache alias for \`--cache-file=config.cache' 1811 -C, --config-cache alias for \`--cache-file=config.cache'
1821 -n, --no-create do not create output files 1812 -n, --no-create do not create output files
@@ -2037,9 +2028,9 @@ test -n "$ac_init_help" && exit $ac_status
2037if $ac_init_version; then 2028if $ac_init_version; then
2038 cat <<\_ACEOF 2029 cat <<\_ACEOF
2039emacs configure 24.0.50 2030emacs configure 24.0.50
2040generated by GNU Autoconf 2.68 2031generated by GNU Autoconf 2.65
2041 2032
2042Copyright (C) 2010 Free Software Foundation, Inc. 2033Copyright (C) 2009 Free Software Foundation, Inc.
2043This configure script is free software; the Free Software Foundation 2034This configure script is free software; the Free Software Foundation
2044gives unlimited permission to copy, distribute and modify it. 2035gives unlimited permission to copy, distribute and modify it.
2045_ACEOF 2036_ACEOF
@@ -2083,7 +2074,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
2083 2074
2084 ac_retval=1 2075 ac_retval=1
2085fi 2076fi
2086 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2077 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2087 as_fn_set_status $ac_retval 2078 as_fn_set_status $ac_retval
2088 2079
2089} # ac_fn_c_try_compile 2080} # ac_fn_c_try_compile
@@ -2109,7 +2100,7 @@ $as_echo "$ac_try_echo"; } >&5
2109 mv -f conftest.er1 conftest.err 2100 mv -f conftest.er1 conftest.err
2110 fi 2101 fi
2111 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 2102 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2112 test $ac_status = 0; } > conftest.i && { 2103 test $ac_status = 0; } >/dev/null && {
2113 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || 2104 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
2114 test ! -s conftest.err 2105 test ! -s conftest.err
2115 }; then : 2106 }; then :
@@ -2120,7 +2111,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
2120 2111
2121 ac_retval=1 2112 ac_retval=1
2122fi 2113fi
2123 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2114 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2124 as_fn_set_status $ac_retval 2115 as_fn_set_status $ac_retval
2125 2116
2126} # ac_fn_c_try_cpp 2117} # ac_fn_c_try_cpp
@@ -2133,10 +2124,10 @@ fi
2133ac_fn_c_check_header_mongrel () 2124ac_fn_c_check_header_mongrel ()
2134{ 2125{
2135 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2126 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2136 if eval \${$3+:} false; then : 2127 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2137 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2128 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2138$as_echo_n "checking for $2... " >&6; } 2129$as_echo_n "checking for $2... " >&6; }
2139if eval \${$3+:} false; then : 2130if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2140 $as_echo_n "(cached) " >&6 2131 $as_echo_n "(cached) " >&6
2141fi 2132fi
2142eval ac_res=\$$3 2133eval ac_res=\$$3
@@ -2172,7 +2163,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
2172else 2163else
2173 ac_header_preproc=no 2164 ac_header_preproc=no
2174fi 2165fi
2175rm -f conftest.err conftest.i conftest.$ac_ext 2166rm -f conftest.err conftest.$ac_ext
2176{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 2167{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
2177$as_echo "$ac_header_preproc" >&6; } 2168$as_echo "$ac_header_preproc" >&6; }
2178 2169
@@ -2199,7 +2190,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
2199esac 2190esac
2200 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2191 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2201$as_echo_n "checking for $2... " >&6; } 2192$as_echo_n "checking for $2... " >&6; }
2202if eval \${$3+:} false; then : 2193if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2203 $as_echo_n "(cached) " >&6 2194 $as_echo_n "(cached) " >&6
2204else 2195else
2205 eval "$3=\$ac_header_compiler" 2196 eval "$3=\$ac_header_compiler"
@@ -2208,7 +2199,7 @@ eval ac_res=\$$3
2208 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 2199 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2209$as_echo "$ac_res" >&6; } 2200$as_echo "$ac_res" >&6; }
2210fi 2201fi
2211 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2202 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2212 2203
2213} # ac_fn_c_check_header_mongrel 2204} # ac_fn_c_check_header_mongrel
2214 2205
@@ -2249,7 +2240,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
2249 ac_retval=$ac_status 2240 ac_retval=$ac_status
2250fi 2241fi
2251 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 2242 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
2252 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2243 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2253 as_fn_set_status $ac_retval 2244 as_fn_set_status $ac_retval
2254 2245
2255} # ac_fn_c_try_run 2246} # ac_fn_c_try_run
@@ -2263,7 +2254,7 @@ ac_fn_c_check_header_compile ()
2263 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2254 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2264 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2255 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2265$as_echo_n "checking for $2... " >&6; } 2256$as_echo_n "checking for $2... " >&6; }
2266if eval \${$3+:} false; then : 2257if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2267 $as_echo_n "(cached) " >&6 2258 $as_echo_n "(cached) " >&6
2268else 2259else
2269 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2260 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2281,7 +2272,7 @@ fi
2281eval ac_res=\$$3 2272eval ac_res=\$$3
2282 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 2273 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2283$as_echo "$ac_res" >&6; } 2274$as_echo "$ac_res" >&6; }
2284 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2275 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2285 2276
2286} # ac_fn_c_check_header_compile 2277} # ac_fn_c_check_header_compile
2287 2278
@@ -2326,23 +2317,20 @@ fi
2326 # interfere with the next link command; also delete a directory that is 2317 # interfere with the next link command; also delete a directory that is
2327 # left behind by Apple's compiler. We do this before executing the actions. 2318 # left behind by Apple's compiler. We do this before executing the actions.
2328 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 2319 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
2329 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2320 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2330 as_fn_set_status $ac_retval 2321 as_fn_set_status $ac_retval
2331 2322
2332} # ac_fn_c_try_link 2323} # ac_fn_c_try_link
2333 2324
2334# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES 2325# ac_fn_c_check_decl LINENO SYMBOL VAR
2335# --------------------------------------------- 2326# ------------------------------------
2336# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR 2327# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
2337# accordingly.
2338ac_fn_c_check_decl () 2328ac_fn_c_check_decl ()
2339{ 2329{
2340 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2330 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2341 as_decl_name=`echo $2|sed 's/ *(.*//'` 2331 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
2342 as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` 2332$as_echo_n "checking whether $2 is declared... " >&6; }
2343 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 2333if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2344$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
2345if eval \${$3+:} false; then :
2346 $as_echo_n "(cached) " >&6 2334 $as_echo_n "(cached) " >&6
2347else 2335else
2348 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2336 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2351,12 +2339,8 @@ $4
2351int 2339int
2352main () 2340main ()
2353{ 2341{
2354#ifndef $as_decl_name 2342#ifndef $2
2355#ifdef __cplusplus 2343 (void) $2;
2356 (void) $as_decl_use;
2357#else
2358 (void) $as_decl_name;
2359#endif
2360#endif 2344#endif
2361 2345
2362 ; 2346 ;
@@ -2373,7 +2357,7 @@ fi
2373eval ac_res=\$$3 2357eval ac_res=\$$3
2374 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 2358 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2375$as_echo "$ac_res" >&6; } 2359$as_echo "$ac_res" >&6; }
2376 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2360 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2377 2361
2378} # ac_fn_c_check_decl 2362} # ac_fn_c_check_decl
2379 2363
@@ -2385,7 +2369,7 @@ ac_fn_c_check_header_preproc ()
2385 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2369 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2386 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2370 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2387$as_echo_n "checking for $2... " >&6; } 2371$as_echo_n "checking for $2... " >&6; }
2388if eval \${$3+:} false; then : 2372if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2389 $as_echo_n "(cached) " >&6 2373 $as_echo_n "(cached) " >&6
2390else 2374else
2391 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2375 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2397,12 +2381,12 @@ if ac_fn_c_try_cpp "$LINENO"; then :
2397else 2381else
2398 eval "$3=no" 2382 eval "$3=no"
2399fi 2383fi
2400rm -f conftest.err conftest.i conftest.$ac_ext 2384rm -f conftest.err conftest.$ac_ext
2401fi 2385fi
2402eval ac_res=\$$3 2386eval ac_res=\$$3
2403 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 2387 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2404$as_echo "$ac_res" >&6; } 2388$as_echo "$ac_res" >&6; }
2405 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2389 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2406 2390
2407} # ac_fn_c_check_header_preproc 2391} # ac_fn_c_check_header_preproc
2408 2392
@@ -2415,7 +2399,7 @@ ac_fn_c_check_member ()
2415 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2399 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2416 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 2400 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
2417$as_echo_n "checking for $2.$3... " >&6; } 2401$as_echo_n "checking for $2.$3... " >&6; }
2418if eval \${$4+:} false; then : 2402if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
2419 $as_echo_n "(cached) " >&6 2403 $as_echo_n "(cached) " >&6
2420else 2404else
2421 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2405 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2459,7 +2443,7 @@ fi
2459eval ac_res=\$$4 2443eval ac_res=\$$4
2460 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 2444 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2461$as_echo "$ac_res" >&6; } 2445$as_echo "$ac_res" >&6; }
2462 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2446 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2463 2447
2464} # ac_fn_c_check_member 2448} # ac_fn_c_check_member
2465 2449
@@ -2471,7 +2455,7 @@ ac_fn_c_check_func ()
2471 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2455 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2472 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2456 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2473$as_echo_n "checking for $2... " >&6; } 2457$as_echo_n "checking for $2... " >&6; }
2474if eval \${$3+:} false; then : 2458if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2475 $as_echo_n "(cached) " >&6 2459 $as_echo_n "(cached) " >&6
2476else 2460else
2477 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2461 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2526,7 +2510,7 @@ fi
2526eval ac_res=\$$3 2510eval ac_res=\$$3
2527 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 2511 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2528$as_echo "$ac_res" >&6; } 2512$as_echo "$ac_res" >&6; }
2529 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2513 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2530 2514
2531} # ac_fn_c_check_func 2515} # ac_fn_c_check_func
2532 2516
@@ -2539,7 +2523,7 @@ ac_fn_c_check_type ()
2539 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2523 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2540 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2524 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2541$as_echo_n "checking for $2... " >&6; } 2525$as_echo_n "checking for $2... " >&6; }
2542if eval \${$3+:} false; then : 2526if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2543 $as_echo_n "(cached) " >&6 2527 $as_echo_n "(cached) " >&6
2544else 2528else
2545 eval "$3=no" 2529 eval "$3=no"
@@ -2580,7 +2564,7 @@ fi
2580eval ac_res=\$$3 2564eval ac_res=\$$3
2581 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 2565 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2582$as_echo "$ac_res" >&6; } 2566$as_echo "$ac_res" >&6; }
2583 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2567 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2584 2568
2585} # ac_fn_c_check_type 2569} # ac_fn_c_check_type
2586 2570
@@ -2757,7 +2741,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
2757rm -f conftest.val 2741rm -f conftest.val
2758 2742
2759 fi 2743 fi
2760 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2744 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2761 as_fn_set_status $ac_retval 2745 as_fn_set_status $ac_retval
2762 2746
2763} # ac_fn_c_compute_int 2747} # ac_fn_c_compute_int
@@ -2766,7 +2750,7 @@ This file contains any messages produced by compilers while
2766running configure, to aid debugging if configure makes a mistake. 2750running configure, to aid debugging if configure makes a mistake.
2767 2751
2768It was created by emacs $as_me 24.0.50, which was 2752It was created by emacs $as_me 24.0.50, which was
2769generated by GNU Autoconf 2.68. Invocation command line was 2753generated by GNU Autoconf 2.65. Invocation command line was
2770 2754
2771 $ $0 $@ 2755 $ $0 $@
2772 2756
@@ -2876,9 +2860,11 @@ trap 'exit_status=$?
2876 { 2860 {
2877 echo 2861 echo
2878 2862
2879 $as_echo "## ---------------- ## 2863 cat <<\_ASBOX
2864## ---------------- ##
2880## Cache variables. ## 2865## Cache variables. ##
2881## ---------------- ##" 2866## ---------------- ##
2867_ASBOX
2882 echo 2868 echo
2883 # The following way of writing the cache mishandles newlines in values, 2869 # The following way of writing the cache mishandles newlines in values,
2884( 2870(
@@ -2912,9 +2898,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
2912) 2898)
2913 echo 2899 echo
2914 2900
2915 $as_echo "## ----------------- ## 2901 cat <<\_ASBOX
2902## ----------------- ##
2916## Output variables. ## 2903## Output variables. ##
2917## ----------------- ##" 2904## ----------------- ##
2905_ASBOX
2918 echo 2906 echo
2919 for ac_var in $ac_subst_vars 2907 for ac_var in $ac_subst_vars
2920 do 2908 do
@@ -2927,9 +2915,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
2927 echo 2915 echo
2928 2916
2929 if test -n "$ac_subst_files"; then 2917 if test -n "$ac_subst_files"; then
2930 $as_echo "## ------------------- ## 2918 cat <<\_ASBOX
2919## ------------------- ##
2931## File substitutions. ## 2920## File substitutions. ##
2932## ------------------- ##" 2921## ------------------- ##
2922_ASBOX
2933 echo 2923 echo
2934 for ac_var in $ac_subst_files 2924 for ac_var in $ac_subst_files
2935 do 2925 do
@@ -2943,9 +2933,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
2943 fi 2933 fi
2944 2934
2945 if test -s confdefs.h; then 2935 if test -s confdefs.h; then
2946 $as_echo "## ----------- ## 2936 cat <<\_ASBOX
2937## ----------- ##
2947## confdefs.h. ## 2938## confdefs.h. ##
2948## ----------- ##" 2939## ----------- ##
2940_ASBOX
2949 echo 2941 echo
2950 cat confdefs.h 2942 cat confdefs.h
2951 echo 2943 echo
@@ -3000,12 +2992,7 @@ _ACEOF
3000ac_site_file1=NONE 2992ac_site_file1=NONE
3001ac_site_file2=NONE 2993ac_site_file2=NONE
3002if test -n "$CONFIG_SITE"; then 2994if test -n "$CONFIG_SITE"; then
3003 # We do not want a PATH search for config.site. 2995 ac_site_file1=$CONFIG_SITE
3004 case $CONFIG_SITE in #((
3005 -*) ac_site_file1=./$CONFIG_SITE;;
3006 */*) ac_site_file1=$CONFIG_SITE;;
3007 *) ac_site_file1=./$CONFIG_SITE;;
3008 esac
3009elif test "x$prefix" != xNONE; then 2996elif test "x$prefix" != xNONE; then
3010 ac_site_file1=$prefix/share/config.site 2997 ac_site_file1=$prefix/share/config.site
3011 ac_site_file2=$prefix/etc/config.site 2998 ac_site_file2=$prefix/etc/config.site
@@ -3020,11 +3007,7 @@ do
3020 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 3007 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
3021$as_echo "$as_me: loading site script $ac_site_file" >&6;} 3008$as_echo "$as_me: loading site script $ac_site_file" >&6;}
3022 sed 's/^/| /' "$ac_site_file" >&5 3009 sed 's/^/| /' "$ac_site_file" >&5
3023 . "$ac_site_file" \ 3010 . "$ac_site_file"
3024 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3025$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3026as_fn_error $? "failed to load site script $ac_site_file
3027See \`config.log' for more details" "$LINENO" 5; }
3028 fi 3011 fi
3029done 3012done
3030 3013
@@ -3117,7 +3100,7 @@ if $ac_cache_corrupted; then
3117$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3100$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3118 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 3101 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
3119$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} 3102$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
3120 as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 3103 as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
3121fi 3104fi
3122## -------------------- ## 3105## -------------------- ##
3123## Main body of script. ## 3106## Main body of script. ##
@@ -3137,22 +3120,16 @@ am__api_version='1.11'
3137 3120
3138ac_aux_dir= 3121ac_aux_dir=
3139for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do 3122for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
3140 if test -f "$ac_dir/install-sh"; then 3123 for ac_t in install-sh install.sh shtool; do
3141 ac_aux_dir=$ac_dir 3124 if test -f "$ac_dir/$ac_t"; then
3142 ac_install_sh="$ac_aux_dir/install-sh -c" 3125 ac_aux_dir=$ac_dir
3143 break 3126 ac_install_sh="$ac_aux_dir/$ac_t -c"
3144 elif test -f "$ac_dir/install.sh"; then 3127 break 2
3145 ac_aux_dir=$ac_dir 3128 fi
3146 ac_install_sh="$ac_aux_dir/install.sh -c" 3129 done
3147 break
3148 elif test -f "$ac_dir/shtool"; then
3149 ac_aux_dir=$ac_dir
3150 ac_install_sh="$ac_aux_dir/shtool install -c"
3151 break
3152 fi
3153done 3130done
3154if test -z "$ac_aux_dir"; then 3131if test -z "$ac_aux_dir"; then
3155 as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 3132 as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
3156fi 3133fi
3157 3134
3158# These three variables are undocumented and unsupported, 3135# These three variables are undocumented and unsupported,
@@ -3181,7 +3158,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
3181{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 3158{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
3182$as_echo_n "checking for a BSD-compatible install... " >&6; } 3159$as_echo_n "checking for a BSD-compatible install... " >&6; }
3183if test -z "$INSTALL"; then 3160if test -z "$INSTALL"; then
3184if ${ac_cv_path_install+:} false; then : 3161if test "${ac_cv_path_install+set}" = set; then :
3185 $as_echo_n "(cached) " >&6 3162 $as_echo_n "(cached) " >&6
3186else 3163else
3187 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3164 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3268,11 +3245,11 @@ am_lf='
3268' 3245'
3269case `pwd` in 3246case `pwd` in
3270 *[\\\"\#\$\&\'\`$am_lf]*) 3247 *[\\\"\#\$\&\'\`$am_lf]*)
3271 as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; 3248 as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
3272esac 3249esac
3273case $srcdir in 3250case $srcdir in
3274 *[\\\"\#\$\&\'\`$am_lf\ \ ]*) 3251 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
3275 as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; 3252 as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
3276esac 3253esac
3277 3254
3278# Do `set' in a subshell so we don't clobber the current shell's 3255# Do `set' in a subshell so we don't clobber the current shell's
@@ -3294,7 +3271,7 @@ if (
3294 # if, for instance, CONFIG_SHELL is bash and it inherits a 3271 # if, for instance, CONFIG_SHELL is bash and it inherits a
3295 # broken ls alias from the environment. This has actually 3272 # broken ls alias from the environment. This has actually
3296 # happened. Such a system could not be considered "sane". 3273 # happened. Such a system could not be considered "sane".
3297 as_fn_error $? "ls -t appears to fail. Make sure there is not a broken 3274 as_fn_error "ls -t appears to fail. Make sure there is not a broken
3298alias in your environment" "$LINENO" 5 3275alias in your environment" "$LINENO" 5
3299 fi 3276 fi
3300 3277
@@ -3304,7 +3281,7 @@ then
3304 # Ok. 3281 # Ok.
3305 : 3282 :
3306else 3283else
3307 as_fn_error $? "newly created file is older than distributed files! 3284 as_fn_error "newly created file is older than distributed files!
3308Check your system clock" "$LINENO" 5 3285Check your system clock" "$LINENO" 5
3309fi 3286fi
3310{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 3287{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -3358,7 +3335,7 @@ if test "$cross_compiling" != no; then
3358set dummy ${ac_tool_prefix}strip; ac_word=$2 3335set dummy ${ac_tool_prefix}strip; ac_word=$2
3359{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3336{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3360$as_echo_n "checking for $ac_word... " >&6; } 3337$as_echo_n "checking for $ac_word... " >&6; }
3361if ${ac_cv_prog_STRIP+:} false; then : 3338if test "${ac_cv_prog_STRIP+set}" = set; then :
3362 $as_echo_n "(cached) " >&6 3339 $as_echo_n "(cached) " >&6
3363else 3340else
3364 if test -n "$STRIP"; then 3341 if test -n "$STRIP"; then
@@ -3398,7 +3375,7 @@ if test -z "$ac_cv_prog_STRIP"; then
3398set dummy strip; ac_word=$2 3375set dummy strip; ac_word=$2
3399{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3376{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3400$as_echo_n "checking for $ac_word... " >&6; } 3377$as_echo_n "checking for $ac_word... " >&6; }
3401if ${ac_cv_prog_ac_ct_STRIP+:} false; then : 3378if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
3402 $as_echo_n "(cached) " >&6 3379 $as_echo_n "(cached) " >&6
3403else 3380else
3404 if test -n "$ac_ct_STRIP"; then 3381 if test -n "$ac_ct_STRIP"; then
@@ -3451,7 +3428,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
3451{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 3428{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
3452$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } 3429$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
3453if test -z "$MKDIR_P"; then 3430if test -z "$MKDIR_P"; then
3454 if ${ac_cv_path_mkdir+:} false; then : 3431 if test "${ac_cv_path_mkdir+set}" = set; then :
3455 $as_echo_n "(cached) " >&6 3432 $as_echo_n "(cached) " >&6
3456else 3433else
3457 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3434 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3503,7 +3480,7 @@ do
3503set dummy $ac_prog; ac_word=$2 3480set dummy $ac_prog; ac_word=$2
3504{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3481{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3505$as_echo_n "checking for $ac_word... " >&6; } 3482$as_echo_n "checking for $ac_word... " >&6; }
3506if ${ac_cv_prog_AWK+:} false; then : 3483if test "${ac_cv_prog_AWK+set}" = set; then :
3507 $as_echo_n "(cached) " >&6 3484 $as_echo_n "(cached) " >&6
3508else 3485else
3509 if test -n "$AWK"; then 3486 if test -n "$AWK"; then
@@ -3543,7 +3520,7 @@ done
3543$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } 3520$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
3544set x ${MAKE-make} 3521set x ${MAKE-make}
3545ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` 3522ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
3546if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : 3523if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
3547 $as_echo_n "(cached) " >&6 3524 $as_echo_n "(cached) " >&6
3548else 3525else
3549 cat >conftest.make <<\_ACEOF 3526 cat >conftest.make <<\_ACEOF
@@ -3551,7 +3528,7 @@ SHELL = /bin/sh
3551all: 3528all:
3552 @echo '@@@%%%=$(MAKE)=@@@%%%' 3529 @echo '@@@%%%=$(MAKE)=@@@%%%'
3553_ACEOF 3530_ACEOF
3554# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. 3531# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
3555case `${MAKE-make} -f conftest.make 2>/dev/null` in 3532case `${MAKE-make} -f conftest.make 2>/dev/null` in
3556 *@@@%%%=?*=@@@%%%*) 3533 *@@@%%%=?*=@@@%%%*)
3557 eval ac_cv_prog_make_${ac_make}_set=yes;; 3534 eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -3585,7 +3562,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
3585 am__isrc=' -I$(srcdir)' 3562 am__isrc=' -I$(srcdir)'
3586 # test to see if srcdir already configured 3563 # test to see if srcdir already configured
3587 if test -f $srcdir/config.status; then 3564 if test -f $srcdir/config.status; then
3588 as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 3565 as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
3589 fi 3566 fi
3590fi 3567fi
3591 3568
@@ -3788,7 +3765,7 @@ if test "${with_x_toolkit+set}" = set; then :
3788 g | gt | gtk ) val=gtk ;; 3765 g | gt | gtk ) val=gtk ;;
3789 gtk3 ) val=gtk3 ;; 3766 gtk3 ) val=gtk3 ;;
3790 * ) 3767 * )
3791as_fn_error $? "\`--with-x-toolkit=$withval' is invalid; 3768as_fn_error "\`--with-x-toolkit=$withval' is invalid;
3792this option's value should be \`yes', \`no', \`lucid', \`athena', \`motif', \`gtk' or 3769this option's value should be \`yes', \`no', \`lucid', \`athena', \`motif', \`gtk' or
3793\`gtk3'. \`yes' and \`gtk' are synonyms. \`athena' and \`lucid' are synonyms." "$LINENO" 5 3770\`gtk3'. \`yes' and \`gtk' are synonyms. \`athena' and \`lucid' are synonyms." "$LINENO" 5
3794 ;; 3771 ;;
@@ -4101,7 +4078,7 @@ do
4101 stringfreelist) ac_gc_check_string_free_list=1 ;; 4078 stringfreelist) ac_gc_check_string_free_list=1 ;;
4102 xmallocoverrun) ac_xmalloc_overrun=1 ;; 4079 xmallocoverrun) ac_xmalloc_overrun=1 ;;
4103 conslist) ac_gc_check_cons_list=1 ;; 4080 conslist) ac_gc_check_cons_list=1 ;;
4104 *) as_fn_error $? "unknown check category $check" "$LINENO" 5 ;; 4081 *) as_fn_error "unknown check category $check" "$LINENO" 5 ;;
4105 esac 4082 esac
4106done 4083done
4107IFS="$ac_save_IFS" 4084IFS="$ac_save_IFS"
@@ -4216,27 +4193,27 @@ fi
4216 4193
4217# Make sure we can run config.sub. 4194# Make sure we can run config.sub.
4218$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || 4195$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
4219 as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 4196 as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
4220 4197
4221{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 4198{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
4222$as_echo_n "checking build system type... " >&6; } 4199$as_echo_n "checking build system type... " >&6; }
4223if ${ac_cv_build+:} false; then : 4200if test "${ac_cv_build+set}" = set; then :
4224 $as_echo_n "(cached) " >&6 4201 $as_echo_n "(cached) " >&6
4225else 4202else
4226 ac_build_alias=$build_alias 4203 ac_build_alias=$build_alias
4227test "x$ac_build_alias" = x && 4204test "x$ac_build_alias" = x &&
4228 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` 4205 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
4229test "x$ac_build_alias" = x && 4206test "x$ac_build_alias" = x &&
4230 as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 4207 as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
4231ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || 4208ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
4232 as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 4209 as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
4233 4210
4234fi 4211fi
4235{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 4212{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
4236$as_echo "$ac_cv_build" >&6; } 4213$as_echo "$ac_cv_build" >&6; }
4237case $ac_cv_build in 4214case $ac_cv_build in
4238*-*-*) ;; 4215*-*-*) ;;
4239*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; 4216*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
4240esac 4217esac
4241build=$ac_cv_build 4218build=$ac_cv_build
4242ac_save_IFS=$IFS; IFS='-' 4219ac_save_IFS=$IFS; IFS='-'
@@ -4254,14 +4231,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
4254 4231
4255{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 4232{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
4256$as_echo_n "checking host system type... " >&6; } 4233$as_echo_n "checking host system type... " >&6; }
4257if ${ac_cv_host+:} false; then : 4234if test "${ac_cv_host+set}" = set; then :
4258 $as_echo_n "(cached) " >&6 4235 $as_echo_n "(cached) " >&6
4259else 4236else
4260 if test "x$host_alias" = x; then 4237 if test "x$host_alias" = x; then
4261 ac_cv_host=$ac_cv_build 4238 ac_cv_host=$ac_cv_build
4262else 4239else
4263 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || 4240 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
4264 as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 4241 as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
4265fi 4242fi
4266 4243
4267fi 4244fi
@@ -4269,7 +4246,7 @@ fi
4269$as_echo "$ac_cv_host" >&6; } 4246$as_echo "$ac_cv_host" >&6; }
4270case $ac_cv_host in 4247case $ac_cv_host in
4271*-*-*) ;; 4248*-*-*) ;;
4272*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; 4249*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
4273esac 4250esac
4274host=$ac_cv_host 4251host=$ac_cv_host
4275ac_save_IFS=$IFS; IFS='-' 4252ac_save_IFS=$IFS; IFS='-'
@@ -4523,7 +4500,7 @@ fi
4523 4500
4524 4501
4525if test $unported = yes; then 4502if test $unported = yes; then
4526 as_fn_error $? "Emacs hasn't been ported to \`${canonical}' systems. 4503 as_fn_error "Emacs hasn't been ported to \`${canonical}' systems.
4527Check \`etc/MACHINES' for recognized configuration names." "$LINENO" 5 4504Check \`etc/MACHINES' for recognized configuration names." "$LINENO" 5
4528fi 4505fi
4529 4506
@@ -4551,7 +4528,7 @@ if test -n "$ac_tool_prefix"; then
4551set dummy ${ac_tool_prefix}gcc; ac_word=$2 4528set dummy ${ac_tool_prefix}gcc; ac_word=$2
4552{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4529{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4553$as_echo_n "checking for $ac_word... " >&6; } 4530$as_echo_n "checking for $ac_word... " >&6; }
4554if ${ac_cv_prog_CC+:} false; then : 4531if test "${ac_cv_prog_CC+set}" = set; then :
4555 $as_echo_n "(cached) " >&6 4532 $as_echo_n "(cached) " >&6
4556else 4533else
4557 if test -n "$CC"; then 4534 if test -n "$CC"; then
@@ -4591,7 +4568,7 @@ if test -z "$ac_cv_prog_CC"; then
4591set dummy gcc; ac_word=$2 4568set dummy gcc; ac_word=$2
4592{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4569{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4593$as_echo_n "checking for $ac_word... " >&6; } 4570$as_echo_n "checking for $ac_word... " >&6; }
4594if ${ac_cv_prog_ac_ct_CC+:} false; then : 4571if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
4595 $as_echo_n "(cached) " >&6 4572 $as_echo_n "(cached) " >&6
4596else 4573else
4597 if test -n "$ac_ct_CC"; then 4574 if test -n "$ac_ct_CC"; then
@@ -4644,7 +4621,7 @@ if test -z "$CC"; then
4644set dummy ${ac_tool_prefix}cc; ac_word=$2 4621set dummy ${ac_tool_prefix}cc; ac_word=$2
4645{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4622{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4646$as_echo_n "checking for $ac_word... " >&6; } 4623$as_echo_n "checking for $ac_word... " >&6; }
4647if ${ac_cv_prog_CC+:} false; then : 4624if test "${ac_cv_prog_CC+set}" = set; then :
4648 $as_echo_n "(cached) " >&6 4625 $as_echo_n "(cached) " >&6
4649else 4626else
4650 if test -n "$CC"; then 4627 if test -n "$CC"; then
@@ -4684,7 +4661,7 @@ if test -z "$CC"; then
4684set dummy cc; ac_word=$2 4661set dummy cc; ac_word=$2
4685{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4662{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4686$as_echo_n "checking for $ac_word... " >&6; } 4663$as_echo_n "checking for $ac_word... " >&6; }
4687if ${ac_cv_prog_CC+:} false; then : 4664if test "${ac_cv_prog_CC+set}" = set; then :
4688 $as_echo_n "(cached) " >&6 4665 $as_echo_n "(cached) " >&6
4689else 4666else
4690 if test -n "$CC"; then 4667 if test -n "$CC"; then
@@ -4743,7 +4720,7 @@ if test -z "$CC"; then
4743set dummy $ac_tool_prefix$ac_prog; ac_word=$2 4720set dummy $ac_tool_prefix$ac_prog; ac_word=$2
4744{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4721{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4745$as_echo_n "checking for $ac_word... " >&6; } 4722$as_echo_n "checking for $ac_word... " >&6; }
4746if ${ac_cv_prog_CC+:} false; then : 4723if test "${ac_cv_prog_CC+set}" = set; then :
4747 $as_echo_n "(cached) " >&6 4724 $as_echo_n "(cached) " >&6
4748else 4725else
4749 if test -n "$CC"; then 4726 if test -n "$CC"; then
@@ -4787,7 +4764,7 @@ do
4787set dummy $ac_prog; ac_word=$2 4764set dummy $ac_prog; ac_word=$2
4788{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4765{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4789$as_echo_n "checking for $ac_word... " >&6; } 4766$as_echo_n "checking for $ac_word... " >&6; }
4790if ${ac_cv_prog_ac_ct_CC+:} false; then : 4767if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
4791 $as_echo_n "(cached) " >&6 4768 $as_echo_n "(cached) " >&6
4792else 4769else
4793 if test -n "$ac_ct_CC"; then 4770 if test -n "$ac_ct_CC"; then
@@ -4841,8 +4818,8 @@ fi
4841 4818
4842test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4819test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4843$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4820$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4844as_fn_error $? "no acceptable C compiler found in \$PATH 4821as_fn_error "no acceptable C compiler found in \$PATH
4845See \`config.log' for more details" "$LINENO" 5; } 4822See \`config.log' for more details." "$LINENO" 5; }
4846 4823
4847# Provide some information about the compiler. 4824# Provide some information about the compiler.
4848$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 4825$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4956,8 +4933,9 @@ sed 's/^/| /' conftest.$ac_ext >&5
4956 4933
4957{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4934{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4958$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4935$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4959as_fn_error 77 "C compiler cannot create executables 4936{ as_fn_set_status 77
4960See \`config.log' for more details" "$LINENO" 5; } 4937as_fn_error "C compiler cannot create executables
4938See \`config.log' for more details." "$LINENO" 5; }; }
4961else 4939else
4962 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 4940 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4963$as_echo "yes" >&6; } 4941$as_echo "yes" >&6; }
@@ -4999,8 +4977,8 @@ done
4999else 4977else
5000 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4978 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
5001$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4979$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
5002as_fn_error $? "cannot compute suffix of executables: cannot compile and link 4980as_fn_error "cannot compute suffix of executables: cannot compile and link
5003See \`config.log' for more details" "$LINENO" 5; } 4981See \`config.log' for more details." "$LINENO" 5; }
5004fi 4982fi
5005rm -f conftest conftest$ac_cv_exeext 4983rm -f conftest conftest$ac_cv_exeext
5006{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 4984{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -5057,9 +5035,9 @@ $as_echo "$ac_try_echo"; } >&5
5057 else 5035 else
5058 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 5036 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
5059$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 5037$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
5060as_fn_error $? "cannot run C compiled programs. 5038as_fn_error "cannot run C compiled programs.
5061If you meant to cross compile, use \`--host'. 5039If you meant to cross compile, use \`--host'.
5062See \`config.log' for more details" "$LINENO" 5; } 5040See \`config.log' for more details." "$LINENO" 5; }
5063 fi 5041 fi
5064 fi 5042 fi
5065fi 5043fi
@@ -5070,7 +5048,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
5070ac_clean_files=$ac_clean_files_save 5048ac_clean_files=$ac_clean_files_save
5071{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 5049{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
5072$as_echo_n "checking for suffix of object files... " >&6; } 5050$as_echo_n "checking for suffix of object files... " >&6; }
5073if ${ac_cv_objext+:} false; then : 5051if test "${ac_cv_objext+set}" = set; then :
5074 $as_echo_n "(cached) " >&6 5052 $as_echo_n "(cached) " >&6
5075else 5053else
5076 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 5054 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5110,8 +5088,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
5110 5088
5111{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 5089{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
5112$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 5090$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
5113as_fn_error $? "cannot compute suffix of object files: cannot compile 5091as_fn_error "cannot compute suffix of object files: cannot compile
5114See \`config.log' for more details" "$LINENO" 5; } 5092See \`config.log' for more details." "$LINENO" 5; }
5115fi 5093fi
5116rm -f conftest.$ac_cv_objext conftest.$ac_ext 5094rm -f conftest.$ac_cv_objext conftest.$ac_ext
5117fi 5095fi
@@ -5121,7 +5099,7 @@ OBJEXT=$ac_cv_objext
5121ac_objext=$OBJEXT 5099ac_objext=$OBJEXT
5122{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 5100{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
5123$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } 5101$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
5124if ${ac_cv_c_compiler_gnu+:} false; then : 5102if test "${ac_cv_c_compiler_gnu+set}" = set; then :
5125 $as_echo_n "(cached) " >&6 5103 $as_echo_n "(cached) " >&6
5126else 5104else
5127 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 5105 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5158,7 +5136,7 @@ ac_test_CFLAGS=${CFLAGS+set}
5158ac_save_CFLAGS=$CFLAGS 5136ac_save_CFLAGS=$CFLAGS
5159{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 5137{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
5160$as_echo_n "checking whether $CC accepts -g... " >&6; } 5138$as_echo_n "checking whether $CC accepts -g... " >&6; }
5161if ${ac_cv_prog_cc_g+:} false; then : 5139if test "${ac_cv_prog_cc_g+set}" = set; then :
5162 $as_echo_n "(cached) " >&6 5140 $as_echo_n "(cached) " >&6
5163else 5141else
5164 ac_save_c_werror_flag=$ac_c_werror_flag 5142 ac_save_c_werror_flag=$ac_c_werror_flag
@@ -5236,7 +5214,7 @@ else
5236fi 5214fi
5237{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 5215{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
5238$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } 5216$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
5239if ${ac_cv_prog_cc_c89+:} false; then : 5217if test "${ac_cv_prog_cc_c89+set}" = set; then :
5240 $as_echo_n "(cached) " >&6 5218 $as_echo_n "(cached) " >&6
5241else 5219else
5242 ac_cv_prog_cc_c89=no 5220 ac_cv_prog_cc_c89=no
@@ -5397,7 +5375,7 @@ depcc="$CC" am_compiler_list=
5397 5375
5398{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 5376{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
5399$as_echo_n "checking dependency style of $depcc... " >&6; } 5377$as_echo_n "checking dependency style of $depcc... " >&6; }
5400if ${am_cv_CC_dependencies_compiler_type+:} false; then : 5378if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
5401 $as_echo_n "(cached) " >&6 5379 $as_echo_n "(cached) " >&6
5402else 5380else
5403 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then 5381 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -5529,7 +5507,7 @@ $as_echo_n "checking whether cc understands -c and -o together... " >&6; }
5529fi 5507fi
5530set dummy $CC; ac_cc=`$as_echo "$2" | 5508set dummy $CC; ac_cc=`$as_echo "$2" |
5531 sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` 5509 sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
5532if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : 5510if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
5533 $as_echo_n "(cached) " >&6 5511 $as_echo_n "(cached) " >&6
5534else 5512else
5535 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 5513 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5653,7 +5631,7 @@ if test -n "$ac_tool_prefix"; then
5653set dummy ${ac_tool_prefix}ranlib; ac_word=$2 5631set dummy ${ac_tool_prefix}ranlib; ac_word=$2
5654{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 5632{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5655$as_echo_n "checking for $ac_word... " >&6; } 5633$as_echo_n "checking for $ac_word... " >&6; }
5656if ${ac_cv_prog_RANLIB+:} false; then : 5634if test "${ac_cv_prog_RANLIB+set}" = set; then :
5657 $as_echo_n "(cached) " >&6 5635 $as_echo_n "(cached) " >&6
5658else 5636else
5659 if test -n "$RANLIB"; then 5637 if test -n "$RANLIB"; then
@@ -5693,7 +5671,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
5693set dummy ranlib; ac_word=$2 5671set dummy ranlib; ac_word=$2
5694{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 5672{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5695$as_echo_n "checking for $ac_word... " >&6; } 5673$as_echo_n "checking for $ac_word... " >&6; }
5696if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : 5674if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
5697 $as_echo_n "(cached) " >&6 5675 $as_echo_n "(cached) " >&6
5698else 5676else
5699 if test -n "$ac_ct_RANLIB"; then 5677 if test -n "$ac_ct_RANLIB"; then
@@ -5753,7 +5731,7 @@ if test -n "$CPP" && test -d "$CPP"; then
5753 CPP= 5731 CPP=
5754fi 5732fi
5755if test -z "$CPP"; then 5733if test -z "$CPP"; then
5756 if ${ac_cv_prog_CPP+:} false; then : 5734 if test "${ac_cv_prog_CPP+set}" = set; then :
5757 $as_echo_n "(cached) " >&6 5735 $as_echo_n "(cached) " >&6
5758else 5736else
5759 # Double quotes because CPP needs to be expanded 5737 # Double quotes because CPP needs to be expanded
@@ -5783,7 +5761,7 @@ else
5783 # Broken: fails on valid input. 5761 # Broken: fails on valid input.
5784continue 5762continue
5785fi 5763fi
5786rm -f conftest.err conftest.i conftest.$ac_ext 5764rm -f conftest.err conftest.$ac_ext
5787 5765
5788 # OK, works on sane cases. Now check whether nonexistent headers 5766 # OK, works on sane cases. Now check whether nonexistent headers
5789 # can be detected and how. 5767 # can be detected and how.
@@ -5799,11 +5777,11 @@ else
5799ac_preproc_ok=: 5777ac_preproc_ok=:
5800break 5778break
5801fi 5779fi
5802rm -f conftest.err conftest.i conftest.$ac_ext 5780rm -f conftest.err conftest.$ac_ext
5803 5781
5804done 5782done
5805# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 5783# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
5806rm -f conftest.i conftest.err conftest.$ac_ext 5784rm -f conftest.err conftest.$ac_ext
5807if $ac_preproc_ok; then : 5785if $ac_preproc_ok; then :
5808 break 5786 break
5809fi 5787fi
@@ -5842,7 +5820,7 @@ else
5842 # Broken: fails on valid input. 5820 # Broken: fails on valid input.
5843continue 5821continue
5844fi 5822fi
5845rm -f conftest.err conftest.i conftest.$ac_ext 5823rm -f conftest.err conftest.$ac_ext
5846 5824
5847 # OK, works on sane cases. Now check whether nonexistent headers 5825 # OK, works on sane cases. Now check whether nonexistent headers
5848 # can be detected and how. 5826 # can be detected and how.
@@ -5858,18 +5836,18 @@ else
5858ac_preproc_ok=: 5836ac_preproc_ok=:
5859break 5837break
5860fi 5838fi
5861rm -f conftest.err conftest.i conftest.$ac_ext 5839rm -f conftest.err conftest.$ac_ext
5862 5840
5863done 5841done
5864# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 5842# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
5865rm -f conftest.i conftest.err conftest.$ac_ext 5843rm -f conftest.err conftest.$ac_ext
5866if $ac_preproc_ok; then : 5844if $ac_preproc_ok; then :
5867 5845
5868else 5846else
5869 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 5847 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
5870$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 5848$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
5871as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 5849as_fn_error "C preprocessor \"$CPP\" fails sanity check
5872See \`config.log' for more details" "$LINENO" 5; } 5850See \`config.log' for more details." "$LINENO" 5; }
5873fi 5851fi
5874 5852
5875ac_ext=c 5853ac_ext=c
@@ -5881,7 +5859,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
5881 5859
5882{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 5860{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
5883$as_echo_n "checking for grep that handles long lines and -e... " >&6; } 5861$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
5884if ${ac_cv_path_GREP+:} false; then : 5862if test "${ac_cv_path_GREP+set}" = set; then :
5885 $as_echo_n "(cached) " >&6 5863 $as_echo_n "(cached) " >&6
5886else 5864else
5887 if test -z "$GREP"; then 5865 if test -z "$GREP"; then
@@ -5930,7 +5908,7 @@ esac
5930 done 5908 done
5931IFS=$as_save_IFS 5909IFS=$as_save_IFS
5932 if test -z "$ac_cv_path_GREP"; then 5910 if test -z "$ac_cv_path_GREP"; then
5933 as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 5911 as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
5934 fi 5912 fi
5935else 5913else
5936 ac_cv_path_GREP=$GREP 5914 ac_cv_path_GREP=$GREP
@@ -5944,7 +5922,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
5944 5922
5945{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 5923{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
5946$as_echo_n "checking for egrep... " >&6; } 5924$as_echo_n "checking for egrep... " >&6; }
5947if ${ac_cv_path_EGREP+:} false; then : 5925if test "${ac_cv_path_EGREP+set}" = set; then :
5948 $as_echo_n "(cached) " >&6 5926 $as_echo_n "(cached) " >&6
5949else 5927else
5950 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 5928 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -5996,7 +5974,7 @@ esac
5996 done 5974 done
5997IFS=$as_save_IFS 5975IFS=$as_save_IFS
5998 if test -z "$ac_cv_path_EGREP"; then 5976 if test -z "$ac_cv_path_EGREP"; then
5999 as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 5977 as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
6000 fi 5978 fi
6001else 5979else
6002 ac_cv_path_EGREP=$EGREP 5980 ac_cv_path_EGREP=$EGREP
@@ -6011,7 +5989,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
6011 5989
6012{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 5990{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
6013$as_echo_n "checking for ANSI C header files... " >&6; } 5991$as_echo_n "checking for ANSI C header files... " >&6; }
6014if ${ac_cv_header_stdc+:} false; then : 5992if test "${ac_cv_header_stdc+set}" = set; then :
6015 $as_echo_n "(cached) " >&6 5993 $as_echo_n "(cached) " >&6
6016else 5994else
6017 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 5995 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6128,7 +6106,8 @@ do :
6128 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 6106 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
6129ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 6107ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
6130" 6108"
6131if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 6109eval as_val=\$$as_ac_Header
6110 if test "x$as_val" = x""yes; then :
6132 cat >>confdefs.h <<_ACEOF 6111 cat >>confdefs.h <<_ACEOF
6133#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 6112#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
6134_ACEOF 6113_ACEOF
@@ -6142,7 +6121,7 @@ done
6142 6121
6143 6122
6144 ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" 6123 ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
6145if test "x$ac_cv_header_minix_config_h" = xyes; then : 6124if test "x$ac_cv_header_minix_config_h" = x""yes; then :
6146 MINIX=yes 6125 MINIX=yes
6147else 6126else
6148 MINIX= 6127 MINIX=
@@ -6172,7 +6151,7 @@ $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
6172 6151
6173 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 6152 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
6174$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } 6153$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
6175if ${ac_cv_safe_to_define___extensions__+:} false; then : 6154if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
6176 $as_echo_n "(cached) " >&6 6155 $as_echo_n "(cached) " >&6
6177else 6156else
6178 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6157 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6265,7 +6244,7 @@ if test x"$GCC" != xyes && test x"$emacs_check_sunpro_c" = xyes && \
6265 test x"$CPP" = x; then 6244 test x"$CPP" = x; then
6266 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using a Sun C compiler" >&5 6245 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using a Sun C compiler" >&5
6267$as_echo_n "checking whether we are using a Sun C compiler... " >&6; } 6246$as_echo_n "checking whether we are using a Sun C compiler... " >&6; }
6268 if ${emacs_cv_sunpro_c+:} false; then : 6247 if test "${emacs_cv_sunpro_c+set}" = set; then :
6269 $as_echo_n "(cached) " >&6 6248 $as_echo_n "(cached) " >&6
6270else 6249else
6271 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6250 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6433,7 +6412,7 @@ if test -n "$CPP" && test -d "$CPP"; then
6433 CPP= 6412 CPP=
6434fi 6413fi
6435if test -z "$CPP"; then 6414if test -z "$CPP"; then
6436 if ${ac_cv_prog_CPP+:} false; then : 6415 if test "${ac_cv_prog_CPP+set}" = set; then :
6437 $as_echo_n "(cached) " >&6 6416 $as_echo_n "(cached) " >&6
6438else 6417else
6439 # Double quotes because CPP needs to be expanded 6418 # Double quotes because CPP needs to be expanded
@@ -6463,7 +6442,7 @@ else
6463 # Broken: fails on valid input. 6442 # Broken: fails on valid input.
6464continue 6443continue
6465fi 6444fi
6466rm -f conftest.err conftest.i conftest.$ac_ext 6445rm -f conftest.err conftest.$ac_ext
6467 6446
6468 # OK, works on sane cases. Now check whether nonexistent headers 6447 # OK, works on sane cases. Now check whether nonexistent headers
6469 # can be detected and how. 6448 # can be detected and how.
@@ -6479,11 +6458,11 @@ else
6479ac_preproc_ok=: 6458ac_preproc_ok=:
6480break 6459break
6481fi 6460fi
6482rm -f conftest.err conftest.i conftest.$ac_ext 6461rm -f conftest.err conftest.$ac_ext
6483 6462
6484done 6463done
6485# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 6464# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
6486rm -f conftest.i conftest.err conftest.$ac_ext 6465rm -f conftest.err conftest.$ac_ext
6487if $ac_preproc_ok; then : 6466if $ac_preproc_ok; then :
6488 break 6467 break
6489fi 6468fi
@@ -6522,7 +6501,7 @@ else
6522 # Broken: fails on valid input. 6501 # Broken: fails on valid input.
6523continue 6502continue
6524fi 6503fi
6525rm -f conftest.err conftest.i conftest.$ac_ext 6504rm -f conftest.err conftest.$ac_ext
6526 6505
6527 # OK, works on sane cases. Now check whether nonexistent headers 6506 # OK, works on sane cases. Now check whether nonexistent headers
6528 # can be detected and how. 6507 # can be detected and how.
@@ -6538,18 +6517,18 @@ else
6538ac_preproc_ok=: 6517ac_preproc_ok=:
6539break 6518break
6540fi 6519fi
6541rm -f conftest.err conftest.i conftest.$ac_ext 6520rm -f conftest.err conftest.$ac_ext
6542 6521
6543done 6522done
6544# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 6523# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
6545rm -f conftest.i conftest.err conftest.$ac_ext 6524rm -f conftest.err conftest.$ac_ext
6546if $ac_preproc_ok; then : 6525if $ac_preproc_ok; then :
6547 6526
6548else 6527else
6549 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 6528 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
6550$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 6529$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6551as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 6530as_fn_error "C preprocessor \"$CPP\" fails sanity check
6552See \`config.log' for more details" "$LINENO" 5; } 6531See \`config.log' for more details." "$LINENO" 5; }
6553fi 6532fi
6554 6533
6555ac_ext=c 6534ac_ext=c
@@ -6565,7 +6544,7 @@ if test "x$RANLIB" = x; then
6565set dummy ${ac_tool_prefix}ranlib; ac_word=$2 6544set dummy ${ac_tool_prefix}ranlib; ac_word=$2
6566{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6545{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6567$as_echo_n "checking for $ac_word... " >&6; } 6546$as_echo_n "checking for $ac_word... " >&6; }
6568if ${ac_cv_prog_RANLIB+:} false; then : 6547if test "${ac_cv_prog_RANLIB+set}" = set; then :
6569 $as_echo_n "(cached) " >&6 6548 $as_echo_n "(cached) " >&6
6570else 6549else
6571 if test -n "$RANLIB"; then 6550 if test -n "$RANLIB"; then
@@ -6605,7 +6584,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
6605set dummy ranlib; ac_word=$2 6584set dummy ranlib; ac_word=$2
6606{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6585{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6607$as_echo_n "checking for $ac_word... " >&6; } 6586$as_echo_n "checking for $ac_word... " >&6; }
6608if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : 6587if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
6609 $as_echo_n "(cached) " >&6 6588 $as_echo_n "(cached) " >&6
6610else 6589else
6611 if test -n "$ac_ct_RANLIB"; then 6590 if test -n "$ac_ct_RANLIB"; then
@@ -6660,7 +6639,7 @@ fi
6660## is running in i386 mode, we can help them out. 6639## is running in i386 mode, we can help them out.
6661if test "$machine" = "amdx86-64"; then 6640if test "$machine" = "amdx86-64"; then
6662 ac_fn_c_check_decl "$LINENO" "i386" "ac_cv_have_decl_i386" "$ac_includes_default" 6641 ac_fn_c_check_decl "$LINENO" "i386" "ac_cv_have_decl_i386" "$ac_includes_default"
6663if test "x$ac_cv_have_decl_i386" = xyes; then : 6642if test "x$ac_cv_have_decl_i386" = x""yes; then :
6664 6643
6665fi 6644fi
6666 6645
@@ -6675,7 +6654,7 @@ fi
6675set dummy install-info; ac_word=$2 6654set dummy install-info; ac_word=$2
6676{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6655{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6677$as_echo_n "checking for $ac_word... " >&6; } 6656$as_echo_n "checking for $ac_word... " >&6; }
6678if ${ac_cv_path_INSTALL_INFO+:} false; then : 6657if test "${ac_cv_path_INSTALL_INFO+set}" = set; then :
6679 $as_echo_n "(cached) " >&6 6658 $as_echo_n "(cached) " >&6
6680else 6659else
6681 case $INSTALL_INFO in 6660 case $INSTALL_INFO in
@@ -6715,7 +6694,7 @@ fi
6715set dummy install-info; ac_word=$2 6694set dummy install-info; ac_word=$2
6716{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6695{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6717$as_echo_n "checking for $ac_word... " >&6; } 6696$as_echo_n "checking for $ac_word... " >&6; }
6718if ${ac_cv_path_INSTALL_INFO+:} false; then : 6697if test "${ac_cv_path_INSTALL_INFO+set}" = set; then :
6719 $as_echo_n "(cached) " >&6 6698 $as_echo_n "(cached) " >&6
6720else 6699else
6721 case $INSTALL_INFO in 6700 case $INSTALL_INFO in
@@ -6755,7 +6734,7 @@ fi
6755set dummy install-info; ac_word=$2 6734set dummy install-info; ac_word=$2
6756{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6735{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6757$as_echo_n "checking for $ac_word... " >&6; } 6736$as_echo_n "checking for $ac_word... " >&6; }
6758if ${ac_cv_path_INSTALL_INFO+:} false; then : 6737if test "${ac_cv_path_INSTALL_INFO+set}" = set; then :
6759 $as_echo_n "(cached) " >&6 6738 $as_echo_n "(cached) " >&6
6760else 6739else
6761 case $INSTALL_INFO in 6740 case $INSTALL_INFO in
@@ -6796,7 +6775,7 @@ fi
6796set dummy gzip; ac_word=$2 6775set dummy gzip; ac_word=$2
6797{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6776{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6798$as_echo_n "checking for $ac_word... " >&6; } 6777$as_echo_n "checking for $ac_word... " >&6; }
6799if ${ac_cv_path_GZIP_PROG+:} false; then : 6778if test "${ac_cv_path_GZIP_PROG+set}" = set; then :
6800 $as_echo_n "(cached) " >&6 6779 $as_echo_n "(cached) " >&6
6801else 6780else
6802 case $GZIP_PROG in 6781 case $GZIP_PROG in
@@ -6839,7 +6818,7 @@ fi
6839set dummy makeinfo; ac_word=$2 6818set dummy makeinfo; ac_word=$2
6840{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6819{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6841$as_echo_n "checking for $ac_word... " >&6; } 6820$as_echo_n "checking for $ac_word... " >&6; }
6842if ${ac_cv_path_MAKEINFO+:} false; then : 6821if test "${ac_cv_path_MAKEINFO+set}" = set; then :
6843 $as_echo_n "(cached) " >&6 6822 $as_echo_n "(cached) " >&6
6844else 6823else
6845 case $MAKEINFO in 6824 case $MAKEINFO in
@@ -6897,7 +6876,7 @@ if test "$MAKEINFO" = "no"; then
6897 if test "x${with_makeinfo}" = "xno"; then 6876 if test "x${with_makeinfo}" = "xno"; then
6898 HAVE_MAKEINFO=no 6877 HAVE_MAKEINFO=no
6899 elif test ! -e $srcdir/info/emacs; then 6878 elif test ! -e $srcdir/info/emacs; then
6900 as_fn_error $? "You do not seem to have makeinfo >= 4.6, and your 6879 as_fn_error "You do not seem to have makeinfo >= 4.6, and your
6901source tree does not seem to have pre-built manuals in the \`info' directory. 6880source tree does not seem to have pre-built manuals in the \`info' directory.
6902Either install a suitable version of makeinfo, or re-run configure 6881Either install a suitable version of makeinfo, or re-run configure
6903with the \`--without-makeinfo' option to build without the manuals. " "$LINENO" 5 6882with the \`--without-makeinfo' option to build without the manuals. " "$LINENO" 5
@@ -7045,7 +7024,7 @@ esac
7045C_SWITCH_MACHINE= 7024C_SWITCH_MACHINE=
7046if test "$machine" = "alpha"; then 7025if test "$machine" = "alpha"; then
7047 ac_fn_c_check_decl "$LINENO" "__ELF__" "ac_cv_have_decl___ELF__" "$ac_includes_default" 7026 ac_fn_c_check_decl "$LINENO" "__ELF__" "ac_cv_have_decl___ELF__" "$ac_includes_default"
7048if test "x$ac_cv_have_decl___ELF__" = xyes; then : 7027if test "x$ac_cv_have_decl___ELF__" = x""yes; then :
7049 7028
7050fi 7029fi
7051 7030
@@ -7058,7 +7037,7 @@ fi
7058 if test "x$GCC" = "xyes"; then 7037 if test "x$GCC" = "xyes"; then
7059 C_SWITCH_MACHINE="-fno-common" 7038 C_SWITCH_MACHINE="-fno-common"
7060 else 7039 else
7061 as_fn_error $? "What gives? Fix me if DEC Unix supports ELF now." "$LINENO" 5 7040 as_fn_error "What gives? Fix me if DEC Unix supports ELF now." "$LINENO" 5
7062 fi 7041 fi
7063 else 7042 else
7064 UNEXEC_OBJ=unexalpha.o 7043 UNEXEC_OBJ=unexalpha.o
@@ -7113,7 +7092,7 @@ if test "$enable_largefile" != no; then
7113 7092
7114 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 7093 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
7115$as_echo_n "checking for special C compiler options needed for large files... " >&6; } 7094$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
7116if ${ac_cv_sys_largefile_CC+:} false; then : 7095if test "${ac_cv_sys_largefile_CC+set}" = set; then :
7117 $as_echo_n "(cached) " >&6 7096 $as_echo_n "(cached) " >&6
7118else 7097else
7119 ac_cv_sys_largefile_CC=no 7098 ac_cv_sys_largefile_CC=no
@@ -7164,7 +7143,7 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; }
7164 7143
7165 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 7144 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
7166$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } 7145$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
7167if ${ac_cv_sys_file_offset_bits+:} false; then : 7146if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
7168 $as_echo_n "(cached) " >&6 7147 $as_echo_n "(cached) " >&6
7169else 7148else
7170 while :; do 7149 while :; do
@@ -7233,7 +7212,7 @@ rm -rf conftest*
7233 if test $ac_cv_sys_file_offset_bits = unknown; then 7212 if test $ac_cv_sys_file_offset_bits = unknown; then
7234 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 7213 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
7235$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } 7214$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
7236if ${ac_cv_sys_large_files+:} false; then : 7215if test "${ac_cv_sys_large_files+set}" = set; then :
7237 $as_echo_n "(cached) " >&6 7216 $as_echo_n "(cached) " >&6
7238else 7217else
7239 while :; do 7218 while :; do
@@ -7334,7 +7313,7 @@ else
7334 ## Some platforms don't use any of these files, so it is not 7313 ## Some platforms don't use any of these files, so it is not
7335 ## appropriate to put this test outside the if block. 7314 ## appropriate to put this test outside the if block.
7336 test -e $CRT_DIR/crtn.o || test -e $CRT_DIR/crt0.o || \ 7315 test -e $CRT_DIR/crtn.o || test -e $CRT_DIR/crt0.o || \
7337 as_fn_error $? "crt*.o not found in specified location." "$LINENO" 5 7316 as_fn_error "crt*.o not found in specified location." "$LINENO" 5
7338 7317
7339fi 7318fi
7340 7319
@@ -7389,7 +7368,8 @@ if test "${with_sound}" != "no"; then
7389do : 7368do :
7390 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 7369 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
7391ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 7370ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
7392if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 7371eval as_val=\$$as_ac_Header
7372 if test "x$as_val" = x""yes; then :
7393 cat >>confdefs.h <<_ACEOF 7373 cat >>confdefs.h <<_ACEOF
7394#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 7374#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
7395_ACEOF 7375_ACEOF
@@ -7401,7 +7381,7 @@ done
7401 # Emulation library used on NetBSD. 7381 # Emulation library used on NetBSD.
7402 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _oss_ioctl in -lossaudio" >&5 7382 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _oss_ioctl in -lossaudio" >&5
7403$as_echo_n "checking for _oss_ioctl in -lossaudio... " >&6; } 7383$as_echo_n "checking for _oss_ioctl in -lossaudio... " >&6; }
7404if ${ac_cv_lib_ossaudio__oss_ioctl+:} false; then : 7384if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then :
7405 $as_echo_n "(cached) " >&6 7385 $as_echo_n "(cached) " >&6
7406else 7386else
7407 ac_check_lib_save_LIBS=$LIBS 7387 ac_check_lib_save_LIBS=$LIBS
@@ -7435,7 +7415,7 @@ LIBS=$ac_check_lib_save_LIBS
7435fi 7415fi
7436{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5 7416{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
7437$as_echo "$ac_cv_lib_ossaudio__oss_ioctl" >&6; } 7417$as_echo "$ac_cv_lib_ossaudio__oss_ioctl" >&6; }
7438if test "x$ac_cv_lib_ossaudio__oss_ioctl" = xyes; then : 7418if test "x$ac_cv_lib_ossaudio__oss_ioctl" = x""yes; then :
7439 LIBSOUND=-lossaudio 7419 LIBSOUND=-lossaudio
7440else 7420else
7441 LIBSOUND= 7421 LIBSOUND=
@@ -7452,7 +7432,7 @@ fi
7452set dummy pkg-config; ac_word=$2 7432set dummy pkg-config; ac_word=$2
7453{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7433{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7454$as_echo_n "checking for $ac_word... " >&6; } 7434$as_echo_n "checking for $ac_word... " >&6; }
7455if ${ac_cv_path_PKG_CONFIG+:} false; then : 7435if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
7456 $as_echo_n "(cached) " >&6 7436 $as_echo_n "(cached) " >&6
7457else 7437else
7458 case $PKG_CONFIG in 7438 case $PKG_CONFIG in
@@ -7580,7 +7560,7 @@ else
7580fi 7560fi
7581rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 7561rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7582 if test "$emacs_alsa_subdir" != yes; then 7562 if test "$emacs_alsa_subdir" != yes; then
7583 as_fn_error $? "pkg-config found alsa, but it does not compile. See config.log for error messages." "$LINENO" 5 7563 as_fn_error "pkg-config found alsa, but it does not compile. See config.log for error messages." "$LINENO" 5
7584 fi 7564 fi
7585 ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE" 7565 ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
7586 fi 7566 fi
@@ -7615,7 +7595,8 @@ for ac_header in sys/select.h sys/time.h unistd.h utime.h \
7615do : 7595do :
7616 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 7596 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
7617ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 7597ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
7618if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 7598eval as_val=\$$as_ac_Header
7599 if test "x$as_val" = x""yes; then :
7619 cat >>confdefs.h <<_ACEOF 7600 cat >>confdefs.h <<_ACEOF
7620#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 7601#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
7621_ACEOF 7602_ACEOF
@@ -7656,7 +7637,7 @@ fi
7656for ac_header in term.h 7637for ac_header in term.h
7657do : 7638do :
7658 ac_fn_c_check_header_preproc "$LINENO" "term.h" "ac_cv_header_term_h" 7639 ac_fn_c_check_header_preproc "$LINENO" "term.h" "ac_cv_header_term_h"
7659if test "x$ac_cv_header_term_h" = xyes; then : 7640if test "x$ac_cv_header_term_h" = x""yes; then :
7660 cat >>confdefs.h <<_ACEOF 7641 cat >>confdefs.h <<_ACEOF
7661#define HAVE_TERM_H 1 7642#define HAVE_TERM_H 1
7662_ACEOF 7643_ACEOF
@@ -7667,7 +7648,7 @@ done
7667 7648
7668{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 7649{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
7669$as_echo_n "checking for ANSI C header files... " >&6; } 7650$as_echo_n "checking for ANSI C header files... " >&6; }
7670if ${ac_cv_header_stdc+:} false; then : 7651if test "${ac_cv_header_stdc+set}" = set; then :
7671 $as_echo_n "(cached) " >&6 7652 $as_echo_n "(cached) " >&6
7672else 7653else
7673 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 7654 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7779,7 +7760,7 @@ fi
7779 7760
7780{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 7761{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
7781$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } 7762$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
7782if ${ac_cv_header_time+:} false; then : 7763if test "${ac_cv_header_time+set}" = set; then :
7783 $as_echo_n "(cached) " >&6 7764 $as_echo_n "(cached) " >&6
7784else 7765else
7785 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 7766 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7813,7 +7794,7 @@ $as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
7813fi 7794fi
7814 7795
7815ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist" "$ac_includes_default" 7796ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist" "$ac_includes_default"
7816if test "x$ac_cv_have_decl_sys_siglist" = xyes; then : 7797if test "x$ac_cv_have_decl_sys_siglist" = x""yes; then :
7817 ac_have_decl=1 7798 ac_have_decl=1
7818else 7799else
7819 ac_have_decl=0 7800 ac_have_decl=0
@@ -7826,7 +7807,7 @@ _ACEOF
7826if test $ac_cv_have_decl_sys_siglist != yes; then 7807if test $ac_cv_have_decl_sys_siglist != yes; then
7827 # For Tru64, at least: 7808 # For Tru64, at least:
7828 ac_fn_c_check_decl "$LINENO" "__sys_siglist" "ac_cv_have_decl___sys_siglist" "$ac_includes_default" 7809 ac_fn_c_check_decl "$LINENO" "__sys_siglist" "ac_cv_have_decl___sys_siglist" "$ac_includes_default"
7829if test "x$ac_cv_have_decl___sys_siglist" = xyes; then : 7810if test "x$ac_cv_have_decl___sys_siglist" = x""yes; then :
7830 ac_have_decl=1 7811 ac_have_decl=1
7831else 7812else
7832 ac_have_decl=0 7813 ac_have_decl=0
@@ -7844,7 +7825,7 @@ $as_echo "#define sys_siglist __sys_siglist" >>confdefs.h
7844fi 7825fi
7845{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 7826{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
7846$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } 7827$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
7847if ${ac_cv_header_sys_wait_h+:} false; then : 7828if test "${ac_cv_header_sys_wait_h+set}" = set; then :
7848 $as_echo_n "(cached) " >&6 7829 $as_echo_n "(cached) " >&6
7849else 7830else
7850 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 7831 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7886,7 +7867,7 @@ fi
7886 7867
7887{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct utimbuf" >&5 7868{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct utimbuf" >&5
7888$as_echo_n "checking for struct utimbuf... " >&6; } 7869$as_echo_n "checking for struct utimbuf... " >&6; }
7889if ${emacs_cv_struct_utimbuf+:} false; then : 7870if test "${emacs_cv_struct_utimbuf+set}" = set; then :
7890 $as_echo_n "(cached) " >&6 7871 $as_echo_n "(cached) " >&6
7891else 7872else
7892 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 7873 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7929,7 +7910,7 @@ fi
7929 7910
7930{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for speed_t" >&5 7911{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for speed_t" >&5
7931$as_echo_n "checking for speed_t... " >&6; } 7912$as_echo_n "checking for speed_t... " >&6; }
7932if ${emacs_cv_speed_t+:} false; then : 7913if test "${emacs_cv_speed_t+set}" = set; then :
7933 $as_echo_n "(cached) " >&6 7914 $as_echo_n "(cached) " >&6
7934else 7915else
7935 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 7916 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7960,7 +7941,7 @@ fi
7960 7941
7961{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timeval" >&5 7942{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timeval" >&5
7962$as_echo_n "checking for struct timeval... " >&6; } 7943$as_echo_n "checking for struct timeval... " >&6; }
7963if ${emacs_cv_struct_timeval+:} false; then : 7944if test "${emacs_cv_struct_timeval+set}" = set; then :
7964 $as_echo_n "(cached) " >&6 7945 $as_echo_n "(cached) " >&6
7965else 7946else
7966 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 7947 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8001,7 +7982,7 @@ fi
8001 7982
8002{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct exception" >&5 7983{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct exception" >&5
8003$as_echo_n "checking for struct exception... " >&6; } 7984$as_echo_n "checking for struct exception... " >&6; }
8004if ${emacs_cv_struct_exception+:} false; then : 7985if test "${emacs_cv_struct_exception+set}" = set; then :
8005 $as_echo_n "(cached) " >&6 7986 $as_echo_n "(cached) " >&6
8006else 7987else
8007 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 7988 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8038,7 +8019,7 @@ do :
8038#include <sys/socket.h> 8019#include <sys/socket.h>
8039#endif 8020#endif
8040" 8021"
8041if test "x$ac_cv_header_net_if_h" = xyes; then : 8022if test "x$ac_cv_header_net_if_h" = x""yes; then :
8042 cat >>confdefs.h <<_ACEOF 8023 cat >>confdefs.h <<_ACEOF
8043#define HAVE_NET_IF_H 1 8024#define HAVE_NET_IF_H 1
8044_ACEOF 8025_ACEOF
@@ -8050,7 +8031,7 @@ done
8050 8031
8051{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 8032{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
8052$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } 8033$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
8053if ${ac_cv_struct_tm+:} false; then : 8034if test "${ac_cv_struct_tm+set}" = set; then :
8054 $as_echo_n "(cached) " >&6 8035 $as_echo_n "(cached) " >&6
8055else 8036else
8056 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8037 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8087,7 +8068,7 @@ ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_
8087#include <$ac_cv_struct_tm> 8068#include <$ac_cv_struct_tm>
8088 8069
8089" 8070"
8090if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then : 8071if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then :
8091 8072
8092cat >>confdefs.h <<_ACEOF 8073cat >>confdefs.h <<_ACEOF
8093#define HAVE_STRUCT_TM_TM_ZONE 1 8074#define HAVE_STRUCT_TM_TM_ZONE 1
@@ -8103,7 +8084,7 @@ $as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h
8103else 8084else
8104 ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h> 8085 ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
8105" 8086"
8106if test "x$ac_cv_have_decl_tzname" = xyes; then : 8087if test "x$ac_cv_have_decl_tzname" = x""yes; then :
8107 ac_have_decl=1 8088 ac_have_decl=1
8108else 8089else
8109 ac_have_decl=0 8090 ac_have_decl=0
@@ -8115,7 +8096,7 @@ _ACEOF
8115 8096
8116 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5 8097 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
8117$as_echo_n "checking for tzname... " >&6; } 8098$as_echo_n "checking for tzname... " >&6; }
8118if ${ac_cv_var_tzname+:} false; then : 8099if test "${ac_cv_var_tzname+set}" = set; then :
8119 $as_echo_n "(cached) " >&6 8100 $as_echo_n "(cached) " >&6
8120else 8101else
8121 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8102 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8152,7 +8133,7 @@ fi
8152 8133
8153ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "#include <time.h> 8134ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "#include <time.h>
8154" 8135"
8155if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes; then : 8136if test "x$ac_cv_member_struct_tm_tm_gmtoff" = x""yes; then :
8156 8137
8157$as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h 8138$as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h
8158 8139
@@ -8166,7 +8147,7 @@ ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_flags" "ac_cv_member_struct_i
8166#include <net/if.h> 8147#include <net/if.h>
8167#endif 8148#endif
8168" 8149"
8169if test "x$ac_cv_member_struct_ifreq_ifr_flags" = xyes; then : 8150if test "x$ac_cv_member_struct_ifreq_ifr_flags" = x""yes; then :
8170 8151
8171cat >>confdefs.h <<_ACEOF 8152cat >>confdefs.h <<_ACEOF
8172#define HAVE_STRUCT_IFREQ_IFR_FLAGS 1 8153#define HAVE_STRUCT_IFREQ_IFR_FLAGS 1
@@ -8182,7 +8163,7 @@ ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_hwaddr" "ac_cv_member_struct_
8182#include <net/if.h> 8163#include <net/if.h>
8183#endif 8164#endif
8184" 8165"
8185if test "x$ac_cv_member_struct_ifreq_ifr_hwaddr" = xyes; then : 8166if test "x$ac_cv_member_struct_ifreq_ifr_hwaddr" = x""yes; then :
8186 8167
8187cat >>confdefs.h <<_ACEOF 8168cat >>confdefs.h <<_ACEOF
8188#define HAVE_STRUCT_IFREQ_IFR_HWADDR 1 8169#define HAVE_STRUCT_IFREQ_IFR_HWADDR 1
@@ -8198,7 +8179,7 @@ ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_netmask" "ac_cv_member_struct
8198#include <net/if.h> 8179#include <net/if.h>
8199#endif 8180#endif
8200" 8181"
8201if test "x$ac_cv_member_struct_ifreq_ifr_netmask" = xyes; then : 8182if test "x$ac_cv_member_struct_ifreq_ifr_netmask" = x""yes; then :
8202 8183
8203cat >>confdefs.h <<_ACEOF 8184cat >>confdefs.h <<_ACEOF
8204#define HAVE_STRUCT_IFREQ_IFR_NETMASK 1 8185#define HAVE_STRUCT_IFREQ_IFR_NETMASK 1
@@ -8214,7 +8195,7 @@ ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_broadaddr" "ac_cv_member_stru
8214#include <net/if.h> 8195#include <net/if.h>
8215#endif 8196#endif
8216" 8197"
8217if test "x$ac_cv_member_struct_ifreq_ifr_broadaddr" = xyes; then : 8198if test "x$ac_cv_member_struct_ifreq_ifr_broadaddr" = x""yes; then :
8218 8199
8219cat >>confdefs.h <<_ACEOF 8200cat >>confdefs.h <<_ACEOF
8220#define HAVE_STRUCT_IFREQ_IFR_BROADADDR 1 8201#define HAVE_STRUCT_IFREQ_IFR_BROADADDR 1
@@ -8230,7 +8211,7 @@ ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_addr" "ac_cv_member_struct_if
8230#include <net/if.h> 8211#include <net/if.h>
8231#endif 8212#endif
8232" 8213"
8233if test "x$ac_cv_member_struct_ifreq_ifr_addr" = xyes; then : 8214if test "x$ac_cv_member_struct_ifreq_ifr_addr" = x""yes; then :
8234 8215
8235cat >>confdefs.h <<_ACEOF 8216cat >>confdefs.h <<_ACEOF
8236#define HAVE_STRUCT_IFREQ_IFR_ADDR 1 8217#define HAVE_STRUCT_IFREQ_IFR_ADDR 1
@@ -8259,7 +8240,7 @@ fi
8259 8240
8260{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5 8241{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5
8261$as_echo_n "checking for working volatile... " >&6; } 8242$as_echo_n "checking for working volatile... " >&6; }
8262if ${ac_cv_c_volatile+:} false; then : 8243if test "${ac_cv_c_volatile+set}" = set; then :
8263 $as_echo_n "(cached) " >&6 8244 $as_echo_n "(cached) " >&6
8264else 8245else
8265 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8246 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8293,7 +8274,7 @@ fi
8293 8274
8294{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 8275{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
8295$as_echo_n "checking for an ANSI C-conforming const... " >&6; } 8276$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
8296if ${ac_cv_c_const+:} false; then : 8277if test "${ac_cv_c_const+set}" = set; then :
8297 $as_echo_n "(cached) " >&6 8278 $as_echo_n "(cached) " >&6
8298else 8279else
8299 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8280 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8373,7 +8354,7 @@ fi
8373 8354
8374{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for void * support" >&5 8355{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for void * support" >&5
8375$as_echo_n "checking for void * support... " >&6; } 8356$as_echo_n "checking for void * support... " >&6; }
8376if ${emacs_cv_void_star+:} false; then : 8357if test "${emacs_cv_void_star+set}" = set; then :
8377 $as_echo_n "(cached) " >&6 8358 $as_echo_n "(cached) " >&6
8378else 8359else
8379 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8360 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8406,7 +8387,7 @@ fi
8406 8387
8407 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 8388 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
8408$as_echo_n "checking whether byte ordering is bigendian... " >&6; } 8389$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
8409if ${ac_cv_c_bigendian+:} false; then : 8390if test "${ac_cv_c_bigendian+set}" = set; then :
8410 $as_echo_n "(cached) " >&6 8391 $as_echo_n "(cached) " >&6
8411else 8392else
8412 ac_cv_c_bigendian=unknown 8393 ac_cv_c_bigendian=unknown
@@ -8624,14 +8605,14 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
8624 8605
8625 ;; #( 8606 ;; #(
8626 *) 8607 *)
8627 as_fn_error $? "unknown endianness 8608 as_fn_error "unknown endianness
8628 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; 8609 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
8629 esac 8610 esac
8630 8611
8631 8612
8632{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__ ((__aligned__ (expr)))" >&5 8613{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__ ((__aligned__ (expr)))" >&5
8633$as_echo_n "checking for __attribute__ ((__aligned__ (expr)))... " >&6; } 8614$as_echo_n "checking for __attribute__ ((__aligned__ (expr)))... " >&6; }
8634if ${emacs_cv_attribute_aligned+:} false; then : 8615if test "${emacs_cv_attribute_aligned+set}" = set; then :
8635 $as_echo_n "(cached) " >&6 8616 $as_echo_n "(cached) " >&6
8636else 8617else
8637 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8618 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8664,7 +8645,7 @@ fi
8664$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } 8645$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
8665set x ${MAKE-make} 8646set x ${MAKE-make}
8666ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` 8647ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
8667if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : 8648if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
8668 $as_echo_n "(cached) " >&6 8649 $as_echo_n "(cached) " >&6
8669else 8650else
8670 cat >conftest.make <<\_ACEOF 8651 cat >conftest.make <<\_ACEOF
@@ -8672,7 +8653,7 @@ SHELL = /bin/sh
8672all: 8653all:
8673 @echo '@@@%%%=$(MAKE)=@@@%%%' 8654 @echo '@@@%%%=$(MAKE)=@@@%%%'
8674_ACEOF 8655_ACEOF
8675# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. 8656# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
8676case `${MAKE-make} -f conftest.make 2>/dev/null` in 8657case `${MAKE-make} -f conftest.make 2>/dev/null` in
8677 *@@@%%%=?*=@@@%%%*) 8658 *@@@%%%=?*=@@@%%%*)
8678 eval ac_cv_prog_make_${ac_make}_set=yes;; 8659 eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -8752,7 +8733,7 @@ deps_frag=$srcdir/src/$deps_frag
8752 8733
8753{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5 8734{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5
8754$as_echo_n "checking for long file names... " >&6; } 8735$as_echo_n "checking for long file names... " >&6; }
8755if ${ac_cv_sys_long_file_names+:} false; then : 8736if test "${ac_cv_sys_long_file_names+set}" = set; then :
8756 $as_echo_n "(cached) " >&6 8737 $as_echo_n "(cached) " >&6
8757else 8738else
8758 ac_cv_sys_long_file_names=yes 8739 ac_cv_sys_long_file_names=yes
@@ -8808,8 +8789,8 @@ if test "x$with_x" = xno; then
8808 have_x=disabled 8789 have_x=disabled
8809else 8790else
8810 case $x_includes,$x_libraries in #( 8791 case $x_includes,$x_libraries in #(
8811 *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( 8792 *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
8812 *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : 8793 *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
8813 $as_echo_n "(cached) " >&6 8794 $as_echo_n "(cached) " >&6
8814else 8795else
8815 # One or both of the vars are not set, and there is no cached value. 8796 # One or both of the vars are not set, and there is no cached value.
@@ -8826,7 +8807,7 @@ libdir:
8826 @echo libdir='${LIBDIR}' 8807 @echo libdir='${LIBDIR}'
8827_ACEOF 8808_ACEOF
8828 if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then 8809 if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
8829 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. 8810 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
8830 for ac_var in incroot usrlibdir libdir; do 8811 for ac_var in incroot usrlibdir libdir; do
8831 eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" 8812 eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
8832 done 8813 done
@@ -8912,7 +8893,7 @@ else
8912 fi 8893 fi
8913done 8894done
8914fi 8895fi
8915rm -f conftest.err conftest.i conftest.$ac_ext 8896rm -f conftest.err conftest.$ac_ext
8916fi # $ac_x_includes = no 8897fi # $ac_x_includes = no
8917 8898
8918if test "$ac_x_libraries" = no; then 8899if test "$ac_x_libraries" = no; then
@@ -9092,10 +9073,10 @@ if test "${with_ns}" != no; then
9092 TEMACS_LDFLAGS2= 9073 TEMACS_LDFLAGS2=
9093 fi 9074 fi
9094 ac_fn_c_check_header_mongrel "$LINENO" "AppKit/AppKit.h" "ac_cv_header_AppKit_AppKit_h" "$ac_includes_default" 9075 ac_fn_c_check_header_mongrel "$LINENO" "AppKit/AppKit.h" "ac_cv_header_AppKit_AppKit_h" "$ac_includes_default"
9095if test "x$ac_cv_header_AppKit_AppKit_h" = xyes; then : 9076if test "x$ac_cv_header_AppKit_AppKit_h" = x""yes; then :
9096 HAVE_NS=yes 9077 HAVE_NS=yes
9097else 9078else
9098 as_fn_error $? "\`--with-ns' was specified, but the include 9079 as_fn_error "\`--with-ns' was specified, but the include
9099 files are missing or cannot be compiled." "$LINENO" 5 9080 files are missing or cannot be compiled." "$LINENO" 5
9100fi 9081fi
9101 9082
@@ -9177,7 +9158,7 @@ if test "$window_system" = none && test "X$with_x" != "Xno"; then
9177set dummy X; ac_word=$2 9158set dummy X; ac_word=$2
9178{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 9159{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9179$as_echo_n "checking for $ac_word... " >&6; } 9160$as_echo_n "checking for $ac_word... " >&6; }
9180if ${ac_cv_prog_HAVE_XSERVER+:} false; then : 9161if test "${ac_cv_prog_HAVE_XSERVER+set}" = set; then :
9181 $as_echo_n "(cached) " >&6 9162 $as_echo_n "(cached) " >&6
9182else 9163else
9183 if test -n "$HAVE_XSERVER"; then 9164 if test -n "$HAVE_XSERVER"; then
@@ -9214,7 +9195,7 @@ fi
9214 if test "$HAVE_XSERVER" = true || 9195 if test "$HAVE_XSERVER" = true ||
9215 test -n "$DISPLAY" || 9196 test -n "$DISPLAY" ||
9216 test "`echo /usr/lib/libX11.*`" != "/usr/lib/libX11.*"; then 9197 test "`echo /usr/lib/libX11.*`" != "/usr/lib/libX11.*"; then
9217 as_fn_error $? "You seem to be running X, but no X development libraries 9198 as_fn_error "You seem to be running X, but no X development libraries
9218were found. You should install the relevant development files for X 9199were found. You should install the relevant development files for X
9219and for the toolkit you want, such as Gtk+, Lesstif or Motif. Also make 9200and for the toolkit you want, such as Gtk+, Lesstif or Motif. Also make
9220sure you have development files for image handling, i.e. 9201sure you have development files for image handling, i.e.
@@ -9236,14 +9217,14 @@ esac
9236GNU_MALLOC=yes 9217GNU_MALLOC=yes
9237doug_lea_malloc=yes 9218doug_lea_malloc=yes
9238ac_fn_c_check_func "$LINENO" "malloc_get_state" "ac_cv_func_malloc_get_state" 9219ac_fn_c_check_func "$LINENO" "malloc_get_state" "ac_cv_func_malloc_get_state"
9239if test "x$ac_cv_func_malloc_get_state" = xyes; then : 9220if test "x$ac_cv_func_malloc_get_state" = x""yes; then :
9240 9221
9241else 9222else
9242 doug_lea_malloc=no 9223 doug_lea_malloc=no
9243fi 9224fi
9244 9225
9245ac_fn_c_check_func "$LINENO" "malloc_set_state" "ac_cv_func_malloc_set_state" 9226ac_fn_c_check_func "$LINENO" "malloc_set_state" "ac_cv_func_malloc_set_state"
9246if test "x$ac_cv_func_malloc_set_state" = xyes; then : 9227if test "x$ac_cv_func_malloc_set_state" = x""yes; then :
9247 9228
9248else 9229else
9249 doug_lea_malloc=no 9230 doug_lea_malloc=no
@@ -9251,7 +9232,7 @@ fi
9251 9232
9252{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __after_morecore_hook exists" >&5 9233{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __after_morecore_hook exists" >&5
9253$as_echo_n "checking whether __after_morecore_hook exists... " >&6; } 9234$as_echo_n "checking whether __after_morecore_hook exists... " >&6; }
9254if ${emacs_cv_var___after_morecore_hook+:} false; then : 9235if test "${emacs_cv_var___after_morecore_hook+set}" = set; then :
9255 $as_echo_n "(cached) " >&6 9236 $as_echo_n "(cached) " >&6
9256else 9237else
9257 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 9238 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9337,7 +9318,8 @@ do :
9337 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 9318 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
9338ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 9319ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
9339" 9320"
9340if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 9321eval as_val=\$$as_ac_Header
9322 if test "x$as_val" = x""yes; then :
9341 cat >>confdefs.h <<_ACEOF 9323 cat >>confdefs.h <<_ACEOF
9342#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 9324#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
9343_ACEOF 9325_ACEOF
@@ -9356,7 +9338,7 @@ done
9356for ac_func in getpagesize 9338for ac_func in getpagesize
9357do : 9339do :
9358 ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" 9340 ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
9359if test "x$ac_cv_func_getpagesize" = xyes; then : 9341if test "x$ac_cv_func_getpagesize" = x""yes; then :
9360 cat >>confdefs.h <<_ACEOF 9342 cat >>confdefs.h <<_ACEOF
9361#define HAVE_GETPAGESIZE 1 9343#define HAVE_GETPAGESIZE 1
9362_ACEOF 9344_ACEOF
@@ -9366,7 +9348,7 @@ done
9366 9348
9367{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 9349{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
9368$as_echo_n "checking for working mmap... " >&6; } 9350$as_echo_n "checking for working mmap... " >&6; }
9369if ${ac_cv_func_mmap_fixed_mapped+:} false; then : 9351if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
9370 $as_echo_n "(cached) " >&6 9352 $as_echo_n "(cached) " >&6
9371else 9353else
9372 if test "$cross_compiling" = yes; then : 9354 if test "$cross_compiling" = yes; then :
@@ -9541,7 +9523,7 @@ LIBS="$LIBS_SYSTEM $LIBS"
9541 9523
9542{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 9524{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
9543$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } 9525$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
9544if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : 9526if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
9545 $as_echo_n "(cached) " >&6 9527 $as_echo_n "(cached) " >&6
9546else 9528else
9547 ac_check_lib_save_LIBS=$LIBS 9529 ac_check_lib_save_LIBS=$LIBS
@@ -9575,7 +9557,7 @@ LIBS=$ac_check_lib_save_LIBS
9575fi 9557fi
9576{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 9558{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
9577$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } 9559$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
9578if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : 9560if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
9579 cat >>confdefs.h <<_ACEOF 9561 cat >>confdefs.h <<_ACEOF
9580#define HAVE_LIBDNET 1 9562#define HAVE_LIBDNET 1
9581_ACEOF 9563_ACEOF
@@ -9587,7 +9569,7 @@ fi
9587 9569
9588{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXbsd" >&5 9570{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXbsd" >&5
9589$as_echo_n "checking for main in -lXbsd... " >&6; } 9571$as_echo_n "checking for main in -lXbsd... " >&6; }
9590if ${ac_cv_lib_Xbsd_main+:} false; then : 9572if test "${ac_cv_lib_Xbsd_main+set}" = set; then :
9591 $as_echo_n "(cached) " >&6 9573 $as_echo_n "(cached) " >&6
9592else 9574else
9593 ac_check_lib_save_LIBS=$LIBS 9575 ac_check_lib_save_LIBS=$LIBS
@@ -9615,14 +9597,14 @@ LIBS=$ac_check_lib_save_LIBS
9615fi 9597fi
9616{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xbsd_main" >&5 9598{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xbsd_main" >&5
9617$as_echo "$ac_cv_lib_Xbsd_main" >&6; } 9599$as_echo "$ac_cv_lib_Xbsd_main" >&6; }
9618if test "x$ac_cv_lib_Xbsd_main" = xyes; then : 9600if test "x$ac_cv_lib_Xbsd_main" = x""yes; then :
9619 LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd" 9601 LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd"
9620fi 9602fi
9621 9603
9622 9604
9623{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cma_open in -lpthreads" >&5 9605{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cma_open in -lpthreads" >&5
9624$as_echo_n "checking for cma_open in -lpthreads... " >&6; } 9606$as_echo_n "checking for cma_open in -lpthreads... " >&6; }
9625if ${ac_cv_lib_pthreads_cma_open+:} false; then : 9607if test "${ac_cv_lib_pthreads_cma_open+set}" = set; then :
9626 $as_echo_n "(cached) " >&6 9608 $as_echo_n "(cached) " >&6
9627else 9609else
9628 ac_check_lib_save_LIBS=$LIBS 9610 ac_check_lib_save_LIBS=$LIBS
@@ -9656,7 +9638,7 @@ LIBS=$ac_check_lib_save_LIBS
9656fi 9638fi
9657{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_cma_open" >&5 9639{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_cma_open" >&5
9658$as_echo "$ac_cv_lib_pthreads_cma_open" >&6; } 9640$as_echo "$ac_cv_lib_pthreads_cma_open" >&6; }
9659if test "x$ac_cv_lib_pthreads_cma_open" = xyes; then : 9641if test "x$ac_cv_lib_pthreads_cma_open" = x""yes; then :
9660 cat >>confdefs.h <<_ACEOF 9642 cat >>confdefs.h <<_ACEOF
9661#define HAVE_LIBPTHREADS 1 9643#define HAVE_LIBPTHREADS 1
9662_ACEOF 9644_ACEOF
@@ -9683,7 +9665,7 @@ case ${host_os} in
9683aix*) 9665aix*)
9684 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -bbigtoc option" >&5 9666 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -bbigtoc option" >&5
9685$as_echo_n "checking for -bbigtoc option... " >&6; } 9667$as_echo_n "checking for -bbigtoc option... " >&6; }
9686if ${gdb_cv_bigtoc+:} false; then : 9668if test "${gdb_cv_bigtoc+set}" = set; then :
9687 $as_echo_n "(cached) " >&6 9669 $as_echo_n "(cached) " >&6
9688else 9670else
9689 9671
@@ -9844,7 +9826,8 @@ XScreenNumberOfScreen XSetWMProtocols
9844do : 9826do :
9845 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 9827 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
9846ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 9828ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
9847if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 9829eval as_val=\$$as_ac_var
9830 if test "x$as_val" = x""yes; then :
9848 cat >>confdefs.h <<_ACEOF 9831 cat >>confdefs.h <<_ACEOF
9849#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 9832#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
9850_ACEOF 9833_ACEOF
@@ -9857,7 +9840,7 @@ fi
9857if test "${window_system}" = "x11"; then 9840if test "${window_system}" = "x11"; then
9858 { $as_echo "$as_me:${as_lineno-$LINENO}: checking X11 version 6" >&5 9841 { $as_echo "$as_me:${as_lineno-$LINENO}: checking X11 version 6" >&5
9859$as_echo_n "checking X11 version 6... " >&6; } 9842$as_echo_n "checking X11 version 6... " >&6; }
9860 if ${emacs_cv_x11_version_6+:} false; then : 9843 if test "${emacs_cv_x11_version_6+set}" = set; then :
9861 $as_echo_n "(cached) " >&6 9844 $as_echo_n "(cached) " >&6
9862else 9845else
9863 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 9846 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9922,7 +9905,7 @@ if test "${HAVE_X11}" = "yes" || test "${NS_IMPL_GNUSTEP}" = "yes"; then
9922set dummy pkg-config; ac_word=$2 9905set dummy pkg-config; ac_word=$2
9923{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 9906{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9924$as_echo_n "checking for $ac_word... " >&6; } 9907$as_echo_n "checking for $ac_word... " >&6; }
9925if ${ac_cv_path_PKG_CONFIG+:} false; then : 9908if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
9926 $as_echo_n "(cached) " >&6 9909 $as_echo_n "(cached) " >&6
9927else 9910else
9928 case $PKG_CONFIG in 9911 case $PKG_CONFIG in
@@ -10033,7 +10016,7 @@ if test "${HAVE_X11}" = "yes"; then
10033set dummy pkg-config; ac_word=$2 10016set dummy pkg-config; ac_word=$2
10034{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 10017{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10035$as_echo_n "checking for $ac_word... " >&6; } 10018$as_echo_n "checking for $ac_word... " >&6; }
10036if ${ac_cv_path_PKG_CONFIG+:} false; then : 10019if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
10037 $as_echo_n "(cached) " >&6 10020 $as_echo_n "(cached) " >&6
10038else 10021else
10039 case $PKG_CONFIG in 10022 case $PKG_CONFIG in
@@ -10132,7 +10115,7 @@ $as_echo "#define HAVE_IMAGEMAGICK 1" >>confdefs.h
10132 for ac_func in MagickExportImagePixels 10115 for ac_func in MagickExportImagePixels
10133do : 10116do :
10134 ac_fn_c_check_func "$LINENO" "MagickExportImagePixels" "ac_cv_func_MagickExportImagePixels" 10117 ac_fn_c_check_func "$LINENO" "MagickExportImagePixels" "ac_cv_func_MagickExportImagePixels"
10135if test "x$ac_cv_func_MagickExportImagePixels" = xyes; then : 10118if test "x$ac_cv_func_MagickExportImagePixels" = x""yes; then :
10136 cat >>confdefs.h <<_ACEOF 10119 cat >>confdefs.h <<_ACEOF
10137#define HAVE_MAGICKEXPORTIMAGEPIXELS 1 10120#define HAVE_MAGICKEXPORTIMAGEPIXELS 1
10138_ACEOF 10121_ACEOF
@@ -10158,7 +10141,7 @@ if test "${with_gtk3}" = "yes"; then
10158set dummy pkg-config; ac_word=$2 10141set dummy pkg-config; ac_word=$2
10159{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 10142{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10160$as_echo_n "checking for $ac_word... " >&6; } 10143$as_echo_n "checking for $ac_word... " >&6; }
10161if ${ac_cv_path_PKG_CONFIG+:} false; then : 10144if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
10162 $as_echo_n "(cached) " >&6 10145 $as_echo_n "(cached) " >&6
10163else 10146else
10164 case $PKG_CONFIG in 10147 case $PKG_CONFIG in
@@ -10246,7 +10229,7 @@ $as_echo "no" >&6; }
10246 fi 10229 fi
10247 10230
10248 if test "$pkg_check_gtk" = "no" && test "$USE_X_TOOLKIT" != "maybe"; then 10231 if test "$pkg_check_gtk" = "no" && test "$USE_X_TOOLKIT" != "maybe"; then
10249 as_fn_error $? "$GTK_PKG_ERRORS" "$LINENO" 5 10232 as_fn_error "$GTK_PKG_ERRORS" "$LINENO" 5
10250 fi 10233 fi
10251 10234
10252$as_echo "#define HAVE_GTK3 1" >>confdefs.h 10235$as_echo "#define HAVE_GTK3 1" >>confdefs.h
@@ -10267,7 +10250,7 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then
10267set dummy pkg-config; ac_word=$2 10250set dummy pkg-config; ac_word=$2
10268{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 10251{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10269$as_echo_n "checking for $ac_word... " >&6; } 10252$as_echo_n "checking for $ac_word... " >&6; }
10270if ${ac_cv_path_PKG_CONFIG+:} false; then : 10253if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
10271 $as_echo_n "(cached) " >&6 10254 $as_echo_n "(cached) " >&6
10272else 10255else
10273 case $PKG_CONFIG in 10256 case $PKG_CONFIG in
@@ -10355,7 +10338,7 @@ $as_echo "no" >&6; }
10355 fi 10338 fi
10356 10339
10357 if test "$pkg_check_gtk" = "no" && test "$USE_X_TOOLKIT" != "maybe"; then 10340 if test "$pkg_check_gtk" = "no" && test "$USE_X_TOOLKIT" != "maybe"; then
10358 as_fn_error $? "$GTK_PKG_ERRORS" "$LINENO" 5 10341 as_fn_error "$GTK_PKG_ERRORS" "$LINENO" 5
10359 fi 10342 fi
10360fi 10343fi
10361fi 10344fi
@@ -10372,7 +10355,7 @@ if test x"$pkg_check_gtk" = xyes; then
10372 for ac_func in gtk_main 10355 for ac_func in gtk_main
10373do : 10356do :
10374 ac_fn_c_check_func "$LINENO" "gtk_main" "ac_cv_func_gtk_main" 10357 ac_fn_c_check_func "$LINENO" "gtk_main" "ac_cv_func_gtk_main"
10375if test "x$ac_cv_func_gtk_main" = xyes; then : 10358if test "x$ac_cv_func_gtk_main" = x""yes; then :
10376 cat >>confdefs.h <<_ACEOF 10359 cat >>confdefs.h <<_ACEOF
10377#define HAVE_GTK_MAIN 1 10360#define HAVE_GTK_MAIN 1
10378_ACEOF 10361_ACEOF
@@ -10382,7 +10365,7 @@ done
10382 10365
10383 if test "${GTK_COMPILES}" != "yes"; then 10366 if test "${GTK_COMPILES}" != "yes"; then
10384 if test "$USE_X_TOOLKIT" != "maybe"; then 10367 if test "$USE_X_TOOLKIT" != "maybe"; then
10385 as_fn_error $? "Gtk+ wanted, but it does not compile, see config.log. Maybe some x11-devel files missing?" "$LINENO" 5; 10368 as_fn_error "Gtk+ wanted, but it does not compile, see config.log. Maybe some x11-devel files missing?" "$LINENO" 5;
10386 fi 10369 fi
10387 else 10370 else
10388 HAVE_GTK=yes 10371 HAVE_GTK=yes
@@ -10420,7 +10403,7 @@ if test "${HAVE_GTK}" = "yes"; then
10420 ac_fn_c_check_decl "$LINENO" "GTK_TYPE_FILE_SELECTION" "ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" "$ac_includes_default 10403 ac_fn_c_check_decl "$LINENO" "GTK_TYPE_FILE_SELECTION" "ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" "$ac_includes_default
10421#include <gtk/gtk.h> 10404#include <gtk/gtk.h>
10422" 10405"
10423if test "x$ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" = xyes; then : 10406if test "x$ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" = x""yes; then :
10424 HAVE_GTK_FILE_SELECTION=yes 10407 HAVE_GTK_FILE_SELECTION=yes
10425else 10408else
10426 HAVE_GTK_FILE_SELECTION=no 10409 HAVE_GTK_FILE_SELECTION=no
@@ -10430,7 +10413,7 @@ fi
10430 for ac_func in gtk_file_selection_new 10413 for ac_func in gtk_file_selection_new
10431do : 10414do :
10432 ac_fn_c_check_func "$LINENO" "gtk_file_selection_new" "ac_cv_func_gtk_file_selection_new" 10415 ac_fn_c_check_func "$LINENO" "gtk_file_selection_new" "ac_cv_func_gtk_file_selection_new"
10433if test "x$ac_cv_func_gtk_file_selection_new" = xyes; then : 10416if test "x$ac_cv_func_gtk_file_selection_new" = x""yes; then :
10434 cat >>confdefs.h <<_ACEOF 10417 cat >>confdefs.h <<_ACEOF
10435#define HAVE_GTK_FILE_SELECTION_NEW 1 10418#define HAVE_GTK_FILE_SELECTION_NEW 1
10436_ACEOF 10419_ACEOF
@@ -10444,7 +10427,7 @@ done
10444 for ac_header in pthread.h 10427 for ac_header in pthread.h
10445do : 10428do :
10446 ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" 10429 ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
10447if test "x$ac_cv_header_pthread_h" = xyes; then : 10430if test "x$ac_cv_header_pthread_h" = x""yes; then :
10448 cat >>confdefs.h <<_ACEOF 10431 cat >>confdefs.h <<_ACEOF
10449#define HAVE_PTHREAD_H 1 10432#define HAVE_PTHREAD_H 1
10450_ACEOF 10433_ACEOF
@@ -10456,7 +10439,7 @@ done
10456 if test "$ac_cv_header_pthread_h"; then 10439 if test "$ac_cv_header_pthread_h"; then
10457 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lpthread" >&5 10440 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lpthread" >&5
10458$as_echo_n "checking for pthread_self in -lpthread... " >&6; } 10441$as_echo_n "checking for pthread_self in -lpthread... " >&6; }
10459if ${ac_cv_lib_pthread_pthread_self+:} false; then : 10442if test "${ac_cv_lib_pthread_pthread_self+set}" = set; then :
10460 $as_echo_n "(cached) " >&6 10443 $as_echo_n "(cached) " >&6
10461else 10444else
10462 ac_check_lib_save_LIBS=$LIBS 10445 ac_check_lib_save_LIBS=$LIBS
@@ -10490,7 +10473,7 @@ LIBS=$ac_check_lib_save_LIBS
10490fi 10473fi
10491{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_self" >&5 10474{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_self" >&5
10492$as_echo "$ac_cv_lib_pthread_pthread_self" >&6; } 10475$as_echo "$ac_cv_lib_pthread_pthread_self" >&6; }
10493if test "x$ac_cv_lib_pthread_pthread_self" = xyes; then : 10476if test "x$ac_cv_lib_pthread_pthread_self" = x""yes; then :
10494 HAVE_GTK_AND_PTHREAD=yes 10477 HAVE_GTK_AND_PTHREAD=yes
10495fi 10478fi
10496 10479
@@ -10512,7 +10495,8 @@ $as_echo "#define HAVE_GTK_AND_PTHREAD 1" >>confdefs.h
10512do : 10495do :
10513 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 10496 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
10514ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 10497ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
10515if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 10498eval as_val=\$$as_ac_var
10499 if test "x$as_val" = x""yes; then :
10516 cat >>confdefs.h <<_ACEOF 10500 cat >>confdefs.h <<_ACEOF
10517#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 10501#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
10518_ACEOF 10502_ACEOF
@@ -10533,7 +10517,7 @@ if test "${with_dbus}" = "yes"; then
10533set dummy pkg-config; ac_word=$2 10517set dummy pkg-config; ac_word=$2
10534{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 10518{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10535$as_echo_n "checking for $ac_word... " >&6; } 10519$as_echo_n "checking for $ac_word... " >&6; }
10536if ${ac_cv_path_PKG_CONFIG+:} false; then : 10520if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
10537 $as_echo_n "(cached) " >&6 10521 $as_echo_n "(cached) " >&6
10538else 10522else
10539 case $PKG_CONFIG in 10523 case $PKG_CONFIG in
@@ -10628,7 +10612,7 @@ $as_echo "#define HAVE_DBUS 1" >>confdefs.h
10628 for ac_func in dbus_watch_get_unix_fd 10612 for ac_func in dbus_watch_get_unix_fd
10629do : 10613do :
10630 ac_fn_c_check_func "$LINENO" "dbus_watch_get_unix_fd" "ac_cv_func_dbus_watch_get_unix_fd" 10614 ac_fn_c_check_func "$LINENO" "dbus_watch_get_unix_fd" "ac_cv_func_dbus_watch_get_unix_fd"
10631if test "x$ac_cv_func_dbus_watch_get_unix_fd" = xyes; then : 10615if test "x$ac_cv_func_dbus_watch_get_unix_fd" = x""yes; then :
10632 cat >>confdefs.h <<_ACEOF 10616 cat >>confdefs.h <<_ACEOF
10633#define HAVE_DBUS_WATCH_GET_UNIX_FD 1 10617#define HAVE_DBUS_WATCH_GET_UNIX_FD 1
10634_ACEOF 10618_ACEOF
@@ -10650,7 +10634,7 @@ if test "${HAVE_X11}" = "yes" && test "${with_gconf}" = "yes"; then
10650set dummy pkg-config; ac_word=$2 10634set dummy pkg-config; ac_word=$2
10651{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 10635{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10652$as_echo_n "checking for $ac_word... " >&6; } 10636$as_echo_n "checking for $ac_word... " >&6; }
10653if ${ac_cv_path_PKG_CONFIG+:} false; then : 10637if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
10654 $as_echo_n "(cached) " >&6 10638 $as_echo_n "(cached) " >&6
10655else 10639else
10656 case $PKG_CONFIG in 10640 case $PKG_CONFIG in
@@ -10744,7 +10728,7 @@ $as_echo "#define HAVE_GCONF 1" >>confdefs.h
10744 for ac_func in g_type_init 10728 for ac_func in g_type_init
10745do : 10729do :
10746 ac_fn_c_check_func "$LINENO" "g_type_init" "ac_cv_func_g_type_init" 10730 ac_fn_c_check_func "$LINENO" "g_type_init" "ac_cv_func_g_type_init"
10747if test "x$ac_cv_func_g_type_init" = xyes; then : 10731if test "x$ac_cv_func_g_type_init" = x""yes; then :
10748 cat >>confdefs.h <<_ACEOF 10732 cat >>confdefs.h <<_ACEOF
10749#define HAVE_G_TYPE_INIT 1 10733#define HAVE_G_TYPE_INIT 1
10750_ACEOF 10734_ACEOF
@@ -10760,7 +10744,7 @@ LIBSELINUX_LIBS=
10760if test "${with_selinux}" = "yes"; then 10744if test "${with_selinux}" = "yes"; then
10761 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lgetfilecon in -lselinux" >&5 10745 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lgetfilecon in -lselinux" >&5
10762$as_echo_n "checking for lgetfilecon in -lselinux... " >&6; } 10746$as_echo_n "checking for lgetfilecon in -lselinux... " >&6; }
10763if ${ac_cv_lib_selinux_lgetfilecon+:} false; then : 10747if test "${ac_cv_lib_selinux_lgetfilecon+set}" = set; then :
10764 $as_echo_n "(cached) " >&6 10748 $as_echo_n "(cached) " >&6
10765else 10749else
10766 ac_check_lib_save_LIBS=$LIBS 10750 ac_check_lib_save_LIBS=$LIBS
@@ -10794,7 +10778,7 @@ LIBS=$ac_check_lib_save_LIBS
10794fi 10778fi
10795{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_lgetfilecon" >&5 10779{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_lgetfilecon" >&5
10796$as_echo "$ac_cv_lib_selinux_lgetfilecon" >&6; } 10780$as_echo "$ac_cv_lib_selinux_lgetfilecon" >&6; }
10797if test "x$ac_cv_lib_selinux_lgetfilecon" = xyes; then : 10781if test "x$ac_cv_lib_selinux_lgetfilecon" = x""yes; then :
10798 HAVE_LIBSELINUX=yes 10782 HAVE_LIBSELINUX=yes
10799else 10783else
10800 HAVE_LIBSELINUX=no 10784 HAVE_LIBSELINUX=no
@@ -10818,7 +10802,7 @@ if test "${with_gnutls}" = "yes" ; then
10818set dummy pkg-config; ac_word=$2 10802set dummy pkg-config; ac_word=$2
10819{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 10803{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10820$as_echo_n "checking for $ac_word... " >&6; } 10804$as_echo_n "checking for $ac_word... " >&6; }
10821if ${ac_cv_path_PKG_CONFIG+:} false; then : 10805if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
10822 $as_echo_n "(cached) " >&6 10806 $as_echo_n "(cached) " >&6
10823else 10807else
10824 case $PKG_CONFIG in 10808 case $PKG_CONFIG in
@@ -10920,7 +10904,7 @@ if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
10920 if test "$with_xaw3d" != no; then 10904 if test "$with_xaw3d" != no; then
10921 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xaw3d" >&5 10905 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xaw3d" >&5
10922$as_echo_n "checking for xaw3d... " >&6; } 10906$as_echo_n "checking for xaw3d... " >&6; }
10923 if ${emacs_cv_xaw3d+:} false; then : 10907 if test "${emacs_cv_xaw3d+set}" = set; then :
10924 $as_echo_n "(cached) " >&6 10908 $as_echo_n "(cached) " >&6
10925else 10909else
10926 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 10910 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10939,7 +10923,7 @@ _ACEOF
10939if ac_fn_c_try_link "$LINENO"; then : 10923if ac_fn_c_try_link "$LINENO"; then :
10940 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawScrollbarSetThumb in -lXaw3d" >&5 10924 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawScrollbarSetThumb in -lXaw3d" >&5
10941$as_echo_n "checking for XawScrollbarSetThumb in -lXaw3d... " >&6; } 10925$as_echo_n "checking for XawScrollbarSetThumb in -lXaw3d... " >&6; }
10942if ${ac_cv_lib_Xaw3d_XawScrollbarSetThumb+:} false; then : 10926if test "${ac_cv_lib_Xaw3d_XawScrollbarSetThumb+set}" = set; then :
10943 $as_echo_n "(cached) " >&6 10927 $as_echo_n "(cached) " >&6
10944else 10928else
10945 ac_check_lib_save_LIBS=$LIBS 10929 ac_check_lib_save_LIBS=$LIBS
@@ -10973,7 +10957,7 @@ LIBS=$ac_check_lib_save_LIBS
10973fi 10957fi
10974{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&5 10958{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&5
10975$as_echo "$ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&6; } 10959$as_echo "$ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&6; }
10976if test "x$ac_cv_lib_Xaw3d_XawScrollbarSetThumb" = xyes; then : 10960if test "x$ac_cv_lib_Xaw3d_XawScrollbarSetThumb" = x""yes; then :
10977 emacs_cv_xaw3d=yes 10961 emacs_cv_xaw3d=yes
10978else 10962else
10979 emacs_cv_xaw3d=no 10963 emacs_cv_xaw3d=no
@@ -11003,7 +10987,7 @@ $as_echo "#define HAVE_XAW3D 1" >>confdefs.h
11003$as_echo "no" >&6; } 10987$as_echo "no" >&6; }
11004 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libXaw" >&5 10988 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libXaw" >&5
11005$as_echo_n "checking for libXaw... " >&6; } 10989$as_echo_n "checking for libXaw... " >&6; }
11006 if ${emacs_cv_xaw+:} false; then : 10990 if test "${emacs_cv_xaw+set}" = set; then :
11007 $as_echo_n "(cached) " >&6 10991 $as_echo_n "(cached) " >&6
11008else 10992else
11009 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 10993 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11034,7 +11018,7 @@ $as_echo "yes; using Lucid toolkit" >&6; }
11034 USE_X_TOOLKIT=LUCID 11018 USE_X_TOOLKIT=LUCID
11035 LUCID_LIBW=-lXaw 11019 LUCID_LIBW=-lXaw
11036 elif test x"${USE_X_TOOLKIT}" = xLUCID; then 11020 elif test x"${USE_X_TOOLKIT}" = xLUCID; then
11037 as_fn_error $? "Lucid toolkit requires X11/Xaw include files" "$LINENO" 5 11021 as_fn_error "Lucid toolkit requires X11/Xaw include files" "$LINENO" 5
11038 else 11022 else
11039 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; do not use toolkit by default" >&5 11023 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; do not use toolkit by default" >&5
11040$as_echo "no; do not use toolkit by default" >&6; } 11024$as_echo "no; do not use toolkit by default" >&6; }
@@ -11049,7 +11033,7 @@ LIBXTR6=
11049if test "${USE_X_TOOLKIT}" != "none"; then 11033if test "${USE_X_TOOLKIT}" != "none"; then
11050 { $as_echo "$as_me:${as_lineno-$LINENO}: checking X11 toolkit version" >&5 11034 { $as_echo "$as_me:${as_lineno-$LINENO}: checking X11 toolkit version" >&5
11051$as_echo_n "checking X11 toolkit version... " >&6; } 11035$as_echo_n "checking X11 toolkit version... " >&6; }
11052 if ${emacs_cv_x11_toolkit_version_6+:} false; then : 11036 if test "${emacs_cv_x11_toolkit_version_6+set}" = set; then :
11053 $as_echo_n "(cached) " >&6 11037 $as_echo_n "(cached) " >&6
11054else 11038else
11055 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 11039 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11100,7 +11084,7 @@ $as_echo "before 6" >&6; }
11100 fi 11084 fi
11101 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmuConvertStandardSelection in -lXmu" >&5 11085 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmuConvertStandardSelection in -lXmu" >&5
11102$as_echo_n "checking for XmuConvertStandardSelection in -lXmu... " >&6; } 11086$as_echo_n "checking for XmuConvertStandardSelection in -lXmu... " >&6; }
11103if ${ac_cv_lib_Xmu_XmuConvertStandardSelection+:} false; then : 11087if test "${ac_cv_lib_Xmu_XmuConvertStandardSelection+set}" = set; then :
11104 $as_echo_n "(cached) " >&6 11088 $as_echo_n "(cached) " >&6
11105else 11089else
11106 ac_check_lib_save_LIBS=$LIBS 11090 ac_check_lib_save_LIBS=$LIBS
@@ -11134,7 +11118,7 @@ LIBS=$ac_check_lib_save_LIBS
11134fi 11118fi
11135{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xmu_XmuConvertStandardSelection" >&5 11119{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xmu_XmuConvertStandardSelection" >&5
11136$as_echo "$ac_cv_lib_Xmu_XmuConvertStandardSelection" >&6; } 11120$as_echo "$ac_cv_lib_Xmu_XmuConvertStandardSelection" >&6; }
11137if test "x$ac_cv_lib_Xmu_XmuConvertStandardSelection" = xyes; then : 11121if test "x$ac_cv_lib_Xmu_XmuConvertStandardSelection" = x""yes; then :
11138 cat >>confdefs.h <<_ACEOF 11122 cat >>confdefs.h <<_ACEOF
11139#define HAVE_LIBXMU 1 11123#define HAVE_LIBXMU 1
11140_ACEOF 11124_ACEOF
@@ -11161,7 +11145,7 @@ if test "${HAVE_X11}" = "yes"; then
11161 if test "${USE_X_TOOLKIT}" != "none"; then 11145 if test "${USE_X_TOOLKIT}" != "none"; then
11162 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5 11146 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5
11163$as_echo_n "checking for XShapeQueryExtension in -lXext... " >&6; } 11147$as_echo_n "checking for XShapeQueryExtension in -lXext... " >&6; }
11164if ${ac_cv_lib_Xext_XShapeQueryExtension+:} false; then : 11148if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then :
11165 $as_echo_n "(cached) " >&6 11149 $as_echo_n "(cached) " >&6
11166else 11150else
11167 ac_check_lib_save_LIBS=$LIBS 11151 ac_check_lib_save_LIBS=$LIBS
@@ -11195,7 +11179,7 @@ LIBS=$ac_check_lib_save_LIBS
11195fi 11179fi
11196{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 11180{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
11197$as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; } 11181$as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
11198if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = xyes; then : 11182if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = x""yes; then :
11199 cat >>confdefs.h <<_ACEOF 11183 cat >>confdefs.h <<_ACEOF
11200#define HAVE_LIBXEXT 1 11184#define HAVE_LIBXEXT 1
11201_ACEOF 11185_ACEOF
@@ -11211,7 +11195,7 @@ LIBXP=
11211if test "${USE_X_TOOLKIT}" = "MOTIF"; then 11195if test "${USE_X_TOOLKIT}" = "MOTIF"; then
11212 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif version 2.1" >&5 11196 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif version 2.1" >&5
11213$as_echo_n "checking for Motif version 2.1... " >&6; } 11197$as_echo_n "checking for Motif version 2.1... " >&6; }
11214if ${emacs_cv_motif_version_2_1+:} false; then : 11198if test "${emacs_cv_motif_version_2_1+set}" = set; then :
11215 $as_echo_n "(cached) " >&6 11199 $as_echo_n "(cached) " >&6
11216else 11200else
11217 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 11201 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11241,7 +11225,7 @@ $as_echo "$emacs_cv_motif_version_2_1" >&6; }
11241 if test $emacs_cv_motif_version_2_1 = yes; then 11225 if test $emacs_cv_motif_version_2_1 = yes; then
11242 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpCreateContext in -lXp" >&5 11226 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpCreateContext in -lXp" >&5
11243$as_echo_n "checking for XpCreateContext in -lXp... " >&6; } 11227$as_echo_n "checking for XpCreateContext in -lXp... " >&6; }
11244if ${ac_cv_lib_Xp_XpCreateContext+:} false; then : 11228if test "${ac_cv_lib_Xp_XpCreateContext+set}" = set; then :
11245 $as_echo_n "(cached) " >&6 11229 $as_echo_n "(cached) " >&6
11246else 11230else
11247 ac_check_lib_save_LIBS=$LIBS 11231 ac_check_lib_save_LIBS=$LIBS
@@ -11275,14 +11259,14 @@ LIBS=$ac_check_lib_save_LIBS
11275fi 11259fi
11276{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xp_XpCreateContext" >&5 11260{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xp_XpCreateContext" >&5
11277$as_echo "$ac_cv_lib_Xp_XpCreateContext" >&6; } 11261$as_echo "$ac_cv_lib_Xp_XpCreateContext" >&6; }
11278if test "x$ac_cv_lib_Xp_XpCreateContext" = xyes; then : 11262if test "x$ac_cv_lib_Xp_XpCreateContext" = x""yes; then :
11279 LIBXP=-lXp 11263 LIBXP=-lXp
11280fi 11264fi
11281 11265
11282 else 11266 else
11283 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LessTif where some systems put it" >&5 11267 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LessTif where some systems put it" >&5
11284$as_echo_n "checking for LessTif where some systems put it... " >&6; } 11268$as_echo_n "checking for LessTif where some systems put it... " >&6; }
11285if ${emacs_cv_lesstif+:} false; then : 11269if test "${emacs_cv_lesstif+set}" = set; then :
11286 $as_echo_n "(cached) " >&6 11270 $as_echo_n "(cached) " >&6
11287else 11271else
11288 # We put this in CFLAGS temporarily to precede other -I options 11272 # We put this in CFLAGS temporarily to precede other -I options
@@ -11441,7 +11425,7 @@ if test "${HAVE_X11}" = "yes"; then
11441set dummy pkg-config; ac_word=$2 11425set dummy pkg-config; ac_word=$2
11442{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 11426{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11443$as_echo_n "checking for $ac_word... " >&6; } 11427$as_echo_n "checking for $ac_word... " >&6; }
11444if ${ac_cv_path_PKG_CONFIG+:} false; then : 11428if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
11445 $as_echo_n "(cached) " >&6 11429 $as_echo_n "(cached) " >&6
11446else 11430else
11447 case $PKG_CONFIG in 11431 case $PKG_CONFIG in
@@ -11543,7 +11527,7 @@ $as_echo "no" >&6; }
11543set dummy pkg-config; ac_word=$2 11527set dummy pkg-config; ac_word=$2
11544{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 11528{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11545$as_echo_n "checking for $ac_word... " >&6; } 11529$as_echo_n "checking for $ac_word... " >&6; }
11546if ${ac_cv_path_PKG_CONFIG+:} false; then : 11530if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
11547 $as_echo_n "(cached) " >&6 11531 $as_echo_n "(cached) " >&6
11548else 11532else
11549 case $PKG_CONFIG in 11533 case $PKG_CONFIG in
@@ -11635,7 +11619,7 @@ $as_echo "no" >&6; }
11635 HAVE_XRENDER=no 11619 HAVE_XRENDER=no
11636 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRenderQueryExtension in -lXrender" >&5 11620 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRenderQueryExtension in -lXrender" >&5
11637$as_echo_n "checking for XRenderQueryExtension in -lXrender... " >&6; } 11621$as_echo_n "checking for XRenderQueryExtension in -lXrender... " >&6; }
11638if ${ac_cv_lib_Xrender_XRenderQueryExtension+:} false; then : 11622if test "${ac_cv_lib_Xrender_XRenderQueryExtension+set}" = set; then :
11639 $as_echo_n "(cached) " >&6 11623 $as_echo_n "(cached) " >&6
11640else 11624else
11641 ac_check_lib_save_LIBS=$LIBS 11625 ac_check_lib_save_LIBS=$LIBS
@@ -11669,7 +11653,7 @@ LIBS=$ac_check_lib_save_LIBS
11669fi 11653fi
11670{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderQueryExtension" >&5 11654{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderQueryExtension" >&5
11671$as_echo "$ac_cv_lib_Xrender_XRenderQueryExtension" >&6; } 11655$as_echo "$ac_cv_lib_Xrender_XRenderQueryExtension" >&6; }
11672if test "x$ac_cv_lib_Xrender_XRenderQueryExtension" = xyes; then : 11656if test "x$ac_cv_lib_Xrender_XRenderQueryExtension" = x""yes; then :
11673 HAVE_XRENDER=yes 11657 HAVE_XRENDER=yes
11674fi 11658fi
11675 11659
@@ -11682,10 +11666,10 @@ fi
11682 XFT_LIBS="-lXrender $XFT_LIBS" 11666 XFT_LIBS="-lXrender $XFT_LIBS"
11683 LIBS="$XFT_LIBS $LIBS" 11667 LIBS="$XFT_LIBS $LIBS"
11684 ac_fn_c_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default" 11668 ac_fn_c_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default"
11685if test "x$ac_cv_header_X11_Xft_Xft_h" = xyes; then : 11669if test "x$ac_cv_header_X11_Xft_Xft_h" = x""yes; then :
11686 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XftFontOpen in -lXft" >&5 11670 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XftFontOpen in -lXft" >&5
11687$as_echo_n "checking for XftFontOpen in -lXft... " >&6; } 11671$as_echo_n "checking for XftFontOpen in -lXft... " >&6; }
11688if ${ac_cv_lib_Xft_XftFontOpen+:} false; then : 11672if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then :
11689 $as_echo_n "(cached) " >&6 11673 $as_echo_n "(cached) " >&6
11690else 11674else
11691 ac_check_lib_save_LIBS=$LIBS 11675 ac_check_lib_save_LIBS=$LIBS
@@ -11719,7 +11703,7 @@ LIBS=$ac_check_lib_save_LIBS
11719fi 11703fi
11720{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xft_XftFontOpen" >&5 11704{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xft_XftFontOpen" >&5
11721$as_echo "$ac_cv_lib_Xft_XftFontOpen" >&6; } 11705$as_echo "$ac_cv_lib_Xft_XftFontOpen" >&6; }
11722if test "x$ac_cv_lib_Xft_XftFontOpen" = xyes; then : 11706if test "x$ac_cv_lib_Xft_XftFontOpen" = x""yes; then :
11723 HAVE_XFT=yes 11707 HAVE_XFT=yes
11724fi 11708fi
11725 11709
@@ -11754,7 +11738,7 @@ $as_echo "#define HAVE_XFT 1" >>confdefs.h
11754set dummy pkg-config; ac_word=$2 11738set dummy pkg-config; ac_word=$2
11755{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 11739{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11756$as_echo_n "checking for $ac_word... " >&6; } 11740$as_echo_n "checking for $ac_word... " >&6; }
11757if ${ac_cv_path_PKG_CONFIG+:} false; then : 11741if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
11758 $as_echo_n "(cached) " >&6 11742 $as_echo_n "(cached) " >&6
11759else 11743else
11760 case $PKG_CONFIG in 11744 case $PKG_CONFIG in
@@ -11842,7 +11826,7 @@ $as_echo "no" >&6; }
11842 fi 11826 fi
11843 11827
11844 11828
11845 test "$HAVE_FREETYPE" = "no" && as_fn_error $? "libxft requires libfreetype" "$LINENO" 5 11829 test "$HAVE_FREETYPE" = "no" && as_fn_error "libxft requires libfreetype" "$LINENO" 5
11846 fi 11830 fi
11847 11831
11848 HAVE_LIBOTF=no 11832 HAVE_LIBOTF=no
@@ -11858,7 +11842,7 @@ $as_echo "#define HAVE_FREETYPE 1" >>confdefs.h
11858set dummy pkg-config; ac_word=$2 11842set dummy pkg-config; ac_word=$2
11859{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 11843{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11860$as_echo_n "checking for $ac_word... " >&6; } 11844$as_echo_n "checking for $ac_word... " >&6; }
11861if ${ac_cv_path_PKG_CONFIG+:} false; then : 11845if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
11862 $as_echo_n "(cached) " >&6 11846 $as_echo_n "(cached) " >&6
11863else 11847else
11864 case $PKG_CONFIG in 11848 case $PKG_CONFIG in
@@ -11951,7 +11935,7 @@ $as_echo "#define HAVE_LIBOTF 1" >>confdefs.h
11951 11935
11952 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OTF_get_variation_glyphs in -lotf" >&5 11936 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OTF_get_variation_glyphs in -lotf" >&5
11953$as_echo_n "checking for OTF_get_variation_glyphs in -lotf... " >&6; } 11937$as_echo_n "checking for OTF_get_variation_glyphs in -lotf... " >&6; }
11954if ${ac_cv_lib_otf_OTF_get_variation_glyphs+:} false; then : 11938if test "${ac_cv_lib_otf_OTF_get_variation_glyphs+set}" = set; then :
11955 $as_echo_n "(cached) " >&6 11939 $as_echo_n "(cached) " >&6
11956else 11940else
11957 ac_check_lib_save_LIBS=$LIBS 11941 ac_check_lib_save_LIBS=$LIBS
@@ -11985,7 +11969,7 @@ LIBS=$ac_check_lib_save_LIBS
11985fi 11969fi
11986{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_otf_OTF_get_variation_glyphs" >&5 11970{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_otf_OTF_get_variation_glyphs" >&5
11987$as_echo "$ac_cv_lib_otf_OTF_get_variation_glyphs" >&6; } 11971$as_echo "$ac_cv_lib_otf_OTF_get_variation_glyphs" >&6; }
11988if test "x$ac_cv_lib_otf_OTF_get_variation_glyphs" = xyes; then : 11972if test "x$ac_cv_lib_otf_OTF_get_variation_glyphs" = x""yes; then :
11989 HAVE_OTF_GET_VARIATION_GLYPHS=yes 11973 HAVE_OTF_GET_VARIATION_GLYPHS=yes
11990else 11974else
11991 HAVE_OTF_GET_VARIATION_GLYPHS=no 11975 HAVE_OTF_GET_VARIATION_GLYPHS=no
@@ -12010,7 +11994,7 @@ $as_echo "#define HAVE_OTF_GET_VARIATION_GLYPHS 1" >>confdefs.h
12010set dummy pkg-config; ac_word=$2 11994set dummy pkg-config; ac_word=$2
12011{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 11995{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
12012$as_echo_n "checking for $ac_word... " >&6; } 11996$as_echo_n "checking for $ac_word... " >&6; }
12013if ${ac_cv_path_PKG_CONFIG+:} false; then : 11997if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
12014 $as_echo_n "(cached) " >&6 11998 $as_echo_n "(cached) " >&6
12015else 11999else
12016 case $PKG_CONFIG in 12000 case $PKG_CONFIG in
@@ -12128,10 +12112,10 @@ LIBXPM=
12128if test "${HAVE_X11}" = "yes"; then 12112if test "${HAVE_X11}" = "yes"; then
12129 if test "${with_xpm}" != "no"; then 12113 if test "${with_xpm}" != "no"; then
12130 ac_fn_c_check_header_mongrel "$LINENO" "X11/xpm.h" "ac_cv_header_X11_xpm_h" "$ac_includes_default" 12114 ac_fn_c_check_header_mongrel "$LINENO" "X11/xpm.h" "ac_cv_header_X11_xpm_h" "$ac_includes_default"
12131if test "x$ac_cv_header_X11_xpm_h" = xyes; then : 12115if test "x$ac_cv_header_X11_xpm_h" = x""yes; then :
12132 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmReadFileToPixmap in -lXpm" >&5 12116 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmReadFileToPixmap in -lXpm" >&5
12133$as_echo_n "checking for XpmReadFileToPixmap in -lXpm... " >&6; } 12117$as_echo_n "checking for XpmReadFileToPixmap in -lXpm... " >&6; }
12134if ${ac_cv_lib_Xpm_XpmReadFileToPixmap+:} false; then : 12118if test "${ac_cv_lib_Xpm_XpmReadFileToPixmap+set}" = set; then :
12135 $as_echo_n "(cached) " >&6 12119 $as_echo_n "(cached) " >&6
12136else 12120else
12137 ac_check_lib_save_LIBS=$LIBS 12121 ac_check_lib_save_LIBS=$LIBS
@@ -12165,7 +12149,7 @@ LIBS=$ac_check_lib_save_LIBS
12165fi 12149fi
12166{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5 12150{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5
12167$as_echo "$ac_cv_lib_Xpm_XpmReadFileToPixmap" >&6; } 12151$as_echo "$ac_cv_lib_Xpm_XpmReadFileToPixmap" >&6; }
12168if test "x$ac_cv_lib_Xpm_XpmReadFileToPixmap" = xyes; then : 12152if test "x$ac_cv_lib_Xpm_XpmReadFileToPixmap" = x""yes; then :
12169 HAVE_XPM=yes 12153 HAVE_XPM=yes
12170fi 12154fi
12171 12155
@@ -12217,10 +12201,10 @@ LIBJPEG=
12217if test "${HAVE_X11}" = "yes"; then 12201if test "${HAVE_X11}" = "yes"; then
12218 if test "${with_jpeg}" != "no"; then 12202 if test "${with_jpeg}" != "no"; then
12219 ac_fn_c_check_header_mongrel "$LINENO" "jerror.h" "ac_cv_header_jerror_h" "$ac_includes_default" 12203 ac_fn_c_check_header_mongrel "$LINENO" "jerror.h" "ac_cv_header_jerror_h" "$ac_includes_default"
12220if test "x$ac_cv_header_jerror_h" = xyes; then : 12204if test "x$ac_cv_header_jerror_h" = x""yes; then :
12221 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_destroy_compress in -ljpeg" >&5 12205 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_destroy_compress in -ljpeg" >&5
12222$as_echo_n "checking for jpeg_destroy_compress in -ljpeg... " >&6; } 12206$as_echo_n "checking for jpeg_destroy_compress in -ljpeg... " >&6; }
12223if ${ac_cv_lib_jpeg_jpeg_destroy_compress+:} false; then : 12207if test "${ac_cv_lib_jpeg_jpeg_destroy_compress+set}" = set; then :
12224 $as_echo_n "(cached) " >&6 12208 $as_echo_n "(cached) " >&6
12225else 12209else
12226 ac_check_lib_save_LIBS=$LIBS 12210 ac_check_lib_save_LIBS=$LIBS
@@ -12254,7 +12238,7 @@ LIBS=$ac_check_lib_save_LIBS
12254fi 12238fi
12255{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5 12239{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5
12256$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_compress" >&6; } 12240$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_compress" >&6; }
12257if test "x$ac_cv_lib_jpeg_jpeg_destroy_compress" = xyes; then : 12241if test "x$ac_cv_lib_jpeg_jpeg_destroy_compress" = x""yes; then :
12258 HAVE_JPEG=yes 12242 HAVE_JPEG=yes
12259fi 12243fi
12260 12244
@@ -12301,7 +12285,8 @@ if test "${HAVE_X11}" = "yes"; then
12301do : 12285do :
12302 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 12286 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
12303ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 12287ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
12304if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 12288eval as_val=\$$as_ac_Header
12289 if test "x$as_val" = x""yes; then :
12305 cat >>confdefs.h <<_ACEOF 12290 cat >>confdefs.h <<_ACEOF
12306#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 12291#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
12307_ACEOF 12292_ACEOF
@@ -12313,7 +12298,7 @@ done
12313 if test "$ac_cv_header_png_h" = yes || test "$ac_cv_header_libpng_png_h" = yes ; then 12298 if test "$ac_cv_header_png_h" = yes || test "$ac_cv_header_libpng_png_h" = yes ; then
12314 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_get_channels in -lpng" >&5 12299 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_get_channels in -lpng" >&5
12315$as_echo_n "checking for png_get_channels in -lpng... " >&6; } 12300$as_echo_n "checking for png_get_channels in -lpng... " >&6; }
12316if ${ac_cv_lib_png_png_get_channels+:} false; then : 12301if test "${ac_cv_lib_png_png_get_channels+set}" = set; then :
12317 $as_echo_n "(cached) " >&6 12302 $as_echo_n "(cached) " >&6
12318else 12303else
12319 ac_check_lib_save_LIBS=$LIBS 12304 ac_check_lib_save_LIBS=$LIBS
@@ -12347,7 +12332,7 @@ LIBS=$ac_check_lib_save_LIBS
12347fi 12332fi
12348{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_get_channels" >&5 12333{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_get_channels" >&5
12349$as_echo "$ac_cv_lib_png_png_get_channels" >&6; } 12334$as_echo "$ac_cv_lib_png_png_get_channels" >&6; }
12350if test "x$ac_cv_lib_png_png_get_channels" = xyes; then : 12335if test "x$ac_cv_lib_png_png_get_channels" = x""yes; then :
12351 HAVE_PNG=yes 12336 HAVE_PNG=yes
12352fi 12337fi
12353 12338
@@ -12369,13 +12354,13 @@ LIBTIFF=
12369if test "${HAVE_X11}" = "yes"; then 12354if test "${HAVE_X11}" = "yes"; then
12370 if test "${with_tiff}" != "no"; then 12355 if test "${with_tiff}" != "no"; then
12371 ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default" 12356 ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
12372if test "x$ac_cv_header_tiffio_h" = xyes; then : 12357if test "x$ac_cv_header_tiffio_h" = x""yes; then :
12373 tifflibs="-lz -lm" 12358 tifflibs="-lz -lm"
12374 # At least one tiff package requires the jpeg library. 12359 # At least one tiff package requires the jpeg library.
12375 if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi 12360 if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi
12376 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFGetVersion in -ltiff" >&5 12361 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFGetVersion in -ltiff" >&5
12377$as_echo_n "checking for TIFFGetVersion in -ltiff... " >&6; } 12362$as_echo_n "checking for TIFFGetVersion in -ltiff... " >&6; }
12378if ${ac_cv_lib_tiff_TIFFGetVersion+:} false; then : 12363if test "${ac_cv_lib_tiff_TIFFGetVersion+set}" = set; then :
12379 $as_echo_n "(cached) " >&6 12364 $as_echo_n "(cached) " >&6
12380else 12365else
12381 ac_check_lib_save_LIBS=$LIBS 12366 ac_check_lib_save_LIBS=$LIBS
@@ -12409,7 +12394,7 @@ LIBS=$ac_check_lib_save_LIBS
12409fi 12394fi
12410{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFGetVersion" >&5 12395{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFGetVersion" >&5
12411$as_echo "$ac_cv_lib_tiff_TIFFGetVersion" >&6; } 12396$as_echo "$ac_cv_lib_tiff_TIFFGetVersion" >&6; }
12412if test "x$ac_cv_lib_tiff_TIFFGetVersion" = xyes; then : 12397if test "x$ac_cv_lib_tiff_TIFFGetVersion" = x""yes; then :
12413 HAVE_TIFF=yes 12398 HAVE_TIFF=yes
12414fi 12399fi
12415 12400
@@ -12432,12 +12417,12 @@ HAVE_GIF=no
12432LIBGIF= 12417LIBGIF=
12433if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no"; then 12418if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no"; then
12434 ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default" 12419 ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
12435if test "x$ac_cv_header_gif_lib_h" = xyes; then : 12420if test "x$ac_cv_header_gif_lib_h" = x""yes; then :
12436 # EGifPutExtensionLast only exists from version libungif-4.1.0b1. 12421 # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
12437# Earlier versions can crash Emacs. 12422# Earlier versions can crash Emacs.
12438 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lgif" >&5 12423 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lgif" >&5
12439$as_echo_n "checking for EGifPutExtensionLast in -lgif... " >&6; } 12424$as_echo_n "checking for EGifPutExtensionLast in -lgif... " >&6; }
12440if ${ac_cv_lib_gif_EGifPutExtensionLast+:} false; then : 12425if test "${ac_cv_lib_gif_EGifPutExtensionLast+set}" = set; then :
12441 $as_echo_n "(cached) " >&6 12426 $as_echo_n "(cached) " >&6
12442else 12427else
12443 ac_check_lib_save_LIBS=$LIBS 12428 ac_check_lib_save_LIBS=$LIBS
@@ -12471,7 +12456,7 @@ LIBS=$ac_check_lib_save_LIBS
12471fi 12456fi
12472{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5 12457{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5
12473$as_echo "$ac_cv_lib_gif_EGifPutExtensionLast" >&6; } 12458$as_echo "$ac_cv_lib_gif_EGifPutExtensionLast" >&6; }
12474if test "x$ac_cv_lib_gif_EGifPutExtensionLast" = xyes; then : 12459if test "x$ac_cv_lib_gif_EGifPutExtensionLast" = x""yes; then :
12475 HAVE_GIF=yes 12460 HAVE_GIF=yes
12476else 12461else
12477 HAVE_GIF=maybe 12462 HAVE_GIF=maybe
@@ -12487,7 +12472,7 @@ fi
12487# If gif_lib.h but no libgif, try libungif. 12472# If gif_lib.h but no libgif, try libungif.
12488 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lungif" >&5 12473 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lungif" >&5
12489$as_echo_n "checking for EGifPutExtensionLast in -lungif... " >&6; } 12474$as_echo_n "checking for EGifPutExtensionLast in -lungif... " >&6; }
12490if ${ac_cv_lib_ungif_EGifPutExtensionLast+:} false; then : 12475if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then :
12491 $as_echo_n "(cached) " >&6 12476 $as_echo_n "(cached) " >&6
12492else 12477else
12493 ac_check_lib_save_LIBS=$LIBS 12478 ac_check_lib_save_LIBS=$LIBS
@@ -12521,7 +12506,7 @@ LIBS=$ac_check_lib_save_LIBS
12521fi 12506fi
12522{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5 12507{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
12523$as_echo "$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; } 12508$as_echo "$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; }
12524if test "x$ac_cv_lib_ungif_EGifPutExtensionLast" = xyes; then : 12509if test "x$ac_cv_lib_ungif_EGifPutExtensionLast" = x""yes; then :
12525 HAVE_GIF=yes 12510 HAVE_GIF=yes
12526else 12511else
12527 HAVE_GIF=no 12512 HAVE_GIF=no
@@ -12553,7 +12538,7 @@ if test "${HAVE_X11}" = "yes"; then
12553 MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no" 12538 MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no"
12554 12539
12555 if test "X${MISSING}" != X; then 12540 if test "X${MISSING}" != X; then
12556 as_fn_error $? "The following required libraries were not found: 12541 as_fn_error "The following required libraries were not found:
12557 $MISSING 12542 $MISSING
12558Maybe some development libraries/packages are missing? 12543Maybe some development libraries/packages are missing?
12559If you don't want to link with them give 12544If you don't want to link with them give
@@ -12568,10 +12553,10 @@ LIBGPM=
12568MOUSE_SUPPORT= 12553MOUSE_SUPPORT=
12569if test "${with_gpm}" != "no"; then 12554if test "${with_gpm}" != "no"; then
12570 ac_fn_c_check_header_mongrel "$LINENO" "gpm.h" "ac_cv_header_gpm_h" "$ac_includes_default" 12555 ac_fn_c_check_header_mongrel "$LINENO" "gpm.h" "ac_cv_header_gpm_h" "$ac_includes_default"
12571if test "x$ac_cv_header_gpm_h" = xyes; then : 12556if test "x$ac_cv_header_gpm_h" = x""yes; then :
12572 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Gpm_Open in -lgpm" >&5 12557 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Gpm_Open in -lgpm" >&5
12573$as_echo_n "checking for Gpm_Open in -lgpm... " >&6; } 12558$as_echo_n "checking for Gpm_Open in -lgpm... " >&6; }
12574if ${ac_cv_lib_gpm_Gpm_Open+:} false; then : 12559if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then :
12575 $as_echo_n "(cached) " >&6 12560 $as_echo_n "(cached) " >&6
12576else 12561else
12577 ac_check_lib_save_LIBS=$LIBS 12562 ac_check_lib_save_LIBS=$LIBS
@@ -12605,7 +12590,7 @@ LIBS=$ac_check_lib_save_LIBS
12605fi 12590fi
12606{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gpm_Gpm_Open" >&5 12591{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gpm_Gpm_Open" >&5
12607$as_echo "$ac_cv_lib_gpm_Gpm_Open" >&6; } 12592$as_echo "$ac_cv_lib_gpm_Gpm_Open" >&6; }
12608if test "x$ac_cv_lib_gpm_Gpm_Open" = xyes; then : 12593if test "x$ac_cv_lib_gpm_Gpm_Open" = x""yes; then :
12609 HAVE_GPM=yes 12594 HAVE_GPM=yes
12610fi 12595fi
12611 12596
@@ -12625,7 +12610,7 @@ fi
12625 12610
12626 12611
12627ac_fn_c_check_header_mongrel "$LINENO" "malloc/malloc.h" "ac_cv_header_malloc_malloc_h" "$ac_includes_default" 12612ac_fn_c_check_header_mongrel "$LINENO" "malloc/malloc.h" "ac_cv_header_malloc_malloc_h" "$ac_includes_default"
12628if test "x$ac_cv_header_malloc_malloc_h" = xyes; then : 12613if test "x$ac_cv_header_malloc_malloc_h" = x""yes; then :
12629 12614
12630$as_echo "#define HAVE_MALLOC_MALLOC_H 1" >>confdefs.h 12615$as_echo "#define HAVE_MALLOC_MALLOC_H 1" >>confdefs.h
12631 12616
@@ -12670,10 +12655,10 @@ HAVE_X_SM=no
12670LIBXSM= 12655LIBXSM=
12671if test "${HAVE_X11}" = "yes"; then 12656if test "${HAVE_X11}" = "yes"; then
12672 ac_fn_c_check_header_mongrel "$LINENO" "X11/SM/SMlib.h" "ac_cv_header_X11_SM_SMlib_h" "$ac_includes_default" 12657 ac_fn_c_check_header_mongrel "$LINENO" "X11/SM/SMlib.h" "ac_cv_header_X11_SM_SMlib_h" "$ac_includes_default"
12673if test "x$ac_cv_header_X11_SM_SMlib_h" = xyes; then : 12658if test "x$ac_cv_header_X11_SM_SMlib_h" = x""yes; then :
12674 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SmcOpenConnection in -lSM" >&5 12659 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SmcOpenConnection in -lSM" >&5
12675$as_echo_n "checking for SmcOpenConnection in -lSM... " >&6; } 12660$as_echo_n "checking for SmcOpenConnection in -lSM... " >&6; }
12676if ${ac_cv_lib_SM_SmcOpenConnection+:} false; then : 12661if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then :
12677 $as_echo_n "(cached) " >&6 12662 $as_echo_n "(cached) " >&6
12678else 12663else
12679 ac_check_lib_save_LIBS=$LIBS 12664 ac_check_lib_save_LIBS=$LIBS
@@ -12707,7 +12692,7 @@ LIBS=$ac_check_lib_save_LIBS
12707fi 12692fi
12708{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SM_SmcOpenConnection" >&5 12693{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SM_SmcOpenConnection" >&5
12709$as_echo "$ac_cv_lib_SM_SmcOpenConnection" >&6; } 12694$as_echo "$ac_cv_lib_SM_SmcOpenConnection" >&6; }
12710if test "x$ac_cv_lib_SM_SmcOpenConnection" = xyes; then : 12695if test "x$ac_cv_lib_SM_SmcOpenConnection" = x""yes; then :
12711 HAVE_X_SM=yes 12696 HAVE_X_SM=yes
12712fi 12697fi
12713 12698
@@ -12738,7 +12723,7 @@ if test "${with_xml2}" != "no"; then
12738set dummy pkg-config; ac_word=$2 12723set dummy pkg-config; ac_word=$2
12739{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 12724{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
12740$as_echo_n "checking for $ac_word... " >&6; } 12725$as_echo_n "checking for $ac_word... " >&6; }
12741if ${ac_cv_path_PKG_CONFIG+:} false; then : 12726if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
12742 $as_echo_n "(cached) " >&6 12727 $as_echo_n "(cached) " >&6
12743else 12728else
12744 case $PKG_CONFIG in 12729 case $PKG_CONFIG in
@@ -12829,7 +12814,7 @@ $as_echo "no" >&6; }
12829 LIBS="$LIBXML2_LIBS $LIBS" 12814 LIBS="$LIBXML2_LIBS $LIBS"
12830 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htmlReadMemory in -lxml2" >&5 12815 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htmlReadMemory in -lxml2" >&5
12831$as_echo_n "checking for htmlReadMemory in -lxml2... " >&6; } 12816$as_echo_n "checking for htmlReadMemory in -lxml2... " >&6; }
12832if ${ac_cv_lib_xml2_htmlReadMemory+:} false; then : 12817if test "${ac_cv_lib_xml2_htmlReadMemory+set}" = set; then :
12833 $as_echo_n "(cached) " >&6 12818 $as_echo_n "(cached) " >&6
12834else 12819else
12835 ac_check_lib_save_LIBS=$LIBS 12820 ac_check_lib_save_LIBS=$LIBS
@@ -12863,7 +12848,7 @@ LIBS=$ac_check_lib_save_LIBS
12863fi 12848fi
12864{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_htmlReadMemory" >&5 12849{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_htmlReadMemory" >&5
12865$as_echo "$ac_cv_lib_xml2_htmlReadMemory" >&6; } 12850$as_echo "$ac_cv_lib_xml2_htmlReadMemory" >&6; }
12866if test "x$ac_cv_lib_xml2_htmlReadMemory" = xyes; then : 12851if test "x$ac_cv_lib_xml2_htmlReadMemory" = x""yes; then :
12867 HAVE_LIBXML2=yes 12852 HAVE_LIBXML2=yes
12868else 12853else
12869 HAVE_LIBXML2=no 12854 HAVE_LIBXML2=no
@@ -12885,7 +12870,7 @@ fi
12885# If netdb.h doesn't declare h_errno, we must declare it by hand. 12870# If netdb.h doesn't declare h_errno, we must declare it by hand.
12886{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether netdb declares h_errno" >&5 12871{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether netdb declares h_errno" >&5
12887$as_echo_n "checking whether netdb declares h_errno... " >&6; } 12872$as_echo_n "checking whether netdb declares h_errno... " >&6; }
12888if ${emacs_cv_netdb_declares_h_errno+:} false; then : 12873if test "${emacs_cv_netdb_declares_h_errno+set}" = set; then :
12889 $as_echo_n "(cached) " >&6 12874 $as_echo_n "(cached) " >&6
12890else 12875else
12891 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 12876 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12915,22 +12900,11 @@ $as_echo "#define HAVE_H_ERRNO 1" >>confdefs.h
12915 12900
12916fi 12901fi
12917 12902
12918ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
12919if test "x$ac_cv_type_size_t" = xyes; then :
12920
12921else
12922
12923cat >>confdefs.h <<_ACEOF
12924#define size_t unsigned int
12925_ACEOF
12926
12927fi
12928
12929# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works 12903# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
12930# for constant arguments. Useless! 12904# for constant arguments. Useless!
12931{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 12905{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
12932$as_echo_n "checking for working alloca.h... " >&6; } 12906$as_echo_n "checking for working alloca.h... " >&6; }
12933if ${ac_cv_working_alloca_h+:} false; then : 12907if test "${ac_cv_working_alloca_h+set}" = set; then :
12934 $as_echo_n "(cached) " >&6 12908 $as_echo_n "(cached) " >&6
12935else 12909else
12936 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 12910 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12963,7 +12937,7 @@ fi
12963 12937
12964{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 12938{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
12965$as_echo_n "checking for alloca... " >&6; } 12939$as_echo_n "checking for alloca... " >&6; }
12966if ${ac_cv_func_alloca_works+:} false; then : 12940if test "${ac_cv_func_alloca_works+set}" = set; then :
12967 $as_echo_n "(cached) " >&6 12941 $as_echo_n "(cached) " >&6
12968else 12942else
12969 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 12943 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12982,7 +12956,7 @@ else
12982 #pragma alloca 12956 #pragma alloca
12983# else 12957# else
12984# ifndef alloca /* predefined by HP cc +Olibcalls */ 12958# ifndef alloca /* predefined by HP cc +Olibcalls */
12985void *alloca (size_t); 12959char *alloca ();
12986# endif 12960# endif
12987# endif 12961# endif
12988# endif 12962# endif
@@ -13026,7 +13000,7 @@ $as_echo "#define C_ALLOCA 1" >>confdefs.h
13026 13000
13027{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 13001{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
13028$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } 13002$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
13029if ${ac_cv_os_cray+:} false; then : 13003if test "${ac_cv_os_cray+set}" = set; then :
13030 $as_echo_n "(cached) " >&6 13004 $as_echo_n "(cached) " >&6
13031else 13005else
13032 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13006 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13053,7 +13027,8 @@ if test $ac_cv_os_cray = yes; then
13053 for ac_func in _getb67 GETB67 getb67; do 13027 for ac_func in _getb67 GETB67 getb67; do
13054 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 13028 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
13055ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 13029ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
13056if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 13030eval as_val=\$$as_ac_var
13031 if test "x$as_val" = x""yes; then :
13057 13032
13058cat >>confdefs.h <<_ACEOF 13033cat >>confdefs.h <<_ACEOF
13059#define CRAY_STACKSEG_END $ac_func 13034#define CRAY_STACKSEG_END $ac_func
@@ -13067,7 +13042,7 @@ fi
13067 13042
13068{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 13043{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
13069$as_echo_n "checking stack direction for C alloca... " >&6; } 13044$as_echo_n "checking stack direction for C alloca... " >&6; }
13070if ${ac_cv_c_stack_direction+:} false; then : 13045if test "${ac_cv_c_stack_direction+set}" = set; then :
13071 $as_echo_n "(cached) " >&6 13046 $as_echo_n "(cached) " >&6
13072else 13047else
13073 if test "$cross_compiling" = yes; then : 13048 if test "$cross_compiling" = yes; then :
@@ -13117,14 +13092,14 @@ fi
13117 13092
13118 13093
13119if test x"$ac_cv_func_alloca_works" != xyes; then 13094if test x"$ac_cv_func_alloca_works" != xyes; then
13120 as_fn_error $? "a system implementation of alloca is required " "$LINENO" 5 13095 as_fn_error "a system implementation of alloca is required " "$LINENO" 5
13121fi 13096fi
13122 13097
13123# fmod, logb, and frexp are found in -lm on most systems. 13098# fmod, logb, and frexp are found in -lm on most systems.
13124# On HPUX 9.01, -lm does not contain logb, so check for sqrt. 13099# On HPUX 9.01, -lm does not contain logb, so check for sqrt.
13125{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 13100{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5
13126$as_echo_n "checking for sqrt in -lm... " >&6; } 13101$as_echo_n "checking for sqrt in -lm... " >&6; }
13127if ${ac_cv_lib_m_sqrt+:} false; then : 13102if test "${ac_cv_lib_m_sqrt+set}" = set; then :
13128 $as_echo_n "(cached) " >&6 13103 $as_echo_n "(cached) " >&6
13129else 13104else
13130 ac_check_lib_save_LIBS=$LIBS 13105 ac_check_lib_save_LIBS=$LIBS
@@ -13158,7 +13133,7 @@ LIBS=$ac_check_lib_save_LIBS
13158fi 13133fi
13159{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5 13134{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5
13160$as_echo "$ac_cv_lib_m_sqrt" >&6; } 13135$as_echo "$ac_cv_lib_m_sqrt" >&6; }
13161if test "x$ac_cv_lib_m_sqrt" = xyes; then : 13136if test "x$ac_cv_lib_m_sqrt" = x""yes; then :
13162 cat >>confdefs.h <<_ACEOF 13137 cat >>confdefs.h <<_ACEOF
13163#define HAVE_LIBM 1 13138#define HAVE_LIBM 1
13164_ACEOF 13139_ACEOF
@@ -13172,7 +13147,7 @@ fi
13172# have the same check as for liblockfile below. 13147# have the same check as for liblockfile below.
13173{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for maillock in -lmail" >&5 13148{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for maillock in -lmail" >&5
13174$as_echo_n "checking for maillock in -lmail... " >&6; } 13149$as_echo_n "checking for maillock in -lmail... " >&6; }
13175if ${ac_cv_lib_mail_maillock+:} false; then : 13150if test "${ac_cv_lib_mail_maillock+set}" = set; then :
13176 $as_echo_n "(cached) " >&6 13151 $as_echo_n "(cached) " >&6
13177else 13152else
13178 ac_check_lib_save_LIBS=$LIBS 13153 ac_check_lib_save_LIBS=$LIBS
@@ -13206,7 +13181,7 @@ LIBS=$ac_check_lib_save_LIBS
13206fi 13181fi
13207{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mail_maillock" >&5 13182{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mail_maillock" >&5
13208$as_echo "$ac_cv_lib_mail_maillock" >&6; } 13183$as_echo "$ac_cv_lib_mail_maillock" >&6; }
13209if test "x$ac_cv_lib_mail_maillock" = xyes; then : 13184if test "x$ac_cv_lib_mail_maillock" = x""yes; then :
13210 have_mail=yes 13185 have_mail=yes
13211else 13186else
13212 have_mail=no 13187 have_mail=no
@@ -13223,7 +13198,7 @@ else
13223fi 13198fi
13224{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for maillock in -llockfile" >&5 13199{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for maillock in -llockfile" >&5
13225$as_echo_n "checking for maillock in -llockfile... " >&6; } 13200$as_echo_n "checking for maillock in -llockfile... " >&6; }
13226if ${ac_cv_lib_lockfile_maillock+:} false; then : 13201if test "${ac_cv_lib_lockfile_maillock+set}" = set; then :
13227 $as_echo_n "(cached) " >&6 13202 $as_echo_n "(cached) " >&6
13228else 13203else
13229 ac_check_lib_save_LIBS=$LIBS 13204 ac_check_lib_save_LIBS=$LIBS
@@ -13257,7 +13232,7 @@ LIBS=$ac_check_lib_save_LIBS
13257fi 13232fi
13258{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lockfile_maillock" >&5 13233{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lockfile_maillock" >&5
13259$as_echo "$ac_cv_lib_lockfile_maillock" >&6; } 13234$as_echo "$ac_cv_lib_lockfile_maillock" >&6; }
13260if test "x$ac_cv_lib_lockfile_maillock" = xyes; then : 13235if test "x$ac_cv_lib_lockfile_maillock" = x""yes; then :
13261 have_lockfile=yes 13236 have_lockfile=yes
13262else 13237else
13263 have_lockfile=no 13238 have_lockfile=no
@@ -13277,7 +13252,7 @@ else
13277set dummy liblockfile.so; ac_word=$2 13252set dummy liblockfile.so; ac_word=$2
13278{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13253{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13279$as_echo_n "checking for $ac_word... " >&6; } 13254$as_echo_n "checking for $ac_word... " >&6; }
13280if ${ac_cv_prog_liblockfile+:} false; then : 13255if test "${ac_cv_prog_liblockfile+set}" = set; then :
13281 $as_echo_n "(cached) " >&6 13256 $as_echo_n "(cached) " >&6
13282else 13257else
13283 if test -n "$liblockfile"; then 13258 if test -n "$liblockfile"; then
@@ -13313,7 +13288,7 @@ fi
13313 13288
13314 13289
13315 if test $ac_cv_prog_liblockfile = yes; then 13290 if test $ac_cv_prog_liblockfile = yes; then
13316 as_fn_error $? "Shared liblockfile found but can't link against it. 13291 as_fn_error "Shared liblockfile found but can't link against it.
13317This probably means that movemail could lose mail. 13292This probably means that movemail could lose mail.
13318There may be a \`development' package to install containing liblockfile." "$LINENO" 5 13293There may be a \`development' package to install containing liblockfile." "$LINENO" 5
13319 fi 13294 fi
@@ -13321,7 +13296,7 @@ fi
13321for ac_func in touchlock 13296for ac_func in touchlock
13322do : 13297do :
13323 ac_fn_c_check_func "$LINENO" "touchlock" "ac_cv_func_touchlock" 13298 ac_fn_c_check_func "$LINENO" "touchlock" "ac_cv_func_touchlock"
13324if test "x$ac_cv_func_touchlock" = xyes; then : 13299if test "x$ac_cv_func_touchlock" = x""yes; then :
13325 cat >>confdefs.h <<_ACEOF 13300 cat >>confdefs.h <<_ACEOF
13326#define HAVE_TOUCHLOCK 1 13301#define HAVE_TOUCHLOCK 1
13327_ACEOF 13302_ACEOF
@@ -13332,7 +13307,7 @@ done
13332for ac_header in maillock.h 13307for ac_header in maillock.h
13333do : 13308do :
13334 ac_fn_c_check_header_mongrel "$LINENO" "maillock.h" "ac_cv_header_maillock_h" "$ac_includes_default" 13309 ac_fn_c_check_header_mongrel "$LINENO" "maillock.h" "ac_cv_header_maillock_h" "$ac_includes_default"
13335if test "x$ac_cv_header_maillock_h" = xyes; then : 13310if test "x$ac_cv_header_maillock_h" = x""yes; then :
13336 cat >>confdefs.h <<_ACEOF 13311 cat >>confdefs.h <<_ACEOF
13337#define HAVE_MAILLOCK_H 1 13312#define HAVE_MAILLOCK_H 1
13338_ACEOF 13313_ACEOF
@@ -13402,7 +13377,8 @@ cfmakeraw cfsetspeed isnan copysign __executable_start
13402do : 13377do :
13403 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 13378 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
13404ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 13379ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
13405if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 13380eval as_val=\$$as_ac_var
13381 if test "x$as_val" = x""yes; then :
13406 cat >>confdefs.h <<_ACEOF 13382 cat >>confdefs.h <<_ACEOF
13407#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 13383#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
13408_ACEOF 13384_ACEOF
@@ -13413,7 +13389,7 @@ done
13413 13389
13414{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_unwind_init" >&5 13390{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_unwind_init" >&5
13415$as_echo_n "checking for __builtin_unwind_init... " >&6; } 13391$as_echo_n "checking for __builtin_unwind_init... " >&6; }
13416if ${emacs_cv_func___builtin_unwind_init+:} false; then : 13392if test "${emacs_cv_func___builtin_unwind_init+set}" = set; then :
13417 $as_echo_n "(cached) " >&6 13393 $as_echo_n "(cached) " >&6
13418else 13394else
13419 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13395 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13446,7 +13422,7 @@ fi
13446for ac_header in sys/un.h 13422for ac_header in sys/un.h
13447do : 13423do :
13448 ac_fn_c_check_header_mongrel "$LINENO" "sys/un.h" "ac_cv_header_sys_un_h" "$ac_includes_default" 13424 ac_fn_c_check_header_mongrel "$LINENO" "sys/un.h" "ac_cv_header_sys_un_h" "$ac_includes_default"
13449if test "x$ac_cv_header_sys_un_h" = xyes; then : 13425if test "x$ac_cv_header_sys_un_h" = x""yes; then :
13450 cat >>confdefs.h <<_ACEOF 13426 cat >>confdefs.h <<_ACEOF
13451#define HAVE_SYS_UN_H 1 13427#define HAVE_SYS_UN_H 1
13452_ACEOF 13428_ACEOF
@@ -13458,7 +13434,7 @@ done
13458 13434
13459{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 13435{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
13460$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } 13436$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
13461if ${ac_cv_sys_largefile_source+:} false; then : 13437if test "${ac_cv_sys_largefile_source+set}" = set; then :
13462 $as_echo_n "(cached) " >&6 13438 $as_echo_n "(cached) " >&6
13463else 13439else
13464 while :; do 13440 while :; do
@@ -13527,7 +13503,7 @@ fi
13527 13503
13528{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpgrp requires zero arguments" >&5 13504{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpgrp requires zero arguments" >&5
13529$as_echo_n "checking whether getpgrp requires zero arguments... " >&6; } 13505$as_echo_n "checking whether getpgrp requires zero arguments... " >&6; }
13530if ${ac_cv_func_getpgrp_void+:} false; then : 13506if test "${ac_cv_func_getpgrp_void+set}" = set; then :
13531 $as_echo_n "(cached) " >&6 13507 $as_echo_n "(cached) " >&6
13532else 13508else
13533 # Use it with a single arg. 13509 # Use it with a single arg.
@@ -13580,7 +13556,8 @@ fi
13580do : 13556do :
13581 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 13557 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
13582ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 13558ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
13583if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 13559eval as_val=\$$as_ac_var
13560 if test "x$as_val" = x""yes; then :
13584 cat >>confdefs.h <<_ACEOF 13561 cat >>confdefs.h <<_ACEOF
13585#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 13562#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
13586_ACEOF 13563_ACEOF
@@ -13593,7 +13570,7 @@ done
13593 13570
13594 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 13571 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
13595$as_echo_n "checking whether byte ordering is bigendian... " >&6; } 13572$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
13596if ${ac_cv_c_bigendian+:} false; then : 13573if test "${ac_cv_c_bigendian+set}" = set; then :
13597 $as_echo_n "(cached) " >&6 13574 $as_echo_n "(cached) " >&6
13598else 13575else
13599 ac_cv_c_bigendian=unknown 13576 ac_cv_c_bigendian=unknown
@@ -13811,14 +13788,14 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
13811 13788
13812 ;; #( 13789 ;; #(
13813 *) 13790 *)
13814 as_fn_error $? "unknown endianness 13791 as_fn_error "unknown endianness
13815 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; 13792 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
13816 esac 13793 esac
13817 13794
13818 13795
13819{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 13796{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
13820$as_echo_n "checking for inline... " >&6; } 13797$as_echo_n "checking for inline... " >&6; }
13821if ${ac_cv_c_inline+:} false; then : 13798if test "${ac_cv_c_inline+set}" = set; then :
13822 $as_echo_n "(cached) " >&6 13799 $as_echo_n "(cached) " >&6
13823else 13800else
13824 ac_cv_c_inline=no 13801 ac_cv_c_inline=no
@@ -13861,7 +13838,7 @@ esac
13861 13838
13862 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strtold conforms to C99" >&5 13839 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strtold conforms to C99" >&5
13863$as_echo_n "checking whether strtold conforms to C99... " >&6; } 13840$as_echo_n "checking whether strtold conforms to C99... " >&6; }
13864if ${gl_cv_func_c99_strtold+:} false; then : 13841if test "${gl_cv_func_c99_strtold+set}" = set; then :
13865 $as_echo_n "(cached) " >&6 13842 $as_echo_n "(cached) " >&6
13866else 13843else
13867 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13844 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13904,7 +13881,7 @@ $as_echo "#define HAVE_C99_STRTOLD 1" >>confdefs.h
13904 13881
13905{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_dm_mode in struct stat" >&5 13882{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_dm_mode in struct stat" >&5
13906$as_echo_n "checking for st_dm_mode in struct stat... " >&6; } 13883$as_echo_n "checking for st_dm_mode in struct stat... " >&6; }
13907if ${ac_cv_struct_st_dm_mode+:} false; then : 13884if test "${ac_cv_struct_st_dm_mode+set}" = set; then :
13908 $as_echo_n "(cached) " >&6 13885 $as_echo_n "(cached) " >&6
13909else 13886else
13910 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13887 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13938,7 +13915,7 @@ $as_echo "#define HAVE_ST_DM_MODE 1" >>confdefs.h
13938 13915
13939 13916
13940ac_fn_c_check_decl "$LINENO" "strmode" "ac_cv_have_decl_strmode" "$ac_includes_default" 13917ac_fn_c_check_decl "$LINENO" "strmode" "ac_cv_have_decl_strmode" "$ac_includes_default"
13941if test "x$ac_cv_have_decl_strmode" = xyes; then : 13918if test "x$ac_cv_have_decl_strmode" = x""yes; then :
13942 ac_have_decl=1 13919 ac_have_decl=1
13943else 13920else
13944 ac_have_decl=0 13921 ac_have_decl=0
@@ -14127,7 +14104,7 @@ _ACEOF
14127 14104
14128 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5 14105 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
14129$as_echo_n "checking whether the preprocessor supports include_next... " >&6; } 14106$as_echo_n "checking whether the preprocessor supports include_next... " >&6; }
14130if ${gl_cv_have_include_next+:} false; then : 14107if test "${gl_cv_have_include_next+set}" = set; then :
14131 $as_echo_n "(cached) " >&6 14108 $as_echo_n "(cached) " >&6
14132else 14109else
14133 rm -rf conftestd1a conftestd1b conftestd2 14110 rm -rf conftestd1a conftestd1b conftestd2
@@ -14207,7 +14184,7 @@ $as_echo "$gl_cv_have_include_next" >&6; }
14207 14184
14208 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system header files limit the line length" >&5 14185 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system header files limit the line length" >&5
14209$as_echo_n "checking whether system header files limit the line length... " >&6; } 14186$as_echo_n "checking whether system header files limit the line length... " >&6; }
14210if ${gl_cv_pragma_columns+:} false; then : 14187if test "${gl_cv_pragma_columns+set}" = set; then :
14211 $as_echo_n "(cached) " >&6 14188 $as_echo_n "(cached) " >&6
14212else 14189else
14213 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 14190 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14257,7 +14234,7 @@ $as_echo "$gl_cv_pragma_columns" >&6; }
14257 else 14234 else
14258 { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <getopt.h>" >&5 14235 { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <getopt.h>" >&5
14259$as_echo_n "checking absolute name of <getopt.h>... " >&6; } 14236$as_echo_n "checking absolute name of <getopt.h>... " >&6; }
14260if ${gl_cv_next_getopt_h+:} false; then : 14237if test "${gl_cv_next_getopt_h+set}" = set; then :
14261 $as_echo_n "(cached) " >&6 14238 $as_echo_n "(cached) " >&6
14262else 14239else
14263 14240
@@ -14316,7 +14293,7 @@ $as_echo "$gl_cv_next_getopt_h" >&6; }
14316 for ac_header in getopt.h 14293 for ac_header in getopt.h
14317do : 14294do :
14318 ac_fn_c_check_header_mongrel "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default" 14295 ac_fn_c_check_header_mongrel "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default"
14319if test "x$ac_cv_header_getopt_h" = xyes; then : 14296if test "x$ac_cv_header_getopt_h" = x""yes; then :
14320 cat >>confdefs.h <<_ACEOF 14297 cat >>confdefs.h <<_ACEOF
14321#define HAVE_GETOPT_H 1 14298#define HAVE_GETOPT_H 1
14322_ACEOF 14299_ACEOF
@@ -14333,7 +14310,7 @@ done
14333 for ac_func in getopt_long_only 14310 for ac_func in getopt_long_only
14334do : 14311do :
14335 ac_fn_c_check_func "$LINENO" "getopt_long_only" "ac_cv_func_getopt_long_only" 14312 ac_fn_c_check_func "$LINENO" "getopt_long_only" "ac_cv_func_getopt_long_only"
14336if test "x$ac_cv_func_getopt_long_only" = xyes; then : 14313if test "x$ac_cv_func_getopt_long_only" = x""yes; then :
14337 cat >>confdefs.h <<_ACEOF 14314 cat >>confdefs.h <<_ACEOF
14338#define HAVE_GETOPT_LONG_ONLY 1 14315#define HAVE_GETOPT_LONG_ONLY 1
14339_ACEOF 14316_ACEOF
@@ -14348,7 +14325,7 @@ done
14348 if test -z "$gl_replace_getopt"; then 14325 if test -z "$gl_replace_getopt"; then
14349 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getopt is POSIX compatible" >&5 14326 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getopt is POSIX compatible" >&5
14350$as_echo_n "checking whether getopt is POSIX compatible... " >&6; } 14327$as_echo_n "checking whether getopt is POSIX compatible... " >&6; }
14351if ${gl_cv_func_getopt_posix+:} false; then : 14328if test "${gl_cv_func_getopt_posix+set}" = set; then :
14352 $as_echo_n "(cached) " >&6 14329 $as_echo_n "(cached) " >&6
14353else 14330else
14354 14331
@@ -14506,7 +14483,7 @@ $as_echo "$gl_cv_func_getopt_posix" >&6; }
14506 if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then 14483 if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then
14507 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working GNU getopt function" >&5 14484 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working GNU getopt function" >&5
14508$as_echo_n "checking for working GNU getopt function... " >&6; } 14485$as_echo_n "checking for working GNU getopt function... " >&6; }
14509if ${gl_cv_func_getopt_gnu+:} false; then : 14486if test "${gl_cv_func_getopt_gnu+set}" = set; then :
14510 $as_echo_n "(cached) " >&6 14487 $as_echo_n "(cached) " >&6
14511else 14488else
14512 # Even with POSIXLY_CORRECT, the GNU extension of leading '-' in the 14489 # Even with POSIXLY_CORRECT, the GNU extension of leading '-' in the
@@ -14618,7 +14595,7 @@ $as_echo "$gl_cv_func_getopt_gnu" >&6; }
14618 fi 14595 fi
14619 14596
14620ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default" 14597ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default"
14621if test "x$ac_cv_have_decl_getenv" = xyes; then : 14598if test "x$ac_cv_have_decl_getenv" = x""yes; then :
14622 ac_have_decl=1 14599 ac_have_decl=1
14623else 14600else
14624 ac_have_decl=0 14601 ac_have_decl=0
@@ -14711,7 +14688,7 @@ fi
14711 14688
14712 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 14689 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
14713$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } 14690$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
14714if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then : 14691if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
14715 $as_echo_n "(cached) " >&6 14692 $as_echo_n "(cached) " >&6
14716else 14693else
14717 rm -f conftest.sym conftest.file 14694 rm -f conftest.sym conftest.file
@@ -14846,7 +14823,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14846 for ac_header in ws2tcpip.h 14823 for ac_header in ws2tcpip.h
14847do : 14824do :
14848 ac_fn_c_check_header_mongrel "$LINENO" "ws2tcpip.h" "ac_cv_header_ws2tcpip_h" "$ac_includes_default" 14825 ac_fn_c_check_header_mongrel "$LINENO" "ws2tcpip.h" "ac_cv_header_ws2tcpip_h" "$ac_includes_default"
14849if test "x$ac_cv_header_ws2tcpip_h" = xyes; then : 14826if test "x$ac_cv_header_ws2tcpip_h" = x""yes; then :
14850 cat >>confdefs.h <<_ACEOF 14827 cat >>confdefs.h <<_ACEOF
14851#define HAVE_WS2TCPIP_H 1 14828#define HAVE_WS2TCPIP_H 1
14852_ACEOF 14829_ACEOF
@@ -14859,7 +14836,7 @@ done
14859 14836
14860{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 14837{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
14861$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } 14838$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
14862if ${ac_cv_header_stdbool_h+:} false; then : 14839if test "${ac_cv_header_stdbool_h+set}" = set; then :
14863 $as_echo_n "(cached) " >&6 14840 $as_echo_n "(cached) " >&6
14864else 14841else
14865 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 14842 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14934,7 +14911,7 @@ fi
14934{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 14911{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
14935$as_echo "$ac_cv_header_stdbool_h" >&6; } 14912$as_echo "$ac_cv_header_stdbool_h" >&6; }
14936 ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" 14913 ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
14937if test "x$ac_cv_type__Bool" = xyes; then : 14914if test "x$ac_cv_type__Bool" = x""yes; then :
14938 14915
14939cat >>confdefs.h <<_ACEOF 14916cat >>confdefs.h <<_ACEOF
14940#define HAVE__BOOL 1 14917#define HAVE__BOOL 1
@@ -14951,7 +14928,7 @@ fi
14951 14928
14952 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5 14929 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
14953$as_echo_n "checking for wchar_t... " >&6; } 14930$as_echo_n "checking for wchar_t... " >&6; }
14954if ${gt_cv_c_wchar_t+:} false; then : 14931if test "${gt_cv_c_wchar_t+set}" = set; then :
14955 $as_echo_n "(cached) " >&6 14932 $as_echo_n "(cached) " >&6
14956else 14933else
14957 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 14934 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14984,7 +14961,7 @@ $as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h
14984 14961
14985 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5 14962 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5
14986$as_echo_n "checking for unsigned long long int... " >&6; } 14963$as_echo_n "checking for unsigned long long int... " >&6; }
14987if ${ac_cv_type_unsigned_long_long_int+:} false; then : 14964if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then :
14988 $as_echo_n "(cached) " >&6 14965 $as_echo_n "(cached) " >&6
14989else 14966else
14990 ac_cv_type_unsigned_long_long_int=yes 14967 ac_cv_type_unsigned_long_long_int=yes
@@ -15042,7 +15019,7 @@ $as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
15042 15019
15043 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 15020 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5
15044$as_echo_n "checking for long long int... " >&6; } 15021$as_echo_n "checking for long long int... " >&6; }
15045if ${ac_cv_type_long_long_int+:} false; then : 15022if test "${ac_cv_type_long_long_int+set}" = set; then :
15046 $as_echo_n "(cached) " >&6 15023 $as_echo_n "(cached) " >&6
15047else 15024else
15048 ac_cv_type_long_long_int=yes 15025 ac_cv_type_long_long_int=yes
@@ -15192,7 +15169,7 @@ $as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
15192 15169
15193 ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "#include <time.h> 15170 ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "#include <time.h>
15194" 15171"
15195if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes; then : 15172if test "x$ac_cv_member_struct_tm_tm_gmtoff" = x""yes; then :
15196 15173
15197$as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h 15174$as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h
15198 15175
@@ -15205,7 +15182,7 @@ fi
15205 15182
15206{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5 15183{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
15207$as_echo_n "checking whether stat file-mode macros are broken... " >&6; } 15184$as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
15208if ${ac_cv_header_stat_broken+:} false; then : 15185if test "${ac_cv_header_stat_broken+set}" = set; then :
15209 $as_echo_n "(cached) " >&6 15186 $as_echo_n "(cached) " >&6
15210else 15187else
15211 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 15188 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15249,7 +15226,7 @@ fi
15249 15226
15250{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 15227{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
15251$as_echo_n "checking for C/C++ restrict keyword... " >&6; } 15228$as_echo_n "checking for C/C++ restrict keyword... " >&6; }
15252if ${ac_cv_c_restrict+:} false; then : 15229if test "${ac_cv_c_restrict+set}" = set; then :
15253 $as_echo_n "(cached) " >&6 15230 $as_echo_n "(cached) " >&6
15254else 15231else
15255 ac_cv_c_restrict=no 15232 ac_cv_c_restrict=no
@@ -15299,7 +15276,7 @@ _ACEOF
15299 15276
15300 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5 15277 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5
15301$as_echo_n "checking for struct timespec in <time.h>... " >&6; } 15278$as_echo_n "checking for struct timespec in <time.h>... " >&6; }
15302if ${gl_cv_sys_struct_timespec_in_time_h+:} false; then : 15279if test "${gl_cv_sys_struct_timespec_in_time_h+set}" = set; then :
15303 $as_echo_n "(cached) " >&6 15280 $as_echo_n "(cached) " >&6
15304else 15281else
15305 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 15282 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15332,7 +15309,7 @@ $as_echo "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
15332 else 15309 else
15333 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <sys/time.h>" >&5 15310 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <sys/time.h>" >&5
15334$as_echo_n "checking for struct timespec in <sys/time.h>... " >&6; } 15311$as_echo_n "checking for struct timespec in <sys/time.h>... " >&6; }
15335if ${gl_cv_sys_struct_timespec_in_sys_time_h+:} false; then : 15312if test "${gl_cv_sys_struct_timespec_in_sys_time_h+set}" = set; then :
15336 $as_echo_n "(cached) " >&6 15313 $as_echo_n "(cached) " >&6
15337else 15314else
15338 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 15315 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15361,7 +15338,7 @@ $as_echo "$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; }
15361 else 15338 else
15362 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <pthread.h>" >&5 15339 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <pthread.h>" >&5
15363$as_echo_n "checking for struct timespec in <pthread.h>... " >&6; } 15340$as_echo_n "checking for struct timespec in <pthread.h>... " >&6; }
15364if ${gl_cv_sys_struct_timespec_in_pthread_h+:} false; then : 15341if test "${gl_cv_sys_struct_timespec_in_pthread_h+set}" = set; then :
15365 $as_echo_n "(cached) " >&6 15342 $as_echo_n "(cached) " >&6
15366else 15343else
15367 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 15344 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15410,7 +15387,7 @@ $as_echo "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; }
15410 else 15387 else
15411 { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <time.h>" >&5 15388 { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <time.h>" >&5
15412$as_echo_n "checking absolute name of <time.h>... " >&6; } 15389$as_echo_n "checking absolute name of <time.h>... " >&6; }
15413if ${gl_cv_next_time_h+:} false; then : 15390if test "${gl_cv_next_time_h+set}" = set; then :
15414 $as_echo_n "(cached) " >&6 15391 $as_echo_n "(cached) " >&6
15415else 15392else
15416 15393
@@ -15453,7 +15430,7 @@ $as_echo "$gl_cv_next_time_h" >&6; }
15453 15430
15454 15431
15455ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "$ac_includes_default" 15432ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "$ac_includes_default"
15456if test "x$ac_cv_have_decl_localtime_r" = xyes; then : 15433if test "x$ac_cv_have_decl_localtime_r" = x""yes; then :
15457 ac_have_decl=1 15434 ac_have_decl=1
15458else 15435else
15459 ac_have_decl=0 15436 ac_have_decl=0
@@ -15536,14 +15513,14 @@ fi
15536 15513
15537# Make sure getloadavg.c is where it belongs, at configure-time. 15514# Make sure getloadavg.c is where it belongs, at configure-time.
15538test -f "$srcdir/$gl_source_base/getloadavg.c" || 15515test -f "$srcdir/$gl_source_base/getloadavg.c" ||
15539 as_fn_error $? "$srcdir/$gl_source_base/getloadavg.c is missing" "$LINENO" 5 15516 as_fn_error "$srcdir/$gl_source_base/getloadavg.c is missing" "$LINENO" 5
15540 15517
15541gl_save_LIBS=$LIBS 15518gl_save_LIBS=$LIBS
15542 15519
15543# getloadvg is present in libc on glibc >= 2.2, MacOS X, FreeBSD >= 2.0, 15520# getloadvg is present in libc on glibc >= 2.2, MacOS X, FreeBSD >= 2.0,
15544# NetBSD >= 0.9, OpenBSD >= 2.0, Solaris >= 7. 15521# NetBSD >= 0.9, OpenBSD >= 2.0, Solaris >= 7.
15545ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg" 15522ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg"
15546if test "x$ac_cv_func_getloadavg" = xyes; then : 15523if test "x$ac_cv_func_getloadavg" = x""yes; then :
15547 15524
15548else 15525else
15549 gl_have_func=no 15526 gl_have_func=no
@@ -15556,7 +15533,7 @@ else
15556 if test $gl_have_func = no; then 15533 if test $gl_have_func = no; then
15557 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for elf_begin in -lelf" >&5 15534 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for elf_begin in -lelf" >&5
15558$as_echo_n "checking for elf_begin in -lelf... " >&6; } 15535$as_echo_n "checking for elf_begin in -lelf... " >&6; }
15559if ${ac_cv_lib_elf_elf_begin+:} false; then : 15536if test "${ac_cv_lib_elf_elf_begin+set}" = set; then :
15560 $as_echo_n "(cached) " >&6 15537 $as_echo_n "(cached) " >&6
15561else 15538else
15562 ac_check_lib_save_LIBS=$LIBS 15539 ac_check_lib_save_LIBS=$LIBS
@@ -15590,13 +15567,13 @@ LIBS=$ac_check_lib_save_LIBS
15590fi 15567fi
15591{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elf_elf_begin" >&5 15568{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elf_elf_begin" >&5
15592$as_echo "$ac_cv_lib_elf_elf_begin" >&6; } 15569$as_echo "$ac_cv_lib_elf_elf_begin" >&6; }
15593if test "x$ac_cv_lib_elf_elf_begin" = xyes; then : 15570if test "x$ac_cv_lib_elf_elf_begin" = x""yes; then :
15594 LIBS="-lelf $LIBS" 15571 LIBS="-lelf $LIBS"
15595fi 15572fi
15596 15573
15597 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_open in -lkvm" >&5 15574 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_open in -lkvm" >&5
15598$as_echo_n "checking for kvm_open in -lkvm... " >&6; } 15575$as_echo_n "checking for kvm_open in -lkvm... " >&6; }
15599if ${ac_cv_lib_kvm_kvm_open+:} false; then : 15576if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then :
15600 $as_echo_n "(cached) " >&6 15577 $as_echo_n "(cached) " >&6
15601else 15578else
15602 ac_check_lib_save_LIBS=$LIBS 15579 ac_check_lib_save_LIBS=$LIBS
@@ -15630,14 +15607,14 @@ LIBS=$ac_check_lib_save_LIBS
15630fi 15607fi
15631{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kvm_kvm_open" >&5 15608{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kvm_kvm_open" >&5
15632$as_echo "$ac_cv_lib_kvm_kvm_open" >&6; } 15609$as_echo "$ac_cv_lib_kvm_kvm_open" >&6; }
15633if test "x$ac_cv_lib_kvm_kvm_open" = xyes; then : 15610if test "x$ac_cv_lib_kvm_kvm_open" = x""yes; then :
15634 LIBS="-lkvm $LIBS" 15611 LIBS="-lkvm $LIBS"
15635fi 15612fi
15636 15613
15637 # Check for the 4.4BSD definition of getloadavg. 15614 # Check for the 4.4BSD definition of getloadavg.
15638 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getloadavg in -lutil" >&5 15615 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getloadavg in -lutil" >&5
15639$as_echo_n "checking for getloadavg in -lutil... " >&6; } 15616$as_echo_n "checking for getloadavg in -lutil... " >&6; }
15640if ${ac_cv_lib_util_getloadavg+:} false; then : 15617if test "${ac_cv_lib_util_getloadavg+set}" = set; then :
15641 $as_echo_n "(cached) " >&6 15618 $as_echo_n "(cached) " >&6
15642else 15619else
15643 ac_check_lib_save_LIBS=$LIBS 15620 ac_check_lib_save_LIBS=$LIBS
@@ -15671,7 +15648,7 @@ LIBS=$ac_check_lib_save_LIBS
15671fi 15648fi
15672{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_getloadavg" >&5 15649{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_getloadavg" >&5
15673$as_echo "$ac_cv_lib_util_getloadavg" >&6; } 15650$as_echo "$ac_cv_lib_util_getloadavg" >&6; }
15674if test "x$ac_cv_lib_util_getloadavg" = xyes; then : 15651if test "x$ac_cv_lib_util_getloadavg" = x""yes; then :
15675 LIBS="-lutil $LIBS" gl_have_func=yes 15652 LIBS="-lutil $LIBS" gl_have_func=yes
15676fi 15653fi
15677 15654
@@ -15684,7 +15661,7 @@ fi
15684 LIBS="-L/usr/local/lib $LIBS" 15661 LIBS="-L/usr/local/lib $LIBS"
15685 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getloadavg in -lgetloadavg" >&5 15662 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getloadavg in -lgetloadavg" >&5
15686$as_echo_n "checking for getloadavg in -lgetloadavg... " >&6; } 15663$as_echo_n "checking for getloadavg in -lgetloadavg... " >&6; }
15687if ${ac_cv_lib_getloadavg_getloadavg+:} false; then : 15664if test "${ac_cv_lib_getloadavg_getloadavg+set}" = set; then :
15688 $as_echo_n "(cached) " >&6 15665 $as_echo_n "(cached) " >&6
15689else 15666else
15690 ac_check_lib_save_LIBS=$LIBS 15667 ac_check_lib_save_LIBS=$LIBS
@@ -15718,7 +15695,7 @@ LIBS=$ac_check_lib_save_LIBS
15718fi 15695fi
15719{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_getloadavg_getloadavg" >&5 15696{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_getloadavg_getloadavg" >&5
15720$as_echo "$ac_cv_lib_getloadavg_getloadavg" >&6; } 15697$as_echo "$ac_cv_lib_getloadavg_getloadavg" >&6; }
15721if test "x$ac_cv_lib_getloadavg_getloadavg" = xyes; then : 15698if test "x$ac_cv_lib_getloadavg_getloadavg" = x""yes; then :
15722 LIBS="-lgetloadavg $LIBS" gl_have_func=yes 15699 LIBS="-lgetloadavg $LIBS" gl_have_func=yes
15723else 15700else
15724 LIBS=$gl_getloadavg_LIBS 15701 LIBS=$gl_getloadavg_LIBS
@@ -15744,7 +15721,7 @@ fi
15744# Solaris has libkstat which does not require root. 15721# Solaris has libkstat which does not require root.
15745{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kstat_open in -lkstat" >&5 15722{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kstat_open in -lkstat" >&5
15746$as_echo_n "checking for kstat_open in -lkstat... " >&6; } 15723$as_echo_n "checking for kstat_open in -lkstat... " >&6; }
15747if ${ac_cv_lib_kstat_kstat_open+:} false; then : 15724if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then :
15748 $as_echo_n "(cached) " >&6 15725 $as_echo_n "(cached) " >&6
15749else 15726else
15750 ac_check_lib_save_LIBS=$LIBS 15727 ac_check_lib_save_LIBS=$LIBS
@@ -15778,7 +15755,7 @@ LIBS=$ac_check_lib_save_LIBS
15778fi 15755fi
15779{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kstat_kstat_open" >&5 15756{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kstat_kstat_open" >&5
15780$as_echo "$ac_cv_lib_kstat_kstat_open" >&6; } 15757$as_echo "$ac_cv_lib_kstat_kstat_open" >&6; }
15781if test "x$ac_cv_lib_kstat_kstat_open" = xyes; then : 15758if test "x$ac_cv_lib_kstat_kstat_open" = x""yes; then :
15782 cat >>confdefs.h <<_ACEOF 15759 cat >>confdefs.h <<_ACEOF
15783#define HAVE_LIBKSTAT 1 15760#define HAVE_LIBKSTAT 1
15784_ACEOF 15761_ACEOF
@@ -15794,7 +15771,7 @@ if test $gl_have_func = no; then
15794 for ac_func in pstat_getdynamic 15771 for ac_func in pstat_getdynamic
15795do : 15772do :
15796 ac_fn_c_check_func "$LINENO" "pstat_getdynamic" "ac_cv_func_pstat_getdynamic" 15773 ac_fn_c_check_func "$LINENO" "pstat_getdynamic" "ac_cv_func_pstat_getdynamic"
15797if test "x$ac_cv_func_pstat_getdynamic" = xyes; then : 15774if test "x$ac_cv_func_pstat_getdynamic" = x""yes; then :
15798 cat >>confdefs.h <<_ACEOF 15775 cat >>confdefs.h <<_ACEOF
15799#define HAVE_PSTAT_GETDYNAMIC 1 15776#define HAVE_PSTAT_GETDYNAMIC 1
15800_ACEOF 15777_ACEOF
@@ -15808,7 +15785,7 @@ fi
15808if test $gl_have_func = no; then 15785if test $gl_have_func = no; then
15809 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perfstat_cpu_total in -lperfstat" >&5 15786 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perfstat_cpu_total in -lperfstat" >&5
15810$as_echo_n "checking for perfstat_cpu_total in -lperfstat... " >&6; } 15787$as_echo_n "checking for perfstat_cpu_total in -lperfstat... " >&6; }
15811if ${ac_cv_lib_perfstat_perfstat_cpu_total+:} false; then : 15788if test "${ac_cv_lib_perfstat_perfstat_cpu_total+set}" = set; then :
15812 $as_echo_n "(cached) " >&6 15789 $as_echo_n "(cached) " >&6
15813else 15790else
15814 ac_check_lib_save_LIBS=$LIBS 15791 ac_check_lib_save_LIBS=$LIBS
@@ -15842,7 +15819,7 @@ LIBS=$ac_check_lib_save_LIBS
15842fi 15819fi
15843{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_perfstat_perfstat_cpu_total" >&5 15820{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_perfstat_perfstat_cpu_total" >&5
15844$as_echo "$ac_cv_lib_perfstat_perfstat_cpu_total" >&6; } 15821$as_echo "$ac_cv_lib_perfstat_perfstat_cpu_total" >&6; }
15845if test "x$ac_cv_lib_perfstat_perfstat_cpu_total" = xyes; then : 15822if test "x$ac_cv_lib_perfstat_perfstat_cpu_total" = x""yes; then :
15846 cat >>confdefs.h <<_ACEOF 15823 cat >>confdefs.h <<_ACEOF
15847#define HAVE_LIBPERFSTAT 1 15824#define HAVE_LIBPERFSTAT 1
15848_ACEOF 15825_ACEOF
@@ -15856,14 +15833,14 @@ fi
15856 15833
15857if test $gl_have_func = no; then 15834if test $gl_have_func = no; then
15858 ac_fn_c_check_header_mongrel "$LINENO" "sys/dg_sys_info.h" "ac_cv_header_sys_dg_sys_info_h" "$ac_includes_default" 15835 ac_fn_c_check_header_mongrel "$LINENO" "sys/dg_sys_info.h" "ac_cv_header_sys_dg_sys_info_h" "$ac_includes_default"
15859if test "x$ac_cv_header_sys_dg_sys_info_h" = xyes; then : 15836if test "x$ac_cv_header_sys_dg_sys_info_h" = x""yes; then :
15860 gl_have_func=yes 15837 gl_have_func=yes
15861 15838
15862$as_echo "#define DGUX 1" >>confdefs.h 15839$as_echo "#define DGUX 1" >>confdefs.h
15863 15840
15864 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dg_sys_info in -ldgc" >&5 15841 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dg_sys_info in -ldgc" >&5
15865$as_echo_n "checking for dg_sys_info in -ldgc... " >&6; } 15842$as_echo_n "checking for dg_sys_info in -ldgc... " >&6; }
15866if ${ac_cv_lib_dgc_dg_sys_info+:} false; then : 15843if test "${ac_cv_lib_dgc_dg_sys_info+set}" = set; then :
15867 $as_echo_n "(cached) " >&6 15844 $as_echo_n "(cached) " >&6
15868else 15845else
15869 ac_check_lib_save_LIBS=$LIBS 15846 ac_check_lib_save_LIBS=$LIBS
@@ -15897,7 +15874,7 @@ LIBS=$ac_check_lib_save_LIBS
15897fi 15874fi
15898{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dgc_dg_sys_info" >&5 15875{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dgc_dg_sys_info" >&5
15899$as_echo "$ac_cv_lib_dgc_dg_sys_info" >&6; } 15876$as_echo "$ac_cv_lib_dgc_dg_sys_info" >&6; }
15900if test "x$ac_cv_lib_dgc_dg_sys_info" = xyes; then : 15877if test "x$ac_cv_lib_dgc_dg_sys_info" = x""yes; then :
15901 cat >>confdefs.h <<_ACEOF 15878 cat >>confdefs.h <<_ACEOF
15902#define HAVE_LIBDGC 1 15879#define HAVE_LIBDGC 1
15903_ACEOF 15880_ACEOF
@@ -15924,7 +15901,7 @@ fi
15924 15901
15925if test $gl_have_func = no; then 15902if test $gl_have_func = no; then
15926 ac_fn_c_check_header_mongrel "$LINENO" "inq_stats/cpustats.h" "ac_cv_header_inq_stats_cpustats_h" "$ac_includes_default" 15903 ac_fn_c_check_header_mongrel "$LINENO" "inq_stats/cpustats.h" "ac_cv_header_inq_stats_cpustats_h" "$ac_includes_default"
15927if test "x$ac_cv_header_inq_stats_cpustats_h" = xyes; then : 15904if test "x$ac_cv_header_inq_stats_cpustats_h" = x""yes; then :
15928 gl_have_func=yes 15905 gl_have_func=yes
15929 15906
15930$as_echo "#define UMAX 1" >>confdefs.h 15907$as_echo "#define UMAX 1" >>confdefs.h
@@ -15939,7 +15916,7 @@ fi
15939 15916
15940if test $gl_have_func = no; then 15917if test $gl_have_func = no; then
15941 ac_fn_c_check_header_mongrel "$LINENO" "sys/cpustats.h" "ac_cv_header_sys_cpustats_h" "$ac_includes_default" 15918 ac_fn_c_check_header_mongrel "$LINENO" "sys/cpustats.h" "ac_cv_header_sys_cpustats_h" "$ac_includes_default"
15942if test "x$ac_cv_header_sys_cpustats_h" = xyes; then : 15919if test "x$ac_cv_header_sys_cpustats_h" = x""yes; then :
15943 gl_have_func=yes; $as_echo "#define UMAX 1" >>confdefs.h 15920 gl_have_func=yes; $as_echo "#define UMAX 1" >>confdefs.h
15944 15921
15945fi 15922fi
@@ -15951,7 +15928,7 @@ if test $gl_have_func = no; then
15951 for ac_header in mach/mach.h 15928 for ac_header in mach/mach.h
15952do : 15929do :
15953 ac_fn_c_check_header_mongrel "$LINENO" "mach/mach.h" "ac_cv_header_mach_mach_h" "$ac_includes_default" 15930 ac_fn_c_check_header_mongrel "$LINENO" "mach/mach.h" "ac_cv_header_mach_mach_h" "$ac_includes_default"
15954if test "x$ac_cv_header_mach_mach_h" = xyes; then : 15931if test "x$ac_cv_header_mach_mach_h" = x""yes; then :
15955 cat >>confdefs.h <<_ACEOF 15932 cat >>confdefs.h <<_ACEOF
15956#define HAVE_MACH_MACH_H 1 15933#define HAVE_MACH_MACH_H 1
15957_ACEOF 15934_ACEOF
@@ -15965,13 +15942,13 @@ fi
15965for ac_header in nlist.h 15942for ac_header in nlist.h
15966do : 15943do :
15967 ac_fn_c_check_header_mongrel "$LINENO" "nlist.h" "ac_cv_header_nlist_h" "$ac_includes_default" 15944 ac_fn_c_check_header_mongrel "$LINENO" "nlist.h" "ac_cv_header_nlist_h" "$ac_includes_default"
15968if test "x$ac_cv_header_nlist_h" = xyes; then : 15945if test "x$ac_cv_header_nlist_h" = x""yes; then :
15969 cat >>confdefs.h <<_ACEOF 15946 cat >>confdefs.h <<_ACEOF
15970#define HAVE_NLIST_H 1 15947#define HAVE_NLIST_H 1
15971_ACEOF 15948_ACEOF
15972 ac_fn_c_check_member "$LINENO" "struct nlist" "n_un.n_name" "ac_cv_member_struct_nlist_n_un_n_name" "#include <nlist.h> 15949 ac_fn_c_check_member "$LINENO" "struct nlist" "n_un.n_name" "ac_cv_member_struct_nlist_n_un_n_name" "#include <nlist.h>
15973" 15950"
15974if test "x$ac_cv_member_struct_nlist_n_un_n_name" = xyes; then : 15951if test "x$ac_cv_member_struct_nlist_n_un_n_name" = x""yes; then :
15975 15952
15976cat >>confdefs.h <<_ACEOF 15953cat >>confdefs.h <<_ACEOF
15977#define HAVE_STRUCT_NLIST_N_UN_N_NAME 1 15954#define HAVE_STRUCT_NLIST_N_UN_N_NAME 1
@@ -16025,7 +16002,7 @@ LIBS=$gl_save_LIBS
16025for ac_header in sys/loadavg.h 16002for ac_header in sys/loadavg.h
16026do : 16003do :
16027 ac_fn_c_check_header_mongrel "$LINENO" "sys/loadavg.h" "ac_cv_header_sys_loadavg_h" "$ac_includes_default" 16004 ac_fn_c_check_header_mongrel "$LINENO" "sys/loadavg.h" "ac_cv_header_sys_loadavg_h" "$ac_includes_default"
16028if test "x$ac_cv_header_sys_loadavg_h" = xyes; then : 16005if test "x$ac_cv_header_sys_loadavg_h" = x""yes; then :
16029 cat >>confdefs.h <<_ACEOF 16006 cat >>confdefs.h <<_ACEOF
16030#define HAVE_SYS_LOADAVG_H 1 16007#define HAVE_SYS_LOADAVG_H 1
16031_ACEOF 16008_ACEOF
@@ -16044,7 +16021,7 @@ ac_fn_c_check_decl "$LINENO" "getloadavg" "ac_cv_have_decl_getloadavg" "#if HAVE
16044 #endif 16021 #endif
16045 #include <stdlib.h> 16022 #include <stdlib.h>
16046" 16023"
16047if test "x$ac_cv_have_decl_getloadavg" = xyes; then : 16024if test "x$ac_cv_have_decl_getloadavg" = x""yes; then :
16048 16025
16049else 16026else
16050 HAVE_DECL_GETLOADAVG=0 16027 HAVE_DECL_GETLOADAVG=0
@@ -16153,7 +16130,7 @@ if test $APPLE_UNIVERSAL_BUILD = 1; then
16153fi 16130fi
16154{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5 16131{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5
16155$as_echo_n "checking for working mktime... " >&6; } 16132$as_echo_n "checking for working mktime... " >&6; }
16156if ${ac_cv_func_working_mktime+:} false; then : 16133if test "${ac_cv_func_working_mktime+set}" = set; then :
16157 $as_echo_n "(cached) " >&6 16134 $as_echo_n "(cached) " >&6
16158else 16135else
16159 if test "$cross_compiling" = yes; then : 16136 if test "$cross_compiling" = yes; then :
@@ -16418,7 +16395,7 @@ fi
16418 else 16395 else
16419 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readlink signature is correct" >&5 16396 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readlink signature is correct" >&5
16420$as_echo_n "checking whether readlink signature is correct... " >&6; } 16397$as_echo_n "checking whether readlink signature is correct... " >&6; }
16421if ${gl_cv_decl_readlink_works+:} false; then : 16398if test "${gl_cv_decl_readlink_works+set}" = set; then :
16422 $as_echo_n "(cached) " >&6 16399 $as_echo_n "(cached) " >&6
16423else 16400else
16424 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 16401 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16445,7 +16422,7 @@ fi
16445$as_echo "$gl_cv_decl_readlink_works" >&6; } 16422$as_echo "$gl_cv_decl_readlink_works" >&6; }
16446 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readlink handles trailing slash correctly" >&5 16423 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readlink handles trailing slash correctly" >&5
16447$as_echo_n "checking whether readlink handles trailing slash correctly... " >&6; } 16424$as_echo_n "checking whether readlink handles trailing slash correctly... " >&6; }
16448if ${gl_cv_func_readlink_works+:} false; then : 16425if test "${gl_cv_func_readlink_works+set}" = set; then :
16449 $as_echo_n "(cached) " >&6 16426 $as_echo_n "(cached) " >&6
16450else 16427else
16451 # We have readlink, so assume ln -s works. 16428 # We have readlink, so assume ln -s works.
@@ -16530,12 +16507,12 @@ $as_echo "#define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h
16530#endif 16507#endif
16531 16508
16532" 16509"
16533if test "x$ac_cv_type_socklen_t" = xyes; then : 16510if test "x$ac_cv_type_socklen_t" = x""yes; then :
16534 16511
16535else 16512else
16536 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t equivalent" >&5 16513 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t equivalent" >&5
16537$as_echo_n "checking for socklen_t equivalent... " >&6; } 16514$as_echo_n "checking for socklen_t equivalent... " >&6; }
16538 if ${gl_cv_socklen_t_equiv+:} false; then : 16515 if test "${gl_cv_socklen_t_equiv+set}" = set; then :
16539 $as_echo_n "(cached) " >&6 16516 $as_echo_n "(cached) " >&6
16540else 16517else
16541 # Systems have either "struct sockaddr *" or 16518 # Systems have either "struct sockaddr *" or
@@ -16570,7 +16547,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
16570fi 16547fi
16571 16548
16572 if test "$gl_cv_socklen_t_equiv" = ""; then 16549 if test "$gl_cv_socklen_t_equiv" = ""; then
16573 as_fn_error $? "Cannot find a type to use in place of socklen_t" "$LINENO" 5 16550 as_fn_error "Cannot find a type to use in place of socklen_t" "$LINENO" 5
16574 fi 16551 fi
16575 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socklen_t_equiv" >&5 16552 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socklen_t_equiv" >&5
16576$as_echo "$gl_cv_socklen_t_equiv" >&6; } 16553$as_echo "$gl_cv_socklen_t_equiv" >&6; }
@@ -16585,7 +16562,7 @@ fi
16585 16562
16586 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5 16563 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
16587$as_echo_n "checking for ssize_t... " >&6; } 16564$as_echo_n "checking for ssize_t... " >&6; }
16588if ${gt_cv_ssize_t+:} false; then : 16565if test "${gt_cv_ssize_t+set}" = set; then :
16589 $as_echo_n "(cached) " >&6 16566 $as_echo_n "(cached) " >&6
16590else 16567else
16591 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 16568 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16621,7 +16598,7 @@ $as_echo "#define ssize_t int" >>confdefs.h
16621 16598
16622 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on directories" >&5 16599 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on directories" >&5
16623$as_echo_n "checking whether stat handles trailing slashes on directories... " >&6; } 16600$as_echo_n "checking whether stat handles trailing slashes on directories... " >&6; }
16624if ${gl_cv_func_stat_dir_slash+:} false; then : 16601if test "${gl_cv_func_stat_dir_slash+set}" = set; then :
16625 $as_echo_n "(cached) " >&6 16602 $as_echo_n "(cached) " >&6
16626else 16603else
16627 if test "$cross_compiling" = yes; then : 16604 if test "$cross_compiling" = yes; then :
@@ -16656,7 +16633,7 @@ fi
16656$as_echo "$gl_cv_func_stat_dir_slash" >&6; } 16633$as_echo "$gl_cv_func_stat_dir_slash" >&6; }
16657 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5 16634 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
16658$as_echo_n "checking whether stat handles trailing slashes on files... " >&6; } 16635$as_echo_n "checking whether stat handles trailing slashes on files... " >&6; }
16659if ${gl_cv_func_stat_file_slash+:} false; then : 16636if test "${gl_cv_func_stat_file_slash+set}" = set; then :
16660 $as_echo_n "(cached) " >&6 16637 $as_echo_n "(cached) " >&6
16661else 16638else
16662 touch conftest.tmp 16639 touch conftest.tmp
@@ -16773,7 +16750,7 @@ fi
16773 fi 16750 fi
16774 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5 16751 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
16775$as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; } 16752$as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; }
16776if ${gl_cv_decl_null_works+:} false; then : 16753if test "${gl_cv_decl_null_works+set}" = set; then :
16777 $as_echo_n "(cached) " >&6 16754 $as_echo_n "(cached) " >&6
16778else 16755else
16779 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 16756 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16825,7 +16802,7 @@ fi
16825 else 16802 else
16826 { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5 16803 { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
16827$as_echo_n "checking absolute name of <stddef.h>... " >&6; } 16804$as_echo_n "checking absolute name of <stddef.h>... " >&6; }
16828if ${gl_cv_next_stddef_h+:} false; then : 16805if test "${gl_cv_next_stddef_h+set}" = set; then :
16829 $as_echo_n "(cached) " >&6 16806 $as_echo_n "(cached) " >&6
16830else 16807else
16831 16808
@@ -16921,7 +16898,7 @@ $as_echo "$gl_cv_next_stddef_h" >&6; }
16921 else 16898 else
16922 { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5 16899 { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
16923$as_echo_n "checking absolute name of <stdint.h>... " >&6; } 16900$as_echo_n "checking absolute name of <stdint.h>... " >&6; }
16924if ${gl_cv_next_stdint_h+:} false; then : 16901if test "${gl_cv_next_stdint_h+set}" = set; then :
16925 $as_echo_n "(cached) " >&6 16902 $as_echo_n "(cached) " >&6
16926else 16903else
16927 16904
@@ -16977,7 +16954,7 @@ $as_echo "$gl_cv_next_stdint_h" >&6; }
16977 if test $ac_cv_header_stdint_h = yes; then 16954 if test $ac_cv_header_stdint_h = yes; then
16978 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5 16955 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
16979$as_echo_n "checking whether stdint.h conforms to C99... " >&6; } 16956$as_echo_n "checking whether stdint.h conforms to C99... " >&6; }
16980if ${gl_cv_header_working_stdint_h+:} false; then : 16957if test "${gl_cv_header_working_stdint_h+set}" = set; then :
16981 $as_echo_n "(cached) " >&6 16958 $as_echo_n "(cached) " >&6
16982else 16959else
16983 gl_cv_header_working_stdint_h=no 16960 gl_cv_header_working_stdint_h=no
@@ -17250,7 +17227,8 @@ $as_echo "$gl_cv_header_working_stdint_h" >&6; }
17250do : 17227do :
17251 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 17228 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
17252ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 17229ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
17253if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 17230eval as_val=\$$as_ac_Header
17231 if test "x$as_val" = x""yes; then :
17254 cat >>confdefs.h <<_ACEOF 17232 cat >>confdefs.h <<_ACEOF
17255#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 17233#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
17256_ACEOF 17234_ACEOF
@@ -17280,7 +17258,7 @@ done
17280 for gltype in ptrdiff_t size_t ; do 17258 for gltype in ptrdiff_t size_t ; do
17281 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5 17259 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
17282$as_echo_n "checking for bit size of $gltype... " >&6; } 17260$as_echo_n "checking for bit size of $gltype... " >&6; }
17283if eval \${gl_cv_bitsizeof_${gltype}+:} false; then : 17261if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then :
17284 $as_echo_n "(cached) " >&6 17262 $as_echo_n "(cached) " >&6
17285else 17263else
17286 if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result" " 17264 if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result" "
@@ -17325,7 +17303,7 @@ _ACEOF
17325 for gltype in sig_atomic_t wchar_t wint_t ; do 17303 for gltype in sig_atomic_t wchar_t wint_t ; do
17326 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5 17304 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
17327$as_echo_n "checking for bit size of $gltype... " >&6; } 17305$as_echo_n "checking for bit size of $gltype... " >&6; }
17328if eval \${gl_cv_bitsizeof_${gltype}+:} false; then : 17306if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then :
17329 $as_echo_n "(cached) " >&6 17307 $as_echo_n "(cached) " >&6
17330else 17308else
17331 if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result" " 17309 if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result" "
@@ -17369,7 +17347,7 @@ _ACEOF
17369 for gltype in sig_atomic_t wchar_t wint_t ; do 17347 for gltype in sig_atomic_t wchar_t wint_t ; do
17370 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5 17348 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
17371$as_echo_n "checking whether $gltype is signed... " >&6; } 17349$as_echo_n "checking whether $gltype is signed... " >&6; }
17372if eval \${gl_cv_type_${gltype}_signed+:} false; then : 17350if { as_var=gl_cv_type_${gltype}_signed; eval "test \"\${$as_var+set}\" = set"; }; then :
17373 $as_echo_n "(cached) " >&6 17351 $as_echo_n "(cached) " >&6
17374else 17352else
17375 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 17353 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17428,7 +17406,7 @@ _ACEOF
17428 for gltype in ptrdiff_t size_t ; do 17406 for gltype in ptrdiff_t size_t ; do
17429 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5 17407 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
17430$as_echo_n "checking for $gltype integer literal suffix... " >&6; } 17408$as_echo_n "checking for $gltype integer literal suffix... " >&6; }
17431if eval \${gl_cv_type_${gltype}_suffix+:} false; then : 17409if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then :
17432 $as_echo_n "(cached) " >&6 17410 $as_echo_n "(cached) " >&6
17433else 17411else
17434 eval gl_cv_type_${gltype}_suffix=no 17412 eval gl_cv_type_${gltype}_suffix=no
@@ -17500,7 +17478,7 @@ _ACEOF
17500 for gltype in sig_atomic_t wchar_t wint_t ; do 17478 for gltype in sig_atomic_t wchar_t wint_t ; do
17501 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5 17479 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
17502$as_echo_n "checking for $gltype integer literal suffix... " >&6; } 17480$as_echo_n "checking for $gltype integer literal suffix... " >&6; }
17503if eval \${gl_cv_type_${gltype}_suffix+:} false; then : 17481if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then :
17504 $as_echo_n "(cached) " >&6 17482 $as_echo_n "(cached) " >&6
17505else 17483else
17506 eval gl_cv_type_${gltype}_suffix=no 17484 eval gl_cv_type_${gltype}_suffix=no
@@ -17596,7 +17574,7 @@ fi
17596 else 17574 else
17597 { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdio.h>" >&5 17575 { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdio.h>" >&5
17598$as_echo_n "checking absolute name of <stdio.h>... " >&6; } 17576$as_echo_n "checking absolute name of <stdio.h>... " >&6; }
17599if ${gl_cv_next_stdio_h+:} false; then : 17577if test "${gl_cv_next_stdio_h+set}" = set; then :
17600 $as_echo_n "(cached) " >&6 17578 $as_echo_n "(cached) " >&6
17601else 17579else
17602 17580
@@ -17666,7 +17644,7 @@ $as_echo "$gl_cv_next_stdio_h" >&6; }
17666 else 17644 else
17667 { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5 17645 { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
17668$as_echo_n "checking absolute name of <stdlib.h>... " >&6; } 17646$as_echo_n "checking absolute name of <stdlib.h>... " >&6; }
17669if ${gl_cv_next_stdlib_h+:} false; then : 17647if test "${gl_cv_next_stdlib_h+set}" = set; then :
17670 $as_echo_n "(cached) " >&6 17648 $as_echo_n "(cached) " >&6
17671else 17649else
17672 17650
@@ -17754,7 +17732,7 @@ $as_echo "#define my_strftime nstrftime" >>confdefs.h
17754 else 17732 else
17755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether symlink handles trailing slash correctly" >&5 17733 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether symlink handles trailing slash correctly" >&5
17756$as_echo_n "checking whether symlink handles trailing slash correctly... " >&6; } 17734$as_echo_n "checking whether symlink handles trailing slash correctly... " >&6; }
17757if ${gl_cv_func_symlink_works+:} false; then : 17735if test "${gl_cv_func_symlink_works+set}" = set; then :
17758 $as_echo_n "(cached) " >&6 17736 $as_echo_n "(cached) " >&6
17759else 17737else
17760 if test "$cross_compiling" = yes; then : 17738 if test "$cross_compiling" = yes; then :
@@ -17837,7 +17815,7 @@ $as_echo "$gl_cv_func_symlink_works" >&6; }
17837 else 17815 else
17838 { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5 17816 { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5
17839$as_echo_n "checking absolute name of <sys/stat.h>... " >&6; } 17817$as_echo_n "checking absolute name of <sys/stat.h>... " >&6; }
17840if ${gl_cv_next_sys_stat_h+:} false; then : 17818if test "${gl_cv_next_sys_stat_h+set}" = set; then :
17841 $as_echo_n "(cached) " >&6 17819 $as_echo_n "(cached) " >&6
17842else 17820else
17843 17821
@@ -17887,7 +17865,7 @@ $as_echo "$gl_cv_next_sys_stat_h" >&6; }
17887 ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include <sys/types.h> 17865 ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include <sys/types.h>
17888 #include <sys/stat.h> 17866 #include <sys/stat.h>
17889" 17867"
17890if test "x$ac_cv_type_nlink_t" = xyes; then : 17868if test "x$ac_cv_type_nlink_t" = x""yes; then :
17891 17869
17892else 17870else
17893 17871
@@ -17920,7 +17898,7 @@ fi
17920 HAVE_LOCALTIME_R=1 17898 HAVE_LOCALTIME_R=1
17921 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether localtime_r is compatible with its POSIX signature" >&5 17899 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether localtime_r is compatible with its POSIX signature" >&5
17922$as_echo_n "checking whether localtime_r is compatible with its POSIX signature... " >&6; } 17900$as_echo_n "checking whether localtime_r is compatible with its POSIX signature... " >&6; }
17923if ${gl_cv_time_r_posix+:} false; then : 17901if test "${gl_cv_time_r_posix+set}" = set; then :
17924 $as_echo_n "(cached) " >&6 17902 $as_echo_n "(cached) " >&6
17925else 17903else
17926 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 17904 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18002,7 +17980,7 @@ $as_echo "$gl_cv_time_r_posix" >&6; }
18002 else 17980 else
18003 { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <unistd.h>" >&5 17981 { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <unistd.h>" >&5
18004$as_echo_n "checking absolute name of <unistd.h>... " >&6; } 17982$as_echo_n "checking absolute name of <unistd.h>... " >&6; }
18005if ${gl_cv_next_unistd_h+:} false; then : 17983if test "${gl_cv_next_unistd_h+set}" = set; then :
18006 $as_echo_n "(cached) " >&6 17984 $as_echo_n "(cached) " >&6
18007else 17985else
18008 17986
@@ -18102,7 +18080,7 @@ $as_echo "$gl_cv_next_unistd_h" >&6; }
18102for ac_func in grantpt 18080for ac_func in grantpt
18103do : 18081do :
18104 ac_fn_c_check_func "$LINENO" "grantpt" "ac_cv_func_grantpt" 18082 ac_fn_c_check_func "$LINENO" "grantpt" "ac_cv_func_grantpt"
18105if test "x$ac_cv_func_grantpt" = xyes; then : 18083if test "x$ac_cv_func_grantpt" = x""yes; then :
18106 cat >>confdefs.h <<_ACEOF 18084 cat >>confdefs.h <<_ACEOF
18107#define HAVE_GRANTPT 1 18085#define HAVE_GRANTPT 1
18108_ACEOF 18086_ACEOF
@@ -18115,7 +18093,7 @@ done
18115for ac_func in getpt 18093for ac_func in getpt
18116do : 18094do :
18117 ac_fn_c_check_func "$LINENO" "getpt" "ac_cv_func_getpt" 18095 ac_fn_c_check_func "$LINENO" "getpt" "ac_cv_func_getpt"
18118if test "x$ac_cv_func_getpt" = xyes; then : 18096if test "x$ac_cv_func_getpt" = x""yes; then :
18119 cat >>confdefs.h <<_ACEOF 18097 cat >>confdefs.h <<_ACEOF
18120#define HAVE_GETPT 1 18098#define HAVE_GETPT 1
18121_ACEOF 18099_ACEOF
@@ -18132,7 +18110,7 @@ done
18132have_tputs_et_al=true 18110have_tputs_et_al=true
18133{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tputs" >&5 18111{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tputs" >&5
18134$as_echo_n "checking for library containing tputs... " >&6; } 18112$as_echo_n "checking for library containing tputs... " >&6; }
18135if ${ac_cv_search_tputs+:} false; then : 18113if test "${ac_cv_search_tputs+set}" = set; then :
18136 $as_echo_n "(cached) " >&6 18114 $as_echo_n "(cached) " >&6
18137else 18115else
18138 ac_func_search_save_LIBS=$LIBS 18116 ac_func_search_save_LIBS=$LIBS
@@ -18166,11 +18144,11 @@ for ac_lib in '' ncurses terminfo termcap; do
18166fi 18144fi
18167rm -f core conftest.err conftest.$ac_objext \ 18145rm -f core conftest.err conftest.$ac_objext \
18168 conftest$ac_exeext 18146 conftest$ac_exeext
18169 if ${ac_cv_search_tputs+:} false; then : 18147 if test "${ac_cv_search_tputs+set}" = set; then :
18170 break 18148 break
18171fi 18149fi
18172done 18150done
18173if ${ac_cv_search_tputs+:} false; then : 18151if test "${ac_cv_search_tputs+set}" = set; then :
18174 18152
18175else 18153else
18176 ac_cv_search_tputs=no 18154 ac_cv_search_tputs=no
@@ -18189,7 +18167,7 @@ else
18189fi 18167fi
18190 18168
18191if test "$have_tputs_et_al" != true; then 18169if test "$have_tputs_et_al" != true; then
18192 as_fn_error $? "I couldn't find termcap functions (tputs and friends). 18170 as_fn_error "I couldn't find termcap functions (tputs and friends).
18193Maybe some development libraries/packages are missing? Try installing 18171Maybe some development libraries/packages are missing? Try installing
18194libncurses-dev(el), libterminfo-dev(el) or similar." "$LINENO" 5 18172libncurses-dev(el), libterminfo-dev(el) or similar." "$LINENO" 5
18195fi 18173fi
@@ -18229,7 +18207,7 @@ case "$opsys" in
18229 freebsd) 18207 freebsd)
18230 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether FreeBSD is new enough to use terminfo" >&5 18208 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether FreeBSD is new enough to use terminfo" >&5
18231$as_echo_n "checking whether FreeBSD is new enough to use terminfo... " >&6; } 18209$as_echo_n "checking whether FreeBSD is new enough to use terminfo... " >&6; }
18232 if ${emacs_cv_freebsd_terminfo+:} false; then : 18210 if test "${emacs_cv_freebsd_terminfo+set}" = set; then :
18233 $as_echo_n "(cached) " >&6 18211 $as_echo_n "(cached) " >&6
18234else 18212else
18235 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 18213 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18371,16 +18349,16 @@ LIBHESIOD=
18371if test "$with_hesiod" != no ; then 18349if test "$with_hesiod" != no ; then
18372 # Don't set $LIBS here -- see comments above. FIXME which comments? 18350 # Don't set $LIBS here -- see comments above. FIXME which comments?
18373 ac_fn_c_check_func "$LINENO" "res_send" "ac_cv_func_res_send" 18351 ac_fn_c_check_func "$LINENO" "res_send" "ac_cv_func_res_send"
18374if test "x$ac_cv_func_res_send" = xyes; then : 18352if test "x$ac_cv_func_res_send" = x""yes; then :
18375 18353
18376else 18354else
18377 ac_fn_c_check_func "$LINENO" "__res_send" "ac_cv_func___res_send" 18355 ac_fn_c_check_func "$LINENO" "__res_send" "ac_cv_func___res_send"
18378if test "x$ac_cv_func___res_send" = xyes; then : 18356if test "x$ac_cv_func___res_send" = x""yes; then :
18379 18357
18380else 18358else
18381 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_send in -lresolv" >&5 18359 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_send in -lresolv" >&5
18382$as_echo_n "checking for res_send in -lresolv... " >&6; } 18360$as_echo_n "checking for res_send in -lresolv... " >&6; }
18383if ${ac_cv_lib_resolv_res_send+:} false; then : 18361if test "${ac_cv_lib_resolv_res_send+set}" = set; then :
18384 $as_echo_n "(cached) " >&6 18362 $as_echo_n "(cached) " >&6
18385else 18363else
18386 ac_check_lib_save_LIBS=$LIBS 18364 ac_check_lib_save_LIBS=$LIBS
@@ -18414,12 +18392,12 @@ LIBS=$ac_check_lib_save_LIBS
18414fi 18392fi
18415{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_send" >&5 18393{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_send" >&5
18416$as_echo "$ac_cv_lib_resolv_res_send" >&6; } 18394$as_echo "$ac_cv_lib_resolv_res_send" >&6; }
18417if test "x$ac_cv_lib_resolv_res_send" = xyes; then : 18395if test "x$ac_cv_lib_resolv_res_send" = x""yes; then :
18418 resolv=yes 18396 resolv=yes
18419else 18397else
18420 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_send in -lresolv" >&5 18398 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_send in -lresolv" >&5
18421$as_echo_n "checking for __res_send in -lresolv... " >&6; } 18399$as_echo_n "checking for __res_send in -lresolv... " >&6; }
18422if ${ac_cv_lib_resolv___res_send+:} false; then : 18400if test "${ac_cv_lib_resolv___res_send+set}" = set; then :
18423 $as_echo_n "(cached) " >&6 18401 $as_echo_n "(cached) " >&6
18424else 18402else
18425 ac_check_lib_save_LIBS=$LIBS 18403 ac_check_lib_save_LIBS=$LIBS
@@ -18453,7 +18431,7 @@ LIBS=$ac_check_lib_save_LIBS
18453fi 18431fi
18454{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_send" >&5 18432{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_send" >&5
18455$as_echo "$ac_cv_lib_resolv___res_send" >&6; } 18433$as_echo "$ac_cv_lib_resolv___res_send" >&6; }
18456if test "x$ac_cv_lib_resolv___res_send" = xyes; then : 18434if test "x$ac_cv_lib_resolv___res_send" = x""yes; then :
18457 resolv=yes 18435 resolv=yes
18458fi 18436fi
18459 18437
@@ -18469,12 +18447,12 @@ fi
18469 RESOLVLIB= 18447 RESOLVLIB=
18470 fi 18448 fi
18471 ac_fn_c_check_func "$LINENO" "hes_getmailhost" "ac_cv_func_hes_getmailhost" 18449 ac_fn_c_check_func "$LINENO" "hes_getmailhost" "ac_cv_func_hes_getmailhost"
18472if test "x$ac_cv_func_hes_getmailhost" = xyes; then : 18450if test "x$ac_cv_func_hes_getmailhost" = x""yes; then :
18473 18451
18474else 18452else
18475 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hes_getmailhost in -lhesiod" >&5 18453 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hes_getmailhost in -lhesiod" >&5
18476$as_echo_n "checking for hes_getmailhost in -lhesiod... " >&6; } 18454$as_echo_n "checking for hes_getmailhost in -lhesiod... " >&6; }
18477if ${ac_cv_lib_hesiod_hes_getmailhost+:} false; then : 18455if test "${ac_cv_lib_hesiod_hes_getmailhost+set}" = set; then :
18478 $as_echo_n "(cached) " >&6 18456 $as_echo_n "(cached) " >&6
18479else 18457else
18480 ac_check_lib_save_LIBS=$LIBS 18458 ac_check_lib_save_LIBS=$LIBS
@@ -18508,7 +18486,7 @@ LIBS=$ac_check_lib_save_LIBS
18508fi 18486fi
18509{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hesiod_hes_getmailhost" >&5 18487{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hesiod_hes_getmailhost" >&5
18510$as_echo "$ac_cv_lib_hesiod_hes_getmailhost" >&6; } 18488$as_echo "$ac_cv_lib_hesiod_hes_getmailhost" >&6; }
18511if test "x$ac_cv_lib_hesiod_hes_getmailhost" = xyes; then : 18489if test "x$ac_cv_lib_hesiod_hes_getmailhost" = x""yes; then :
18512 hesiod=yes 18490 hesiod=yes
18513else 18491else
18514 : 18492 :
@@ -18547,7 +18525,7 @@ KRB4LIB=
18547if test "${with_kerberos}" != no; then 18525if test "${with_kerberos}" != no; then
18548 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for com_err in -lcom_err" >&5 18526 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for com_err in -lcom_err" >&5
18549$as_echo_n "checking for com_err in -lcom_err... " >&6; } 18527$as_echo_n "checking for com_err in -lcom_err... " >&6; }
18550if ${ac_cv_lib_com_err_com_err+:} false; then : 18528if test "${ac_cv_lib_com_err_com_err+set}" = set; then :
18551 $as_echo_n "(cached) " >&6 18529 $as_echo_n "(cached) " >&6
18552else 18530else
18553 ac_check_lib_save_LIBS=$LIBS 18531 ac_check_lib_save_LIBS=$LIBS
@@ -18581,7 +18559,7 @@ LIBS=$ac_check_lib_save_LIBS
18581fi 18559fi
18582{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_com_err_com_err" >&5 18560{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_com_err_com_err" >&5
18583$as_echo "$ac_cv_lib_com_err_com_err" >&6; } 18561$as_echo "$ac_cv_lib_com_err_com_err" >&6; }
18584if test "x$ac_cv_lib_com_err_com_err" = xyes; then : 18562if test "x$ac_cv_lib_com_err_com_err" = x""yes; then :
18585 have_com_err=yes 18563 have_com_err=yes
18586else 18564else
18587 have_com_err=no 18565 have_com_err=no
@@ -18596,7 +18574,7 @@ $as_echo "#define HAVE_LIBCOM_ERR 1" >>confdefs.h
18596 fi 18574 fi
18597 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mit_des_cbc_encrypt in -lcrypto" >&5 18575 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mit_des_cbc_encrypt in -lcrypto" >&5
18598$as_echo_n "checking for mit_des_cbc_encrypt in -lcrypto... " >&6; } 18576$as_echo_n "checking for mit_des_cbc_encrypt in -lcrypto... " >&6; }
18599if ${ac_cv_lib_crypto_mit_des_cbc_encrypt+:} false; then : 18577if test "${ac_cv_lib_crypto_mit_des_cbc_encrypt+set}" = set; then :
18600 $as_echo_n "(cached) " >&6 18578 $as_echo_n "(cached) " >&6
18601else 18579else
18602 ac_check_lib_save_LIBS=$LIBS 18580 ac_check_lib_save_LIBS=$LIBS
@@ -18630,7 +18608,7 @@ LIBS=$ac_check_lib_save_LIBS
18630fi 18608fi
18631{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_mit_des_cbc_encrypt" >&5 18609{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_mit_des_cbc_encrypt" >&5
18632$as_echo "$ac_cv_lib_crypto_mit_des_cbc_encrypt" >&6; } 18610$as_echo "$ac_cv_lib_crypto_mit_des_cbc_encrypt" >&6; }
18633if test "x$ac_cv_lib_crypto_mit_des_cbc_encrypt" = xyes; then : 18611if test "x$ac_cv_lib_crypto_mit_des_cbc_encrypt" = x""yes; then :
18634 have_crypto=yes 18612 have_crypto=yes
18635else 18613else
18636 have_crypto=no 18614 have_crypto=no
@@ -18645,7 +18623,7 @@ $as_echo "#define HAVE_LIBCRYPTO 1" >>confdefs.h
18645 fi 18623 fi
18646 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mit_des_cbc_encrypt in -lk5crypto" >&5 18624 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mit_des_cbc_encrypt in -lk5crypto" >&5
18647$as_echo_n "checking for mit_des_cbc_encrypt in -lk5crypto... " >&6; } 18625$as_echo_n "checking for mit_des_cbc_encrypt in -lk5crypto... " >&6; }
18648if ${ac_cv_lib_k5crypto_mit_des_cbc_encrypt+:} false; then : 18626if test "${ac_cv_lib_k5crypto_mit_des_cbc_encrypt+set}" = set; then :
18649 $as_echo_n "(cached) " >&6 18627 $as_echo_n "(cached) " >&6
18650else 18628else
18651 ac_check_lib_save_LIBS=$LIBS 18629 ac_check_lib_save_LIBS=$LIBS
@@ -18679,7 +18657,7 @@ LIBS=$ac_check_lib_save_LIBS
18679fi 18657fi
18680{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&5 18658{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&5
18681$as_echo "$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&6; } 18659$as_echo "$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&6; }
18682if test "x$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" = xyes; then : 18660if test "x$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" = x""yes; then :
18683 have_k5crypto=yes 18661 have_k5crypto=yes
18684else 18662else
18685 have_k5crypto=no 18663 have_k5crypto=no
@@ -18694,7 +18672,7 @@ $as_echo "#define HAVE_LIBK5CRYPTO 1" >>confdefs.h
18694 fi 18672 fi
18695 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_init_context in -lkrb5" >&5 18673 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_init_context in -lkrb5" >&5
18696$as_echo_n "checking for krb5_init_context in -lkrb5... " >&6; } 18674$as_echo_n "checking for krb5_init_context in -lkrb5... " >&6; }
18697if ${ac_cv_lib_krb5_krb5_init_context+:} false; then : 18675if test "${ac_cv_lib_krb5_krb5_init_context+set}" = set; then :
18698 $as_echo_n "(cached) " >&6 18676 $as_echo_n "(cached) " >&6
18699else 18677else
18700 ac_check_lib_save_LIBS=$LIBS 18678 ac_check_lib_save_LIBS=$LIBS
@@ -18728,7 +18706,7 @@ LIBS=$ac_check_lib_save_LIBS
18728fi 18706fi
18729{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb5_krb5_init_context" >&5 18707{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb5_krb5_init_context" >&5
18730$as_echo "$ac_cv_lib_krb5_krb5_init_context" >&6; } 18708$as_echo "$ac_cv_lib_krb5_krb5_init_context" >&6; }
18731if test "x$ac_cv_lib_krb5_krb5_init_context" = xyes; then : 18709if test "x$ac_cv_lib_krb5_krb5_init_context" = x""yes; then :
18732 have_krb5=yes 18710 have_krb5=yes
18733else 18711else
18734 have_krb5=no 18712 have_krb5=no
@@ -18744,7 +18722,7 @@ $as_echo "#define HAVE_LIBKRB5 1" >>confdefs.h
18744 if test "${with_kerberos5}" = no; then 18722 if test "${with_kerberos5}" = no; then
18745 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_cbc_encrypt in -ldes425" >&5 18723 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_cbc_encrypt in -ldes425" >&5
18746$as_echo_n "checking for des_cbc_encrypt in -ldes425... " >&6; } 18724$as_echo_n "checking for des_cbc_encrypt in -ldes425... " >&6; }
18747if ${ac_cv_lib_des425_des_cbc_encrypt+:} false; then : 18725if test "${ac_cv_lib_des425_des_cbc_encrypt+set}" = set; then :
18748 $as_echo_n "(cached) " >&6 18726 $as_echo_n "(cached) " >&6
18749else 18727else
18750 ac_check_lib_save_LIBS=$LIBS 18728 ac_check_lib_save_LIBS=$LIBS
@@ -18778,7 +18756,7 @@ LIBS=$ac_check_lib_save_LIBS
18778fi 18756fi
18779{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5 18757{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5
18780$as_echo "$ac_cv_lib_des425_des_cbc_encrypt" >&6; } 18758$as_echo "$ac_cv_lib_des425_des_cbc_encrypt" >&6; }
18781if test "x$ac_cv_lib_des425_des_cbc_encrypt" = xyes; then : 18759if test "x$ac_cv_lib_des425_des_cbc_encrypt" = x""yes; then :
18782 have_des425=yes 18760 have_des425=yes
18783else 18761else
18784 have_des425=no 18762 have_des425=no
@@ -18793,7 +18771,7 @@ $as_echo "#define HAVE_LIBDES425 1" >>confdefs.h
18793 else 18771 else
18794 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_cbc_encrypt in -ldes" >&5 18772 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_cbc_encrypt in -ldes" >&5
18795$as_echo_n "checking for des_cbc_encrypt in -ldes... " >&6; } 18773$as_echo_n "checking for des_cbc_encrypt in -ldes... " >&6; }
18796if ${ac_cv_lib_des_des_cbc_encrypt+:} false; then : 18774if test "${ac_cv_lib_des_des_cbc_encrypt+set}" = set; then :
18797 $as_echo_n "(cached) " >&6 18775 $as_echo_n "(cached) " >&6
18798else 18776else
18799 ac_check_lib_save_LIBS=$LIBS 18777 ac_check_lib_save_LIBS=$LIBS
@@ -18827,7 +18805,7 @@ LIBS=$ac_check_lib_save_LIBS
18827fi 18805fi
18828{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_des_des_cbc_encrypt" >&5 18806{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_des_des_cbc_encrypt" >&5
18829$as_echo "$ac_cv_lib_des_des_cbc_encrypt" >&6; } 18807$as_echo "$ac_cv_lib_des_des_cbc_encrypt" >&6; }
18830if test "x$ac_cv_lib_des_des_cbc_encrypt" = xyes; then : 18808if test "x$ac_cv_lib_des_des_cbc_encrypt" = x""yes; then :
18831 have_des=yes 18809 have_des=yes
18832else 18810else
18833 have_des=no 18811 have_des=no
@@ -18843,7 +18821,7 @@ $as_echo "#define HAVE_LIBDES 1" >>confdefs.h
18843 fi 18821 fi
18844 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_get_cred in -lkrb4" >&5 18822 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_get_cred in -lkrb4" >&5
18845$as_echo_n "checking for krb_get_cred in -lkrb4... " >&6; } 18823$as_echo_n "checking for krb_get_cred in -lkrb4... " >&6; }
18846if ${ac_cv_lib_krb4_krb_get_cred+:} false; then : 18824if test "${ac_cv_lib_krb4_krb_get_cred+set}" = set; then :
18847 $as_echo_n "(cached) " >&6 18825 $as_echo_n "(cached) " >&6
18848else 18826else
18849 ac_check_lib_save_LIBS=$LIBS 18827 ac_check_lib_save_LIBS=$LIBS
@@ -18877,7 +18855,7 @@ LIBS=$ac_check_lib_save_LIBS
18877fi 18855fi
18878{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb4_krb_get_cred" >&5 18856{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb4_krb_get_cred" >&5
18879$as_echo "$ac_cv_lib_krb4_krb_get_cred" >&6; } 18857$as_echo "$ac_cv_lib_krb4_krb_get_cred" >&6; }
18880if test "x$ac_cv_lib_krb4_krb_get_cred" = xyes; then : 18858if test "x$ac_cv_lib_krb4_krb_get_cred" = x""yes; then :
18881 have_krb4=yes 18859 have_krb4=yes
18882else 18860else
18883 have_krb4=no 18861 have_krb4=no
@@ -18892,7 +18870,7 @@ $as_echo "#define HAVE_LIBKRB4 1" >>confdefs.h
18892 else 18870 else
18893 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_get_cred in -lkrb" >&5 18871 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_get_cred in -lkrb" >&5
18894$as_echo_n "checking for krb_get_cred in -lkrb... " >&6; } 18872$as_echo_n "checking for krb_get_cred in -lkrb... " >&6; }
18895if ${ac_cv_lib_krb_krb_get_cred+:} false; then : 18873if test "${ac_cv_lib_krb_krb_get_cred+set}" = set; then :
18896 $as_echo_n "(cached) " >&6 18874 $as_echo_n "(cached) " >&6
18897else 18875else
18898 ac_check_lib_save_LIBS=$LIBS 18876 ac_check_lib_save_LIBS=$LIBS
@@ -18926,7 +18904,7 @@ LIBS=$ac_check_lib_save_LIBS
18926fi 18904fi
18927{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb_krb_get_cred" >&5 18905{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb_krb_get_cred" >&5
18928$as_echo "$ac_cv_lib_krb_krb_get_cred" >&6; } 18906$as_echo "$ac_cv_lib_krb_krb_get_cred" >&6; }
18929if test "x$ac_cv_lib_krb_krb_get_cred" = xyes; then : 18907if test "x$ac_cv_lib_krb_krb_get_cred" = x""yes; then :
18930 have_krb=yes 18908 have_krb=yes
18931else 18909else
18932 have_krb=no 18910 have_krb=no
@@ -18946,13 +18924,13 @@ $as_echo "#define HAVE_LIBKRB 1" >>confdefs.h
18946 for ac_header in krb5.h 18924 for ac_header in krb5.h
18947do : 18925do :
18948 ac_fn_c_check_header_mongrel "$LINENO" "krb5.h" "ac_cv_header_krb5_h" "$ac_includes_default" 18926 ac_fn_c_check_header_mongrel "$LINENO" "krb5.h" "ac_cv_header_krb5_h" "$ac_includes_default"
18949if test "x$ac_cv_header_krb5_h" = xyes; then : 18927if test "x$ac_cv_header_krb5_h" = x""yes; then :
18950 cat >>confdefs.h <<_ACEOF 18928 cat >>confdefs.h <<_ACEOF
18951#define HAVE_KRB5_H 1 18929#define HAVE_KRB5_H 1
18952_ACEOF 18930_ACEOF
18953 ac_fn_c_check_member "$LINENO" "krb5_error" "text" "ac_cv_member_krb5_error_text" "#include <krb5.h> 18931 ac_fn_c_check_member "$LINENO" "krb5_error" "text" "ac_cv_member_krb5_error_text" "#include <krb5.h>
18954" 18932"
18955if test "x$ac_cv_member_krb5_error_text" = xyes; then : 18933if test "x$ac_cv_member_krb5_error_text" = x""yes; then :
18956 18934
18957cat >>confdefs.h <<_ACEOF 18935cat >>confdefs.h <<_ACEOF
18958#define HAVE_KRB5_ERROR_TEXT 1 18936#define HAVE_KRB5_ERROR_TEXT 1
@@ -18962,7 +18940,7 @@ _ACEOF
18962fi 18940fi
18963ac_fn_c_check_member "$LINENO" "krb5_error" "e_text" "ac_cv_member_krb5_error_e_text" "#include <krb5.h> 18941ac_fn_c_check_member "$LINENO" "krb5_error" "e_text" "ac_cv_member_krb5_error_e_text" "#include <krb5.h>
18964" 18942"
18965if test "x$ac_cv_member_krb5_error_e_text" = xyes; then : 18943if test "x$ac_cv_member_krb5_error_e_text" = x""yes; then :
18966 18944
18967cat >>confdefs.h <<_ACEOF 18945cat >>confdefs.h <<_ACEOF
18968#define HAVE_KRB5_ERROR_E_TEXT 1 18946#define HAVE_KRB5_ERROR_E_TEXT 1
@@ -18979,7 +18957,7 @@ done
18979 for ac_header in des.h 18957 for ac_header in des.h
18980do : 18958do :
18981 ac_fn_c_check_header_mongrel "$LINENO" "des.h" "ac_cv_header_des_h" "$ac_includes_default" 18959 ac_fn_c_check_header_mongrel "$LINENO" "des.h" "ac_cv_header_des_h" "$ac_includes_default"
18982if test "x$ac_cv_header_des_h" = xyes; then : 18960if test "x$ac_cv_header_des_h" = x""yes; then :
18983 cat >>confdefs.h <<_ACEOF 18961 cat >>confdefs.h <<_ACEOF
18984#define HAVE_DES_H 1 18962#define HAVE_DES_H 1
18985_ACEOF 18963_ACEOF
@@ -18988,7 +18966,7 @@ else
18988 for ac_header in kerberosIV/des.h 18966 for ac_header in kerberosIV/des.h
18989do : 18967do :
18990 ac_fn_c_check_header_mongrel "$LINENO" "kerberosIV/des.h" "ac_cv_header_kerberosIV_des_h" "$ac_includes_default" 18968 ac_fn_c_check_header_mongrel "$LINENO" "kerberosIV/des.h" "ac_cv_header_kerberosIV_des_h" "$ac_includes_default"
18991if test "x$ac_cv_header_kerberosIV_des_h" = xyes; then : 18969if test "x$ac_cv_header_kerberosIV_des_h" = x""yes; then :
18992 cat >>confdefs.h <<_ACEOF 18970 cat >>confdefs.h <<_ACEOF
18993#define HAVE_KERBEROSIV_DES_H 1 18971#define HAVE_KERBEROSIV_DES_H 1
18994_ACEOF 18972_ACEOF
@@ -18997,7 +18975,7 @@ else
18997 for ac_header in kerberos/des.h 18975 for ac_header in kerberos/des.h
18998do : 18976do :
18999 ac_fn_c_check_header_mongrel "$LINENO" "kerberos/des.h" "ac_cv_header_kerberos_des_h" "$ac_includes_default" 18977 ac_fn_c_check_header_mongrel "$LINENO" "kerberos/des.h" "ac_cv_header_kerberos_des_h" "$ac_includes_default"
19000if test "x$ac_cv_header_kerberos_des_h" = xyes; then : 18978if test "x$ac_cv_header_kerberos_des_h" = x""yes; then :
19001 cat >>confdefs.h <<_ACEOF 18979 cat >>confdefs.h <<_ACEOF
19002#define HAVE_KERBEROS_DES_H 1 18980#define HAVE_KERBEROS_DES_H 1
19003_ACEOF 18981_ACEOF
@@ -19017,7 +18995,7 @@ done
19017 for ac_header in krb.h 18995 for ac_header in krb.h
19018do : 18996do :
19019 ac_fn_c_check_header_mongrel "$LINENO" "krb.h" "ac_cv_header_krb_h" "$ac_includes_default" 18997 ac_fn_c_check_header_mongrel "$LINENO" "krb.h" "ac_cv_header_krb_h" "$ac_includes_default"
19020if test "x$ac_cv_header_krb_h" = xyes; then : 18998if test "x$ac_cv_header_krb_h" = x""yes; then :
19021 cat >>confdefs.h <<_ACEOF 18999 cat >>confdefs.h <<_ACEOF
19022#define HAVE_KRB_H 1 19000#define HAVE_KRB_H 1
19023_ACEOF 19001_ACEOF
@@ -19026,7 +19004,7 @@ else
19026 for ac_header in kerberosIV/krb.h 19004 for ac_header in kerberosIV/krb.h
19027do : 19005do :
19028 ac_fn_c_check_header_mongrel "$LINENO" "kerberosIV/krb.h" "ac_cv_header_kerberosIV_krb_h" "$ac_includes_default" 19006 ac_fn_c_check_header_mongrel "$LINENO" "kerberosIV/krb.h" "ac_cv_header_kerberosIV_krb_h" "$ac_includes_default"
19029if test "x$ac_cv_header_kerberosIV_krb_h" = xyes; then : 19007if test "x$ac_cv_header_kerberosIV_krb_h" = x""yes; then :
19030 cat >>confdefs.h <<_ACEOF 19008 cat >>confdefs.h <<_ACEOF
19031#define HAVE_KERBEROSIV_KRB_H 1 19009#define HAVE_KERBEROSIV_KRB_H 1
19032_ACEOF 19010_ACEOF
@@ -19035,7 +19013,7 @@ else
19035 for ac_header in kerberos/krb.h 19013 for ac_header in kerberos/krb.h
19036do : 19014do :
19037 ac_fn_c_check_header_mongrel "$LINENO" "kerberos/krb.h" "ac_cv_header_kerberos_krb_h" "$ac_includes_default" 19015 ac_fn_c_check_header_mongrel "$LINENO" "kerberos/krb.h" "ac_cv_header_kerberos_krb_h" "$ac_includes_default"
19038if test "x$ac_cv_header_kerberos_krb_h" = xyes; then : 19016if test "x$ac_cv_header_kerberos_krb_h" = x""yes; then :
19039 cat >>confdefs.h <<_ACEOF 19017 cat >>confdefs.h <<_ACEOF
19040#define HAVE_KERBEROS_KRB_H 1 19018#define HAVE_KERBEROS_KRB_H 1
19041_ACEOF 19019_ACEOF
@@ -19056,7 +19034,7 @@ done
19056 for ac_header in com_err.h 19034 for ac_header in com_err.h
19057do : 19035do :
19058 ac_fn_c_check_header_mongrel "$LINENO" "com_err.h" "ac_cv_header_com_err_h" "$ac_includes_default" 19036 ac_fn_c_check_header_mongrel "$LINENO" "com_err.h" "ac_cv_header_com_err_h" "$ac_includes_default"
19059if test "x$ac_cv_header_com_err_h" = xyes; then : 19037if test "x$ac_cv_header_com_err_h" = x""yes; then :
19060 cat >>confdefs.h <<_ACEOF 19038 cat >>confdefs.h <<_ACEOF
19061#define HAVE_COM_ERR_H 1 19039#define HAVE_COM_ERR_H 1
19062_ACEOF 19040_ACEOF
@@ -19077,7 +19055,7 @@ fi
19077# to return localized messages. 19055# to return localized messages.
19078{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 19056{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
19079$as_echo_n "checking for dgettext in -lintl... " >&6; } 19057$as_echo_n "checking for dgettext in -lintl... " >&6; }
19080if ${ac_cv_lib_intl_dgettext+:} false; then : 19058if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
19081 $as_echo_n "(cached) " >&6 19059 $as_echo_n "(cached) " >&6
19082else 19060else
19083 ac_check_lib_save_LIBS=$LIBS 19061 ac_check_lib_save_LIBS=$LIBS
@@ -19111,7 +19089,7 @@ LIBS=$ac_check_lib_save_LIBS
19111fi 19089fi
19112{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 19090{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
19113$as_echo "$ac_cv_lib_intl_dgettext" >&6; } 19091$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
19114if test "x$ac_cv_lib_intl_dgettext" = xyes; then : 19092if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
19115 cat >>confdefs.h <<_ACEOF 19093 cat >>confdefs.h <<_ACEOF
19116#define HAVE_LIBINTL 1 19094#define HAVE_LIBINTL 1
19117_ACEOF 19095_ACEOF
@@ -19123,7 +19101,7 @@ fi
19123 19101
19124{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether localtime caches TZ" >&5 19102{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether localtime caches TZ" >&5
19125$as_echo_n "checking whether localtime caches TZ... " >&6; } 19103$as_echo_n "checking whether localtime caches TZ... " >&6; }
19126if ${emacs_cv_localtime_cache+:} false; then : 19104if test "${emacs_cv_localtime_cache+set}" = set; then :
19127 $as_echo_n "(cached) " >&6 19105 $as_echo_n "(cached) " >&6
19128else 19106else
19129 if test x$ac_cv_func_tzset = xyes; then 19107 if test x$ac_cv_func_tzset = xyes; then
@@ -19182,7 +19160,7 @@ if test "x$HAVE_TIMEVAL" = xyes; then
19182 for ac_func in gettimeofday 19160 for ac_func in gettimeofday
19183do : 19161do :
19184 ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" 19162 ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
19185if test "x$ac_cv_func_gettimeofday" = xyes; then : 19163if test "x$ac_cv_func_gettimeofday" = x""yes; then :
19186 cat >>confdefs.h <<_ACEOF 19164 cat >>confdefs.h <<_ACEOF
19187#define HAVE_GETTIMEOFDAY 1 19165#define HAVE_GETTIMEOFDAY 1
19188_ACEOF 19166_ACEOF
@@ -19193,7 +19171,7 @@ done
19193 if test $ac_cv_func_gettimeofday = yes; then 19171 if test $ac_cv_func_gettimeofday = yes; then
19194 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday can accept two arguments" >&5 19172 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday can accept two arguments" >&5
19195$as_echo_n "checking whether gettimeofday can accept two arguments... " >&6; } 19173$as_echo_n "checking whether gettimeofday can accept two arguments... " >&6; }
19196if ${emacs_cv_gettimeofday_two_arguments+:} false; then : 19174if test "${emacs_cv_gettimeofday_two_arguments+set}" = set; then :
19197 $as_echo_n "(cached) " >&6 19175 $as_echo_n "(cached) " >&6
19198else 19176else
19199 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 19177 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -19237,7 +19215,7 @@ fi
19237 19215
19238ok_so_far=yes 19216ok_so_far=yes
19239ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket" 19217ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
19240if test "x$ac_cv_func_socket" = xyes; then : 19218if test "x$ac_cv_func_socket" = x""yes; then :
19241 19219
19242else 19220else
19243 ok_so_far=no 19221 ok_so_far=no
@@ -19245,7 +19223,7 @@ fi
19245 19223
19246if test $ok_so_far = yes; then 19224if test $ok_so_far = yes; then
19247 ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default" 19225 ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default"
19248if test "x$ac_cv_header_netinet_in_h" = xyes; then : 19226if test "x$ac_cv_header_netinet_in_h" = x""yes; then :
19249 19227
19250else 19228else
19251 ok_so_far=no 19229 ok_so_far=no
@@ -19255,7 +19233,7 @@ fi
19255fi 19233fi
19256if test $ok_so_far = yes; then 19234if test $ok_so_far = yes; then
19257 ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default" 19235 ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default"
19258if test "x$ac_cv_header_arpa_inet_h" = xyes; then : 19236if test "x$ac_cv_header_arpa_inet_h" = x""yes; then :
19259 19237
19260else 19238else
19261 ok_so_far=no 19239 ok_so_far=no
@@ -19289,7 +19267,7 @@ $as_echo "no" >&6; }
19289fi 19267fi
19290 19268
19291ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" 19269ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
19292if test "x$ac_cv_type_pid_t" = xyes; then : 19270if test "x$ac_cv_type_pid_t" = x""yes; then :
19293 19271
19294else 19272else
19295 19273
@@ -19302,7 +19280,7 @@ fi
19302for ac_header in vfork.h 19280for ac_header in vfork.h
19303do : 19281do :
19304 ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default" 19282 ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
19305if test "x$ac_cv_header_vfork_h" = xyes; then : 19283if test "x$ac_cv_header_vfork_h" = x""yes; then :
19306 cat >>confdefs.h <<_ACEOF 19284 cat >>confdefs.h <<_ACEOF
19307#define HAVE_VFORK_H 1 19285#define HAVE_VFORK_H 1
19308_ACEOF 19286_ACEOF
@@ -19315,7 +19293,8 @@ for ac_func in fork vfork
19315do : 19293do :
19316 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 19294 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
19317ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 19295ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
19318if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 19296eval as_val=\$$as_ac_var
19297 if test "x$as_val" = x""yes; then :
19319 cat >>confdefs.h <<_ACEOF 19298 cat >>confdefs.h <<_ACEOF
19320#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 19299#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
19321_ACEOF 19300_ACEOF
@@ -19326,7 +19305,7 @@ done
19326if test "x$ac_cv_func_fork" = xyes; then 19305if test "x$ac_cv_func_fork" = xyes; then
19327 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5 19306 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
19328$as_echo_n "checking for working fork... " >&6; } 19307$as_echo_n "checking for working fork... " >&6; }
19329if ${ac_cv_func_fork_works+:} false; then : 19308if test "${ac_cv_func_fork_works+set}" = set; then :
19330 $as_echo_n "(cached) " >&6 19309 $as_echo_n "(cached) " >&6
19331else 19310else
19332 if test "$cross_compiling" = yes; then : 19311 if test "$cross_compiling" = yes; then :
@@ -19379,7 +19358,7 @@ ac_cv_func_vfork_works=$ac_cv_func_vfork
19379if test "x$ac_cv_func_vfork" = xyes; then 19358if test "x$ac_cv_func_vfork" = xyes; then
19380 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5 19359 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
19381$as_echo_n "checking for working vfork... " >&6; } 19360$as_echo_n "checking for working vfork... " >&6; }
19382if ${ac_cv_func_vfork_works+:} false; then : 19361if test "${ac_cv_func_vfork_works+set}" = set; then :
19383 $as_echo_n "(cached) " >&6 19362 $as_echo_n "(cached) " >&6
19384else 19363else
19385 if test "$cross_compiling" = yes; then : 19364 if test "$cross_compiling" = yes; then :
@@ -19515,7 +19494,7 @@ fi
19515 19494
19516{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 19495{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
19517$as_echo_n "checking for nl_langinfo and CODESET... " >&6; } 19496$as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
19518if ${emacs_cv_langinfo_codeset+:} false; then : 19497if test "${emacs_cv_langinfo_codeset+set}" = set; then :
19519 $as_echo_n "(cached) " >&6 19498 $as_echo_n "(cached) " >&6
19520else 19499else
19521 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 19500 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -19547,7 +19526,7 @@ $as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
19547fi 19526fi
19548 19527
19549ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" 19528ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
19550if test "x$ac_cv_type_size_t" = xyes; then : 19529if test "x$ac_cv_type_size_t" = x""yes; then :
19551 19530
19552cat >>confdefs.h <<_ACEOF 19531cat >>confdefs.h <<_ACEOF
19553#define HAVE_SIZE_T 1 19532#define HAVE_SIZE_T 1
@@ -19559,7 +19538,7 @@ fi
19559 19538
19560{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5 19539{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
19561$as_echo_n "checking for mbstate_t... " >&6; } 19540$as_echo_n "checking for mbstate_t... " >&6; }
19562if ${ac_cv_type_mbstate_t+:} false; then : 19541if test "${ac_cv_type_mbstate_t+set}" = set; then :
19563 $as_echo_n "(cached) " >&6 19542 $as_echo_n "(cached) " >&6
19564else 19543else
19565 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 19544 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -19595,7 +19574,7 @@ $as_echo "#define mbstate_t int" >>confdefs.h
19595 19574
19596{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C restricted array declarations" >&5 19575{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C restricted array declarations" >&5
19597$as_echo_n "checking for C restricted array declarations... " >&6; } 19576$as_echo_n "checking for C restricted array declarations... " >&6; }
19598if ${emacs_cv_c_restrict_arr+:} false; then : 19577if test "${emacs_cv_c_restrict_arr+set}" = set; then :
19599 $as_echo_n "(cached) " >&6 19578 $as_echo_n "(cached) " >&6
19600else 19579else
19601 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 19580 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -19635,7 +19614,7 @@ if test "x$GCC" = xyes \
19635 && test x"`$CC --version 2> /dev/null | grep 'gcc.* 4.5.0'`" != x \ 19614 && test x"`$CC --version 2> /dev/null | grep 'gcc.* 4.5.0'`" != x \
19636 && test x"`echo $CFLAGS | grep '\-O[23]'`" != x \ 19615 && test x"`echo $CFLAGS | grep '\-O[23]'`" != x \
19637 && test x"`echo $CFLAGS | grep '\-fno-optimize-sibling-calls'`" = x; then 19616 && test x"`echo $CFLAGS | grep '\-fno-optimize-sibling-calls'`" = x; then
19638 as_fn_error $? "GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'." "$LINENO" 5 19617 as_fn_error "GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'." "$LINENO" 5
19639fi 19618fi
19640 19619
19641version=$PACKAGE_VERSION 19620version=$PACKAGE_VERSION
@@ -20192,21 +20171,10 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
20192 :end' >>confcache 20171 :end' >>confcache
20193if diff "$cache_file" confcache >/dev/null 2>&1; then :; else 20172if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
20194 if test -w "$cache_file"; then 20173 if test -w "$cache_file"; then
20195 if test "x$cache_file" != "x/dev/null"; then 20174 test "x$cache_file" != "x/dev/null" &&
20196 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 20175 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
20197$as_echo "$as_me: updating cache $cache_file" >&6;} 20176$as_echo "$as_me: updating cache $cache_file" >&6;}
20198 if test ! -f "$cache_file" || test -h "$cache_file"; then 20177 cat confcache >$cache_file
20199 cat confcache >"$cache_file"
20200 else
20201 case $cache_file in #(
20202 */* | ?:*)
20203 mv -f confcache "$cache_file"$$ &&
20204 mv -f "$cache_file"$$ "$cache_file" ;; #(
20205 *)
20206 mv -f confcache "$cache_file" ;;
20207 esac
20208 fi
20209 fi
20210 else 20178 else
20211 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 20179 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
20212$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} 20180$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -20222,7 +20190,6 @@ DEFS=-DHAVE_CONFIG_H
20222 20190
20223ac_libobjs= 20191ac_libobjs=
20224ac_ltlibobjs= 20192ac_ltlibobjs=
20225U=
20226for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue 20193for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
20227 # 1. Remove the extension, and $U if already installed. 20194 # 1. Remove the extension, and $U if already installed.
20228 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' 20195 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -20246,29 +20213,29 @@ else
20246fi 20213fi
20247 20214
20248if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then 20215if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
20249 as_fn_error $? "conditional \"AMDEP\" was never defined. 20216 as_fn_error "conditional \"AMDEP\" was never defined.
20250Usually this means the macro was only invoked conditionally." "$LINENO" 5 20217Usually this means the macro was only invoked conditionally." "$LINENO" 5
20251fi 20218fi
20252if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then 20219if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
20253 as_fn_error $? "conditional \"am__fastdepCC\" was never defined. 20220 as_fn_error "conditional \"am__fastdepCC\" was never defined.
20254Usually this means the macro was only invoked conditionally." "$LINENO" 5 20221Usually this means the macro was only invoked conditionally." "$LINENO" 5
20255fi 20222fi
20256 20223
20257if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then 20224if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then
20258 as_fn_error $? "conditional \"GL_COND_LIBTOOL\" was never defined. 20225 as_fn_error "conditional \"GL_COND_LIBTOOL\" was never defined.
20259Usually this means the macro was only invoked conditionally." "$LINENO" 5 20226Usually this means the macro was only invoked conditionally." "$LINENO" 5
20260fi 20227fi
20261 20228
20262if test -z "${GL_GENERATE_STDBOOL_H_TRUE}" && test -z "${GL_GENERATE_STDBOOL_H_FALSE}"; then 20229if test -z "${GL_GENERATE_STDBOOL_H_TRUE}" && test -z "${GL_GENERATE_STDBOOL_H_FALSE}"; then
20263 as_fn_error $? "conditional \"GL_GENERATE_STDBOOL_H\" was never defined. 20230 as_fn_error "conditional \"GL_GENERATE_STDBOOL_H\" was never defined.
20264Usually this means the macro was only invoked conditionally." "$LINENO" 5 20231Usually this means the macro was only invoked conditionally." "$LINENO" 5
20265fi 20232fi
20266if test -z "${GL_GENERATE_STDDEF_H_TRUE}" && test -z "${GL_GENERATE_STDDEF_H_FALSE}"; then 20233if test -z "${GL_GENERATE_STDDEF_H_TRUE}" && test -z "${GL_GENERATE_STDDEF_H_FALSE}"; then
20267 as_fn_error $? "conditional \"GL_GENERATE_STDDEF_H\" was never defined. 20234 as_fn_error "conditional \"GL_GENERATE_STDDEF_H\" was never defined.
20268Usually this means the macro was only invoked conditionally." "$LINENO" 5 20235Usually this means the macro was only invoked conditionally." "$LINENO" 5
20269fi 20236fi
20270if test -z "${GL_GENERATE_STDINT_H_TRUE}" && test -z "${GL_GENERATE_STDINT_H_FALSE}"; then 20237if test -z "${GL_GENERATE_STDINT_H_TRUE}" && test -z "${GL_GENERATE_STDINT_H_FALSE}"; then
20271 as_fn_error $? "conditional \"GL_GENERATE_STDINT_H\" was never defined. 20238 as_fn_error "conditional \"GL_GENERATE_STDINT_H\" was never defined.
20272Usually this means the macro was only invoked conditionally." "$LINENO" 5 20239Usually this means the macro was only invoked conditionally." "$LINENO" 5
20273fi 20240fi
20274 20241
@@ -20304,7 +20271,7 @@ fi
20304 20271
20305 20272
20306 20273
20307: "${CONFIG_STATUS=./config.status}" 20274: ${CONFIG_STATUS=./config.status}
20308ac_write_fail=0 20275ac_write_fail=0
20309ac_clean_files_save=$ac_clean_files 20276ac_clean_files_save=$ac_clean_files
20310ac_clean_files="$ac_clean_files $CONFIG_STATUS" 20277ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -20405,7 +20372,6 @@ fi
20405IFS=" "" $as_nl" 20372IFS=" "" $as_nl"
20406 20373
20407# Find who we are. Look in the path if we contain no directory separator. 20374# Find who we are. Look in the path if we contain no directory separator.
20408as_myself=
20409case $0 in #(( 20375case $0 in #((
20410 *[\\/]* ) as_myself=$0 ;; 20376 *[\\/]* ) as_myself=$0 ;;
20411 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 20377 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -20451,19 +20417,19 @@ export LANGUAGE
20451(unset CDPATH) >/dev/null 2>&1 && unset CDPATH 20417(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
20452 20418
20453 20419
20454# as_fn_error STATUS ERROR [LINENO LOG_FD] 20420# as_fn_error ERROR [LINENO LOG_FD]
20455# ---------------------------------------- 20421# ---------------------------------
20456# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 20422# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
20457# provided, also output the error to LOG_FD, referencing LINENO. Then exit the 20423# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
20458# script with STATUS, using 1 if that was 0. 20424# script with status $?, using 1 if that was 0.
20459as_fn_error () 20425as_fn_error ()
20460{ 20426{
20461 as_status=$1; test $as_status -eq 0 && as_status=1 20427 as_status=$?; test $as_status -eq 0 && as_status=1
20462 if test "$4"; then 20428 if test "$3"; then
20463 as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 20429 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
20464 $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 20430 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
20465 fi 20431 fi
20466 $as_echo "$as_me: error: $2" >&2 20432 $as_echo "$as_me: error: $1" >&2
20467 as_fn_exit $as_status 20433 as_fn_exit $as_status
20468} # as_fn_error 20434} # as_fn_error
20469 20435
@@ -20659,7 +20625,7 @@ $as_echo X"$as_dir" |
20659 test -d "$as_dir" && break 20625 test -d "$as_dir" && break
20660 done 20626 done
20661 test -z "$as_dirs" || eval "mkdir $as_dirs" 20627 test -z "$as_dirs" || eval "mkdir $as_dirs"
20662 } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" 20628 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
20663 20629
20664 20630
20665} # as_fn_mkdir_p 20631} # as_fn_mkdir_p
@@ -20713,7 +20679,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
20713# values after options handling. 20679# values after options handling.
20714ac_log=" 20680ac_log="
20715This file was extended by emacs $as_me 24.0.50, which was 20681This file was extended by emacs $as_me 24.0.50, which was
20716generated by GNU Autoconf 2.68. Invocation command line was 20682generated by GNU Autoconf 2.65. Invocation command line was
20717 20683
20718 CONFIG_FILES = $CONFIG_FILES 20684 CONFIG_FILES = $CONFIG_FILES
20719 CONFIG_HEADERS = $CONFIG_HEADERS 20685 CONFIG_HEADERS = $CONFIG_HEADERS
@@ -20779,10 +20745,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
20779ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 20745ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
20780ac_cs_version="\\ 20746ac_cs_version="\\
20781emacs config.status 24.0.50 20747emacs config.status 24.0.50
20782configured by $0, generated by GNU Autoconf 2.68, 20748configured by $0, generated by GNU Autoconf 2.65,
20783 with options \\"\$ac_cs_config\\" 20749 with options \\"\$ac_cs_config\\"
20784 20750
20785Copyright (C) 2010 Free Software Foundation, Inc. 20751Copyright (C) 2009 Free Software Foundation, Inc.
20786This config.status script is free software; the Free Software Foundation 20752This config.status script is free software; the Free Software Foundation
20787gives unlimited permission to copy, distribute and modify it." 20753gives unlimited permission to copy, distribute and modify it."
20788 20754
@@ -20800,16 +20766,11 @@ ac_need_defaults=:
20800while test $# != 0 20766while test $# != 0
20801do 20767do
20802 case $1 in 20768 case $1 in
20803 --*=?*) 20769 --*=*)
20804 ac_option=`expr "X$1" : 'X\([^=]*\)='` 20770 ac_option=`expr "X$1" : 'X\([^=]*\)='`
20805 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` 20771 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
20806 ac_shift=: 20772 ac_shift=:
20807 ;; 20773 ;;
20808 --*=)
20809 ac_option=`expr "X$1" : 'X\([^=]*\)='`
20810 ac_optarg=
20811 ac_shift=:
20812 ;;
20813 *) 20774 *)
20814 ac_option=$1 20775 ac_option=$1
20815 ac_optarg=$2 20776 ac_optarg=$2
@@ -20831,7 +20792,6 @@ do
20831 $ac_shift 20792 $ac_shift
20832 case $ac_optarg in 20793 case $ac_optarg in
20833 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; 20794 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
20834 '') as_fn_error $? "missing file argument" ;;
20835 esac 20795 esac
20836 as_fn_append CONFIG_FILES " '$ac_optarg'" 20796 as_fn_append CONFIG_FILES " '$ac_optarg'"
20837 ac_need_defaults=false;; 20797 ac_need_defaults=false;;
@@ -20844,7 +20804,7 @@ do
20844 ac_need_defaults=false;; 20804 ac_need_defaults=false;;
20845 --he | --h) 20805 --he | --h)
20846 # Conflict between --help and --header 20806 # Conflict between --help and --header
20847 as_fn_error $? "ambiguous option: \`$1' 20807 as_fn_error "ambiguous option: \`$1'
20848Try \`$0 --help' for more information.";; 20808Try \`$0 --help' for more information.";;
20849 --help | --hel | -h ) 20809 --help | --hel | -h )
20850 $as_echo "$ac_cs_usage"; exit ;; 20810 $as_echo "$ac_cs_usage"; exit ;;
@@ -20853,7 +20813,7 @@ Try \`$0 --help' for more information.";;
20853 ac_cs_silent=: ;; 20813 ac_cs_silent=: ;;
20854 20814
20855 # This is an error. 20815 # This is an error.
20856 -*) as_fn_error $? "unrecognized option: \`$1' 20816 -*) as_fn_error "unrecognized option: \`$1'
20857Try \`$0 --help' for more information." ;; 20817Try \`$0 --help' for more information." ;;
20858 20818
20859 *) as_fn_append ac_config_targets " $1" 20819 *) as_fn_append ac_config_targets " $1"
@@ -20927,7 +20887,7 @@ do
20927 "epaths") CONFIG_COMMANDS="$CONFIG_COMMANDS epaths" ;; 20887 "epaths") CONFIG_COMMANDS="$CONFIG_COMMANDS epaths" ;;
20928 "gdbinit") CONFIG_COMMANDS="$CONFIG_COMMANDS gdbinit" ;; 20888 "gdbinit") CONFIG_COMMANDS="$CONFIG_COMMANDS gdbinit" ;;
20929 20889
20930 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 20890 *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
20931 esac 20891 esac
20932done 20892done
20933 20893
@@ -20950,10 +20910,9 @@ fi
20950# after its creation but before its name has been assigned to `$tmp'. 20910# after its creation but before its name has been assigned to `$tmp'.
20951$debug || 20911$debug ||
20952{ 20912{
20953 tmp= ac_tmp= 20913 tmp=
20954 trap 'exit_status=$? 20914 trap 'exit_status=$?
20955 : "${ac_tmp:=$tmp}" 20915 { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
20956 { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
20957' 0 20916' 0
20958 trap 'as_fn_exit 1' 1 2 13 15 20917 trap 'as_fn_exit 1' 1 2 13 15
20959} 20918}
@@ -20961,13 +20920,12 @@ $debug ||
20961 20920
20962{ 20921{
20963 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && 20922 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
20964 test -d "$tmp" 20923 test -n "$tmp" && test -d "$tmp"
20965} || 20924} ||
20966{ 20925{
20967 tmp=./conf$$-$RANDOM 20926 tmp=./conf$$-$RANDOM
20968 (umask 077 && mkdir "$tmp") 20927 (umask 077 && mkdir "$tmp")
20969} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 20928} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
20970ac_tmp=$tmp
20971 20929
20972# Set up the scripts for CONFIG_FILES section. 20930# Set up the scripts for CONFIG_FILES section.
20973# No need to generate them if there are no CONFIG_FILES. 20931# No need to generate them if there are no CONFIG_FILES.
@@ -21001,24 +20959,24 @@ if test "x$ac_cr" = x; then
21001fi 20959fi
21002ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` 20960ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
21003if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then 20961if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
21004 ac_cs_awk_cr='\\r' 20962 ac_cs_awk_cr='\r'
21005else 20963else
21006 ac_cs_awk_cr=$ac_cr 20964 ac_cs_awk_cr=$ac_cr
21007fi 20965fi
21008 20966
21009echo 'BEGIN {' >"$ac_tmp/subs1.awk" && 20967echo 'BEGIN {' >"$tmp/subs1.awk" &&
21010_ACEOF 20968_ACEOF
21011 20969
21012# Create commands to substitute file output variables. 20970# Create commands to substitute file output variables.
21013{ 20971{
21014 echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" && 20972 echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" &&
21015 echo 'cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&' && 20973 echo 'cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&' &&
21016 echo "$ac_subst_files" | sed 's/.*/F["&"]="$&"/' && 20974 echo "$ac_subst_files" | sed 's/.*/F["&"]="$&"/' &&
21017 echo "_ACAWK" && 20975 echo "_ACAWK" &&
21018 echo "_ACEOF" 20976 echo "_ACEOF"
21019} >conf$$files.sh && 20977} >conf$$files.sh &&
21020. ./conf$$files.sh || 20978. ./conf$$files.sh ||
21021 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 20979 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
21022rm -f conf$$files.sh 20980rm -f conf$$files.sh
21023 20981
21024{ 20982{
@@ -21026,18 +20984,18 @@ rm -f conf$$files.sh
21026 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && 20984 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
21027 echo "_ACEOF" 20985 echo "_ACEOF"
21028} >conf$$subs.sh || 20986} >conf$$subs.sh ||
21029 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 20987 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
21030ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` 20988ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
21031ac_delim='%!_!# ' 20989ac_delim='%!_!# '
21032for ac_last_try in false false false false false :; do 20990for ac_last_try in false false false false false :; do
21033 . ./conf$$subs.sh || 20991 . ./conf$$subs.sh ||
21034 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 20992 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
21035 20993
21036 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` 20994 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
21037 if test $ac_delim_n = $ac_delim_num; then 20995 if test $ac_delim_n = $ac_delim_num; then
21038 break 20996 break
21039 elif $ac_last_try; then 20997 elif $ac_last_try; then
21040 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 20998 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
21041 else 20999 else
21042 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " 21000 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
21043 fi 21001 fi
@@ -21045,7 +21003,7 @@ done
21045rm -f conf$$subs.sh 21003rm -f conf$$subs.sh
21046 21004
21047cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 21005cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
21048cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && 21006cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
21049_ACEOF 21007_ACEOF
21050sed -n ' 21008sed -n '
21051h 21009h
@@ -21093,7 +21051,7 @@ t delim
21093rm -f conf$$subs.awk 21051rm -f conf$$subs.awk
21094cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 21052cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
21095_ACAWK 21053_ACAWK
21096cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && 21054cat >>"\$tmp/subs1.awk" <<_ACAWK &&
21097 for (key in S) S_is_set[key] = 1 21055 for (key in S) S_is_set[key] = 1
21098 FS = "" 21056 FS = ""
21099 \$ac_cs_awk_pipe_init 21057 \$ac_cs_awk_pipe_init
@@ -21131,29 +21089,21 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
21131 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" 21089 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
21132else 21090else
21133 cat 21091 cat
21134fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ 21092fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
21135 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 21093 || as_fn_error "could not setup config files machinery" "$LINENO" 5
21136_ACEOF 21094_ACEOF
21137 21095
21138# VPATH may cause trouble with some makes, so we remove sole $(srcdir), 21096# VPATH may cause trouble with some makes, so we remove $(srcdir),
21139# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and 21097# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
21140# trailing colons and then remove the whole line if VPATH becomes empty 21098# trailing colons and then remove the whole line if VPATH becomes empty
21141# (actually we leave an empty line to preserve line numbers). 21099# (actually we leave an empty line to preserve line numbers).
21142if test "x$srcdir" = x.; then 21100if test "x$srcdir" = x.; then
21143 ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ 21101 ac_vpsub='/^[ ]*VPATH[ ]*=/{
21144h 21102s/:*\$(srcdir):*/:/
21145s/// 21103s/:*\${srcdir}:*/:/
21146s/^/:/ 21104s/:*@srcdir@:*/:/
21147s/[ ]*$/:/ 21105s/^\([^=]*=[ ]*\):*/\1/
21148s/:\$(srcdir):/:/g
21149s/:\${srcdir}:/:/g
21150s/:@srcdir@:/:/g
21151s/^:*//
21152s/:*$// 21106s/:*$//
21153x
21154s/\(=[ ]*\).*/\1/
21155G
21156s/\n//
21157s/^[^=]*=[ ]*$// 21107s/^[^=]*=[ ]*$//
21158}' 21108}'
21159fi 21109fi
@@ -21165,7 +21115,7 @@ fi # test -n "$CONFIG_FILES"
21165# No need to generate them if there are no CONFIG_HEADERS. 21115# No need to generate them if there are no CONFIG_HEADERS.
21166# This happens for instance with `./config.status Makefile'. 21116# This happens for instance with `./config.status Makefile'.
21167if test -n "$CONFIG_HEADERS"; then 21117if test -n "$CONFIG_HEADERS"; then
21168cat >"$ac_tmp/defines.awk" <<\_ACAWK || 21118cat >"$tmp/defines.awk" <<\_ACAWK ||
21169BEGIN { 21119BEGIN {
21170_ACEOF 21120_ACEOF
21171 21121
@@ -21177,11 +21127,11 @@ _ACEOF
21177# handling of long lines. 21127# handling of long lines.
21178ac_delim='%!_!# ' 21128ac_delim='%!_!# '
21179for ac_last_try in false false :; do 21129for ac_last_try in false false :; do
21180 ac_tt=`sed -n "/$ac_delim/p" confdefs.h` 21130 ac_t=`sed -n "/$ac_delim/p" confdefs.h`
21181 if test -z "$ac_tt"; then 21131 if test -z "$ac_t"; then
21182 break 21132 break
21183 elif $ac_last_try; then 21133 elif $ac_last_try; then
21184 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 21134 as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
21185 else 21135 else
21186 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " 21136 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
21187 fi 21137 fi
@@ -21266,7 +21216,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
21266_ACAWK 21216_ACAWK
21267_ACEOF 21217_ACEOF
21268cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 21218cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
21269 as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 21219 as_fn_error "could not setup config headers machinery" "$LINENO" 5
21270fi # test -n "$CONFIG_HEADERS" 21220fi # test -n "$CONFIG_HEADERS"
21271 21221
21272 21222
@@ -21279,7 +21229,7 @@ do
21279 esac 21229 esac
21280 case $ac_mode$ac_tag in 21230 case $ac_mode$ac_tag in
21281 :[FHL]*:*);; 21231 :[FHL]*:*);;
21282 :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; 21232 :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
21283 :[FH]-) ac_tag=-:-;; 21233 :[FH]-) ac_tag=-:-;;
21284 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 21234 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
21285 esac 21235 esac
@@ -21298,7 +21248,7 @@ do
21298 for ac_f 21248 for ac_f
21299 do 21249 do
21300 case $ac_f in 21250 case $ac_f in
21301 -) ac_f="$ac_tmp/stdin";; 21251 -) ac_f="$tmp/stdin";;
21302 *) # Look for the file first in the build tree, then in the source tree 21252 *) # Look for the file first in the build tree, then in the source tree
21303 # (if the path is not absolute). The absolute path cannot be DOS-style, 21253 # (if the path is not absolute). The absolute path cannot be DOS-style,
21304 # because $ac_f cannot contain `:'. 21254 # because $ac_f cannot contain `:'.
@@ -21307,7 +21257,7 @@ do
21307 [\\/$]*) false;; 21257 [\\/$]*) false;;
21308 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 21258 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
21309 esac || 21259 esac ||
21310 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; 21260 as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
21311 esac 21261 esac
21312 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 21262 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
21313 as_fn_append ac_file_inputs " '$ac_f'" 21263 as_fn_append ac_file_inputs " '$ac_f'"
@@ -21333,8 +21283,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
21333 esac 21283 esac
21334 21284
21335 case $ac_tag in 21285 case $ac_tag in
21336 *:-:* | *:-) cat >"$ac_tmp/stdin" \ 21286 *:-:* | *:-) cat >"$tmp/stdin" \
21337 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 21287 || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
21338 esac 21288 esac
21339 ;; 21289 ;;
21340 esac 21290 esac
@@ -21472,27 +21422,26 @@ $ac_datarootdir_hack
21472" 21422"
21473eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | 21423eval sed \"\$ac_sed_extra\" "$ac_file_inputs" |
21474if $ac_cs_awk_getline; then 21424if $ac_cs_awk_getline; then
21475 $AWK -f "$ac_tmp/subs.awk" 21425 $AWK -f "$tmp/subs.awk"
21476else 21426else
21477 $AWK -f "$ac_tmp/subs.awk" | $SHELL 21427 $AWK -f "$tmp/subs.awk" | $SHELL
21478fi \ 21428fi >$tmp/out \
21479 >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 21429 || as_fn_error "could not create $ac_file" "$LINENO" 5
21480 21430
21481test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 21431test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
21482 { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && 21432 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
21483 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ 21433 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
21484 "$ac_tmp/out"`; test -z "$ac_out"; } &&
21485 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 21434 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
21486which seems to be undefined. Please make sure it is defined" >&5 21435which seems to be undefined. Please make sure it is defined." >&5
21487$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 21436$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
21488which seems to be undefined. Please make sure it is defined" >&2;} 21437which seems to be undefined. Please make sure it is defined." >&2;}
21489 21438
21490 rm -f "$ac_tmp/stdin" 21439 rm -f "$tmp/stdin"
21491 case $ac_file in 21440 case $ac_file in
21492 -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; 21441 -) cat "$tmp/out" && rm -f "$tmp/out";;
21493 *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; 21442 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
21494 esac \ 21443 esac \
21495 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 21444 || as_fn_error "could not create $ac_file" "$LINENO" 5
21496 ;; 21445 ;;
21497 :H) 21446 :H)
21498 # 21447 #
@@ -21501,21 +21450,21 @@ which seems to be undefined. Please make sure it is defined" >&2;}
21501 if test x"$ac_file" != x-; then 21450 if test x"$ac_file" != x-; then
21502 { 21451 {
21503 $as_echo "/* $configure_input */" \ 21452 $as_echo "/* $configure_input */" \
21504 && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" 21453 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
21505 } >"$ac_tmp/config.h" \ 21454 } >"$tmp/config.h" \
21506 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 21455 || as_fn_error "could not create $ac_file" "$LINENO" 5
21507 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then 21456 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
21508 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 21457 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
21509$as_echo "$as_me: $ac_file is unchanged" >&6;} 21458$as_echo "$as_me: $ac_file is unchanged" >&6;}
21510 else 21459 else
21511 rm -f "$ac_file" 21460 rm -f "$ac_file"
21512 mv "$ac_tmp/config.h" "$ac_file" \ 21461 mv "$tmp/config.h" "$ac_file" \
21513 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 21462 || as_fn_error "could not create $ac_file" "$LINENO" 5
21514 fi 21463 fi
21515 else 21464 else
21516 $as_echo "/* $configure_input */" \ 21465 $as_echo "/* $configure_input */" \
21517 && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ 21466 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
21518 || as_fn_error $? "could not create -" "$LINENO" 5 21467 || as_fn_error "could not create -" "$LINENO" 5
21519 fi 21468 fi
21520# Compute "$ac_file"'s index in $config_headers. 21469# Compute "$ac_file"'s index in $config_headers.
21521_am_arg="$ac_file" 21470_am_arg="$ac_file"
@@ -21680,7 +21629,7 @@ _ACEOF
21680ac_clean_files=$ac_clean_files_save 21629ac_clean_files=$ac_clean_files_save
21681 21630
21682test $ac_write_fail = 0 || 21631test $ac_write_fail = 0 ||
21683 as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 21632 as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
21684 21633
21685 21634
21686# configure is writing to config.log, and then calls config.status. 21635# configure is writing to config.log, and then calls config.status.
@@ -21701,7 +21650,7 @@ if test "$no_create" != yes; then
21701 exec 5>>config.log 21650 exec 5>>config.log
21702 # Use ||, not &&, to avoid exiting from the if with $? = 1, which 21651 # Use ||, not &&, to avoid exiting from the if with $? = 1, which
21703 # would make configure fail if this is the last instruction. 21652 # would make configure fail if this is the last instruction.
21704 $ac_cs_success || as_fn_exit 1 21653 $ac_cs_success || as_fn_exit $?
21705fi 21654fi
21706if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then 21655if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
21707 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 21656 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff --git a/autogen/update_autogen b/autogen/update_autogen
index d1687b293e9..c134609356c 100755
--- a/autogen/update_autogen
+++ b/autogen/update_autogen
@@ -268,7 +268,10 @@ echo "Running lisp/ make..."
268make -C lisp "$@" autoloads EMACS=../src/bootstrap-emacs || die "make src error" 268make -C lisp "$@" autoloads EMACS=../src/bootstrap-emacs || die "make src error"
269 269
270 270
271[ ! "$lboot_flag" ] || cp $ldefs_in $ldefs_out || die "cp ldefs_boot error" 271## Ignore comment differences.
272[ ! "$lboot_flag" ] || \
273 diff -q -I '^;' $ldefs_in $ldefs_out || \
274 cp $ldefs_in $ldefs_out || die "cp ldefs_boot error"
272 275
273 276
274cd lisp 277cd lisp
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index b25e6ce219f..47aa395c730 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12011-03-26 Chong Yidong <cyd@stupidchicken.com>
2
3 * display.texi (Auto Scrolling): Fix scroll-up/scroll-down confusion.
4
12011-03-30 Eli Zaretskii <eliz@gnu.org> 52011-03-30 Eli Zaretskii <eliz@gnu.org>
2 6
3 * display.texi (Auto Scrolling): Document the limit of 100 lines 7 * display.texi (Auto Scrolling): Document the limit of 100 lines
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 405ee26312f..7777aacf0e5 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -206,16 +206,18 @@ how aggressively it scrolls by setting the variables
206@code{scroll-up-aggressively} and @code{scroll-down-aggressively}. 206@code{scroll-up-aggressively} and @code{scroll-down-aggressively}.
207The value of @code{scroll-up-aggressively} should be either 207The value of @code{scroll-up-aggressively} should be either
208@code{nil}, or a fraction @var{f} between 0 and 1. A fraction 208@code{nil}, or a fraction @var{f} between 0 and 1. A fraction
209specifies where on the screen to put point when scrolling upward: when 209specifies where on the screen to put point when scrolling upward,
210a window scrolls up because point is above the window start, the new 210i.e.@: when point moves forward in the buffer, and therefore text
211scrolls up in the window. When point goes off the window end, the new
211start position is chosen to put point @var{f} parts of the window 212start position is chosen to put point @var{f} parts of the window
212height from the top. Thus, larger @var{f} means more aggressive 213height from the bottom. Thus, larger @var{f} means more aggressive
213scrolling. The default value, @code{nil}, is equivalent to 0.5. 214scrolling: more new text is brought into view. The default value,
215@code{nil}, is equivalent to 0.5.
214 216
215 Likewise, @code{scroll-down-aggressively} is used for scrolling 217 Likewise, @code{scroll-down-aggressively} is used for scrolling
216down. The value specifies how far point should be placed from the 218down, i.e.@: moving point back in the buffer. The value specifies how
217bottom of the window; thus, as with @code{scroll-up-aggressively}, a 219far point should be placed from the top of the window; thus, as with
218larger value is more aggressive. 220@code{scroll-up-aggressively}, a larger value is more aggressive.
219 221
220 These two variables are ignored if either @code{scroll-step} or 222 These two variables are ignored if either @code{scroll-step} or
221@code{scroll-conservatively} are set to a non-zero value. 223@code{scroll-conservatively} are set to a non-zero value.
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 445e94a0c43..784f62dc4cc 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,18 @@
12011-03-21 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * minibuf.texi (Basic Completion): Be a bit more precise about the
4 valid kinds of completion tables.
5 (Programmed Completion): Remove obsolete text about lambda expressions
6 not being valid completion tables.
7
82011-03-19 Chong Yidong <cyd@stupidchicken.com>
9
10 * positions.texi (Excursions): Explain the "save-excursion
11 defeated by set-buffer" warning.
12
13 * buffers.texi (Current Buffer): Copyedits. Don't recommend using
14 save-excursion. Suggested by Uday S Reddy.
15
12011-04-01 Stefan Monnier <monnier@iro.umontreal.ca> 162011-04-01 Stefan Monnier <monnier@iro.umontreal.ca>
2 17
3 * variables.texi (Defining Variables): Mention the new meaning of `defvar'. 18 * variables.texi (Defining Variables): Mention the new meaning of `defvar'.
diff --git a/doc/lispref/buffers.texi b/doc/lispref/buffers.texi
index 07889cdbaa3..0f9de74c948 100644
--- a/doc/lispref/buffers.texi
+++ b/doc/lispref/buffers.texi
@@ -85,43 +85,63 @@ This function returns @code{t} if @var{object} is a buffer,
85@cindex changing to another buffer 85@cindex changing to another buffer
86@cindex current buffer 86@cindex current buffer
87 87
88 There are, in general, many buffers in an Emacs session. At any time, 88 There are, in general, many buffers in an Emacs session. At any
89one of them is designated as the @dfn{current buffer}. This is the 89time, one of them is designated the @dfn{current buffer}---the buffer
90buffer in which most editing takes place, because most of the primitives 90in which most editing takes place. Most of the primitives for
91for examining or changing text in a buffer operate implicitly on the 91examining or changing text operate implicitly on the current buffer
92current buffer (@pxref{Text}). Normally the buffer that is displayed on 92(@pxref{Text}).
93the screen in the selected window is the current buffer, but this is not 93
94always so: a Lisp program can temporarily designate any buffer as 94 Normally, the buffer displayed in the selected window is the current
95current in order to operate on its contents, without changing what is 95buffer, but this is not always so: a Lisp program can temporarily
96displayed on the screen. 96designate any buffer as current in order to operate on its contents,
97 97without changing what is displayed on the screen. The most basic
98 The way to designate a current buffer in a Lisp program is by calling 98function for designating a current buffer is @code{set-buffer}.
99@code{set-buffer}. The specified buffer remains current until a new one 99
100is designated. 100@defun current-buffer
101 101This function returns the current buffer.
102 When an editing command returns to the editor command loop, the 102
103command loop designates the buffer displayed in the selected window as 103@example
104current, to prevent confusion: the buffer that the cursor is in when 104@group
105Emacs reads a command is the buffer that the command will apply to. 105(current-buffer)
106(@xref{Command Loop}.) Therefore, @code{set-buffer} is not the way to 106 @result{} #<buffer buffers.texi>
107switch visibly to a different buffer so that the user can edit it. For 107@end group
108that, you must use the functions described in @ref{Displaying Buffers}. 108@end example
109 109@end defun
110 @strong{Warning:} Lisp functions that change to a different current buffer 110
111should not depend on the command loop to set it back afterwards. 111@defun set-buffer buffer-or-name
112Editing commands written in Emacs Lisp can be called from other programs 112This function makes @var{buffer-or-name} the current buffer.
113as well as from the command loop; it is convenient for the caller if 113@var{buffer-or-name} must be an existing buffer or the name of an
114the subroutine does not change which buffer is current (unless, of 114existing buffer. The return value is the buffer made current.
115course, that is the subroutine's purpose). Therefore, you should 115
116normally use @code{set-buffer} within a @code{save-current-buffer} or 116This function does not display the buffer in any window, so the user
117@code{save-excursion} (@pxref{Excursions}) form that will restore the 117cannot necessarily see the buffer. But Lisp programs will now operate
118current buffer when your function is done. Here, as an example, is a 118on it.
119@end defun
120
121 When an editing command returns to the editor command loop, Emacs
122automatically calls @code{set-buffer} on the buffer shown in the
123selected window. This is to prevent confusion: it ensures that the
124buffer that the cursor is in, when Emacs reads a command, is the
125buffer to which that command applies (@pxref{Command Loop}). Thus,
126you should not use @code{set-buffer} to switch visibly to a different
127buffer; for that, use the functions described in @ref{Displaying
128Buffers}.
129
130 When writing a Lisp function, do @emph{not} rely on this behavior of
131the command loop to restore the current buffer after an operation.
132Editing commands can also be called as Lisp functions by other
133programs, not just from the command loop; it is convenient for the
134caller if the subroutine does not change which buffer is current
135(unless, of course, that is the subroutine's purpose).
136
137 To operate temporarily on another buffer, put the @code{set-buffer}
138within a @code{save-current-buffer} form. Here, as an example, is a
119simplified version of the command @code{append-to-buffer}: 139simplified version of the command @code{append-to-buffer}:
120 140
121@example 141@example
122@group 142@group
123(defun append-to-buffer (buffer start end) 143(defun append-to-buffer (buffer start end)
124 "Append to specified buffer the text of the region." 144 "Append the text of the region to BUFFER."
125 (interactive "BAppend to buffer: \nr") 145 (interactive "BAppend to buffer: \nr")
126 (let ((oldbuf (current-buffer))) 146 (let ((oldbuf (current-buffer)))
127 (save-current-buffer 147 (save-current-buffer
@@ -131,27 +151,36 @@ simplified version of the command @code{append-to-buffer}:
131@end example 151@end example
132 152
133@noindent 153@noindent
134This function binds a local variable to record the current buffer, and 154Here, we bind a local variable to record the current buffer, and then
135then @code{save-current-buffer} arranges to make it current again. 155@code{save-current-buffer} arranges to make it current again later.
136Next, @code{set-buffer} makes the specified buffer current. Finally, 156Next, @code{set-buffer} makes the specified buffer current, and
137@code{insert-buffer-substring} copies the string from the original 157@code{insert-buffer-substring} copies the string from the original
138current buffer to the specified (and now current) buffer. 158buffer to the specified (and now current) buffer.
139 159
140 If the buffer appended to happens to be displayed in some window, 160 Alternatively, we can use the @code{with-current-buffer} macro:
141the next redisplay will show how its text has changed. Otherwise, you 161
142will not see the change immediately on the screen. The buffer becomes 162@example
143current temporarily during the execution of the command, but this does 163@group
144not cause it to be displayed. 164(defun append-to-buffer (buffer start end)
145 165 "Append the text of the region to BUFFER."
146 If you make local bindings (with @code{let} or function arguments) for 166 (interactive "BAppend to buffer: \nr")
147a variable that may also have buffer-local bindings, make sure that the 167 (let ((oldbuf (current-buffer)))
148same buffer is current at the beginning and at the end of the local 168 (with-current-buffer (get-buffer-create buffer)
149binding's scope. Otherwise you might bind it in one buffer and unbind 169 (insert-buffer-substring oldbuf start end))))
150it in another! There are two ways to do this. In simple cases, you may 170@end group
151see that nothing ever changes the current buffer within the scope of the 171@end example
152binding. Otherwise, use @code{save-current-buffer} or 172
153@code{save-excursion} to make sure that the buffer current at the 173 In either case, if the buffer appended to happens to be displayed in
154beginning is current again whenever the variable is unbound. 174some window, the next redisplay will show how its text has changed.
175If it is not displayed in any window, you will not see the change
176immediately on the screen. The command causes the buffer to become
177current temporarily, but does not cause it to be displayed.
178
179 If you make local bindings (with @code{let} or function arguments)
180for a variable that may also have buffer-local bindings, make sure
181that the same buffer is current at the beginning and at the end of the
182local binding's scope. Otherwise you might bind it in one buffer and
183unbind it in another!
155 184
156 Do not rely on using @code{set-buffer} to change the current buffer 185 Do not rely on using @code{set-buffer} to change the current buffer
157back, because that won't do the job if a quit happens while the wrong 186back, because that won't do the job if a quit happens while the wrong
@@ -168,29 +197,9 @@ have been wrong to do this:
168@end example 197@end example
169 198
170@noindent 199@noindent
171Using @code{save-current-buffer}, as we did, handles quitting, errors, 200Using @code{save-current-buffer} or @code{with-current-buffer}, as we
172and @code{throw}, as well as ordinary evaluation. 201did, correctly handles quitting, errors, and @code{throw}, as well as
173 202ordinary evaluation.
174@defun current-buffer
175This function returns the current buffer.
176
177@example
178@group
179(current-buffer)
180 @result{} #<buffer buffers.texi>
181@end group
182@end example
183@end defun
184
185@defun set-buffer buffer-or-name
186This function makes @var{buffer-or-name} the current buffer.
187@var{buffer-or-name} must be an existing buffer or the name of an
188existing buffer. The return value is the buffer made current.
189
190This function does not display the buffer in any window, so the user
191cannot necessarily see the buffer. But Lisp programs will now operate
192on it.
193@end defun
194 203
195@defspec save-current-buffer body@dots{} 204@defspec save-current-buffer body@dots{}
196The @code{save-current-buffer} special form saves the identity of the 205The @code{save-current-buffer} special form saves the identity of the
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 07975e64b35..acc68b0aafa 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -645,9 +645,9 @@ higher-level completion features that do use the minibuffer.
645@defun try-completion string collection &optional predicate 645@defun try-completion string collection &optional predicate
646This function returns the longest common substring of all possible 646This function returns the longest common substring of all possible
647completions of @var{string} in @var{collection}. The value of 647completions of @var{string} in @var{collection}. The value of
648@var{collection} must be a list of strings or symbols, an alist, an 648@var{collection} must be a list of strings, an alist whose keys are
649obarray, a hash table, or a completion function (@pxref{Programmed 649strings or symbols, an obarray, a hash table, or a completion function
650Completion}). 650(@pxref{Programmed Completion}).
651 651
652Completion compares @var{string} against each of the permissible 652Completion compares @var{string} against each of the permissible
653completions specified by @var{collection}. If no permissible 653completions specified by @var{collection}. If no permissible
@@ -658,11 +658,11 @@ to all possible matching completions.
658 658
659If @var{collection} is an alist (@pxref{Association Lists}), the 659If @var{collection} is an alist (@pxref{Association Lists}), the
660permissible completions are the elements of the alist that are either 660permissible completions are the elements of the alist that are either
661strings, symbols, or conses whose @sc{car} is a string or symbol. 661strings, or conses whose @sc{car} is a string or symbol.
662Symbols are converted to strings using @code{symbol-name}. Other 662Symbols are converted to strings using @code{symbol-name}. Other
663elements of the alist are ignored. (Remember that in Emacs Lisp, the 663elements of the alist are ignored. (Remember that in Emacs Lisp, the
664elements of alists do not @emph{have} to be conses.) In particular, a 664elements of alists do not @emph{have} to be conses.) In particular, a
665list of strings or symbols is allowed, even though we usually do not 665list of strings is allowed, even though we usually do not
666think of such lists as alists. 666think of such lists as alists.
667 667
668@cindex obarray in completion 668@cindex obarray in completion
@@ -678,7 +678,7 @@ Also, you cannot intern a given symbol in more than one obarray.
678If @var{collection} is a hash table, then the keys that are strings 678If @var{collection} is a hash table, then the keys that are strings
679are the possible completions. Other keys are ignored. 679are the possible completions. Other keys are ignored.
680 680
681You can also use a symbol that is a function as @var{collection}. 681You can also use a function as @var{collection}.
682Then the function is solely responsible for performing completion; 682Then the function is solely responsible for performing completion;
683@code{try-completion} returns whatever this function returns. The 683@code{try-completion} returns whatever this function returns. The
684function is called with three arguments: @var{string}, @var{predicate} 684function is called with three arguments: @var{string}, @var{predicate}
@@ -1632,12 +1632,12 @@ which performs completion according to the rules used in Emacs 21; and
1632@subsection Programmed Completion 1632@subsection Programmed Completion
1633@cindex programmed completion 1633@cindex programmed completion
1634 1634
1635 Sometimes it is not possible to create an alist or an obarray 1635 Sometimes it is not possible or convenient to create an alist or
1636containing all the intended possible completions. In such a case, you 1636an obarray containing all the intended possible completions ahead
1637can supply your own function to compute the completion of a given 1637of time. In such a case, you can supply your own function to compute
1638string. This is called @dfn{programmed completion}. Emacs uses 1638the completion of a given string. This is called @dfn{programmed
1639programmed completion when completing file names (@pxref{File Name 1639completion}. Emacs uses programmed completion when completing file
1640Completion}), among many other cases. 1640names (@pxref{File Name Completion}), among many other cases.
1641 1641
1642 To use this feature, pass a function as the @var{collection} 1642 To use this feature, pass a function as the @var{collection}
1643argument to @code{completing-read}. The function 1643argument to @code{completing-read}. The function
@@ -1665,7 +1665,7 @@ specifies which method to run.
1665@end itemize 1665@end itemize
1666 1666
1667 There are currently four methods, i.e. four flag values, one for 1667 There are currently four methods, i.e. four flag values, one for
1668 each of the four different basic operations: 1668each of the four different basic operations:
1669 1669
1670@itemize @bullet 1670@itemize @bullet
1671@item 1671@item
@@ -1696,14 +1696,6 @@ in the string to complete, and END is the position of the end boundary
1696in SUFFIX. 1696in SUFFIX.
1697@end itemize 1697@end itemize
1698 1698
1699 It would be consistent and clean for completion functions to allow
1700lambda expressions (lists that are functions) as well as function
1701symbols as @var{collection}, but this is impossible. Lists as
1702completion tables already have other meanings, and it would be
1703unreliable to treat one differently just because it is also a possible
1704function. So you must arrange for any function you wish to use for
1705completion to be encapsulated in a symbol.
1706
1707@defun completion-table-dynamic function 1699@defun completion-table-dynamic function
1708This function is a convenient way to write a function that can act as 1700This function is a convenient way to write a function that can act as
1709programmed completion function. The argument @var{function} should be 1701programmed completion function. The argument @var{function} should be
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi
index a44cd1fbcc7..1124d58ebcc 100644
--- a/doc/lispref/positions.texi
+++ b/doc/lispref/positions.texi
@@ -797,69 +797,72 @@ is zero or less.
797@cindex excursion 797@cindex excursion
798 798
799 It is often useful to move point ``temporarily'' within a localized 799 It is often useful to move point ``temporarily'' within a localized
800portion of the program, or to switch buffers temporarily. This is 800portion of the program. This is called an @dfn{excursion}, and it is
801called an @dfn{excursion}, and it is done with the @code{save-excursion} 801done with the @code{save-excursion} special form. This construct
802special form. This construct initially remembers the identity of the 802remembers the initial identity of the current buffer, and its values
803current buffer, and its values of point and the mark, and restores them 803of point and the mark, and restores them after the excursion
804after the completion of the excursion. 804completes. It is the standard way to move point within one part of a
805 805program and avoid affecting the rest of the program, and is used
806 The forms for saving and restoring the configuration of windows are 806thousands of times in the Lisp sources of Emacs.
807described elsewhere (see @ref{Window Configurations}, and @pxref{Frame 807
808Configurations}). When only the identity of the current buffer needs 808 If you only need to save and restore the identity of the current
809to be saved and restored, it is preferable to use 809buffer, use @code{save-current-buffer} or @code{with-current-buffer}
810@code{save-current-buffer} instead. 810instead (@pxref{Current Buffer}). If you need to save or restore
811window configurations, see the forms described in @ref{Window
812Configurations} and in @ref{Frame Configurations}.
811 813
812@defspec save-excursion body@dots{} 814@defspec save-excursion body@dots{}
813@cindex mark excursion 815@cindex mark excursion
814@cindex point excursion 816@cindex point excursion
815The @code{save-excursion} special form saves the identity of the current 817This special form saves the identity of the current buffer and the
816buffer and the values of point and the mark in it, evaluates 818values of point and the mark in it, evaluates @var{body}, and finally
817@var{body}, and finally restores the buffer and its saved values of 819restores the buffer and its saved values of point and the mark. All
818point and the mark. All three saved values are restored even in case of 820three saved values are restored even in case of an abnormal exit via
819an abnormal exit via @code{throw} or error (@pxref{Nonlocal Exits}). 821@code{throw} or error (@pxref{Nonlocal Exits}).
820 822
821The @code{save-excursion} special form is the standard way to move 823The value returned by @code{save-excursion} is the result of the last
822point within one part of a program and avoid affecting the rest of the 824form in @var{body}, or @code{nil} if no body forms were given.
823program. It is used more than 4000 times in the Lisp sources 825@end defspec
824of Emacs.
825 826
826@code{save-excursion} does not save the values of point and the mark for 827 Because @code{save-excursion} only saves point and mark for the
827other buffers, so changes in other buffers remain in effect after 828buffer that was current at the start of the excursion, any changes
828@code{save-excursion} exits. 829made to point and/or mark in other buffers, during the excursion, will
830remain in effect afterward. This frequently leads to unintended
831consequences, so the byte compiler warns if you call @code{set-buffer}
832during an excursion:
829 833
830@cindex window excursions 834@example
831Likewise, @code{save-excursion} does not restore window-buffer 835Warning: @code{save-excursion} defeated by @code{set-buffer}
832correspondences altered by functions such as @code{switch-to-buffer}. 836@end example
833One way to restore these correspondences, and the selected window, is to
834use @code{save-window-excursion} inside @code{save-excursion}
835(@pxref{Window Configurations}).
836 837
837The value returned by @code{save-excursion} is the result of the last 838@noindent
838form in @var{body}, or @code{nil} if no body forms were given. 839To avoid such problems, you should call @code{save-excursion} only
840after setting the desired current buffer, as in the following example:
839 841
840@example 842@example
841@group 843@group
842(save-excursion @var{forms}) 844(defun append-string-to-buffer (string buffer)
843@equiv{} 845 "Append STRING to the end of BUFFER."
844(let ((old-buf (current-buffer)) 846 (with-current-buffer buffer
845 (old-pnt (point-marker)) 847 (save-excursion
846@end group 848 (goto-char (point-max))
847 (old-mark (copy-marker (mark-marker)))) 849 (insert string))))
848 (unwind-protect
849 (progn @var{forms})
850 (set-buffer old-buf)
851@group
852 (goto-char old-pnt)
853 (set-marker (mark-marker) old-mark)))
854@end group 850@end group
855@end example 851@end example
856@end defspec 852
853@cindex window excursions
854 Likewise, @code{save-excursion} does not restore window-buffer
855correspondences altered by functions such as @code{switch-to-buffer}.
856One way to restore these correspondences, and the selected window, is to
857use @code{save-window-excursion} inside @code{save-excursion}
858(@pxref{Window Configurations}).
857 859
858 @strong{Warning:} Ordinary insertion of text adjacent to the saved 860 @strong{Warning:} Ordinary insertion of text adjacent to the saved
859point value relocates the saved value, just as it relocates all markers. 861point value relocates the saved value, just as it relocates all
860More precisely, the saved value is a marker with insertion type 862markers. More precisely, the saved value is a marker with insertion
861@code{nil}. @xref{Marker Insertion Types}. Therefore, when the saved 863type @code{nil}. @xref{Marker Insertion Types}. Therefore, when the
862point value is restored, it normally comes before the inserted text. 864saved point value is restored, it normally comes before the inserted
865text.
863 866
864 Although @code{save-excursion} saves the location of the mark, it does 867 Although @code{save-excursion} saves the location of the mark, it does
865not prevent functions which modify the buffer from setting 868not prevent functions which modify the buffer from setting
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 50d0acf3931..b9e409e8783 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
12011-04-06 Juanma Barranquero <lekktu@gmail.com>
2
3 * NEWS: New variable `revert-buffer-in-progress-p'.
4
12011-03-22 Sebastian Hermida <sebas00@gmail.com> 52011-03-22 Sebastian Hermida <sebas00@gmail.com>
2 6
3 * themes/misterioso-theme.el: New file. 7 * themes/misterioso-theme.el: New file.
diff --git a/etc/NEWS b/etc/NEWS
index 6b7fd303dde..08d94a4e9cb 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -691,6 +691,9 @@ consult.
691** New global minor modes electric-pair-mode, electric-indent-mode, 691** New global minor modes electric-pair-mode, electric-indent-mode,
692and electric-layout-mode. 692and electric-layout-mode.
693 693
694** tabulated-list.el provides a generic major mode for tabulated data,
695from which other modes can be derived.
696
694** pcase.el provides the ML-style pattern matching macro `pcase'. 697** pcase.el provides the ML-style pattern matching macro `pcase'.
695 698
696** secrets.el is an implementation of the Secret Service API, an 699** secrets.el is an implementation of the Secret Service API, an
@@ -886,6 +889,9 @@ time you call `progress-reporter-update' on that progress reporter,
886with a nil or omitted VALUE argument, the reporter message is 889with a nil or omitted VALUE argument, the reporter message is
887displayed with a "spinning bar". 890displayed with a "spinning bar".
888 891
892** New variable `revert-buffer-in-progress-p' is true while a buffer is
893being reverted, even if the buffer has a local `revert-buffer-function'.
894
889 895
890* Changes in Emacs 24.1 on non-free operating systems 896* Changes in Emacs 24.1 on non-free operating systems
891 897
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index 3e7a364ffd0..458e2bb3d32 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -21,6 +21,13 @@ with a prefix argument or by typing C-u C-h C-n.
21crt*.o files, if they are in a non-standard location. This is only 21crt*.o files, if they are in a non-standard location. This is only
22used on x86-64 and s390x GNU/Linux architectures. 22used on x86-64 and s390x GNU/Linux architectures.
23 23
24** The MS-Windows build prefers libpng version 1.14 or later.
25Versions of libpng before 1.14 had security issues, so we now
26recommend to use version 1.14 or later. Precompiled Windows binaries
27require version 1.14 or later. See README.W32 and nt/INSTALL for
28details and pointers to URLs where the latest libpng can be
29downloaded.
30
24* Changes in Emacs 23.3 31* Changes in Emacs 23.3
25 32
26** The last-resort backup file `%backup%~' is now written to 33** The last-resort backup file `%backup%~' is now written to
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a526ca900a7..62dd255cabe 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,122 @@
12011-04-07 Paul Eggert <eggert@cs.ucla.edu> 12011-04-09 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 Remove the doprnt implementation, as Emacs now uses vsnprintf. 3 Remove the doprnt implementation, as Emacs now uses vsnprintf.
4 * emacs-lisp/find-gc.el (find-gc-source-files): Remove doprnt.c. 4 * emacs-lisp/find-gc.el (find-gc-source-files): Remove doprnt.c.
5 5
62011-04-08 Sho Nakatani <lay.sakura@gmail.com>
7
8 * doc-view.el (doc-view-fit-width-to-window)
9 (doc-view-fit-height-to-window, doc-view-fit-page-to-window): New
10 functions for fitting the shown image to the Emacs window size.
11 (doc-view-mode-map): Add bindings for the new functions.
12
132011-03-24 Juanma Barranquero <lekktu@gmail.com>
14
15 * vc-annotate.el (vc-annotate-show-log-revision-at-line):
16 Fix typo in docstring.
17
182011-04-08 Eli Zaretskii <eliz@gnu.org>
19
20 * files.el (file-size-human-readable): Produce one digit after
21 decimal, like "ls -lh" does.
22
23 * ls-lisp.el (ls-lisp-format-file-size): Allow for 7 characters in
24 the file size representation.
25
26 * simple.el (list-processes): If async subprocesses are not
27 available, error out with a clear error message.
28
292011-04-08 Chong Yidong <cyd@stupidchicken.com>
30
31 * help.el (help-form-show): New function, to be called from C.
32 Put help-form output in a buffer named differently than *Help*.
33
342011-04-08 Eli Zaretskii <eliz@gnu.org>
35
36 * files.el (file-size-human-readable): New function.
37
38 * ls-lisp.el (ls-lisp-format-file-size): Use it, instead of
39 computing the representation inline. Don't require `cl'.
40
412011-04-08 Glenn Morris <rgm@gnu.org>
42
43 * man.el (Man-page-header-regexp): Solaris < 2.6 no longer supported.
44
45 * net/browse-url.el (browse-url-firefox):
46 Test system-type, not system-configuration.
47
48 * vc/log-edit.el (log-edit-empty-buffer-p): New function.
49 (log-edit-insert-cvs-template, log-edit-insert-cvs-rcstemplate):
50 Use log-edit-empty-buffer-p. (Bug#7598)
51
52 * net/rlogin.el (rlogin-process-connection-type): Simplify.
53 (rlogin-mode-map): Initialize in the defvar.
54 (rlogin): Use ignore-errors.
55
56 * replace.el (occur-mode-map): Some fixes for menu items.
57
582011-04-07 Aaron S. Hawley <aaron.s.hawley@gmail.com>
59
60 * play/morse.el (denato-region): Handle varying case. (Bug#8386)
61
622011-04-06 Chong Yidong <cyd@stupidchicken.com>
63
64 * emacs-lisp/cconv.el (cconv--analyse-use): Ignore "ignored" when
65 issuing unused warnings.
66
67 * emacs-lisp/tabulated-list.el (tabulated-list-print): Use lambda
68 macro directly.
69
70 * simple.el: Lisp reimplement of list-processes. Based on an
71 earlier reimplementation by Leo Liu, but using tabulated-list.el.
72 (process-menu-mode): New major mode.
73 (list-processes--refresh, list-processes):
74 (process-menu-visit-buffer): New functions.
75
76 * files.el (save-buffers-kill-emacs): Don't assume any return
77 value of list-processes, which is undocumented anyway.
78
792011-04-06 Chong Yidong <cyd@stupidchicken.com>
80
81 * emacs-lisp/tabulated-list.el: New file.
82
83 * emacs-lisp/package.el: Use Tabulated List mode.
84 (package-menu-mode-map): Inherit from tabulated-list-mode-map.
85 (package-menu-mode): Derive from tabulated-list-mode. Set up the
86 table format using Tabulated List mode variables.
87 (package--push): New macro, replacing package-list-maybe-add.
88 (package-menu--generate): Use package--push. Renamed from
89 package--generate-package-list.
90 (package-menu-refresh, list-packages): Use it.
91 (package-menu--print-info): Renamed from package-print-package.
92 Return insertion data instead of inserting it directly.
93 (package-menu-describe-package, package-menu-execute): Use
94 tabulated-list-get-id.
95 (package-menu-mark-delete, package-menu-mark-install)
96 (package-menu-mark-unmark, package-menu-backup-unmark)
97 (package-menu-mark-obsolete-for-deletion): Use
98 tabulated-list-put-tag.
99 (package--list-packages, package-menu-revert)
100 (package-menu-get-package, package-menu-get-version)
101 (package-menu-sort-by-column): Functions deleted.
102 (package-menu-package-list, package-menu-sort-key): Vars deleted.
103 (package-menu--status-predicate, package-menu--version-predicate)
104 (package-menu--name-predicate)
105 (package-menu--description-predicate): Handle arguments in the
106 Tabulated List format.
107 (package-list-packages-no-fetch): Call list-packages.
108
1092011-04-06 Juanma Barranquero <lekktu@gmail.com>
110
111 * files.el (after-find-file-from-revert-buffer): Remove variable.
112 (after-find-file): Dont' bind it.
113 (revert-buffer-in-progress-p): New variable.
114 (revert-buffer): Bind it.
115 Pass nil for `after-find-file-from-revert-buffer'.
116
117 * saveplace.el (save-place-find-file-hook): Use new variable
118 `rever-buffer-in-progress-p', not `after-find-file-from-revert-buffer'.
119
62011-04-06 Glenn Morris <rgm@gnu.org> 1202011-04-06 Glenn Morris <rgm@gnu.org>
7 121
8 * Makefile.in (AUTOGEN_VCS): New variable. 122 * Makefile.in (AUTOGEN_VCS): New variable.
@@ -575,7 +689,7 @@
575 (emerge-protect-metachars): Quote correctly for ms-dos and 689 (emerge-protect-metachars): Quote correctly for ms-dos and
576 windows-nt systems. 690 windows-nt systems.
577 691
5782011-03-19 Ralph Schleicher <rs@ralph-schleicher.de> 6922011-03-19 Ralph Schleicher <rs@ralph-schleicher.de> (tiny change)
579 693
580 * info.el (info-initialize): Replace all uses of `:' with 694 * info.el (info-initialize): Replace all uses of `:' with
581 path-separator for compatibility with non-Unix systems. 695 path-separator for compatibility with non-Unix systems.
diff --git a/lisp/bs.el b/lisp/bs.el
index 72b3e4c6fef..6965af1368c 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -40,7 +40,7 @@
40;; | % vc-hooks.el 43605 Emacs-Lisp /usr/share/emacs/19.34/lisp$| 40;; | % vc-hooks.el 43605 Emacs-Lisp /usr/share/emacs/19.34/lisp$|
41;; ----------------------------------------------------------------------- 41;; -----------------------------------------------------------------------
42 42
43;;; Quick Installation und Customization: 43;;; Quick Installation and Customization:
44 44
45;; To display the bs menu, do 45;; To display the bs menu, do
46;; M-x bs-show 46;; M-x bs-show
@@ -1083,7 +1083,7 @@ configuration."
1083 bs-dont-show-regexp (nth 3 list) 1083 bs-dont-show-regexp (nth 3 list)
1084 bs-dont-show-function (nth 4 list) 1084 bs-dont-show-function (nth 4 list)
1085 bs-buffer-sort-function (nth 5 list)) 1085 bs-buffer-sort-function (nth 5 list))
1086 ;; for backward compability 1086 ;; for backward compatibility
1087 (funcall (cdr list))) 1087 (funcall (cdr list)))
1088 ;; else 1088 ;; else
1089 (ding) 1089 (ding)
diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index 0a48c0fbd68..f813b5b84d1 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -348,7 +348,7 @@ FACE's list property `theme-face' \(using `custom-push-theme')."
348 (put face 'face-override-spec nil) 348 (put face 'face-override-spec nil)
349 (face-spec-set face spec t)))))))) 349 (face-spec-set face spec t))))))))
350 350
351;; XEmacs compability function. In XEmacs, when you reset a Custom 351;; XEmacs compatibility function. In XEmacs, when you reset a Custom
352;; Theme, you have to specify the theme to reset it to. We just apply 352;; Theme, you have to specify the theme to reset it to. We just apply
353;; the next theme. 353;; the next theme.
354(defun custom-theme-reset-faces (theme &rest args) 354(defun custom-theme-reset-faces (theme &rest args)
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 7bead624cc7..ab0d6bf837b 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -328,6 +328,10 @@ Can be `dvi', `pdf', or `ps'.")
328 ;; Zoom in/out. 328 ;; Zoom in/out.
329 (define-key map "+" 'doc-view-enlarge) 329 (define-key map "+" 'doc-view-enlarge)
330 (define-key map "-" 'doc-view-shrink) 330 (define-key map "-" 'doc-view-shrink)
331 ;; Fit the image to the window
332 (define-key map "W" 'doc-view-fit-width-to-window)
333 (define-key map "H" 'doc-view-fit-height-to-window)
334 (define-key map "P" 'doc-view-fit-page-to-window)
331 ;; Killing the buffer (and the process) 335 ;; Killing the buffer (and the process)
332 (define-key map (kbd "k") 'doc-view-kill-proc-and-buffer) 336 (define-key map (kbd "k") 'doc-view-kill-proc-and-buffer)
333 (define-key map (kbd "K") 'doc-view-kill-proc) 337 (define-key map (kbd "K") 'doc-view-kill-proc)
@@ -664,6 +668,78 @@ OpenDocument format)."
664 (interactive (list doc-view-shrink-factor)) 668 (interactive (list doc-view-shrink-factor))
665 (doc-view-enlarge (/ 1.0 factor))) 669 (doc-view-enlarge (/ 1.0 factor)))
666 670
671(defun doc-view-fit-width-to-window ()
672 "Fit the image width to the window width."
673 (interactive)
674 (let ((win-width (- (nth 2 (window-inside-pixel-edges))
675 (nth 0 (window-inside-pixel-edges))))
676 (slice (doc-view-current-slice)))
677 (if (not slice)
678 (let ((img-width (car (image-display-size
679 (image-get-display-property) t))))
680 (doc-view-enlarge (/ (float win-width) (float img-width))))
681
682 ;; If slice is set
683 (let* ((slice-width (nth 2 slice))
684 (scale-factor (/ (float win-width) (float slice-width)))
685 (new-slice (mapcar (lambda (x) (ceiling (* scale-factor x))) slice)))
686
687 (doc-view-enlarge scale-factor)
688 (setf (doc-view-current-slice) new-slice)
689 (doc-view-goto-page (doc-view-current-page))))))
690
691(defun doc-view-fit-height-to-window ()
692 "Fit the image height to the window height."
693 (interactive)
694 (let ((win-height (- (nth 3 (window-inside-pixel-edges))
695 (nth 1 (window-inside-pixel-edges))))
696 (slice (doc-view-current-slice)))
697 (if (not slice)
698 (let ((img-height (cdr (image-display-size
699 (image-get-display-property) t))))
700 ;; When users call 'doc-view-fit-height-to-window',
701 ;; they might want to go to next page by typing SPC
702 ;; ONLY once. So I used '(- win-height 1)' instead of
703 ;; 'win-height'
704 (doc-view-enlarge (/ (float (- win-height 1)) (float img-height))))
705
706 ;; If slice is set
707 (let* ((slice-height (nth 3 slice))
708 (scale-factor (/ (float (- win-height 1)) (float slice-height)))
709 (new-slice (mapcar (lambda (x) (ceiling (* scale-factor x))) slice)))
710
711 (doc-view-enlarge scale-factor)
712 (setf (doc-view-current-slice) new-slice)
713 (doc-view-goto-page (doc-view-current-page))))))
714
715(defun doc-view-fit-page-to-window ()
716 "Fit the image to the window.
717More specifically, this function enlarges image by:
718
719min {(window-width / image-width), (window-height / image-height)} times."
720 (interactive)
721 (let ((win-width (- (nth 2 (window-inside-pixel-edges))
722 (nth 0 (window-inside-pixel-edges))))
723 (win-height (- (nth 3 (window-inside-pixel-edges))
724 (nth 1 (window-inside-pixel-edges))))
725 (slice (doc-view-current-slice)))
726 (if (not slice)
727 (let ((img-width (car (image-display-size
728 (image-get-display-property) t)))
729 (img-height (cdr (image-display-size
730 (image-get-display-property) t))))
731 (doc-view-enlarge (min (/ (float win-width) (float img-width))
732 (/ (float (- win-height 1)) (float img-height)))))
733 ;; If slice is set
734 (let* ((slice-width (nth 2 slice))
735 (slice-height (nth 3 slice))
736 (scale-factor (min (/ (float win-width) (float slice-width))
737 (/ (float (- win-height 1)) (float slice-height))))
738 (new-slice (mapcar (lambda (x) (ceiling (* scale-factor x))) slice)))
739 (doc-view-enlarge scale-factor)
740 (setf (doc-view-current-slice) new-slice)
741 (doc-view-goto-page (doc-view-current-page))))))
742
667(defun doc-view-reconvert-doc () 743(defun doc-view-reconvert-doc ()
668 "Reconvert the current document. 744 "Reconvert the current document.
669Should be invoked when the cached images aren't up-to-date." 745Should be invoked when the cached images aren't up-to-date."
diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el
index 5cc9ecb4cf7..38584c437b8 100644
--- a/lisp/emacs-lisp/cconv.el
+++ b/lisp/emacs-lisp/cconv.el
@@ -536,7 +536,9 @@ FORM is the parent form that binds this var."
536 ;; it is often non-trivial for the programmer to avoid such 536 ;; it is often non-trivial for the programmer to avoid such
537 ;; unused vars. 537 ;; unused vars.
538 (not (intern-soft var)) 538 (not (intern-soft var))
539 (eq ?_ (aref (symbol-name var) 0))) 539 (eq ?_ (aref (symbol-name var) 0))
540 ;; As a special exception, ignore "ignore".
541 (eq var 'ignored))
540 (byte-compile-log-warning (format "Unused lexical %s `%S'" 542 (byte-compile-log-warning (format "Unused lexical %s `%S'"
541 varkind var)))) 543 varkind var))))
542 ;; If it's unused, there's no point converting it into a cons-cell, even if 544 ;; If it's unused, there's no point converting it into a cons-cell, even if
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 6aecc3615f3..4ce71b29d70 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -173,6 +173,8 @@
173 173
174;;; Code: 174;;; Code:
175 175
176(require 'tabulated-list)
177
176(defgroup package nil 178(defgroup package nil
177 "Manager for Emacs Lisp packages." 179 "Manager for Emacs Lisp packages."
178 :group 'applications 180 :group 'applications
@@ -1249,12 +1251,10 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
1249;;;; Package menu mode. 1251;;;; Package menu mode.
1250 1252
1251(defvar package-menu-mode-map 1253(defvar package-menu-mode-map
1252 (let ((map (copy-keymap special-mode-map)) 1254 (let ((map (make-sparse-keymap))
1253 (menu-map (make-sparse-keymap "Package"))) 1255 (menu-map (make-sparse-keymap "Package")))
1254 (set-keymap-parent map button-buffer-map) 1256 (set-keymap-parent map tabulated-list-mode-map)
1255 (define-key map "\C-m" 'package-menu-describe-package) 1257 (define-key map "\C-m" 'package-menu-describe-package)
1256 (define-key map "n" 'next-line)
1257 (define-key map "p" 'previous-line)
1258 (define-key map "u" 'package-menu-mark-unmark) 1258 (define-key map "u" 'package-menu-mark-unmark)
1259 (define-key map "\177" 'package-menu-backup-unmark) 1259 (define-key map "\177" 'package-menu-backup-unmark)
1260 (define-key map "d" 'package-menu-mark-delete) 1260 (define-key map "d" 'package-menu-mark-delete)
@@ -1264,8 +1264,6 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
1264 (define-key map "x" 'package-menu-execute) 1264 (define-key map "x" 'package-menu-execute)
1265 (define-key map "h" 'package-menu-quick-help) 1265 (define-key map "h" 'package-menu-quick-help)
1266 (define-key map "?" 'package-menu-describe-package) 1266 (define-key map "?" 'package-menu-describe-package)
1267 (define-key map [follow-link] 'mouse-face)
1268 (define-key map [mouse-2] 'mouse-select-window)
1269 (define-key map [menu-bar package-menu] (cons "Package" menu-map)) 1267 (define-key map [menu-bar package-menu] (cons "Package" menu-map))
1270 (define-key menu-map [mq] 1268 (define-key menu-map [mq]
1271 '(menu-item "Quit" quit-window 1269 '(menu-item "Quit" quit-window
@@ -1314,49 +1312,93 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
1314 map) 1312 map)
1315 "Local keymap for `package-menu-mode' buffers.") 1313 "Local keymap for `package-menu-mode' buffers.")
1316 1314
1317(defvar package-menu-sort-button-map 1315(define-derived-mode package-menu-mode tabulated-list-mode "Package Menu"
1318 (let ((map (make-sparse-keymap)))
1319 (define-key map [header-line mouse-1] 'package-menu-sort-by-column)
1320 (define-key map [header-line mouse-2] 'package-menu-sort-by-column)
1321 (define-key map [follow-link] 'mouse-face)
1322 map)
1323 "Local keymap for package menu sort buttons.")
1324
1325(put 'package-menu-mode 'mode-class 'special)
1326
1327(define-derived-mode package-menu-mode special-mode "Package Menu"
1328 "Major mode for browsing a list of packages. 1316 "Major mode for browsing a list of packages.
1329Letters do not insert themselves; instead, they are commands. 1317Letters do not insert themselves; instead, they are commands.
1330\\<package-menu-mode-map> 1318\\<package-menu-mode-map>
1331\\{package-menu-mode-map}" 1319\\{package-menu-mode-map}"
1332 (setq truncate-lines t) 1320 (setq tabulated-list-format [("Package" 18 package-menu--name-predicate)
1333 (setq buffer-read-only t) 1321 ("Version" 12 nil)
1334 (set (make-local-variable 'revert-buffer-function) 'package-menu-revert) 1322 ("Status" 10 package-menu--status-predicate)
1335 (setq header-line-format 1323 ("Description" 0 nil)])
1336 (mapconcat 1324 (setq tabulated-list-padding 2)
1337 (lambda (pair) 1325 (setq tabulated-list-sort-key (cons "Status" nil))
1338 (let ((column (car pair)) 1326 (tabulated-list-init-header))
1339 (name (cdr pair))) 1327
1340 (concat 1328(defmacro package--push (package desc status listname)
1341 ;; Insert a space that aligns the button properly. 1329 "Convenience macro for `package-menu--generate'.
1342 (propertize " " 'display (list 'space :align-to column) 1330If the alist stored in the symbol LISTNAME lacks an entry for a
1343 'face 'fixed-pitch) 1331package PACKAGE with descriptor DESC, add one. The alist is
1344 ;; Set up the column button. 1332keyed with cons cells (PACKAGE . VERSION), where PACKAGE is a
1345 (propertize name 1333symbol and VERSION is a version list."
1346 'column-name name 1334 `(let* ((version (package-desc-vers ,desc))
1347 'help-echo "mouse-1: sort by column" 1335 (key (cons ,package version)))
1348 'mouse-face 'highlight 1336 (unless (assoc key ,listname)
1349 'keymap package-menu-sort-button-map)))) 1337 (push (list key ,status (package-desc-doc ,desc)) ,listname))))
1350 ;; We take a trick from buff-menu and have a dummy leading 1338
1351 ;; space to align the header line with the beginning of the 1339(defun package-menu--generate (&optional remember-pos)
1352 ;; text. This doesn't really work properly on Emacs 21, but 1340 "Populate the Package Menu.
1353 ;; it is close enough. 1341Optional argument REMEMBER-POS, if non-nil, means to move point
1354 '((0 . "") 1342to the entry as before."
1355 (2 . "Package") 1343 ;; Construct list of ((PACKAGE . VERSION) STATUS DESCRIPTION).
1356 (20 . "Version") 1344 (let (info-list name builtin)
1357 (32 . "Status") 1345 ;; Installed packages:
1358 (43 . "Description")) 1346 (dolist (elt package-alist)
1359 ""))) 1347 (setq name (car elt))
1348 (package--push name (cdr elt)
1349 (if (stringp (cadr (assq name package-load-list)))
1350 "held" "installed")
1351 info-list))
1352
1353 ;; Built-in packages:
1354 (dolist (elt package--builtins)
1355 (setq name (car elt))
1356 (unless (eq name 'emacs) ; Hide the `emacs' package.
1357 (package--push name (cdr elt) "built-in" info-list)))
1358
1359 ;; Available and disabled packages:
1360 (dolist (elt package-archive-contents)
1361 (setq name (car elt))
1362 (let ((hold (assq name package-load-list)))
1363 (package--push name (cdr elt)
1364 (if (and hold (null (cadr hold))) "disabled" "available")
1365 info-list)))
1366
1367 ;; Obsolete packages:
1368 (dolist (elt package-obsolete-alist)
1369 (dolist (inner-elt (cdr elt))
1370 (package--push (car elt) (cdr inner-elt) "obsolete" info-list)))
1371
1372 ;; Print the result.
1373 (setq tabulated-list-entries (mapcar 'package-menu--print-info info-list))
1374 (tabulated-list-print remember-pos)))
1375
1376(defun package-menu--print-info (pkg)
1377 "Return a package entry suitable for `tabulated-list-entries'.
1378PKG has the form ((PACKAGE . VERSION) STATUS DOC).
1379Return (KEY [NAME VERSION STATUS DOC]), where KEY is the
1380identifier (NAME . VERSION-LIST)."
1381 (let* ((package (caar pkg))
1382 (version (cdr (car pkg)))
1383 (status (nth 1 pkg))
1384 (doc (or (nth 2 pkg) ""))
1385 (face (cond
1386 ((string= status "built-in") 'font-lock-builtin-face)
1387 ((string= status "available") 'default)
1388 ((string= status "held") 'font-lock-constant-face)
1389 ((string= status "disabled") 'font-lock-warning-face)
1390 ((string= status "installed") 'font-lock-comment-face)
1391 (t 'font-lock-warning-face)))) ; obsolete.
1392 (list (cons package version)
1393 (vector (list (symbol-name package)
1394 'face 'link
1395 'follow-link t
1396 'package-symbol package
1397 'action 'package-menu-describe-package)
1398 (propertize (package-version-join version)
1399 'font-lock-face face)
1400 (propertize status 'font-lock-face face)
1401 (propertize doc 'font-lock-face face)))))
1360 1402
1361(defun package-menu-refresh () 1403(defun package-menu-refresh ()
1362 "Download the Emacs Lisp package archive. 1404 "Download the Emacs Lisp package archive.
@@ -1366,59 +1408,42 @@ This fetches the contents of each archive specified in
1366 (unless (eq major-mode 'package-menu-mode) 1408 (unless (eq major-mode 'package-menu-mode)
1367 (error "The current buffer is not a Package Menu")) 1409 (error "The current buffer is not a Package Menu"))
1368 (package-refresh-contents) 1410 (package-refresh-contents)
1369 (package--generate-package-list)) 1411 (package-menu--generate t))
1370 1412
1371(defun package-menu-revert (&optional arg noconfirm) 1413(defun package-menu-describe-package (&optional button)
1372 "Update the list of packages. 1414 "Describe the current package.
1373This function is the `revert-buffer-function' for Package Menu 1415If optional arg BUTTON is non-nil, describe its associated package."
1374buffers. The arguments are ignored."
1375 (interactive) 1416 (interactive)
1376 (unless (eq major-mode 'package-menu-mode) 1417 (let ((package (if button (button-get button 'package-symbol)
1377 (error "The current buffer is not a Package Menu")) 1418 (car (tabulated-list-get-id)))))
1378 (package--generate-package-list)) 1419 (if package
1379 1420 (describe-package package))))
1380(defun package-menu-describe-package ()
1381 "Describe the package in the current line."
1382 (interactive)
1383 (let ((name (package-menu-get-package)))
1384 (if name
1385 (describe-package (intern name))
1386 (message "No package on this line"))))
1387
1388(defun package-menu-mark-internal (what)
1389 (unless (eobp)
1390 (let ((buffer-read-only nil))
1391 (beginning-of-line)
1392 (delete-char 1)
1393 (insert what)
1394 (forward-line))))
1395 1421
1396;; fixme numeric argument 1422;; fixme numeric argument
1397(defun package-menu-mark-delete (num) 1423(defun package-menu-mark-delete (num)
1398 "Mark a package for deletion and move to the next line." 1424 "Mark a package for deletion and move to the next line."
1399 (interactive "p") 1425 (interactive "p")
1400 (if (string-equal (package-menu-get-status) "installed") 1426 (if (string-equal (package-menu-get-status) "installed")
1401 (package-menu-mark-internal "D") 1427 (tabulated-list-put-tag "D" t)
1402 (forward-line))) 1428 (forward-line)))
1403 1429
1404(defun package-menu-mark-install (num) 1430(defun package-menu-mark-install (num)
1405 "Mark a package for installation and move to the next line." 1431 "Mark a package for installation and move to the next line."
1406 (interactive "p") 1432 (interactive "p")
1407 (if (string-equal (package-menu-get-status) "available") 1433 (if (string-equal (package-menu-get-status) "available")
1408 (package-menu-mark-internal "I") 1434 (tabulated-list-put-tag "I" t)
1409 (forward-line))) 1435 (forward-line)))
1410 1436
1411(defun package-menu-mark-unmark (num) 1437(defun package-menu-mark-unmark (num)
1412 "Clear any marks on a package and move to the next line." 1438 "Clear any marks on a package and move to the next line."
1413 (interactive "p") 1439 (interactive "p")
1414 (package-menu-mark-internal " ")) 1440 (tabulated-list-put-tag " " t))
1415 1441
1416(defun package-menu-backup-unmark () 1442(defun package-menu-backup-unmark ()
1417 "Back up one line and clear any marks on that package." 1443 "Back up one line and clear any marks on that package."
1418 (interactive) 1444 (interactive)
1419 (forward-line -1) 1445 (forward-line -1)
1420 (package-menu-mark-internal " ") 1446 (tabulated-list-put-tag " "))
1421 (forward-line -1))
1422 1447
1423(defun package-menu-mark-obsolete-for-deletion () 1448(defun package-menu-mark-obsolete-for-deletion ()
1424 "Mark all obsolete packages for deletion." 1449 "Mark all obsolete packages for deletion."
@@ -1428,7 +1453,7 @@ buffers. The arguments are ignored."
1428 (forward-line 2) 1453 (forward-line 2)
1429 (while (not (eobp)) 1454 (while (not (eobp))
1430 (if (looking-at ".*\\s obsolete\\s ") 1455 (if (looking-at ".*\\s obsolete\\s ")
1431 (package-menu-mark-internal "D") 1456 (tabulated-list-put-tag "D" t)
1432 (forward-line 1))))) 1457 (forward-line 1)))))
1433 1458
1434(defun package-menu-quick-help () 1459(defun package-menu-quick-help ()
@@ -1439,20 +1464,6 @@ buffers. The arguments are ignored."
1439(define-obsolete-function-alias 1464(define-obsolete-function-alias
1440 'package-menu-view-commentary 'package-menu-describe-package "24.1") 1465 'package-menu-view-commentary 'package-menu-describe-package "24.1")
1441 1466
1442;; Return the name of the package on the current line.
1443(defun package-menu-get-package ()
1444 (save-excursion
1445 (beginning-of-line)
1446 (if (looking-at ". \\([^ \t]*\\)")
1447 (match-string-no-properties 1))))
1448
1449;; Return the version of the package on the current line.
1450(defun package-menu-get-version ()
1451 (save-excursion
1452 (beginning-of-line)
1453 (if (looking-at ". [^ \t]*[ \t]*\\([0-9.]*\\)")
1454 (match-string 1))))
1455
1456(defun package-menu-get-status () 1467(defun package-menu-get-status ()
1457 (save-excursion 1468 (save-excursion
1458 (if (looking-at ". [^ \t]*[ \t]*[^ \t]*[ \t]*\\([^ \t]*\\)") 1469 (if (looking-at ". [^ \t]*[ \t]*[^ \t]*[ \t]*\\([^ \t]*\\)")
@@ -1464,19 +1475,22 @@ buffers. The arguments are ignored."
1464Packages marked for installation are downloaded and installed; 1475Packages marked for installation are downloaded and installed;
1465packages marked for deletion are removed." 1476packages marked for deletion are removed."
1466 (interactive) 1477 (interactive)
1467 (let (install-list delete-list cmd) 1478 (unless (eq major-mode 'package-menu-mode)
1479 (error "The current buffer is not in Package Menu mode"))
1480 (let (install-list delete-list cmd id)
1468 (save-excursion 1481 (save-excursion
1469 (goto-char (point-min)) 1482 (goto-char (point-min))
1470 (while (not (eobp)) 1483 (while (not (eobp))
1471 (setq cmd (char-after)) 1484 (setq cmd (char-after))
1472 (cond 1485 (unless (eq cmd ?\s)
1473 ((eq cmd ?\s) t) 1486 ;; This is the key (PACKAGE . VERSION-LIST).
1474 ((eq cmd ?D) 1487 (setq id (tabulated-list-get-id))
1475 (push (cons (package-menu-get-package) 1488 (cond ((eq cmd ?D)
1476 (package-menu-get-version)) 1489 (push (cons (symbol-name (car id))
1477 delete-list)) 1490 (package-version-join (cdr id)))
1478 ((eq cmd ?I) 1491 delete-list))
1479 (push (package-menu-get-package) install-list))) 1492 ((eq cmd ?I)
1493 (push (car id) install-list))))
1480 (forward-line))) 1494 (forward-line)))
1481 ;; Delete packages, prompting if necessary. 1495 ;; Delete packages, prompting if necessary.
1482 (when delete-list 1496 (when delete-list
@@ -1502,217 +1516,71 @@ packages marked for deletion are removed."
1502 (format "Install package `%s'? " (car install-list)) 1516 (format "Install package `%s'? " (car install-list))
1503 (format "Install these %d packages (%s)? " 1517 (format "Install these %d packages (%s)? "
1504 (length install-list) 1518 (length install-list)
1505 (mapconcat 'identity install-list ", ")))) 1519 (mapconcat 'symbol-name install-list ", "))))
1506 (dolist (elt install-list) 1520 (mapc 'package-install install-list)))
1507 (package-install (intern elt)))))
1508 ;; If we deleted anything, regenerate `package-alist'. This is done 1521 ;; If we deleted anything, regenerate `package-alist'. This is done
1509 ;; automatically if we installed a package. 1522 ;; automatically if we installed a package.
1510 (and delete-list (null install-list) 1523 (and delete-list (null install-list)
1511 (package-initialize)) 1524 (package-initialize))
1512 (if (or delete-list install-list) 1525 (if (or delete-list install-list)
1513 (package-menu-revert) 1526 (package-menu--generate t)
1514 (message "No operations specified.")))) 1527 (message "No operations specified."))))
1515 1528
1516(defun package-print-package (package version key desc) 1529(defun package-menu--version-predicate (A B)
1517 (let ((face 1530 (let ((vA (or (aref (cadr A) 1) '(0)))
1518 (cond ((string= key "built-in") 'font-lock-builtin-face) 1531 (vB (or (aref (cadr B) 1) '(0))))
1519 ((string= key "available") 'default) 1532 (if (version-list-= vA vB)
1520 ((string= key "held") 'font-lock-constant-face) 1533 (package-menu--name-predicate A B)
1521 ((string= key "disabled") 'font-lock-warning-face) 1534 (version-list-< vA vB))))
1522 ((string= key "installed") 'font-lock-comment-face) 1535
1523 (t ; obsolete, but also the default. 1536(defun package-menu--status-predicate (A B)
1524 'font-lock-warning-face)))) 1537 (let ((sA (aref (cadr A) 2))
1525 (insert (propertize " " 'font-lock-face face)) 1538 (sB (aref (cadr B) 2)))
1526 (insert-text-button (symbol-name package) 1539 (cond ((string= sA sB)
1527 'face 'link 1540 (package-menu--name-predicate A B))
1528 'follow-link t 1541 ((string= sA "available") t)
1529 'package-symbol package 1542 ((string= sB "available") nil)
1530 'action (lambda (button) 1543 ((string= sA "installed") t)
1531 (describe-package 1544 ((string= sB "installed") nil)
1532 (button-get button 'package-symbol)))) 1545 ((string= sA "held") t)
1533 (indent-to 20 1) 1546 ((string= sB "held") nil)
1534 (insert (propertize (package-version-join version) 'font-lock-face face)) 1547 ((string= sA "built-in") t)
1535 (indent-to 32 1) 1548 ((string= sB "built-in") nil)
1536 (insert (propertize key 'font-lock-face face)) 1549 ((string= sA "obsolete") t)
1537 ;; FIXME: this 'when' is bogus... 1550 ((string= sB "obsolete") nil)
1538 (when desc 1551 (t (string< sA sB)))))
1539 (indent-to 43 1) 1552
1540 (let ((opoint (point))) 1553(defun package-menu--description-predicate (A B)
1541 (insert (propertize desc 'font-lock-face face)) 1554 (let ((dA (aref (cadr A) 3))
1542 (upcase-region opoint (min (point) (1+ opoint))))) 1555 (dB (aref (cadr B) 3)))
1543 (insert "\n"))) 1556 (if (string= dA dB)
1544 1557 (package-menu--name-predicate A B)
1545(defun package-list-maybe-add (package version status description result) 1558 (string< dA dB))))
1546 (unless (assoc (cons package version) result) 1559
1547 (push (list (cons package version) status description) result)) 1560(defun package-menu--name-predicate (A B)
1548 result) 1561 (string< (symbol-name (caar A))
1549 1562 (symbol-name (caar B))))
1550(defvar package-menu-package-list nil
1551 "List of packages to display in the Package Menu buffer.
1552A value of nil means to display all packages.")
1553
1554(defvar package-menu-sort-key nil
1555 "Sort key for the current Package Menu buffer.")
1556
1557(defun package--generate-package-list ()
1558 "Populate the current Package Menu buffer."
1559 (let ((inhibit-read-only t)
1560 info-list name desc hold builtin)
1561 (erase-buffer)
1562 ;; List installed packages
1563 (dolist (elt package-alist)
1564 (setq name (car elt))
1565 (when (or (null package-menu-package-list)
1566 (memq name package-menu-package-list))
1567 (setq desc (cdr elt)
1568 hold (cadr (assq name package-load-list)))
1569 (setq info-list
1570 (package-list-maybe-add
1571 name (package-desc-vers desc)
1572 ;; FIXME: it turns out to be tricky to see if this
1573 ;; package is presently activated.
1574 (if (stringp hold) "held" "installed")
1575 (package-desc-doc desc)
1576 info-list))))
1577
1578 ;; List built-in packages
1579 (dolist (elt package--builtins)
1580 (setq name (car elt))
1581 (when (and (not (eq name 'emacs)) ; Hide the `emacs' package.
1582 (or (null package-menu-package-list)
1583 (memq name package-menu-package-list)))
1584 (setq desc (cdr elt))
1585 (setq info-list
1586 (package-list-maybe-add
1587 name (package-desc-vers desc)
1588 "built-in"
1589 (package-desc-doc desc)
1590 info-list))))
1591
1592 ;; List available and disabled packages
1593 (dolist (elt package-archive-contents)
1594 (setq name (car elt)
1595 desc (cdr elt)
1596 hold (assq name package-load-list))
1597 (when (or (null package-menu-package-list)
1598 (memq name package-menu-package-list))
1599 (setq info-list
1600 (package-list-maybe-add name
1601 (package-desc-vers desc)
1602 (if (and hold (null (cadr hold)))
1603 "disabled"
1604 "available")
1605 (package-desc-doc (cdr elt))
1606 info-list))))
1607 ;; List obsolete packages
1608 (mapc (lambda (elt)
1609 (mapc (lambda (inner-elt)
1610 (setq info-list
1611 (package-list-maybe-add (car elt)
1612 (package-desc-vers
1613 (cdr inner-elt))
1614 "obsolete"
1615 (package-desc-doc
1616 (cdr inner-elt))
1617 info-list)))
1618 (cdr elt)))
1619 package-obsolete-alist)
1620
1621 (setq info-list
1622 (sort info-list
1623 (cond ((string= package-menu-sort-key "Package")
1624 'package-menu--name-predicate)
1625 ((string= package-menu-sort-key "Version")
1626 'package-menu--version-predicate)
1627 ((string= package-menu-sort-key "Description")
1628 'package-menu--description-predicate)
1629 (t ; By default, sort by package status
1630 'package-menu--status-predicate))))
1631
1632 (dolist (elt info-list)
1633 (package-print-package (car (car elt))
1634 (cdr (car elt))
1635 (car (cdr elt))
1636 (car (cdr (cdr elt)))))
1637 (goto-char (point-min))
1638 (set-buffer-modified-p nil)
1639 (current-buffer)))
1640
1641(defun package-menu--version-predicate (left right)
1642 (let ((vleft (or (cdr (car left)) '(0)))
1643 (vright (or (cdr (car right)) '(0))))
1644 (if (version-list-= vleft vright)
1645 (package-menu--name-predicate left right)
1646 (version-list-< vleft vright))))
1647
1648(defun package-menu--status-predicate (left right)
1649 (let ((sleft (cadr left))
1650 (sright (cadr right)))
1651 (cond ((string= sleft sright)
1652 (package-menu--name-predicate left right))
1653 ((string= sleft "available") t)
1654 ((string= sright "available") nil)
1655 ((string= sleft "installed") t)
1656 ((string= sright "installed") nil)
1657 ((string= sleft "held") t)
1658 ((string= sright "held") nil)
1659 ((string= sleft "built-in") t)
1660 ((string= sright "built-in") nil)
1661 ((string= sleft "obsolete") t)
1662 ((string= sright "obsolete") nil)
1663 (t (string< sleft sright)))))
1664
1665(defun package-menu--description-predicate (left right)
1666 (let ((sleft (car (cddr left)))
1667 (sright (car (cddr right))))
1668 (if (string= sleft sright)
1669 (package-menu--name-predicate left right)
1670 (string< sleft sright))))
1671
1672(defun package-menu--name-predicate (left right)
1673 (string< (symbol-name (caar left))
1674 (symbol-name (caar right))))
1675
1676(defun package-menu-sort-by-column (&optional e)
1677 "Sort the package menu by the column of the mouse click E."
1678 (interactive "e")
1679 (let* ((pos (event-start e))
1680 (obj (posn-object pos))
1681 (col (if obj
1682 (get-text-property (cdr obj) 'column-name (car obj))
1683 (get-text-property (posn-point pos) 'column-name)))
1684 (buf (window-buffer (posn-window (event-start e)))))
1685 (with-current-buffer buf
1686 (when (eq major-mode 'package-menu-mode)
1687 (setq package-menu-sort-key col)
1688 (package--generate-package-list)))))
1689
1690(defun package--list-packages (&optional packages)
1691 "Generate and pop to the *Packages* buffer.
1692Optional PACKAGES is a list of names of packages (symbols) to
1693list; the default is to display everything in `package-alist'."
1694 (require 'finder-inf nil t)
1695 (let ((buf (get-buffer-create "*Packages*")))
1696 (with-current-buffer buf
1697 (package-menu-mode)
1698 (set (make-local-variable 'package-menu-package-list) packages)
1699 (set (make-local-variable 'package-menu-sort-key) nil)
1700 (package--generate-package-list))
1701 ;; The package menu buffer has keybindings. If the user types
1702 ;; `M-x list-packages', that suggests it should become current.
1703 (switch-to-buffer buf)))
1704 1563
1705;;;###autoload 1564;;;###autoload
1706(defun list-packages () 1565(defun list-packages (&optional no-fetch)
1707 "Display a list of packages. 1566 "Display a list of packages.
1708Fetches the updated list of packages before displaying. 1567This first fetches the updated list of packages before
1568displaying, unless a prefix argument NO-FETCH is specified.
1709The list is displayed in a buffer named `*Packages*'." 1569The list is displayed in a buffer named `*Packages*'."
1710 (interactive) 1570 (interactive "P")
1571 (require 'finder-inf nil t)
1711 ;; Initialize the package system if necessary. 1572 ;; Initialize the package system if necessary.
1712 (unless package--initialized 1573 (unless package--initialized
1713 (package-initialize t)) 1574 (package-initialize t))
1714 (package-refresh-contents) 1575 (unless no-fetch
1715 (package--list-packages)) 1576 (package-refresh-contents))
1577 (let ((buf (get-buffer-create "*Packages*")))
1578 (with-current-buffer buf
1579 (package-menu-mode)
1580 (package-menu--generate))
1581 ;; The package menu buffer has keybindings. If the user types
1582 ;; `M-x list-packages', that suggests it should become current.
1583 (switch-to-buffer buf)))
1716 1584
1717;;;###autoload 1585;;;###autoload
1718(defalias 'package-list-packages 'list-packages) 1586(defalias 'package-list-packages 'list-packages)
@@ -1722,7 +1590,7 @@ The list is displayed in a buffer named `*Packages*'."
1722Does not fetch the updated list of packages before displaying. 1590Does not fetch the updated list of packages before displaying.
1723The list is displayed in a buffer named `*Packages*'." 1591The list is displayed in a buffer named `*Packages*'."
1724 (interactive) 1592 (interactive)
1725 (package--list-packages)) 1593 (list-packages t))
1726 1594
1727(provide 'package) 1595(provide 'package)
1728 1596
diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el
new file mode 100644
index 00000000000..03ee59dd89c
--- /dev/null
+++ b/lisp/emacs-lisp/tabulated-list.el
@@ -0,0 +1,355 @@
1;;; tabulated-list.el --- generic major mode for tabulated lists.
2
3;; Copyright (C) 2011 Free Software Foundation, Inc.
4
5;; Author: Chong Yidong <cyd@stupidchicken.com>
6;; Keywords: extensions, lisp
7
8;; This file is part of GNU Emacs.
9
10;; GNU Emacs is free software; you can redistribute it and/or modify
11;; it under the terms of the GNU General Public License as published by
12;; the Free Software Foundation; either version 3, or (at your option)
13;; any later version.
14
15;; GNU Emacs is distributed in the hope that it will be useful,
16;; but WITHOUT ANY WARRANTY; without even the implied warranty of
17;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18;; GNU General Public License for more details.
19
20;; You should have received a copy of the GNU General Public License
21;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
22
23;;; Commentary:
24
25;; This file defines `tabulated-list-mode', a generic major mode for displaying
26;; lists of tabulated data, intended for other major modes to inherit from. It
27;; provides several utility routines, e.g. for pretty-printing lines of
28;; tabulated data to fit into the appropriate columns.
29
30;; For usage information, see the documentation of `tabulated-list-mode'.
31
32;; This package originated from Tom Tromey's Package Menu mode, extended and
33;; generalized to be used by other modes.
34
35;;; Code:
36
37(defvar tabulated-list-format nil
38 "The format of the current Tabulated List mode buffer.
39This should be a vector of elements (NAME WIDTH SORT), where:
40 - NAME is a string describing the column.
41 - WIDTH is the width to reserve for the column.
42 For the final element, its numerical value is ignored.
43 - SORT specifies how to sort entries by this column.
44 If nil, this column cannot be used for sorting.
45 If t, sort by comparing the string value printed in the column.
46 Otherwise, it should be a predicate function suitable for
47 `sort', accepting arguments with the same form as the elements
48 of `tabulated-list-entries'.")
49(make-variable-buffer-local 'tabulated-list-format)
50
51(defvar tabulated-list-entries nil
52 "Entries displayed in the current Tabulated List buffer.
53This should be either a function, or a list.
54If a list, each element has the form (ID [DESC1 ... DESCN]),
55where:
56 - ID is nil, or a Lisp object uniquely identifying this entry,
57 which is used to keep the cursor on the \"same\" entry when
58 rearranging the list. Comparison is done with `equal'.
59
60 - Each DESC is a column descriptor, one for each column
61 specified in `tabulated-list-format'. A descriptor is either
62 a string, which is printed as-is, or a list (LABEL . PROPS),
63 which means to use `insert-text-button' to insert a text
64 button with label LABEL and button properties PROPS.
65 The string, or button label, must not contain any newline.
66
67If `tabulated-list-entries' is a function, it is called with no
68arguments and must return a list of the above form.")
69(make-variable-buffer-local 'tabulated-list-entries)
70
71(defvar tabulated-list-padding 0
72 "Number of characters preceding each Tabulated List mode entry.
73By default, lines are padded with spaces, but you can use the
74function `tabulated-list-put-tag' to change this.")
75(make-variable-buffer-local 'tabulated-list-padding)
76
77(defvar tabulated-list-revert-hook nil
78 "Hook run before reverting a Tabulated List buffer.
79This is commonly used to recompute `tabulated-list-entries'.")
80
81(defvar tabulated-list-printer 'tabulated-list-print-entry
82 "Function for inserting a Tabulated List entry at point.
83It is called with two arguments, ID and COLS. ID is a Lisp
84object identifying the entry, and COLS is a vector of column
85descriptors, as documented in `tabulated-list-entries'.")
86(make-variable-buffer-local 'tabulated-list-printer)
87
88(defvar tabulated-list-sort-key nil
89 "Sort key for the current Tabulated List mode buffer.
90If nil, no additional sorting is performed.
91Otherwise, this should be a cons cell (NAME . FLIP).
92NAME is a string matching one of the column names in
93`tabulated-list-format' (the corresponding SORT entry in
94`tabulated-list-format' then specifies how to sort). FLIP, if
95non-nil, means to invert the resulting sort.")
96(make-variable-buffer-local 'tabulated-list-sort-key)
97
98(defun tabulated-list-get-id (&optional pos)
99 "Obtain the entry ID of the Tabulated List mode entry at POS.
100This is an ID object from `tabulated-list-entries', or nil.
101POS, if omitted or nil, defaults to point."
102 (get-text-property (or pos (point)) 'tabulated-list-id))
103
104(defun tabulated-list-put-tag (tag &optional advance)
105 "Put TAG in the padding area of the current line.
106TAG should be a string, with length <= `tabulated-list-padding'.
107If ADVANCE is non-nil, move forward by one line afterwards."
108 (unless (stringp tag)
109 (error "Invalid argument to `tabulated-list-put-tag'"))
110 (unless (> tabulated-list-padding 0)
111 (error "Unable to tag the current line"))
112 (save-excursion
113 (beginning-of-line)
114 (when (get-text-property (point) 'tabulated-list-id)
115 (let ((beg (point))
116 (inhibit-read-only t))
117 (forward-char tabulated-list-padding)
118 (insert-and-inherit
119 (if (<= (length tag) tabulated-list-padding)
120 (concat tag
121 (make-string (- tabulated-list-padding (length tag))
122 ?\s))
123 (substring tag 0 tabulated-list-padding)))
124 (delete-region beg (+ beg tabulated-list-padding)))))
125 (if advance
126 (forward-line)))
127
128(defvar tabulated-list-mode-map
129 (let ((map (copy-keymap special-mode-map)))
130 (set-keymap-parent map button-buffer-map)
131 (define-key map "n" 'next-line)
132 (define-key map "p" 'previous-line)
133 (define-key map [follow-link] 'mouse-face)
134 (define-key map [mouse-2] 'mouse-select-window)
135 map)
136 "Local keymap for `tabulated-list-mode' buffers.")
137
138(defvar tabulated-list-sort-button-map
139 (let ((map (make-sparse-keymap)))
140 (define-key map [header-line mouse-1] 'tabulated-list-col-sort)
141 (define-key map [header-line mouse-2] 'tabulated-list-col-sort)
142 (define-key map [follow-link] 'mouse-face)
143 map)
144 "Local keymap for `tabulated-list-mode' sort buttons.")
145
146(defun tabulated-list-init-header ()
147 "Set up header line for the Tabulated List buffer."
148 (let ((x tabulated-list-padding)
149 (button-props `(help-echo "Click to sort by column"
150 mouse-face highlight
151 keymap ,tabulated-list-sort-button-map))
152 (cols nil))
153 (if (> tabulated-list-padding 0)
154 (push (propertize " " 'display `(space :align-to ,x)) cols))
155 (dotimes (n (length tabulated-list-format))
156 (let* ((col (aref tabulated-list-format n))
157 (width (nth 1 col))
158 (label (car col)))
159 (setq x (+ x 1 width))
160 (and (<= tabulated-list-padding 0)
161 (= n 0)
162 (setq label (concat " " label)))
163 (push
164 (cond
165 ;; An unsortable column
166 ((not (nth 2 col)) label)
167 ;; The selected sort column
168 ((equal (car col) (car tabulated-list-sort-key))
169 (apply 'propertize
170 (concat label
171 (cond
172 ((> (+ 2 (length label)) width)
173 "")
174 ((cdr tabulated-list-sort-key)
175 " â–²")
176 (t " â–¼")))
177 'face 'bold
178 'tabulated-list-column-name (car col)
179 button-props))
180 ;; Unselected sortable column.
181 (t (apply 'propertize label
182 'tabulated-list-column-name (car col)
183 button-props)))
184 cols))
185 (push (propertize " "
186 'display (list 'space :align-to x)
187 'face 'fixed-pitch)
188 cols))
189 (setq header-line-format (mapconcat 'identity (nreverse cols) ""))))
190
191(defun tabulated-list-revert (&rest ignored)
192 "The `revert-buffer-function' for `tabulated-list-mode'.
193It runs `tabulated-list-revert-hook', then calls `tabulated-list-print'."
194 (interactive)
195 (unless (derived-mode-p 'tabulated-list-mode)
196 (error "The current buffer is not in Tabulated List mode"))
197 (run-hooks 'tabulated-list-revert-hook)
198 (tabulated-list-print t))
199
200(defun tabulated-list-print (&optional remember-pos)
201 "Populate the current Tabulated List mode buffer.
202This sorts the `tabulated-list-entries' list if sorting is
203specified by `tabulated-list-sort-key'. It then erases the
204buffer and inserts the entries with `tabulated-list-printer'.
205
206Optional argument REMEMBER-POS, if non-nil, means to move point
207to the entry with the same ID element as the current line."
208 (let ((inhibit-read-only t)
209 (entries (if (functionp 'tabulated-list-entries)
210 (funcall tabulated-list-entries)
211 tabulated-list-entries))
212 entry-id saved-pt saved-col)
213 (and remember-pos
214 (setq entry-id (tabulated-list-get-id))
215 (setq saved-col (current-column)))
216 (erase-buffer)
217 ;; Sort the buffers, if necessary.
218 (when tabulated-list-sort-key
219 (let ((sort-column (car tabulated-list-sort-key))
220 (len (length tabulated-list-format))
221 (n 0)
222 sorter)
223 ;; Which column is to be sorted?
224 (while (and (< n len)
225 (not (equal (car (aref tabulated-list-format n))
226 sort-column)))
227 (setq n (1+ n)))
228 (when (< n len)
229 (setq sorter (nth 2 (aref tabulated-list-format n)))
230 (when (eq sorter t)
231 (setq sorter ; Default sorter checks column N:
232 (lambda (A B)
233 (setq A (aref (cadr A) n))
234 (setq B (aref (cadr B) n))
235 (string< (if (stringp A) A (car A))
236 (if (stringp B) B (car B))))))
237 (setq entries (sort entries sorter))
238 (if (cdr tabulated-list-sort-key)
239 (setq entries (nreverse entries)))
240 (unless (functionp 'tabulated-list-entries)
241 (setq tabulated-list-entries entries)))))
242 ;; Print the resulting list.
243 (dolist (elt entries)
244 (and entry-id
245 (equal entry-id (car elt))
246 (setq saved-pt (point)))
247 (apply tabulated-list-printer elt))
248 (set-buffer-modified-p nil)
249 ;; If REMEMBER-POS was specified, move to the "old" location.
250 (if saved-pt
251 (progn (goto-char saved-pt)
252 (move-to-column saved-col))
253 (goto-char (point-min)))))
254
255(defun tabulated-list-print-entry (id cols)
256 "Insert a Tabulated List entry at point.
257This is the default `tabulated-list-printer' function. ID is a
258Lisp object identifying the entry to print, and COLS is a vector
259of column descriptors."
260 (let ((beg (point))
261 (x (max tabulated-list-padding 0))
262 (len (length tabulated-list-format)))
263 (if (> tabulated-list-padding 0)
264 (insert (make-string x ?\s)))
265 (dotimes (n len)
266 (let* ((format (aref tabulated-list-format n))
267 (desc (aref cols n))
268 (width (nth 1 format))
269 (label (if (stringp desc) desc (car desc)))
270 (help-echo (concat (car format) ": " label)))
271 ;; Truncate labels if necessary.
272 (and (> width 6)
273 (> (length label) width)
274 (setq label (concat (substring desc 0 (- width 3))
275 "...")))
276 (if (stringp desc)
277 (insert (propertize label 'help-echo help-echo))
278 (apply 'insert-text-button label (cdr desc)))
279 (setq x (+ x 1 width)))
280 ;; No need to append any spaces if this is the last column.
281 (if (< (1+ n) len)
282 (indent-to x 1)))
283 (insert ?\n)
284 (put-text-property beg (point) 'tabulated-list-id id)))
285
286(defun tabulated-list-col-sort (&optional e)
287 "Sort Tabulated List entries by the column of the mouse click E."
288 (interactive "e")
289 (let* ((pos (event-start e))
290 (obj (posn-object pos))
291 (name (get-text-property (if obj (cdr obj) (posn-point pos))
292 'tabulated-list-column-name
293 (car obj))))
294 (with-current-buffer (window-buffer (posn-window pos))
295 (when (derived-mode-p 'tabulated-list-mode)
296 ;; Flip the sort order on a second click.
297 (if (equal name (car tabulated-list-sort-key))
298 (setcdr tabulated-list-sort-key
299 (not (cdr tabulated-list-sort-key)))
300 (setq tabulated-list-sort-key (cons name nil)))
301 (tabulated-list-init-header)
302 (tabulated-list-print t)))))
303
304;;; The mode definition:
305
306;;;###autoload
307(define-derived-mode tabulated-list-mode special-mode "Tabulated"
308 "Generic major mode for browsing a list of items.
309This mode is usually not used directly; instead, other major
310modes are derived from it, using `define-derived-mode'.
311
312In this major mode, the buffer is divided into multiple columns,
313which are labelled using the header line. Each non-empty line
314belongs to one \"entry\", and the entries can be sorted according
315to their column values.
316
317An inheriting mode should usually do the following in their body:
318
319 - Set `tabulated-list-format', specifying the column format.
320 - Set `tabulated-list-revert-hook', if the buffer contents need
321 to be specially recomputed prior to `revert-buffer'.
322 - Maybe set a `tabulated-list-entries' function (see below).
323 - Maybe set `tabulated-list-printer' (see below).
324 - Maybe set `tabulated-list-padding'.
325 - Call `tabulated-list-init-header' to initialize `header-line-format'
326 according to `tabulated-list-format'.
327
328An inheriting mode is usually accompanied by a \"list-FOO\"
329command (e.g. `list-packages', `list-processes'). This command
330creates or switches to a buffer and enables the major mode in
331that buffer. If `tabulated-list-entries' is not a function, the
332command should initialize it to a list of entries for displaying.
333Finally, it should call `tabulated-list-print'.
334
335`tabulated-list-print' calls the printer function specified by
336`tabulated-list-printer', once for each entry. The default
337printer is `tabulated-list-print-entry', but a mode that keeps
338data in an ewoc may instead specify a printer function (e.g., one
339that calls `ewoc-enter-last'), with `tabulated-list-print-entry'
340as the ewoc pretty-printer."
341 (setq truncate-lines t)
342 (setq buffer-read-only t)
343 (set (make-local-variable 'revert-buffer-function)
344 'tabulated-list-revert))
345
346(put 'tabulated-list-mode 'mode-class 'special)
347
348(provide 'tabulated-list)
349
350;; Local Variables:
351;; coding: utf-8
352;; lexical-binding: t
353;; End:
354
355;;; tabulated-list.el ends here
diff --git a/lisp/files.el b/lisp/files.el
index e87c25f3575..5b29f3790e8 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1140,6 +1140,37 @@ it means chase no more than that many links and then stop."
1140 (setq count (1+ count)))) 1140 (setq count (1+ count))))
1141 newname)) 1141 newname))
1142 1142
1143;; A handy function to display file sizes in human-readable form.
1144;; See http://en.wikipedia.org/wiki/Kibibyte for the reference.
1145(defun file-size-human-readable (file-size &optional flavor)
1146 "Produce a string showing FILE-SIZE in human-readable form.
1147
1148Optional second argument FLAVOR controls the units and the display format:
1149
1150 If FLAVOR is nil or omitted, each kilobyte is 1024 bytes and the produced
1151 suffixes are \"k\", \"M\", \"G\", \"T\", etc.
1152 If FLAVOR is `si', each kilobyte is 1000 bytes and the produced suffixes
1153 are \"k\", \"M\", \"G\", \"T\", etc.
1154 If FLAVOR is `iec', each kilobyte is 1024 bytes and the produced suffixes
1155 are \"KiB\", \"MiB\", \"GiB\", \"TiB\", etc."
1156 (let ((power (if (or (null flavor) (eq flavor 'iec))
1157 1024.0
1158 1000.0))
1159 (post-fixes
1160 ;; none, kilo, mega, giga, tera, peta, exa, zetta, yotta
1161 (list "" "k" "M" "G" "T" "P" "E" "Z" "Y")))
1162 (while (and (>= file-size power) (cdr post-fixes))
1163 (setq file-size (/ file-size power)
1164 post-fixes (cdr post-fixes)))
1165 (format (if (> (mod file-size 1.0) 0.05)
1166 "%.1f%s%s"
1167 "%.0f%s%s")
1168 file-size
1169 (if (and (eq flavor 'iec) (string= (car post-fixes) "k"))
1170 "K"
1171 (car post-fixes))
1172 (if (eq flavor 'iec) "iB" ""))))
1173
1143(defun make-temp-file (prefix &optional dir-flag suffix) 1174(defun make-temp-file (prefix &optional dir-flag suffix)
1144 "Create a temporary file. 1175 "Create a temporary file.
1145The returned file name (created by appending some random characters at the end 1176The returned file name (created by appending some random characters at the end
@@ -2100,10 +2131,8 @@ the file contents into it using `insert-file-contents-literally'."
2100 (confirm-nonexistent-file-or-buffer)))) 2131 (confirm-nonexistent-file-or-buffer))))
2101 (switch-to-buffer (find-file-noselect filename nil t))) 2132 (switch-to-buffer (find-file-noselect filename nil t)))
2102 2133
2103(defvar after-find-file-from-revert-buffer nil)
2104
2105(defun after-find-file (&optional error warn noauto 2134(defun after-find-file (&optional error warn noauto
2106 after-find-file-from-revert-buffer 2135 _after-find-file-from-revert-buffer
2107 nomodes) 2136 nomodes)
2108 "Called after finding a file and by the default revert function. 2137 "Called after finding a file and by the default revert function.
2109Sets buffer mode, parses local variables. 2138Sets buffer mode, parses local variables.
@@ -2111,8 +2140,8 @@ Optional args ERROR, WARN, and NOAUTO: ERROR non-nil means there was an
2111error in reading the file. WARN non-nil means warn if there 2140error in reading the file. WARN non-nil means warn if there
2112exists an auto-save file more recent than the visited file. 2141exists an auto-save file more recent than the visited file.
2113NOAUTO means don't mess with auto-save mode. 2142NOAUTO means don't mess with auto-save mode.
2114Fourth arg AFTER-FIND-FILE-FROM-REVERT-BUFFER non-nil 2143Fourth arg AFTER-FIND-FILE-FROM-REVERT-BUFFER is ignored
2115 means this call was from `revert-buffer'. 2144\(see `revert-buffer-in-progress-p' for similar functionality).
2116Fifth arg NOMODES non-nil means don't alter the file's modes. 2145Fifth arg NOMODES non-nil means don't alter the file's modes.
2117Finishes by calling the functions in `find-file-hook' 2146Finishes by calling the functions in `find-file-hook'
2118unless NOMODES is non-nil." 2147unless NOMODES is non-nil."
@@ -5004,6 +5033,10 @@ hook functions.
5004If `revert-buffer-function' is used to override the normal revert 5033If `revert-buffer-function' is used to override the normal revert
5005mechanism, this hook is not used.") 5034mechanism, this hook is not used.")
5006 5035
5036(defvar revert-buffer-in-progress-p nil
5037 "Non-nil if a `revert-buffer' operation is in progress, nil otherwise.
5038This is true even if a `revert-buffer-function' is being used.")
5039
5007(defvar revert-buffer-internal-hook) 5040(defvar revert-buffer-internal-hook)
5008 5041
5009(defun revert-buffer (&optional ignore-auto noconfirm preserve-modes) 5042(defun revert-buffer (&optional ignore-auto noconfirm preserve-modes)
@@ -5046,10 +5079,12 @@ non-nil, it is called instead of rereading visited file contents."
5046 ;; interface, but leaving the programmatic interface the same. 5079 ;; interface, but leaving the programmatic interface the same.
5047 (interactive (list (not current-prefix-arg))) 5080 (interactive (list (not current-prefix-arg)))
5048 (if revert-buffer-function 5081 (if revert-buffer-function
5049 (funcall revert-buffer-function ignore-auto noconfirm) 5082 (let ((revert-buffer-in-progress-p t))
5083 (funcall revert-buffer-function ignore-auto noconfirm))
5050 (with-current-buffer (or (buffer-base-buffer (current-buffer)) 5084 (with-current-buffer (or (buffer-base-buffer (current-buffer))
5051 (current-buffer)) 5085 (current-buffer))
5052 (let* ((auto-save-p (and (not ignore-auto) 5086 (let* ((revert-buffer-in-progress-p t)
5087 (auto-save-p (and (not ignore-auto)
5053 (recent-auto-save-p) 5088 (recent-auto-save-p)
5054 buffer-auto-save-file-name 5089 buffer-auto-save-file-name
5055 (file-readable-p buffer-auto-save-file-name) 5090 (file-readable-p buffer-auto-save-file-name)
@@ -5140,7 +5175,7 @@ non-nil, it is called instead of rereading visited file contents."
5140 ;; have changed the truename. 5175 ;; have changed the truename.
5141 (setq buffer-file-truename 5176 (setq buffer-file-truename
5142 (abbreviate-file-name (file-truename buffer-file-name))) 5177 (abbreviate-file-name (file-truename buffer-file-name)))
5143 (after-find-file nil nil t t preserve-modes) 5178 (after-find-file nil nil t nil preserve-modes)
5144 ;; Run after-revert-hook as it was before we reverted. 5179 ;; Run after-revert-hook as it was before we reverted.
5145 (setq-default revert-buffer-internal-hook global-hook) 5180 (setq-default revert-buffer-internal-hook global-hook)
5146 (if local-hook 5181 (if local-hook
@@ -6142,8 +6177,8 @@ With prefix ARG, silently save all file-visiting buffers, then kill."
6142 (setq active t)) 6177 (setq active t))
6143 (setq processes (cdr processes))) 6178 (setq processes (cdr processes)))
6144 (or (not active) 6179 (or (not active)
6145 (list-processes t) 6180 (progn (list-processes t)
6146 (yes-or-no-p "Active processes exist; kill them and exit anyway? ")))) 6181 (yes-or-no-p "Active processes exist; kill them and exit anyway? ")))))
6147 ;; Query the user for other things, perhaps. 6182 ;; Query the user for other things, perhaps.
6148 (run-hook-with-args-until-failure 'kill-emacs-query-functions) 6183 (run-hook-with-args-until-failure 'kill-emacs-query-functions)
6149 (or (null confirm-kill-emacs) 6184 (or (null confirm-kill-emacs)
diff --git a/lisp/follow.el b/lisp/follow.el
index 7f4093dd442..c76085f6dcb 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -1061,7 +1061,7 @@ Return the selected window."
1061;; it wasn't just moved here. (i.e. M-> shall not unconditionally place 1061;; it wasn't just moved here. (i.e. M-> shall not unconditionally place
1062;; the point in the selected window.) 1062;; the point in the selected window.)
1063;; 1063;;
1064;; (Compability cludge: in Emacs `window-end' is equal to `point-max'; 1064;; (Compatibility cludge: in Emacs `window-end' is equal to `point-max';
1065;; in XEmacs, it is equal to `point-max + 1'. Should I really bother 1065;; in XEmacs, it is equal to `point-max + 1'. Should I really bother
1066;; checking `window-end' now when I check `end-of-buffer' explicitly?) 1066;; checking `window-end' now when I check `end-of-buffer' explicitly?)
1067 1067
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b79a5de55e1..baabe5f65b9 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,10 +1,53 @@
12011-04-07 Teodor Zlatanov <tzz@lifelogs.com>
2
3 * gnus-registry.el (gnus-registry-handle-action): More debugging.
4
5 * gnus-start.el (gnus-gnus-to-newsrc-format): Add a way to run
6 interactively so the newsrc file can contain foreign groups too.
7 Useful for debugging but not much for users.
8
92011-04-07 David Engster <dengste@eml.cc>
10
11 * registry.el (registry-usage-test): Only do
12 `registry-lookup-breaks-before-lexbind' testing for Emacs24 with
13 lexical binding.
14
152011-04-06 David Engster <dengste@eml.cc>
16
17 * registry.el, gnus-registry.el: Use `ignore-errors' instead of third
18 argument NOERROR for `require', since XEmacs 21.4 does not support it.
19
202011-04-06 David Engster <dengste@eml.cc>
21
22 * registry.el (initialize-instance): Change :after to :AFTER to be
23 compatible with old EIEIO version in XEmacs.
24
252011-04-06 Teodor Zlatanov <tzz@lifelogs.com>
26
27 * gnus-registry.el (gnus-registry-post-process-groups)
28 (gnus-registry--split-fancy-with-parent-internal): Fix splitting bugs
29 and provide better messaging.
30
312011-04-06 David Engster <dengste@eml.cc>
32
33 * Makefile.in (fail-on-warning): New rule to compile with warnings as
34 errors.
35
36 * dgnushack.el (dgnushack-compile-error-on-warn): New function to call
37 dgnushack-compile with error-on-warn enabled, and to signal an error if
38 clean compilation failed.
39 (dgnushack-compile): New argument 'error-on-warn'. If non-nil, compile
40 with `byte-compile-error-on-warn'. Return nil if errors occured.
41
12011-04-06 Teodor Zlatanov <tzz@lifelogs.com> 422011-04-06 Teodor Zlatanov <tzz@lifelogs.com>
2 43
3 * gnus-registry.el: Don't use ERT if it's not available. 44 * gnus-registry.el: Don't use ERT if it's not available. Load it
45 unconditionally anyway, discarding errors.
4 (gnus-registry-delete-entries): New convenience function. 46 (gnus-registry-delete-entries): New convenience function.
5 (gnus-registry-import-eld): Import from old .eld registry. 47 (gnus-registry-import-eld): Import from old .eld registry.
6 48
7 * registry.el: Don't use ERT if it's not available. 49 * registry.el: Don't use ERT if it's not available. Load it
50 unconditionally anyway, discarding errors.
8 51
9 * proto-stream.el (gnutls-negotiate): Revert inadvertent commit of the 52 * proto-stream.el (gnutls-negotiate): Revert inadvertent commit of the
10 version from the Claudio Bley GnuTLS patch (extra optional parameters 53 version from the Claudio Bley GnuTLS patch (extra optional parameters
@@ -15171,7 +15214,7 @@
15171 * smime-ldap.el (smime-ldap-search): Add compatibility for XEmacs. 15214 * smime-ldap.el (smime-ldap-search): Add compatibility for XEmacs.
15172 15215
15173 * smime.el (smime-cert-by-ldap-1): Handle certificates distributed 15216 * smime.el (smime-cert-by-ldap-1): Handle certificates distributed
15174 in PEM format. Adjust to the XEmacs compability. 15217 in PEM format. Adjust to the XEmacs compatibility.
15175 15218
151762005-05-30 Reiner Steib <Reiner.Steib@gmx.de> 152192005-05-30 Reiner Steib <Reiner.Steib@gmx.de>
15177 15220
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 511012df577..9824fc26f16 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -58,9 +58,11 @@
58(eval-when-compile (require 'cl)) 58(eval-when-compile (require 'cl))
59 59
60(eval-when-compile 60(eval-when-compile
61 (when (null (require 'ert nil t)) 61 (when (null (ignore-errors (require 'ert)))
62 (defmacro* ert-deftest (name () &body docstring-keys-and-body)))) 62 (defmacro* ert-deftest (name () &body docstring-keys-and-body))))
63 63
64(ignore-errors
65 (require 'ert))
64(require 'gnus) 66(require 'gnus)
65(require 'gnus-int) 67(require 'gnus-int)
66(require 'gnus-sum) 68(require 'gnus-sum)
@@ -319,6 +321,9 @@ This is not required after changing `gnus-registry-cache-file'."
319 (gnus-registry-handle-action id nil to subject sender))) 321 (gnus-registry-handle-action id nil to subject sender)))
320 322
321(defun gnus-registry-handle-action (id from to subject sender) 323(defun gnus-registry-handle-action (id from to subject sender)
324 (gnus-message
325 10
326 "gnus-registry-handle-action %S" (list id from to subject sender))
322 (let ((db gnus-registry-db) 327 (let ((db gnus-registry-db)
323 ;; safe if not found 328 ;; safe if not found
324 (entry (gnus-registry-get-or-make-entry id))) 329 (entry (gnus-registry-get-or-make-entry id)))
@@ -394,85 +399,83 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
394 &allow-other-keys) 399 &allow-other-keys)
395 (gnus-message 400 (gnus-message
396 10 401 10
397 "gnus-registry--split-fancy-with-parent-internal: %S" spec) 402 "gnus-registry--split-fancy-with-parent-internal %S" spec)
398 (let ((db gnus-registry-db) 403 (let ((db gnus-registry-db)
399 found) 404 found)
400 ;; this is a big if-else statement. it uses 405 ;; this is a big chain of statements. it uses
401 ;; gnus-registry-post-process-groups to filter the results after 406 ;; gnus-registry-post-process-groups to filter the results after
402 ;; every step. 407 ;; every step.
403 (cond 408 ;; the references string must be valid and parse to valid references
404 ;; the references string must be valid and parse to valid references 409 (when references
405 (references 410 (gnus-message
411 9
412 "%s is tracing references %s"
413 log-agent refstr)
406 (dolist (reference (nreverse references)) 414 (dolist (reference (nreverse references))
407 (gnus-message 415 (gnus-message 9 "%s is looking up %s" log-agent reference)
408 9 416 (loop for group in (gnus-registry-get-id-key reference 'group)
409 "%s is looking for matches for reference %s from [%s]" 417 when (gnus-registry-follow-group-p group)
410 log-agent reference refstr) 418 do (gnus-message 7 "%s traced %s to %s" log-agent reference group)
411 (setq found 419 do (push group found)))
412 (loop for group in (gnus-registry-get-id-key reference 'group)
413 when (gnus-registry-follow-group-p group)
414 do (gnus-message
415 7
416 "%s traced the reference %s from [%s] to group %s"
417 log-agent reference refstr group)
418 collect group)))
419 ;; filter the found groups and return them 420 ;; filter the found groups and return them
420 ;; the found groups are the full groups 421 ;; the found groups are the full groups
421 (setq found (gnus-registry-post-process-groups 422 (setq found (gnus-registry-post-process-groups
422 "references" refstr found))) 423 "references" refstr found)))
423 424
424 ;; else: there were no matches, try the extra tracking by sender 425 ;; else: there were no matches, try the extra tracking by sender
425 ((and (memq 'sender gnus-registry-track-extra) 426 (when (and (null found)
426 sender 427 (memq 'sender gnus-registry-track-extra)
427 (gnus-grep-in-list 428 sender
428 sender 429 (gnus-grep-in-list
429 gnus-registry-unfollowed-addresses)) 430 sender
430 (let ((groups (apply 431 gnus-registry-unfollowed-addresses))
431 'append 432 (let ((groups (apply
432 (mapcar 433 'append
433 (lambda (reference) 434 (mapcar
434 (gnus-registry-get-id-key reference 'group)) 435 (lambda (reference)
435 (registry-lookup-secondary-value db 'sender sender))))) 436 (gnus-registry-get-id-key reference 'group))
436 (setq found 437 (registry-lookup-secondary-value db 'sender sender)))))
437 (loop for group in groups 438 (setq found
438 when (gnus-registry-follow-group-p group) 439 (loop for group in groups
439 do (gnus-message 440 when (gnus-registry-follow-group-p group)
440 ;; raise level of messaging if gnus-registry-track-extra 441 do (gnus-message
441 (if gnus-registry-track-extra 7 9) 442 ;; warn more if gnus-registry-track-extra
442 "%s (extra tracking) traced sender '%s' to groups %s" 443 (if gnus-registry-track-extra 7 9)
443 log-agent sender found) 444 "%s (extra tracking) traced sender '%s' to %s"
444 collect group))) 445 log-agent sender group)
445 446 collect group)))
446 ;; filter the found groups and return them 447
447 ;; the found groups are NOT the full groups 448 ;; filter the found groups and return them
448 (setq found (gnus-registry-post-process-groups 449 ;; the found groups are NOT the full groups
449 "sender" sender found))) 450 (setq found (gnus-registry-post-process-groups
451 "sender" sender found)))
450 452
451 ;; else: there were no matches, now try the extra tracking by subject 453 ;; else: there were no matches, now try the extra tracking by subject
452 ((and (memq 'subject gnus-registry-track-extra) 454 (when (and (null found)
453 subject 455 (memq 'subject gnus-registry-track-extra)
454 (< gnus-registry-minimum-subject-length (length subject))) 456 subject
455 (let ((groups (apply 457 (< gnus-registry-minimum-subject-length (length subject)))
456 'append 458 (let ((groups (apply
457 (mapcar 459 'append
458 (lambda (reference) 460 (mapcar
459 (gnus-registry-get-id-key reference 'group)) 461 (lambda (reference)
460 (registry-lookup-secondary-value db 'subject subject))))) 462 (gnus-registry-get-id-key reference 'group))
461 (setq found 463 (registry-lookup-secondary-value db 'subject subject)))))
462 (loop for group in groups 464 (setq found
463 when (gnus-registry-follow-group-p group) 465 (loop for group in groups
464 do (gnus-message 466 when (gnus-registry-follow-group-p group)
465 ;; raise level of messaging if gnus-registry-track-extra 467 do (gnus-message
466 (if gnus-registry-track-extra 7 9) 468 ;; warn more if gnus-registry-track-extra
467 "%s (extra tracking) traced subject '%s' to groups %s" 469 (if gnus-registry-track-extra 7 9)
468 log-agent subject found) 470 "%s (extra tracking) traced subject '%s' to %s"
469 collect group)) 471 log-agent subject group)
470 ;; filter the found groups and return them 472 collect group))
471 ;; the found groups are NOT the full groups 473 ;; filter the found groups and return them
472 (setq found (gnus-registry-post-process-groups 474 ;; the found groups are NOT the full groups
473 "subject" subject found))))) 475 (setq found (gnus-registry-post-process-groups
474 ;; after the (cond) we extract the actual value safely 476 "subject" subject found))))
475 (car-safe found))) 477 ;; after the (cond) we extract the actual value safely
478 (car-safe found)))
476 479
477(defun gnus-registry-post-process-groups (mode key groups) 480(defun gnus-registry-post-process-groups (mode key groups)
478 "Inspects GROUPS found by MODE for KEY to determine which ones to follow. 481 "Inspects GROUPS found by MODE for KEY to determine which ones to follow.
@@ -489,25 +492,48 @@ Foreign methods are not supported so they are rejected.
489Reduces the list to a single group, or complains if that's not 492Reduces the list to a single group, or complains if that's not
490possible. Uses `gnus-registry-split-strategy'." 493possible. Uses `gnus-registry-split-strategy'."
491 (let ((log-agent "gnus-registry-post-process-group") 494 (let ((log-agent "gnus-registry-post-process-group")
492 out) 495 (desc (format "%d groups" (length groups)))
493 496 out chosen)
494 ;; the strategy can be nil, in which case groups is nil 497 ;; the strategy can be nil, in which case chosen is nil
495 (setq groups 498 (setq chosen
496 (case gnus-registry-split-strategy 499 (case gnus-registry-split-strategy
497 ;; first strategy 500 ;; default, take only one-element lists into chosen
501 ((nil)
502 (and (= (length groups) 1)
503 (car-safe groups)))
504
498 ((first) 505 ((first)
499 (and groups (list (car-safe groups)))) 506 (car-safe groups))
500 507
501 ((majority) 508 ((majority)
502 (let ((freq (make-hash-table 509 (let ((freq (make-hash-table
503 :size 256 510 :size 256
504 :test 'equal))) 511 :test 'equal)))
505 (mapc (lambda (x) (puthash x (1+ (gethash x freq 0)) freq)) 512 (mapc (lambda (x) (let ((x (gnus-group-short-name x)))
513 (puthash x (1+ (gethash x freq 0)) freq)))
506 groups) 514 groups)
507 (list (car-safe 515 (setq desc (format "%d groups, %d unique"
508 (sort groups (lambda (a b) 516 (length groups)
509 (> (gethash a freq 0) 517 (hash-table-count freq)))
510 (gethash b freq 0)))))))))) 518 (car-safe
519 (sort groups
520 (lambda (a b)
521 (> (gethash (gnus-group-short-name a) freq 0)
522 (gethash (gnus-group-short-name b) freq 0)))))))))
523
524 (if chosen
525 (gnus-message
526 9
527 "%s: strategy %s on %s produced %s"
528 log-agent gnus-registry-split-strategy desc chosen)
529 (gnus-message
530 9
531 "%s: strategy %s on %s did not produce an answer"
532 log-agent
533 (or gnus-registry-split-strategy "default")
534 desc))
535
536 (setq groups (and chosen (list chosen)))
511 537
512 (dolist (group groups) 538 (dolist (group groups)
513 (let ((m1 (gnus-find-method-for-group group)) 539 (let ((m1 (gnus-find-method-for-group group))
@@ -517,18 +543,20 @@ possible. Uses `gnus-registry-split-strategy'."
517 (if (gnus-methods-equal-p m1 m2) 543 (if (gnus-methods-equal-p m1 m2)
518 (progn 544 (progn
519 ;; this is REALLY just for debugging 545 ;; this is REALLY just for debugging
520 (gnus-message 546 (when (not (equal group short-name))
521 10 547 (gnus-message
522 "%s stripped group %s to %s" 548 10
523 log-agent group short-name) 549 "%s: stripped group %s to %s"
550 log-agent group short-name))
524 (add-to-list 'out short-name)) 551 (add-to-list 'out short-name))
525 ;; else... 552 ;; else...
526 (gnus-message 553 (gnus-message
527 7 554 7
528 "%s ignored foreign group %s" 555 "%s: ignored foreign group %s"
529 log-agent group)))) 556 log-agent group))))
530 557
531 ;; is there just one group? 558 (setq out (delq nil out))
559
532 (cond 560 (cond
533 ((= (length out) 1) out) 561 ((= (length out) 1) out)
534 ((null out) 562 ((null out)
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index fa582c58aee..d9d218c6cba 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -2873,7 +2873,8 @@ If FORCE is non-nil, the .newsrc file is read."
2873 (pop list)) 2873 (pop list))
2874 (nreverse olist))) 2874 (nreverse olist)))
2875 2875
2876(defun gnus-gnus-to-newsrc-format () 2876(defun gnus-gnus-to-newsrc-format (&optional foreign-ok)
2877 (interactive (list (gnus-y-or-n-p "write foreign groups too? ")))
2877 ;; Generate and save the .newsrc file. 2878 ;; Generate and save the .newsrc file.
2878 (with-current-buffer (create-file-buffer gnus-current-startup-file) 2879 (with-current-buffer (create-file-buffer gnus-current-startup-file)
2879 (let ((newsrc (cdr gnus-newsrc-alist)) 2880 (let ((newsrc (cdr gnus-newsrc-alist))
@@ -2895,7 +2896,8 @@ If FORCE is non-nil, the .newsrc file is read."
2895 ;; Don't write foreign groups to .newsrc. 2896 ;; Don't write foreign groups to .newsrc.
2896 (when (or (null (setq method (gnus-info-method info))) 2897 (when (or (null (setq method (gnus-info-method info)))
2897 (equal method "native") 2898 (equal method "native")
2898 (inline (gnus-server-equal method gnus-select-method))) 2899 (inline (gnus-server-equal method gnus-select-method))
2900 foreign-ok)
2899 (insert (gnus-info-group info) 2901 (insert (gnus-info-group info)
2900 (if (> (gnus-info-level info) gnus-level-subscribed) 2902 (if (> (gnus-info-level info) gnus-level-subscribed)
2901 "!" ":")) 2903 "!" ":"))
diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el
index cc03b20662d..3c402cb361a 100644
--- a/lisp/gnus/registry.el
+++ b/lisp/gnus/registry.el
@@ -78,9 +78,12 @@
78;;; Code: 78;;; Code:
79 79
80(eval-when-compile 80(eval-when-compile
81 (when (null (require 'ert nil t)) 81 (when (null (ignore-errors (require 'ert)))
82 (defmacro* ert-deftest (name () &body docstring-keys-and-body)))) 82 (defmacro* ert-deftest (name () &body docstring-keys-and-body))))
83 83
84(ignore-errors
85 (require 'ert))
86
84(eval-when-compile (require 'cl)) 87(eval-when-compile (require 'cl))
85(eval-and-compile 88(eval-and-compile
86 (or (ignore-errors (progn 89 (or (ignore-errors (progn
@@ -128,7 +131,7 @@
128 :type hash-table 131 :type hash-table
129 :documentation "The data hashtable."))) 132 :documentation "The data hashtable.")))
130 133
131(defmethod initialize-instance :after ((this registry-db) slots) 134(defmethod initialize-instance :AFTER ((this registry-db) slots)
132 "Set value of data slot of THIS after initialization." 135 "Set value of data slot of THIS after initialization."
133 (with-slots (data tracker) this 136 (with-slots (data tracker) this
134 (unless (member :data slots) 137 (unless (member :data slots)
@@ -354,12 +357,13 @@ Removes only entries without the :precious keys."
354 (should (= 58 (caadr (registry-lookup db '(1 58 99))))) 357 (should (= 58 (caadr (registry-lookup db '(1 58 99)))))
355 (message "Grouped individual lookup") 358 (message "Grouped individual lookup")
356 (should (= 3 (length (registry-lookup db '(1 58 99))))) 359 (should (= 3 (length (registry-lookup db '(1 58 99)))))
357 (message "Individual lookup (breaks before lexbind)") 360 (when (boundp 'lexical-binding)
358 (should (= 58 361 (message "Individual lookup (breaks before lexbind)")
359 (caadr (registry-lookup-breaks-before-lexbind db '(1 58 99))))) 362 (should (= 58
360 (message "Grouped individual lookup (breaks before lexbind)") 363 (caadr (registry-lookup-breaks-before-lexbind db '(1 58 99)))))
361 (should (= 3 364 (message "Grouped individual lookup (breaks before lexbind)")
362 (length (registry-lookup-breaks-before-lexbind db '(1 58 99))))) 365 (should (= 3
366 (length (registry-lookup-breaks-before-lexbind db '(1 58 99))))))
363 (message "Search") 367 (message "Search")
364 (should (= n (length (registry-search db :all t)))) 368 (should (= n (length (registry-search db :all t))))
365 (should (= n (length (registry-search db :member '((sender "me")))))) 369 (should (= n (length (registry-search db :member '((sender "me"))))))
diff --git a/lisp/help.el b/lisp/help.el
index e148e5ef6ab..b7f46a02155 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1256,6 +1256,15 @@ Select help window if the actual value of the user option
1256 ;; Reset `help-window' to nil to avoid confusing future calls of 1256 ;; Reset `help-window' to nil to avoid confusing future calls of
1257 ;; `help-mode-finish' with plain `with-output-to-temp-buffer'. 1257 ;; `help-mode-finish' with plain `with-output-to-temp-buffer'.
1258 (setq help-window nil)))) 1258 (setq help-window nil))))
1259
1260;; Called from C, on encountering `help-char' when reading a char.
1261;; Don't print to *Help*; that would clobber Help history.
1262(defun help-form-show ()
1263 "Display the output of a non-nil `help-form'."
1264 (let ((msg (eval help-form)))
1265 (if (stringp msg)
1266 (with-output-to-temp-buffer " *Char Help*"
1267 (princ msg)))))
1259 1268
1260(provide 'help) 1269(provide 'help)
1261 1270
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 55ec835831a..9314f934dc1 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -62,8 +62,6 @@
62 62
63;;; Code: 63;;; Code:
64 64
65(eval-when-compile (require 'cl))
66
67(defgroup ls-lisp nil 65(defgroup ls-lisp nil
68 "Emulate the ls program completely in Emacs Lisp." 66 "Emulate the ls program completely in Emacs Lisp."
69 :version "21.1" 67 :version "21.1"
@@ -726,13 +724,7 @@ All ls time options, namely c, t and u, are handled."
726 ls-lisp-filesize-f-fmt 724 ls-lisp-filesize-f-fmt
727 ls-lisp-filesize-d-fmt) 725 ls-lisp-filesize-d-fmt)
728 file-size) 726 file-size)
729 (if (< file-size 1024) 727 (format " %7s" (file-size-human-readable file-size))))
730 (format " %4d" file-size)
731 (do ((file-size (/ file-size 1024.0) (/ file-size 1024.0))
732 ;; kilo, mega, giga, tera, peta, exa
733 (post-fixes (list "k" "M" "G" "T" "P" "E") (cdr post-fixes)))
734 ((< file-size 1024)
735 (format " %3.0f%s" file-size (car post-fixes)))))))
736 728
737(provide 'ls-lisp) 729(provide 'ls-lisp)
738 730
diff --git a/lisp/man.el b/lisp/man.el
index c8c2f8653e2..7a9e6e3cca5 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -254,8 +254,7 @@ Used in `bookmark-set' to get the default bookmark name."
254 "Regular expression describing a manpage section within parentheses.") 254 "Regular expression describing a manpage section within parentheses.")
255 255
256(defvar Man-page-header-regexp 256(defvar Man-page-header-regexp
257 (if (and (string-match "-solaris2\\." system-configuration) 257 (if (string-match "-solaris2\\." system-configuration)
258 (not (string-match "-solaris2\\.[123435]$" system-configuration)))
259 (concat "^[-A-Za-z0-9_].*[ \t]\\(" Man-name-regexp 258 (concat "^[-A-Za-z0-9_].*[ \t]\\(" Man-name-regexp
260 "(\\(" Man-section-regexp "\\))\\)$") 259 "(\\(" Man-section-regexp "\\))\\)$")
261 (concat "^[ \t]*\\(" Man-name-regexp 260 (concat "^[ \t]*\\(" Man-name-regexp
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 24dbfc0c30a..8f91fbb26b1 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -1111,8 +1111,7 @@ URL in a new window."
1111 browse-url-firefox-program 1111 browse-url-firefox-program
1112 (append 1112 (append
1113 browse-url-firefox-arguments 1113 browse-url-firefox-arguments
1114 (if (or (featurep 'dos-w32) 1114 (if (memq system-type '(windows-nt ms-dos))
1115 (string-match "win32" system-configuration))
1116 (list url) 1115 (list url)
1117 (list "-remote" 1116 (list "-remote"
1118 (concat "openURL(" 1117 (concat "openURL("
diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el
index 91b4aa7d72e..e2619e3bf79 100644
--- a/lisp/net/rlogin.el
+++ b/lisp/net/rlogin.el
@@ -60,14 +60,9 @@
60 :group 'rlogin) 60 :group 'rlogin)
61 61
62(defcustom rlogin-process-connection-type 62(defcustom rlogin-process-connection-type
63 (save-match-data 63 ;; Solaris 2.x `rlogin' will spew a bunch of ioctl error messages if
64 ;; Solaris 2.x `rlogin' will spew a bunch of ioctl error messages if 64 ;; stdin isn't a tty.
65 ;; stdin isn't a tty. 65 (and (string-match-p "-solaris2" system-configuration) t)
66 (cond ((and (boundp 'system-configuration)
67 (stringp system-configuration)
68 (string-match "-solaris2" system-configuration))
69 t)
70 (t nil)))
71 "If non-nil, use a pty for the local rlogin process. 66 "If non-nil, use a pty for the local rlogin process.
72If nil, use a pipe (if pipes are supported on the local system). 67If nil, use a pipe (if pipes are supported on the local system).
73 68
@@ -115,19 +110,19 @@ this variable is set from that."
115 :type '(choice (const nil) string) 110 :type '(choice (const nil) string)
116 :group 'rlogin) 111 :group 'rlogin)
117 112
118;; Initialize rlogin mode map. 113(defvar rlogin-mode-map
119(defvar rlogin-mode-map '()) 114 (let ((map (if (consp shell-mode-map)
120(cond 115 (cons 'keymap shell-mode-map)
121 ((null rlogin-mode-map) 116 (copy-keymap shell-mode-map))))
122 (setq rlogin-mode-map (if (consp shell-mode-map) 117 (define-key rlogin-mode-map "\C-c\C-c" 'rlogin-send-Ctrl-C)
123 (cons 'keymap shell-mode-map) 118 (define-key rlogin-mode-map "\C-c\C-d" 'rlogin-send-Ctrl-D)
124 (copy-keymap shell-mode-map))) 119 (define-key rlogin-mode-map "\C-c\C-z" 'rlogin-send-Ctrl-Z)
125 (define-key rlogin-mode-map "\C-c\C-c" 'rlogin-send-Ctrl-C) 120 (define-key rlogin-mode-map "\C-c\C-\\" 'rlogin-send-Ctrl-backslash)
126 (define-key rlogin-mode-map "\C-c\C-d" 'rlogin-send-Ctrl-D) 121 (define-key rlogin-mode-map "\C-d" 'rlogin-delchar-or-send-Ctrl-D)
127 (define-key rlogin-mode-map "\C-c\C-z" 'rlogin-send-Ctrl-Z) 122 (define-key rlogin-mode-map "\C-i" 'rlogin-tab-or-complete)
128 (define-key rlogin-mode-map "\C-c\C-\\" 'rlogin-send-Ctrl-backslash) 123 map)
129 (define-key rlogin-mode-map "\C-d" 'rlogin-delchar-or-send-Ctrl-D) 124 "Keymap for `rlogin-mode'.")
130 (define-key rlogin-mode-map "\C-i" 'rlogin-tab-or-complete))) 125
131 126
132 127
133;;;###autoload (add-hook 'same-window-regexps (purecopy "^\\*rlogin-.*\\*\\(\\|<[0-9]+>\\)")) 128;;;###autoload (add-hook 'same-window-regexps (purecopy "^\\*rlogin-.*\\*\\(\\|<[0-9]+>\\)"))
@@ -175,7 +170,6 @@ variable."
175 (read-from-minibuffer "rlogin arguments (hostname first): " 170 (read-from-minibuffer "rlogin arguments (hostname first): "
176 nil nil nil 'rlogin-history) 171 nil nil nil 'rlogin-history)
177 current-prefix-arg)) 172 current-prefix-arg))
178
179 (let* ((process-connection-type rlogin-process-connection-type) 173 (let* ((process-connection-type rlogin-process-connection-type)
180 (args (if rlogin-explicit-args 174 (args (if rlogin-explicit-args
181 (append (split-string input-args) 175 (append (split-string input-args)
@@ -192,7 +186,6 @@ variable."
192 (buffer-name (if (string= user (user-login-name)) 186 (buffer-name (if (string= user (user-login-name))
193 (format "*rlogin-%s*" host) 187 (format "*rlogin-%s*" host)
194 (format "*rlogin-%s@%s*" user host)))) 188 (format "*rlogin-%s@%s*" user host))))
195
196 (cond ((null buffer)) 189 (cond ((null buffer))
197 ((stringp buffer) 190 ((stringp buffer)
198 (setq buffer-name buffer)) 191 (setq buffer-name buffer))
@@ -202,32 +195,26 @@ variable."
202 (setq buffer-name (format "%s<%d>" buffer-name buffer))) 195 (setq buffer-name (format "%s<%d>" buffer-name buffer)))
203 (t 196 (t
204 (setq buffer-name (generate-new-buffer-name buffer-name)))) 197 (setq buffer-name (generate-new-buffer-name buffer-name))))
205
206 (setq buffer (get-buffer-create buffer-name)) 198 (setq buffer (get-buffer-create buffer-name))
207 (pop-to-buffer buffer-name) 199 (pop-to-buffer buffer-name)
208
209 (unless (comint-check-proc buffer-name) 200 (unless (comint-check-proc buffer-name)
210 (comint-exec buffer buffer-name rlogin-program nil args) 201 (comint-exec buffer buffer-name rlogin-program nil args)
211
212 (rlogin-mode) 202 (rlogin-mode)
213
214 (make-local-variable 'rlogin-host) 203 (make-local-variable 'rlogin-host)
215 (setq rlogin-host host) 204 (setq rlogin-host host)
216 (make-local-variable 'rlogin-remote-user) 205 (make-local-variable 'rlogin-remote-user)
217 (setq rlogin-remote-user user) 206 (setq rlogin-remote-user user)
218 207 (ignore-errors
219 (condition-case () 208 (cond ((eq rlogin-directory-tracking-mode t)
220 (cond ((eq rlogin-directory-tracking-mode t) 209 ;; Do this here, rather than calling the tracking mode
221 ;; Do this here, rather than calling the tracking mode 210 ;; function, to avoid a gratuitous resync check; the default
222 ;; function, to avoid a gratuitous resync check; the default 211 ;; should be the user's home directory, be it local or remote.
223 ;; should be the user's home directory, be it local or remote. 212 (setq comint-file-name-prefix
224 (setq comint-file-name-prefix 213 (concat "/" rlogin-remote-user "@" rlogin-host ":"))
225 (concat "/" rlogin-remote-user "@" rlogin-host ":")) 214 (cd-absolute comint-file-name-prefix))
226 (cd-absolute comint-file-name-prefix)) 215 ((null rlogin-directory-tracking-mode))
227 ((null rlogin-directory-tracking-mode)) 216 (t
228 (t 217 (cd-absolute (concat comint-file-name-prefix "~/"))))))))
229 (cd-absolute (concat comint-file-name-prefix "~/"))))
230 (error nil)))))
231 218
232(put 'rlogin-mode 'mode-class 'special) 219(put 'rlogin-mode 'mode-class 'special)
233 220
@@ -302,8 +289,7 @@ local one share the same directories (e.g. through NFS)."
302 (process-send-string nil "\C-\\")) 289 (process-send-string nil "\C-\\"))
303 290
304(defun rlogin-delchar-or-send-Ctrl-D (arg) 291(defun rlogin-delchar-or-send-Ctrl-D (arg)
305 "\ 292 "Delete ARG characters forward, or send a C-d to process if at end of buffer."
306Delete ARG characters forward, or send a C-d to process if at end of buffer."
307 (interactive "p") 293 (interactive "p")
308 (if (eobp) 294 (if (eobp)
309 (rlogin-send-Ctrl-D) 295 (rlogin-send-Ctrl-D)
diff --git a/lisp/play/morse.el b/lisp/play/morse.el
index b88f1b264cb..fa0887c0ac5 100644
--- a/lisp/play/morse.el
+++ b/lisp/play/morse.el
@@ -231,7 +231,7 @@ Geospatial-Intelligence Agency at http://www.nga.mil/")
231 (if (null (looking-at "[a-z]+")) 231 (if (null (looking-at "[a-z]+"))
232 (forward-char 1) 232 (forward-char 1)
233 (setq str (buffer-substring (match-beginning 0) (match-end 0))) 233 (setq str (buffer-substring (match-beginning 0) (match-end 0)))
234 (if (null (setq nato (rassoc str nato-alphabet))) 234 (if (null (setq nato (rassoc (capitalize str) nato-alphabet)))
235 (goto-char (match-end 0)) 235 (goto-char (match-end 0))
236 (replace-match 236 (replace-match
237 (if (string-equal "(" (car nato)) 237 (if (string-equal "(" (car nato))
diff --git a/lisp/replace.el b/lisp/replace.el
index 928c3170c65..0ed716966ed 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -772,26 +772,29 @@ a previously found match."
772 (define-key map "\C-c\C-f" 'next-error-follow-minor-mode) 772 (define-key map "\C-c\C-f" 'next-error-follow-minor-mode)
773 (define-key map [menu-bar] (make-sparse-keymap)) 773 (define-key map [menu-bar] (make-sparse-keymap))
774 (define-key map [menu-bar occur] 774 (define-key map [menu-bar occur]
775 `(cons ,(purecopy "Occur") map)) 775 (cons (purecopy "Occur") map))
776 (define-key map [next-error-follow-minor-mode] 776 (define-key map [next-error-follow-minor-mode]
777 (menu-bar-make-mm-toggle next-error-follow-minor-mode 777 `(menu-item ,(purecopy "Auto Occurrence Display")
778 "Auto Occurrence Display" 778 next-error-follow-minor-mode
779 "Display another occurrence when moving the cursor")) 779 :help ,(purecopy
780 "Display another occurrence when moving the cursor")
781 :button (:toggle . (and (boundp 'next-error-follow-minor-mode)
782 next-error-follow-minor-mode))))
780 (define-key map [separator-1] menu-bar-separator) 783 (define-key map [separator-1] menu-bar-separator)
781 (define-key map [kill-this-buffer] 784 (define-key map [kill-this-buffer]
782 `(menu-item ,(purecopy "Kill occur buffer") kill-this-buffer 785 `(menu-item ,(purecopy "Kill Occur Buffer") kill-this-buffer
783 :help ,(purecopy "Kill the current *Occur* buffer"))) 786 :help ,(purecopy "Kill the current *Occur* buffer")))
784 (define-key map [quit-window] 787 (define-key map [quit-window]
785 `(menu-item ,(purecopy "Quit occur window") quit-window 788 `(menu-item ,(purecopy "Quit Occur Window") quit-window
786 :help ,(purecopy "Quit the current *Occur* buffer. Bury it, and maybe delete the selected frame"))) 789 :help ,(purecopy "Quit the current *Occur* buffer. Bury it, and maybe delete the selected frame")))
787 (define-key map [revert-buffer] 790 (define-key map [revert-buffer]
788 `(menu-item ,(purecopy "Revert occur buffer") revert-buffer 791 `(menu-item ,(purecopy "Revert Occur Buffer") revert-buffer
789 :help ,(purecopy "Replace the text in the *Occur* buffer with the results of rerunning occur"))) 792 :help ,(purecopy "Replace the text in the *Occur* buffer with the results of rerunning occur")))
790 (define-key map [clone-buffer] 793 (define-key map [clone-buffer]
791 `(menu-item ,(purecopy "Clone occur buffer") clone-buffer 794 `(menu-item ,(purecopy "Clone Occur Buffer") clone-buffer
792 :help ,(purecopy "Create and return a twin copy of the current *Occur* buffer"))) 795 :help ,(purecopy "Create and return a twin copy of the current *Occur* buffer")))
793 (define-key map [occur-rename-buffer] 796 (define-key map [occur-rename-buffer]
794 `(menu-item ,(purecopy "Rename occur buffer") occur-rename-buffer 797 `(menu-item ,(purecopy "Rename Occur Buffer") occur-rename-buffer
795 :help ,(purecopy "Rename the current *Occur* buffer to *Occur: original-buffer-name*."))) 798 :help ,(purecopy "Rename the current *Occur* buffer to *Occur: original-buffer-name*.")))
796 (define-key map [separator-2] menu-bar-separator) 799 (define-key map [separator-2] menu-bar-separator)
797 (define-key map [occur-mode-goto-occurrence-other-window] 800 (define-key map [occur-mode-goto-occurrence-other-window]
@@ -804,10 +807,10 @@ a previously found match."
804 `(menu-item ,(purecopy "Display Occurrence") occur-mode-display-occurrence 807 `(menu-item ,(purecopy "Display Occurrence") occur-mode-display-occurrence
805 :help ,(purecopy "Display in another window the occurrence the current line describes"))) 808 :help ,(purecopy "Display in another window the occurrence the current line describes")))
806 (define-key map [occur-next] 809 (define-key map [occur-next]
807 `(menu-item ,(purecopy "Move to next match") occur-next 810 `(menu-item ,(purecopy "Move to Next Match") occur-next
808 :help ,(purecopy "Move to the Nth (default 1) next match in an Occur mode buffer"))) 811 :help ,(purecopy "Move to the Nth (default 1) next match in an Occur mode buffer")))
809 (define-key map [occur-prev] 812 (define-key map [occur-prev]
810 `(menu-item ,(purecopy "Move to previous match") occur-prev 813 `(menu-item ,(purecopy "Move to Previous Match") occur-prev
811 :help ,(purecopy "Move to the Nth (default 1) previous match in an Occur mode buffer"))) 814 :help ,(purecopy "Move to the Nth (default 1) previous match in an Occur mode buffer")))
812 map) 815 map)
813 "Keymap for `occur-mode'.") 816 "Keymap for `occur-mode'.")
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index c10b5cbb7ec..2d1586d895a 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -285,7 +285,7 @@ may have changed\) back to `save-place-alist'."
285 (let ((cell (assoc buffer-file-name save-place-alist))) 285 (let ((cell (assoc buffer-file-name save-place-alist)))
286 (if cell 286 (if cell
287 (progn 287 (progn
288 (or after-find-file-from-revert-buffer 288 (or revert-buffer-in-progress-p
289 (goto-char (cdr cell))) 289 (goto-char (cdr cell)))
290 ;; and make sure it will be saved again for later 290 ;; and make sure it will be saved again for later
291 (setq save-place t))))) 291 (setq save-place t)))))
diff --git a/lisp/simple.el b/lisp/simple.el
index a414fc77a39..f0560c48a3b 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2690,7 +2690,95 @@ support pty association, if PROGRAM is nil."
2690 (let ((fh (find-file-name-handler default-directory 'start-file-process))) 2690 (let ((fh (find-file-name-handler default-directory 'start-file-process)))
2691 (if fh (apply fh 'start-file-process name buffer program program-args) 2691 (if fh (apply fh 'start-file-process name buffer program program-args)
2692 (apply 'start-process name buffer program program-args)))) 2692 (apply 'start-process name buffer program program-args))))
2693 2693
2694;;;; Process menu
2695
2696(defvar tabulated-list-format)
2697(defvar tabulated-list-entries)
2698(defvar tabulated-list-sort-key)
2699(declare-function tabulated-list-init-header "tabulated-list" ())
2700(declare-function tabulated-list-print "tabulated-list" ())
2701
2702(defvar process-menu-query-only nil)
2703
2704(define-derived-mode process-menu-mode tabulated-list-mode "Process Menu"
2705 "Major mode for listing the processes called by Emacs."
2706 (setq tabulated-list-format [("Process" 15 t)
2707 ("Status" 7 t)
2708 ("Buffer" 15 t)
2709 ("TTY" 12 t)
2710 ("Command" 0 t)])
2711 (make-local-variable 'process-menu-query-only)
2712 (setq tabulated-list-sort-key (cons "Process" nil))
2713 (add-hook 'tabulated-list-revert-hook 'list-processes--refresh nil t)
2714 (tabulated-list-init-header))
2715
2716(defun list-processes--refresh ()
2717 "Recompute the list of processes for the Process List buffer."
2718 (setq tabulated-list-entries nil)
2719 (dolist (p (process-list))
2720 (when (or (not process-menu-query-only)
2721 (process-query-on-exit-flag p))
2722 (let* ((buf (process-buffer p))
2723 (type (process-type p))
2724 (name (process-name p))
2725 (status (symbol-name (process-status p)))
2726 (buf-label (if (buffer-live-p buf)
2727 `(,(buffer-name buf)
2728 face link
2729 help-echo ,(concat "Visit buffer `"
2730 (buffer-name buf) "'")
2731 follow-link t
2732 process-buffer ,buf
2733 action process-menu-visit-buffer)
2734 "--"))
2735 (tty (or (process-tty-name p) "--"))
2736 (cmd
2737 (if (memq type '(network serial))
2738 (let ((contact (process-contact p t)))
2739 (if (eq type 'network)
2740 (format "(%s %s)"
2741 (if (plist-get contact :type)
2742 "datagram"
2743 "network")
2744 (if (plist-get contact :server)
2745 (format "server on %s"
2746 (plist-get contact :server))
2747 (format "connection to %s"
2748 (plist-get contact :host))))
2749 (format "(serial port %s%s)"
2750 (or (plist-get contact :port) "?")
2751 (let ((speed (plist-get contact :speed)))
2752 (if speed
2753 (format " at %s b/s" speed)
2754 "")))))
2755 (mapconcat 'identity (process-command p) " "))))
2756 (push (list p (vector name status buf-label tty cmd))
2757 tabulated-list-entries)))))
2758
2759(defun process-menu-visit-buffer (button)
2760 (display-buffer (button-get button 'process-buffer)))
2761
2762(defun list-processes (&optional query-only buffer)
2763 "Display a list of all processes.
2764If optional argument QUERY-ONLY is non-nil, only processes with
2765the query-on-exit flag set are listed.
2766Any process listed as exited or signaled is actually eliminated
2767after the listing is made.
2768Optional argument BUFFER specifies a buffer to use, instead of
2769\"*Process List\".
2770The return value is always nil."
2771 (interactive)
2772 (or (fboundp 'process-list)
2773 (error "Asynchronous subprocesses are not supported on this system"))
2774 (unless (bufferp buffer)
2775 (setq buffer (get-buffer-create "*Process List*")))
2776 (with-current-buffer buffer
2777 (process-menu-mode)
2778 (setq process-menu-query-only query-only)
2779 (list-processes--refresh)
2780 (tabulated-list-print))
2781 (display-buffer buffer))
2694 2782
2695(defvar universal-argument-map 2783(defvar universal-argument-map
2696 (let ((map (make-sparse-keymap))) 2784 (let ((map (make-sparse-keymap)))
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index 54a2cb4f196..b3f5cfb78f7 100644
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -531,13 +531,25 @@ If you want to abort the commit, simply delete the buffer."
531 (shrink-window-if-larger-than-buffer) 531 (shrink-window-if-larger-than-buffer)
532 (selected-window))))) 532 (selected-window)))))
533 533
534(defun log-edit-empty-buffer-p ()
535 "Return non-nil if the buffer is \"empty\"."
536 (or (= (point-min) (point-max))
537 (save-excursion
538 (goto-char (point-min))
539 (while (and (looking-at "^\\(Summary: \\)?$")
540 (zerop (forward-line 1))))
541 (eobp))))
542
534(defun log-edit-insert-cvs-template () 543(defun log-edit-insert-cvs-template ()
535 "Insert the template specified by the CVS administrator, if any. 544 "Insert the template specified by the CVS administrator, if any.
536This simply uses the local CVS/Template file." 545This simply uses the local CVS/Template file."
537 (interactive) 546 (interactive)
538 (when (or (called-interactively-p 'interactive) 547 (when (or (called-interactively-p 'interactive)
539 (= (point-min) (point-max))) 548 (log-edit-empty-buffer-p))
549 ;; Should the template take precedence over an empty Summary:,
550 ;; ie should we first erase the buffer?
540 (when (file-readable-p "CVS/Template") 551 (when (file-readable-p "CVS/Template")
552 (goto-char (point-max))
541 (insert-file-contents "CVS/Template")))) 553 (insert-file-contents "CVS/Template"))))
542 554
543(defun log-edit-insert-cvs-rcstemplate () 555(defun log-edit-insert-cvs-rcstemplate ()
@@ -546,8 +558,9 @@ This contacts the repository to get the rcstemplate file and
546can thus take some time." 558can thus take some time."
547 (interactive) 559 (interactive)
548 (when (or (called-interactively-p 'interactive) 560 (when (or (called-interactively-p 'interactive)
549 (= (point-min) (point-max))) 561 (log-edit-empty-buffer-p))
550 (when (file-readable-p "CVS/Root") 562 (when (file-readable-p "CVS/Root")
563 (goto-char (point-max))
551 ;; Ignore the stderr stuff, even if it's an error. 564 ;; Ignore the stderr stuff, even if it's an error.
552 (call-process "cvs" nil '(t nil) nil 565 (call-process "cvs" nil '(t nil) nil
553 "checkout" "-p" "CVSROOT/rcstemplate")))) 566 "checkout" "-p" "CVSROOT/rcstemplate"))))
diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el
index 479dbb5caea..271fce12429 100644
--- a/lisp/vc/vc-annotate.el
+++ b/lisp/vc/vc-annotate.el
@@ -489,7 +489,7 @@ Return a cons (REV . FILENAME)."
489 "Visit the log of the revision at line. 489 "Visit the log of the revision at line.
490If the VC backend supports it, only show the log entry for the revision. 490If the VC backend supports it, only show the log entry for the revision.
491If a *vc-change-log* buffer exists and already shows a log for 491If a *vc-change-log* buffer exists and already shows a log for
492the file in question, search for the log entry required and move point ." 492the file in question, search for the log entry required and move point."
493 (interactive) 493 (interactive)
494 (if (not (equal major-mode 'vc-annotate-mode)) 494 (if (not (equal major-mode 'vc-annotate-mode))
495 (message "Cannot be invoked outside of a vc annotate buffer") 495 (message "Cannot be invoked outside of a vc annotate buffer")
diff --git a/src/ChangeLog b/src/ChangeLog
index 68f3dbdedcb..cd1b74b75f1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
12011-04-08 Paul Eggert <eggert@cs.ucla.edu> 12011-04-09 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * eval.c: Port to Windows vsnprintf (Bug#8435). 3 * eval.c: Port to Windows vsnprintf (Bug#8435).
4 Include <limits.h>. 4 Include <limits.h>.
@@ -9,8 +9,6 @@
9 Also, simplify the allocation scheme, by avoiding the need for 9 Also, simplify the allocation scheme, by avoiding the need for
10 calling realloc, and removing the ALLOCATED variable. 10 calling realloc, and removing the ALLOCATED variable.
11 11
122011-04-07 Paul Eggert <eggert@cs.ucla.edu>
13
14 * eval.c (verror): Initial buffer size is 4000 (not 200) bytes. 12 * eval.c (verror): Initial buffer size is 4000 (not 200) bytes.
15 13
16 Remove the doprnt implementation, as Emacs now uses vsnprintf. 14 Remove the doprnt implementation, as Emacs now uses vsnprintf.
@@ -45,8 +43,6 @@
45 43
46 * keyboard.c (access_keymap_keyremap): Print func name, not garbage. 44 * keyboard.c (access_keymap_keyremap): Print func name, not garbage.
47 45
482011-04-06 Paul Eggert <eggert@cs.ucla.edu>
49
50 * coding.c (Fdecode_sjis_char): Don't assume CODE fits in int. 46 * coding.c (Fdecode_sjis_char): Don't assume CODE fits in int.
51 47
52 * xterm.c (x_catch_errors): Remove duplicate declaration. 48 * xterm.c (x_catch_errors): Remove duplicate declaration.
@@ -55,6 +51,85 @@
55 51
56 * xdisp.c, lisp.h (message_nolog): Remove; unused. 52 * xdisp.c, lisp.h (message_nolog): Remove; unused.
57 53
542011-04-09 Chong Yidong <cyd@stupidchicken.com>
55
56 * ftfont.c (get_adstyle_property, ftfont_pattern_entity): Use
57 unsigned char, to match FcChar8 type definition.
58
59 * xterm.c (handle_one_xevent):
60 * xmenu.c (create_and_show_popup_menu):
61 * xselect.c (x_decline_selection_request)
62 (x_reply_selection_request): Avoid type-punned deref of X events.
63
642011-04-09 Eli Zaretskii <eliz@emacstest.gnu.org>
65
66 Fix some uses of `int' instead of EMACS_INT.
67 * search.c (string_match_1, fast_string_match)
68 (fast_c_string_match_ignore_case, fast_string_match_ignore_case)
69 (scan_buffer, find_next_newline_no_quit)
70 (find_before_next_newline, search_command, Freplace_match)
71 (Fmatch_data): Make some `int' variables be EMACS_INT.
72
73 * xdisp.c (display_count_lines): 3rd argument and return value now
74 EMACS_INT. All callers changed.
75 (pint2hrstr): Last argument is now EMACS_INT.
76
77 * coding.c (detect_coding_utf_8, detect_coding_emacs_mule)
78 (detect_coding_iso_2022, detect_coding_sjis, detect_coding_big5)
79 (detect_coding_ccl, detect_coding_charset, decode_coding_utf_8)
80 (decode_coding_utf_16, decode_coding_emacs_mule)
81 (decode_coding_iso_2022, decode_coding_sjis, decode_coding_big5)
82 (decode_coding_ccl, decode_coding_charset)
83 <consumed_chars, consumed_chars_base>: Declare EMACS_INT.
84 (decode_coding_iso_2022, decode_coding_emacs_mule)
85 (decode_coding_sjis, decode_coding_big5, decode_coding_charset)
86 <char_offset, last_offset>: Declare EMACS_INT.
87 (encode_coding_utf_8, encode_coding_utf_16)
88 (encode_coding_emacs_mule, encode_invocation_designation)
89 (encode_designation_at_bol, encode_coding_iso_2022)
90 (encode_coding_sjis, encode_coding_big5, encode_coding_ccl)
91 (encode_coding_raw_text, encode_coding_charset) <produced_chars>:
92 Declare EMACS_INT.
93 (ASSURE_DESTINATION): Declare more_bytes EMACS_INT.
94 (encode_invocation_designation): Last argument P_NCHARS is now
95 EMACS_INT.
96 (decode_eol): Declare pos_byte, pos, and pos_end EMACS_INT.
97 (produce_chars): from_nchars and to_nchars are now EMACS_INT.
98
99 * coding.h (struct coding_system) <head_ascii>: Declare EMACS_INT.
100 All users changed.
101
102 * ccl.c (Fccl_execute_on_string): Declare some variables
103 EMACS_INT.
104
1052011-04-08 Samuel Thibault <sthibault@debian.org> (tiny change)
106
107 * term.c (init_tty): Fix incorrect ifdef placement (Bug#8450).
108
1092011-03-19 Christoph Scholtes <cschol2112@googlemail.com>
110
111 * process.c (Fformat_network_address): Doc fix.
112
1132011-04-08 T.V. Raman <tv.raman.tv@gmail.com> (tiny change)
114
115 * xml.c (parse_region): Avoid creating spurious whiespace nodes.
116
1172011-04-08 Chong Yidong <cyd@stupidchicken.com>
118
119 * keyboard.c (read_char): Call Lisp function help-form-show,
120 instead of using internal_with_output_to_temp_buffer.
121 (Qhelp_form_show): New var.
122 (syms_of_keyboard): Use DEFSYM macro.
123
124 * print.c (internal_with_output_to_temp_buffer): Function deleted.
125
126 * lisp.h (internal_with_output_to_temp_buffer): Remove prototype.
127
1282011-04-06 Chong Yidong <cyd@stupidchicken.com>
129
130 * process.c (Flist_processes): Removed to Lisp.
131 (list_processes_1): Deleted.
132
582011-04-06 Eli Zaretskii <eliz@gnu.org> 1332011-04-06 Eli Zaretskii <eliz@gnu.org>
59 134
60 * msdos.c (careadlinkat, careadlinkatcwd): MS-DOS replacements. 135 * msdos.c (careadlinkat, careadlinkatcwd): MS-DOS replacements.
diff --git a/src/ccl.c b/src/ccl.c
index 5428e94c69a..39b9bc32f09 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -2049,7 +2049,7 @@ usage: (ccl-execute-on-string CCL-PROGRAM STATUS STRING &optional CONTINUE UNIBY
2049 Lisp_Object val; 2049 Lisp_Object val;
2050 struct ccl_program ccl; 2050 struct ccl_program ccl;
2051 int i; 2051 int i;
2052 int outbufsize; 2052 EMACS_INT outbufsize;
2053 unsigned char *outbuf, *outp; 2053 unsigned char *outbuf, *outp;
2054 EMACS_INT str_chars, str_bytes; 2054 EMACS_INT str_chars, str_bytes;
2055#define CCL_EXECUTE_BUF_SIZE 1024 2055#define CCL_EXECUTE_BUF_SIZE 1024
diff --git a/src/coding.c b/src/coding.c
index f099605c774..711ada59c85 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -159,7 +159,7 @@ detect_coding_XXX (struct coding_system *coding,
159 const unsigned char *src = coding->source; 159 const unsigned char *src = coding->source;
160 const unsigned char *src_end = coding->source + coding->src_bytes; 160 const unsigned char *src_end = coding->source + coding->src_bytes;
161 int multibytep = coding->src_multibyte; 161 int multibytep = coding->src_multibyte;
162 int consumed_chars = 0; 162 EMACS_INT consumed_chars = 0;
163 int found = 0; 163 int found = 0;
164 ...; 164 ...;
165 165
@@ -266,7 +266,7 @@ encode_coding_XXX (struct coding_system *coding)
266 unsigned char *dst = coding->destination + coding->produced; 266 unsigned char *dst = coding->destination + coding->produced;
267 unsigned char *dst_end = coding->destination + coding->dst_bytes; 267 unsigned char *dst_end = coding->destination + coding->dst_bytes;
268 unsigned char *adjusted_dst_end = dst_end - _MAX_BYTES_PRODUCED_IN_LOOP_; 268 unsigned char *adjusted_dst_end = dst_end - _MAX_BYTES_PRODUCED_IN_LOOP_;
269 int produced_chars = 0; 269 EMACS_INT produced_chars = 0;
270 270
271 for (; charbuf < charbuf_end && dst < adjusted_dst_end; charbuf++) 271 for (; charbuf < charbuf_end && dst < adjusted_dst_end; charbuf++)
272 { 272 {
@@ -943,7 +943,7 @@ record_conversion_result (struct coding_system *coding,
943 do { \ 943 do { \
944 if (dst + (bytes) >= dst_end) \ 944 if (dst + (bytes) >= dst_end) \
945 { \ 945 { \
946 int more_bytes = charbuf_end - charbuf + (bytes); \ 946 EMACS_INT more_bytes = charbuf_end - charbuf + (bytes); \
947 \ 947 \
948 dst = alloc_destination (coding, more_bytes, dst); \ 948 dst = alloc_destination (coding, more_bytes, dst); \
949 dst_end = coding->destination + coding->dst_bytes; \ 949 dst_end = coding->destination + coding->dst_bytes; \
@@ -1208,7 +1208,7 @@ detect_coding_utf_8 (struct coding_system *coding,
1208 const unsigned char *src = coding->source, *src_base; 1208 const unsigned char *src = coding->source, *src_base;
1209 const unsigned char *src_end = coding->source + coding->src_bytes; 1209 const unsigned char *src_end = coding->source + coding->src_bytes;
1210 int multibytep = coding->src_multibyte; 1210 int multibytep = coding->src_multibyte;
1211 int consumed_chars = 0; 1211 EMACS_INT consumed_chars = 0;
1212 int bom_found = 0; 1212 int bom_found = 0;
1213 int found = 0; 1213 int found = 0;
1214 1214
@@ -1293,7 +1293,7 @@ decode_coding_utf_8 (struct coding_system *coding)
1293 const unsigned char *src_base; 1293 const unsigned char *src_base;
1294 int *charbuf = coding->charbuf + coding->charbuf_used; 1294 int *charbuf = coding->charbuf + coding->charbuf_used;
1295 int *charbuf_end = coding->charbuf + coding->charbuf_size; 1295 int *charbuf_end = coding->charbuf + coding->charbuf_size;
1296 int consumed_chars = 0, consumed_chars_base = 0; 1296 EMACS_INT consumed_chars = 0, consumed_chars_base = 0;
1297 int multibytep = coding->src_multibyte; 1297 int multibytep = coding->src_multibyte;
1298 enum utf_bom_type bom = CODING_UTF_8_BOM (coding); 1298 enum utf_bom_type bom = CODING_UTF_8_BOM (coding);
1299 int eol_dos = 1299 int eol_dos =
@@ -1444,7 +1444,7 @@ encode_coding_utf_8 (struct coding_system *coding)
1444 int *charbuf_end = charbuf + coding->charbuf_used; 1444 int *charbuf_end = charbuf + coding->charbuf_used;
1445 unsigned char *dst = coding->destination + coding->produced; 1445 unsigned char *dst = coding->destination + coding->produced;
1446 unsigned char *dst_end = coding->destination + coding->dst_bytes; 1446 unsigned char *dst_end = coding->destination + coding->dst_bytes;
1447 int produced_chars = 0; 1447 EMACS_INT produced_chars = 0;
1448 int c; 1448 int c;
1449 1449
1450 if (CODING_UTF_8_BOM (coding) == utf_with_bom) 1450 if (CODING_UTF_8_BOM (coding) == utf_with_bom)
@@ -1602,7 +1602,7 @@ decode_coding_utf_16 (struct coding_system *coding)
1602 int *charbuf = coding->charbuf + coding->charbuf_used; 1602 int *charbuf = coding->charbuf + coding->charbuf_used;
1603 /* We may produces at most 3 chars in one loop. */ 1603 /* We may produces at most 3 chars in one loop. */
1604 int *charbuf_end = coding->charbuf + coding->charbuf_size - 2; 1604 int *charbuf_end = coding->charbuf + coding->charbuf_size - 2;
1605 int consumed_chars = 0, consumed_chars_base = 0; 1605 EMACS_INT consumed_chars = 0, consumed_chars_base = 0;
1606 int multibytep = coding->src_multibyte; 1606 int multibytep = coding->src_multibyte;
1607 enum utf_bom_type bom = CODING_UTF_16_BOM (coding); 1607 enum utf_bom_type bom = CODING_UTF_16_BOM (coding);
1608 enum utf_16_endian_type endian = CODING_UTF_16_ENDIAN (coding); 1608 enum utf_16_endian_type endian = CODING_UTF_16_ENDIAN (coding);
@@ -1729,7 +1729,7 @@ encode_coding_utf_16 (struct coding_system *coding)
1729 int safe_room = 8; 1729 int safe_room = 8;
1730 enum utf_bom_type bom = CODING_UTF_16_BOM (coding); 1730 enum utf_bom_type bom = CODING_UTF_16_BOM (coding);
1731 int big_endian = CODING_UTF_16_ENDIAN (coding) == utf_16_big_endian; 1731 int big_endian = CODING_UTF_16_ENDIAN (coding) == utf_16_big_endian;
1732 int produced_chars = 0; 1732 EMACS_INT produced_chars = 0;
1733 int c; 1733 int c;
1734 1734
1735 if (bom != utf_without_bom) 1735 if (bom != utf_without_bom)
@@ -1863,7 +1863,7 @@ detect_coding_emacs_mule (struct coding_system *coding,
1863 const unsigned char *src = coding->source, *src_base; 1863 const unsigned char *src = coding->source, *src_base;
1864 const unsigned char *src_end = coding->source + coding->src_bytes; 1864 const unsigned char *src_end = coding->source + coding->src_bytes;
1865 int multibytep = coding->src_multibyte; 1865 int multibytep = coding->src_multibyte;
1866 int consumed_chars = 0; 1866 EMACS_INT consumed_chars = 0;
1867 int c; 1867 int c;
1868 int found = 0; 1868 int found = 0;
1869 1869
@@ -2331,10 +2331,10 @@ decode_coding_emacs_mule (struct coding_system *coding)
2331 loop and one more charset annotation at the end. */ 2331 loop and one more charset annotation at the end. */
2332 int *charbuf_end 2332 int *charbuf_end
2333 = coding->charbuf + coding->charbuf_size - (MAX_ANNOTATION_LENGTH * 3); 2333 = coding->charbuf + coding->charbuf_size - (MAX_ANNOTATION_LENGTH * 3);
2334 int consumed_chars = 0, consumed_chars_base; 2334 EMACS_INT consumed_chars = 0, consumed_chars_base;
2335 int multibytep = coding->src_multibyte; 2335 int multibytep = coding->src_multibyte;
2336 int char_offset = coding->produced_char; 2336 EMACS_INT char_offset = coding->produced_char;
2337 int last_offset = char_offset; 2337 EMACS_INT last_offset = char_offset;
2338 int last_id = charset_ascii; 2338 int last_id = charset_ascii;
2339 int eol_dos = 2339 int eol_dos =
2340 !inhibit_eol_conversion && EQ (CODING_ID_EOL_TYPE (coding->id), Qdos); 2340 !inhibit_eol_conversion && EQ (CODING_ID_EOL_TYPE (coding->id), Qdos);
@@ -2585,7 +2585,7 @@ encode_coding_emacs_mule (struct coding_system *coding)
2585 unsigned char *dst = coding->destination + coding->produced; 2585 unsigned char *dst = coding->destination + coding->produced;
2586 unsigned char *dst_end = coding->destination + coding->dst_bytes; 2586 unsigned char *dst_end = coding->destination + coding->dst_bytes;
2587 int safe_room = 8; 2587 int safe_room = 8;
2588 int produced_chars = 0; 2588 EMACS_INT produced_chars = 0;
2589 Lisp_Object attrs, charset_list; 2589 Lisp_Object attrs, charset_list;
2590 int c; 2590 int c;
2591 int preferred_charset_id = -1; 2591 int preferred_charset_id = -1;
@@ -2943,7 +2943,7 @@ detect_coding_iso_2022 (struct coding_system *coding,
2943 int single_shifting = 0; 2943 int single_shifting = 0;
2944 int id; 2944 int id;
2945 int c, c1; 2945 int c, c1;
2946 int consumed_chars = 0; 2946 EMACS_INT consumed_chars = 0;
2947 int i; 2947 int i;
2948 int rejected = 0; 2948 int rejected = 0;
2949 int found = 0; 2949 int found = 0;
@@ -3453,7 +3453,7 @@ decode_coding_iso_2022 (struct coding_system *coding)
3453 loop and one more charset annotation at the end. */ 3453 loop and one more charset annotation at the end. */
3454 int *charbuf_end 3454 int *charbuf_end
3455 = coding->charbuf + coding->charbuf_size - (MAX_ANNOTATION_LENGTH * 3); 3455 = coding->charbuf + coding->charbuf_size - (MAX_ANNOTATION_LENGTH * 3);
3456 int consumed_chars = 0, consumed_chars_base; 3456 EMACS_INT consumed_chars = 0, consumed_chars_base;
3457 int multibytep = coding->src_multibyte; 3457 int multibytep = coding->src_multibyte;
3458 /* Charsets invoked to graphic plane 0 and 1 respectively. */ 3458 /* Charsets invoked to graphic plane 0 and 1 respectively. */
3459 int charset_id_0 = CODING_ISO_INVOKED_CHARSET (coding, 0); 3459 int charset_id_0 = CODING_ISO_INVOKED_CHARSET (coding, 0);
@@ -3463,8 +3463,8 @@ decode_coding_iso_2022 (struct coding_system *coding)
3463 int c; 3463 int c;
3464 struct composition_status *cmp_status = CODING_ISO_CMP_STATUS (coding); 3464 struct composition_status *cmp_status = CODING_ISO_CMP_STATUS (coding);
3465 Lisp_Object attrs = CODING_ID_ATTRS (coding->id); 3465 Lisp_Object attrs = CODING_ID_ATTRS (coding->id);
3466 int char_offset = coding->produced_char; 3466 EMACS_INT char_offset = coding->produced_char;
3467 int last_offset = char_offset; 3467 EMACS_INT last_offset = char_offset;
3468 int last_id = charset_ascii; 3468 int last_id = charset_ascii;
3469 int eol_dos = 3469 int eol_dos =
3470 !inhibit_eol_conversion && EQ (CODING_ID_EOL_TYPE (coding->id), Qdos); 3470 !inhibit_eol_conversion && EQ (CODING_ID_EOL_TYPE (coding->id), Qdos);
@@ -4190,10 +4190,10 @@ decode_coding_iso_2022 (struct coding_system *coding)
4190static unsigned char * 4190static unsigned char *
4191encode_invocation_designation (struct charset *charset, 4191encode_invocation_designation (struct charset *charset,
4192 struct coding_system *coding, 4192 struct coding_system *coding,
4193 unsigned char *dst, int *p_nchars) 4193 unsigned char *dst, EMACS_INT *p_nchars)
4194{ 4194{
4195 int multibytep = coding->dst_multibyte; 4195 int multibytep = coding->dst_multibyte;
4196 int produced_chars = *p_nchars; 4196 EMACS_INT produced_chars = *p_nchars;
4197 int reg; /* graphic register number */ 4197 int reg; /* graphic register number */
4198 int id = CHARSET_ID (charset); 4198 int id = CHARSET_ID (charset);
4199 4199
@@ -4285,7 +4285,7 @@ encode_designation_at_bol (struct coding_system *coding, int *charbuf,
4285 /* Table of charsets to be designated to each graphic register. */ 4285 /* Table of charsets to be designated to each graphic register. */
4286 int r[4]; 4286 int r[4];
4287 int c, found = 0, reg; 4287 int c, found = 0, reg;
4288 int produced_chars = 0; 4288 EMACS_INT produced_chars = 0;
4289 int multibytep = coding->dst_multibyte; 4289 int multibytep = coding->dst_multibyte;
4290 Lisp_Object attrs; 4290 Lisp_Object attrs;
4291 Lisp_Object charset_list; 4291 Lisp_Object charset_list;
@@ -4340,7 +4340,7 @@ encode_coding_iso_2022 (struct coding_system *coding)
4340 int bol_designation 4340 int bol_designation
4341 = (CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_DESIGNATE_AT_BOL 4341 = (CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_DESIGNATE_AT_BOL
4342 && CODING_ISO_BOL (coding)); 4342 && CODING_ISO_BOL (coding));
4343 int produced_chars = 0; 4343 EMACS_INT produced_chars = 0;
4344 Lisp_Object attrs, eol_type, charset_list; 4344 Lisp_Object attrs, eol_type, charset_list;
4345 int ascii_compatible; 4345 int ascii_compatible;
4346 int c; 4346 int c;
@@ -4528,7 +4528,7 @@ detect_coding_sjis (struct coding_system *coding,
4528 const unsigned char *src = coding->source, *src_base; 4528 const unsigned char *src = coding->source, *src_base;
4529 const unsigned char *src_end = coding->source + coding->src_bytes; 4529 const unsigned char *src_end = coding->source + coding->src_bytes;
4530 int multibytep = coding->src_multibyte; 4530 int multibytep = coding->src_multibyte;
4531 int consumed_chars = 0; 4531 EMACS_INT consumed_chars = 0;
4532 int found = 0; 4532 int found = 0;
4533 int c; 4533 int c;
4534 Lisp_Object attrs, charset_list; 4534 Lisp_Object attrs, charset_list;
@@ -4585,7 +4585,7 @@ detect_coding_big5 (struct coding_system *coding,
4585 const unsigned char *src = coding->source, *src_base; 4585 const unsigned char *src = coding->source, *src_base;
4586 const unsigned char *src_end = coding->source + coding->src_bytes; 4586 const unsigned char *src_end = coding->source + coding->src_bytes;
4587 int multibytep = coding->src_multibyte; 4587 int multibytep = coding->src_multibyte;
4588 int consumed_chars = 0; 4588 EMACS_INT consumed_chars = 0;
4589 int found = 0; 4589 int found = 0;
4590 int c; 4590 int c;
4591 4591
@@ -4636,13 +4636,13 @@ decode_coding_sjis (struct coding_system *coding)
4636 the end. */ 4636 the end. */
4637 int *charbuf_end 4637 int *charbuf_end
4638 = coding->charbuf + coding->charbuf_size - (MAX_ANNOTATION_LENGTH * 2); 4638 = coding->charbuf + coding->charbuf_size - (MAX_ANNOTATION_LENGTH * 2);
4639 int consumed_chars = 0, consumed_chars_base; 4639 EMACS_INT consumed_chars = 0, consumed_chars_base;
4640 int multibytep = coding->src_multibyte; 4640 int multibytep = coding->src_multibyte;
4641 struct charset *charset_roman, *charset_kanji, *charset_kana; 4641 struct charset *charset_roman, *charset_kanji, *charset_kana;
4642 struct charset *charset_kanji2; 4642 struct charset *charset_kanji2;
4643 Lisp_Object attrs, charset_list, val; 4643 Lisp_Object attrs, charset_list, val;
4644 int char_offset = coding->produced_char; 4644 EMACS_INT char_offset = coding->produced_char;
4645 int last_offset = char_offset; 4645 EMACS_INT last_offset = char_offset;
4646 int last_id = charset_ascii; 4646 int last_id = charset_ascii;
4647 int eol_dos = 4647 int eol_dos =
4648 !inhibit_eol_conversion && EQ (CODING_ID_EOL_TYPE (coding->id), Qdos); 4648 !inhibit_eol_conversion && EQ (CODING_ID_EOL_TYPE (coding->id), Qdos);
@@ -4754,12 +4754,12 @@ decode_coding_big5 (struct coding_system *coding)
4754 the end. */ 4754 the end. */
4755 int *charbuf_end 4755 int *charbuf_end
4756 = coding->charbuf + coding->charbuf_size - (MAX_ANNOTATION_LENGTH * 2); 4756 = coding->charbuf + coding->charbuf_size - (MAX_ANNOTATION_LENGTH * 2);
4757 int consumed_chars = 0, consumed_chars_base; 4757 EMACS_INT consumed_chars = 0, consumed_chars_base;
4758 int multibytep = coding->src_multibyte; 4758 int multibytep = coding->src_multibyte;
4759 struct charset *charset_roman, *charset_big5; 4759 struct charset *charset_roman, *charset_big5;
4760 Lisp_Object attrs, charset_list, val; 4760 Lisp_Object attrs, charset_list, val;
4761 int char_offset = coding->produced_char; 4761 EMACS_INT char_offset = coding->produced_char;
4762 int last_offset = char_offset; 4762 EMACS_INT last_offset = char_offset;
4763 int last_id = charset_ascii; 4763 int last_id = charset_ascii;
4764 int eol_dos = 4764 int eol_dos =
4765 !inhibit_eol_conversion && EQ (CODING_ID_EOL_TYPE (coding->id), Qdos); 4765 !inhibit_eol_conversion && EQ (CODING_ID_EOL_TYPE (coding->id), Qdos);
@@ -4856,7 +4856,7 @@ encode_coding_sjis (struct coding_system *coding)
4856 unsigned char *dst = coding->destination + coding->produced; 4856 unsigned char *dst = coding->destination + coding->produced;
4857 unsigned char *dst_end = coding->destination + coding->dst_bytes; 4857 unsigned char *dst_end = coding->destination + coding->dst_bytes;
4858 int safe_room = 4; 4858 int safe_room = 4;
4859 int produced_chars = 0; 4859 EMACS_INT produced_chars = 0;
4860 Lisp_Object attrs, charset_list, val; 4860 Lisp_Object attrs, charset_list, val;
4861 int ascii_compatible; 4861 int ascii_compatible;
4862 struct charset *charset_kanji, *charset_kana; 4862 struct charset *charset_kanji, *charset_kana;
@@ -4947,7 +4947,7 @@ encode_coding_big5 (struct coding_system *coding)
4947 unsigned char *dst = coding->destination + coding->produced; 4947 unsigned char *dst = coding->destination + coding->produced;
4948 unsigned char *dst_end = coding->destination + coding->dst_bytes; 4948 unsigned char *dst_end = coding->destination + coding->dst_bytes;
4949 int safe_room = 4; 4949 int safe_room = 4;
4950 int produced_chars = 0; 4950 EMACS_INT produced_chars = 0;
4951 Lisp_Object attrs, charset_list, val; 4951 Lisp_Object attrs, charset_list, val;
4952 int ascii_compatible; 4952 int ascii_compatible;
4953 struct charset *charset_big5; 4953 struct charset *charset_big5;
@@ -5022,10 +5022,10 @@ detect_coding_ccl (struct coding_system *coding,
5022 const unsigned char *src = coding->source, *src_base; 5022 const unsigned char *src = coding->source, *src_base;
5023 const unsigned char *src_end = coding->source + coding->src_bytes; 5023 const unsigned char *src_end = coding->source + coding->src_bytes;
5024 int multibytep = coding->src_multibyte; 5024 int multibytep = coding->src_multibyte;
5025 int consumed_chars = 0; 5025 EMACS_INT consumed_chars = 0;
5026 int found = 0; 5026 int found = 0;
5027 unsigned char *valids; 5027 unsigned char *valids;
5028 int head_ascii = coding->head_ascii; 5028 EMACS_INT head_ascii = coding->head_ascii;
5029 Lisp_Object attrs; 5029 Lisp_Object attrs;
5030 5030
5031 detect_info->checked |= CATEGORY_MASK_CCL; 5031 detect_info->checked |= CATEGORY_MASK_CCL;
@@ -5062,7 +5062,7 @@ decode_coding_ccl (struct coding_system *coding)
5062 const unsigned char *src_end = coding->source + coding->src_bytes; 5062 const unsigned char *src_end = coding->source + coding->src_bytes;
5063 int *charbuf = coding->charbuf + coding->charbuf_used; 5063 int *charbuf = coding->charbuf + coding->charbuf_used;
5064 int *charbuf_end = coding->charbuf + coding->charbuf_size; 5064 int *charbuf_end = coding->charbuf + coding->charbuf_size;
5065 int consumed_chars = 0; 5065 EMACS_INT consumed_chars = 0;
5066 int multibytep = coding->src_multibyte; 5066 int multibytep = coding->src_multibyte;
5067 struct ccl_program *ccl = &coding->spec.ccl->ccl; 5067 struct ccl_program *ccl = &coding->spec.ccl->ccl;
5068 int source_charbuf[1024]; 5068 int source_charbuf[1024];
@@ -5134,7 +5134,8 @@ encode_coding_ccl (struct coding_system *coding)
5134 unsigned char *dst = coding->destination + coding->produced; 5134 unsigned char *dst = coding->destination + coding->produced;
5135 unsigned char *dst_end = coding->destination + coding->dst_bytes; 5135 unsigned char *dst_end = coding->destination + coding->dst_bytes;
5136 int destination_charbuf[1024]; 5136 int destination_charbuf[1024];
5137 int i, produced_chars = 0; 5137 EMACS_INT produced_chars = 0;
5138 int i;
5138 Lisp_Object attrs, charset_list; 5139 Lisp_Object attrs, charset_list;
5139 5140
5140 CODING_GET_INFO (coding, attrs, charset_list); 5141 CODING_GET_INFO (coding, attrs, charset_list);
@@ -5220,7 +5221,7 @@ encode_coding_raw_text (struct coding_system *coding)
5220 int *charbuf_end = coding->charbuf + coding->charbuf_used; 5221 int *charbuf_end = coding->charbuf + coding->charbuf_used;
5221 unsigned char *dst = coding->destination + coding->produced; 5222 unsigned char *dst = coding->destination + coding->produced;
5222 unsigned char *dst_end = coding->destination + coding->dst_bytes; 5223 unsigned char *dst_end = coding->destination + coding->dst_bytes;
5223 int produced_chars = 0; 5224 EMACS_INT produced_chars = 0;
5224 int c; 5225 int c;
5225 5226
5226 if (multibytep) 5227 if (multibytep)
@@ -5303,10 +5304,10 @@ detect_coding_charset (struct coding_system *coding,
5303 const unsigned char *src = coding->source, *src_base; 5304 const unsigned char *src = coding->source, *src_base;
5304 const unsigned char *src_end = coding->source + coding->src_bytes; 5305 const unsigned char *src_end = coding->source + coding->src_bytes;
5305 int multibytep = coding->src_multibyte; 5306 int multibytep = coding->src_multibyte;
5306 int consumed_chars = 0; 5307 EMACS_INT consumed_chars = 0;
5307 Lisp_Object attrs, valids, name; 5308 Lisp_Object attrs, valids, name;
5308 int found = 0; 5309 int found = 0;
5309 int head_ascii = coding->head_ascii; 5310 EMACS_INT head_ascii = coding->head_ascii;
5310 int check_latin_extra = 0; 5311 int check_latin_extra = 0;
5311 5312
5312 detect_info->checked |= CATEGORY_MASK_CHARSET; 5313 detect_info->checked |= CATEGORY_MASK_CHARSET;
@@ -5410,12 +5411,12 @@ decode_coding_charset (struct coding_system *coding)
5410 the end. */ 5411 the end. */
5411 int *charbuf_end 5412 int *charbuf_end
5412 = coding->charbuf + coding->charbuf_size - (MAX_ANNOTATION_LENGTH * 2); 5413 = coding->charbuf + coding->charbuf_size - (MAX_ANNOTATION_LENGTH * 2);
5413 int consumed_chars = 0, consumed_chars_base; 5414 EMACS_INT consumed_chars = 0, consumed_chars_base;
5414 int multibytep = coding->src_multibyte; 5415 int multibytep = coding->src_multibyte;
5415 Lisp_Object attrs = CODING_ID_ATTRS (coding->id); 5416 Lisp_Object attrs = CODING_ID_ATTRS (coding->id);
5416 Lisp_Object valids; 5417 Lisp_Object valids;
5417 int char_offset = coding->produced_char; 5418 EMACS_INT char_offset = coding->produced_char;
5418 int last_offset = char_offset; 5419 EMACS_INT last_offset = char_offset;
5419 int last_id = charset_ascii; 5420 int last_id = charset_ascii;
5420 int eol_dos = 5421 int eol_dos =
5421 !inhibit_eol_conversion && EQ (CODING_ID_EOL_TYPE (coding->id), Qdos); 5422 !inhibit_eol_conversion && EQ (CODING_ID_EOL_TYPE (coding->id), Qdos);
@@ -5536,7 +5537,7 @@ encode_coding_charset (struct coding_system *coding)
5536 unsigned char *dst = coding->destination + coding->produced; 5537 unsigned char *dst = coding->destination + coding->produced;
5537 unsigned char *dst_end = coding->destination + coding->dst_bytes; 5538 unsigned char *dst_end = coding->destination + coding->dst_bytes;
5538 int safe_room = MAX_MULTIBYTE_LENGTH; 5539 int safe_room = MAX_MULTIBYTE_LENGTH;
5539 int produced_chars = 0; 5540 EMACS_INT produced_chars = 0;
5540 Lisp_Object attrs, charset_list; 5541 Lisp_Object attrs, charset_list;
5541 int ascii_compatible; 5542 int ascii_compatible;
5542 int c; 5543 int c;
@@ -6444,7 +6445,7 @@ decode_eol (struct coding_system *coding)
6444 } 6445 }
6445 else if (EQ (eol_type, Qdos)) 6446 else if (EQ (eol_type, Qdos))
6446 { 6447 {
6447 int n = 0; 6448 EMACS_INT n = 0;
6448 6449
6449 if (NILP (coding->dst_object)) 6450 if (NILP (coding->dst_object))
6450 { 6451 {
@@ -6459,9 +6460,9 @@ decode_eol (struct coding_system *coding)
6459 } 6460 }
6460 else 6461 else
6461 { 6462 {
6462 int pos_byte = coding->dst_pos_byte; 6463 EMACS_INT pos_byte = coding->dst_pos_byte;
6463 int pos = coding->dst_pos; 6464 EMACS_INT pos = coding->dst_pos;
6464 int pos_end = pos + coding->produced_char - 1; 6465 EMACS_INT pos_end = pos + coding->produced_char - 1;
6465 6466
6466 while (pos < pos_end) 6467 while (pos < pos_end)
6467 { 6468 {
@@ -6646,7 +6647,7 @@ produce_chars (struct coding_system *coding, Lisp_Object translation_table,
6646 6647
6647 if (c >= 0) 6648 if (c >= 0)
6648 { 6649 {
6649 int from_nchars = 1, to_nchars = 1; 6650 EMACS_INT from_nchars = 1, to_nchars = 1;
6650 Lisp_Object trans = Qnil; 6651 Lisp_Object trans = Qnil;
6651 6652
6652 LOOKUP_TRANSLATION_TABLE (translation_table, c, trans); 6653 LOOKUP_TRANSLATION_TABLE (translation_table, c, trans);
diff --git a/src/coding.h b/src/coding.h
index 6238a708e76..8414a2fe133 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -449,7 +449,7 @@ struct coding_system
449 -1 in setup_coding_system, and updated by detect_coding. So, 449 -1 in setup_coding_system, and updated by detect_coding. So,
450 when this is equal to the byte length of the text being 450 when this is equal to the byte length of the text being
451 converted, we can skip the actual conversion process. */ 451 converted, we can skip the actual conversion process. */
452 int head_ascii; 452 EMACS_INT head_ascii;
453 453
454 /* The following members are set by encoding/decoding routine. */ 454 /* The following members are set by encoding/decoding routine. */
455 EMACS_INT produced, produced_char, consumed, consumed_char; 455 EMACS_INT produced, produced_char, consumed, consumed_char;
diff --git a/src/editfns.c b/src/editfns.c
index d0f1df694d5..cd424f277bf 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -750,7 +750,7 @@ Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil. */)
750 /* It is possible that NEW_POS is not within the same field as 750 /* It is possible that NEW_POS is not within the same field as
751 OLD_POS; try to move NEW_POS so that it is. */ 751 OLD_POS; try to move NEW_POS so that it is. */
752 { 752 {
753 int shortage; 753 EMACS_INT shortage;
754 Lisp_Object field_bound; 754 Lisp_Object field_bound;
755 755
756 if (fwd) 756 if (fwd)
diff --git a/src/fileio.c b/src/fileio.c
index dec53968947..f9923c420a3 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -271,7 +271,7 @@ use the standard functions without calling themselves recursively. */)
271 if (CONSP (elt)) 271 if (CONSP (elt))
272 { 272 {
273 Lisp_Object string = XCAR (elt); 273 Lisp_Object string = XCAR (elt);
274 int match_pos; 274 EMACS_INT match_pos;
275 Lisp_Object handler = XCDR (elt); 275 Lisp_Object handler = XCDR (elt);
276 Lisp_Object operations = Qnil; 276 Lisp_Object operations = Qnil;
277 277
diff --git a/src/ftfont.c b/src/ftfont.c
index ad01149106e..06ba6d7fe25 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -160,7 +160,7 @@ static struct
160static Lisp_Object 160static Lisp_Object
161get_adstyle_property (FcPattern *p) 161get_adstyle_property (FcPattern *p)
162{ 162{
163 char *str, *end; 163 unsigned char *str, *end;
164 Lisp_Object adstyle; 164 Lisp_Object adstyle;
165 165
166 if (FcPatternGetString (p, FC_STYLE, 0, (FcChar8 **) &str) != FcResultMatch) 166 if (FcPatternGetString (p, FC_STYLE, 0, (FcChar8 **) &str) != FcResultMatch)
@@ -189,7 +189,7 @@ static Lisp_Object
189ftfont_pattern_entity (FcPattern *p, Lisp_Object extra) 189ftfont_pattern_entity (FcPattern *p, Lisp_Object extra)
190{ 190{
191 Lisp_Object key, cache, entity; 191 Lisp_Object key, cache, entity;
192 char *file, *str; 192 unsigned char *file, *str;
193 int idx; 193 int idx;
194 int numeric; 194 int numeric;
195 double dbl; 195 double dbl;
diff --git a/src/keyboard.c b/src/keyboard.c
index 7a8451d8375..e9992ceb365 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -260,6 +260,8 @@ Lisp_Object Qdeferred_action_function;
260Lisp_Object Qinput_method_exit_on_first_char; 260Lisp_Object Qinput_method_exit_on_first_char;
261Lisp_Object Qinput_method_use_echo_area; 261Lisp_Object Qinput_method_use_echo_area;
262 262
263Lisp_Object Qhelp_form_show;
264
263/* File in which we write all commands we read. */ 265/* File in which we write all commands we read. */
264FILE *dribble; 266FILE *dribble;
265 267
@@ -3095,10 +3097,7 @@ read_char (int commandflag, int nmaps, Lisp_Object *maps, Lisp_Object prev_event
3095 = Fcons (Fcurrent_window_configuration (Qnil), 3097 = Fcons (Fcurrent_window_configuration (Qnil),
3096 help_form_saved_window_configs); 3098 help_form_saved_window_configs);
3097 record_unwind_protect (read_char_help_form_unwind, Qnil); 3099 record_unwind_protect (read_char_help_form_unwind, Qnil);
3098 3100 call0 (Qhelp_form_show);
3099 tem0 = Feval (Vhelp_form, Qnil);
3100 if (STRINGP (tem0))
3101 internal_with_output_to_temp_buffer ("*Help*", print_help, tem0);
3102 3101
3103 cancel_echoing (); 3102 cancel_echoing ();
3104 do 3103 do
@@ -11441,14 +11440,9 @@ syms_of_keyboard (void)
11441 staticpro (&Vlispy_mouse_stem); 11440 staticpro (&Vlispy_mouse_stem);
11442 11441
11443 /* Tool-bars. */ 11442 /* Tool-bars. */
11444 QCimage = intern_c_string (":image"); 11443 DEFSYM (QCimage, ":image");
11445 staticpro (&QCimage); 11444 DEFSYM (Qhelp_echo, "help-echo");
11446 11445 DEFSYM (Qrtl, ":rtl");
11447 staticpro (&Qhelp_echo);
11448 Qhelp_echo = intern_c_string ("help-echo");
11449
11450 staticpro (&Qrtl);
11451 Qrtl = intern_c_string (":rtl");
11452 11446
11453 staticpro (&item_properties); 11447 staticpro (&item_properties);
11454 item_properties = Qnil; 11448 item_properties = Qnil;
@@ -11461,147 +11455,81 @@ syms_of_keyboard (void)
11461 staticpro (&real_this_command); 11455 staticpro (&real_this_command);
11462 real_this_command = Qnil; 11456 real_this_command = Qnil;
11463 11457
11464 Qtimer_event_handler = intern_c_string ("timer-event-handler"); 11458 DEFSYM (Qtimer_event_handler, "timer-event-handler");
11465 staticpro (&Qtimer_event_handler); 11459 DEFSYM (Qdisabled_command_function, "disabled-command-function");
11460 DEFSYM (Qself_insert_command, "self-insert-command");
11461 DEFSYM (Qforward_char, "forward-char");
11462 DEFSYM (Qbackward_char, "backward-char");
11463 DEFSYM (Qdisabled, "disabled");
11464 DEFSYM (Qundefined, "undefined");
11465 DEFSYM (Qpre_command_hook, "pre-command-hook");
11466 DEFSYM (Qpost_command_hook, "post-command-hook");
11467 DEFSYM (Qdeferred_action_function, "deferred-action-function");
11468 DEFSYM (Qfunction_key, "function-key");
11469 DEFSYM (Qmouse_click, "mouse-click");
11470 DEFSYM (Qdrag_n_drop, "drag-n-drop");
11471 DEFSYM (Qsave_session, "save-session");
11472 DEFSYM (Qconfig_changed_event, "config-changed-event");
11473 DEFSYM (Qmenu_enable, "menu-enable");
11466 11474
11467 Qdisabled_command_function = intern_c_string ("disabled-command-function"); 11475#if defined (WINDOWSNT)
11468 staticpro (&Qdisabled_command_function); 11476 DEFSYM (Qlanguage_change, "language-change");
11469 11477#endif
11470 Qself_insert_command = intern_c_string ("self-insert-command");
11471 staticpro (&Qself_insert_command);
11472
11473 Qforward_char = intern_c_string ("forward-char");
11474 staticpro (&Qforward_char);
11475
11476 Qbackward_char = intern_c_string ("backward-char");
11477 staticpro (&Qbackward_char);
11478 11478
11479 Qdisabled = intern_c_string ("disabled"); 11479#ifdef HAVE_DBUS
11480 staticpro (&Qdisabled); 11480 DEFSYM (Qdbus_event, "dbus-event");
11481#endif
11482
11483 DEFSYM (QCenable, ":enable");
11484 DEFSYM (QCvisible, ":visible");
11485 DEFSYM (QChelp, ":help");
11486 DEFSYM (QCfilter, ":filter");
11487 DEFSYM (QCbutton, ":button");
11488 DEFSYM (QCkeys, ":keys");
11489 DEFSYM (QCkey_sequence, ":key-sequence");
11490 DEFSYM (QCtoggle, ":toggle");
11491 DEFSYM (QCradio, ":radio");
11492 DEFSYM (QClabel, ":label");
11493 DEFSYM (QCvert_only, ":vert-only");
11494
11495 DEFSYM (Qmode_line, "mode-line");
11496 DEFSYM (Qvertical_line, "vertical-line");
11497 DEFSYM (Qvertical_scroll_bar, "vertical-scroll-bar");
11498 DEFSYM (Qmenu_bar, "menu-bar");
11481 11499
11482 Qundefined = intern_c_string ("undefined"); 11500#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
11483 staticpro (&Qundefined); 11501 DEFSYM (Qmouse_fixup_help_message, "mouse-fixup-help-message");
11502#endif
11484 11503
11485 Qpre_command_hook = intern_c_string ("pre-command-hook"); 11504 DEFSYM (Qabove_handle, "above-handle");
11486 staticpro (&Qpre_command_hook); 11505 DEFSYM (Qhandle, "handle");
11506 DEFSYM (Qbelow_handle, "below-handle");
11507 DEFSYM (Qup, "up");
11508 DEFSYM (Qdown, "down");
11509 DEFSYM (Qtop, "top");
11510 DEFSYM (Qbottom, "bottom");
11511 DEFSYM (Qend_scroll, "end-scroll");
11512 DEFSYM (Qratio, "ratio");
11487 11513
11488 Qpost_command_hook = intern_c_string ("post-command-hook"); 11514 DEFSYM (Qevent_kind, "event-kind");
11489 staticpro (&Qpost_command_hook); 11515 DEFSYM (Qevent_symbol_elements, "event-symbol-elements");
11516 DEFSYM (Qevent_symbol_element_mask, "event-symbol-element-mask");
11517 DEFSYM (Qmodifier_cache, "modifier-cache");
11490 11518
11491 Qdeferred_action_function = intern_c_string ("deferred-action-function"); 11519 DEFSYM (Qrecompute_lucid_menubar, "recompute-lucid-menubar");
11492 staticpro (&Qdeferred_action_function); 11520 DEFSYM (Qactivate_menubar_hook, "activate-menubar-hook");
11493 11521
11494 Qfunction_key = intern_c_string ("function-key"); 11522 DEFSYM (Qpolling_period, "polling-period");
11495 staticpro (&Qfunction_key);
11496 Qmouse_click = intern_c_string ("mouse-click");
11497 staticpro (&Qmouse_click);
11498#if defined (WINDOWSNT)
11499 Qlanguage_change = intern_c_string ("language-change");
11500 staticpro (&Qlanguage_change);
11501#endif
11502 Qdrag_n_drop = intern_c_string ("drag-n-drop");
11503 staticpro (&Qdrag_n_drop);
11504 11523
11505 Qsave_session = intern_c_string ("save-session"); 11524 DEFSYM (Qx_set_selection, "x-set-selection");
11506 staticpro (&Qsave_session); 11525 DEFSYM (QPRIMARY, "PRIMARY");
11526 DEFSYM (Qhandle_switch_frame, "handle-switch-frame");
11507 11527
11508#ifdef HAVE_DBUS 11528 DEFSYM (Qinput_method_function, "input-method-function");
11509 Qdbus_event = intern_c_string ("dbus-event"); 11529 DEFSYM (Qinput_method_exit_on_first_char, "input-method-exit-on-first-char");
11510 staticpro (&Qdbus_event); 11530 DEFSYM (Qinput_method_use_echo_area, "input-method-use-echo-area");
11511#endif
11512
11513 Qconfig_changed_event = intern_c_string ("config-changed-event");
11514 staticpro (&Qconfig_changed_event);
11515
11516 Qmenu_enable = intern_c_string ("menu-enable");
11517 staticpro (&Qmenu_enable);
11518 QCenable = intern_c_string (":enable");
11519 staticpro (&QCenable);
11520 QCvisible = intern_c_string (":visible");
11521 staticpro (&QCvisible);
11522 QChelp = intern_c_string (":help");
11523 staticpro (&QChelp);
11524 QCfilter = intern_c_string (":filter");
11525 staticpro (&QCfilter);
11526 QCbutton = intern_c_string (":button");
11527 staticpro (&QCbutton);
11528 QCkeys = intern_c_string (":keys");
11529 staticpro (&QCkeys);
11530 QCkey_sequence = intern_c_string (":key-sequence");
11531 staticpro (&QCkey_sequence);
11532 QCtoggle = intern_c_string (":toggle");
11533 staticpro (&QCtoggle);
11534 QCradio = intern_c_string (":radio");
11535 staticpro (&QCradio);
11536 QClabel = intern_c_string (":label");
11537 staticpro (&QClabel);
11538 QCvert_only = intern_c_string (":vert-only");
11539 staticpro (&QCvert_only);
11540
11541 Qmode_line = intern_c_string ("mode-line");
11542 staticpro (&Qmode_line);
11543 Qvertical_line = intern_c_string ("vertical-line");
11544 staticpro (&Qvertical_line);
11545 Qvertical_scroll_bar = intern_c_string ("vertical-scroll-bar");
11546 staticpro (&Qvertical_scroll_bar);
11547 Qmenu_bar = intern_c_string ("menu-bar");
11548 staticpro (&Qmenu_bar);
11549 11531
11550#if defined (HAVE_MOUSE) || defined (HAVE_GPM) 11532 DEFSYM (Qhelp_form_show, "help-form-show");
11551 Qmouse_fixup_help_message = intern_c_string ("mouse-fixup-help-message");
11552 staticpro (&Qmouse_fixup_help_message);
11553#endif
11554
11555 Qabove_handle = intern_c_string ("above-handle");
11556 staticpro (&Qabove_handle);
11557 Qhandle = intern_c_string ("handle");
11558 staticpro (&Qhandle);
11559 Qbelow_handle = intern_c_string ("below-handle");
11560 staticpro (&Qbelow_handle);
11561 Qup = intern_c_string ("up");
11562 staticpro (&Qup);
11563 Qdown = intern_c_string ("down");
11564 staticpro (&Qdown);
11565 Qtop = intern_c_string ("top");
11566 staticpro (&Qtop);
11567 Qbottom = intern_c_string ("bottom");
11568 staticpro (&Qbottom);
11569 Qend_scroll = intern_c_string ("end-scroll");
11570 staticpro (&Qend_scroll);
11571 Qratio = intern_c_string ("ratio");
11572 staticpro (&Qratio);
11573
11574 Qevent_kind = intern_c_string ("event-kind");
11575 staticpro (&Qevent_kind);
11576 Qevent_symbol_elements = intern_c_string ("event-symbol-elements");
11577 staticpro (&Qevent_symbol_elements);
11578 Qevent_symbol_element_mask = intern_c_string ("event-symbol-element-mask");
11579 staticpro (&Qevent_symbol_element_mask);
11580 Qmodifier_cache = intern_c_string ("modifier-cache");
11581 staticpro (&Qmodifier_cache);
11582
11583 Qrecompute_lucid_menubar = intern_c_string ("recompute-lucid-menubar");
11584 staticpro (&Qrecompute_lucid_menubar);
11585 Qactivate_menubar_hook = intern_c_string ("activate-menubar-hook");
11586 staticpro (&Qactivate_menubar_hook);
11587
11588 Qpolling_period = intern_c_string ("polling-period");
11589 staticpro (&Qpolling_period);
11590
11591 Qinput_method_function = intern_c_string ("input-method-function");
11592 staticpro (&Qinput_method_function);
11593
11594 Qx_set_selection = intern_c_string ("x-set-selection");
11595 staticpro (&Qx_set_selection);
11596 QPRIMARY = intern_c_string ("PRIMARY");
11597 staticpro (&QPRIMARY);
11598 Qhandle_switch_frame = intern_c_string ("handle-switch-frame");
11599 staticpro (&Qhandle_switch_frame);
11600
11601 Qinput_method_exit_on_first_char = intern_c_string ("input-method-exit-on-first-char");
11602 staticpro (&Qinput_method_exit_on_first_char);
11603 Qinput_method_use_echo_area = intern_c_string ("input-method-use-echo-area");
11604 staticpro (&Qinput_method_use_echo_area);
11605 11533
11606 Fset (Qinput_method_exit_on_first_char, Qnil); 11534 Fset (Qinput_method_exit_on_first_char, Qnil);
11607 Fset (Qinput_method_use_echo_area, Qnil); 11535 Fset (Qinput_method_use_echo_area, Qnil);
@@ -11652,9 +11580,8 @@ syms_of_keyboard (void)
11652 raw_keybuf = Fmake_vector (make_number (30), Qnil); 11580 raw_keybuf = Fmake_vector (make_number (30), Qnil);
11653 staticpro (&raw_keybuf); 11581 staticpro (&raw_keybuf);
11654 11582
11655 Qextended_command_history = intern_c_string ("extended-command-history"); 11583 DEFSYM (Qextended_command_history, "extended-command-history");
11656 Fset (Qextended_command_history, Qnil); 11584 Fset (Qextended_command_history, Qnil);
11657 staticpro (&Qextended_command_history);
11658 11585
11659 accent_key_syms = Qnil; 11586 accent_key_syms = Qnil;
11660 staticpro (&accent_key_syms); 11587 staticpro (&accent_key_syms);
@@ -11955,8 +11882,7 @@ The command loop sets this to nil before each command,
11955and tests the value when the command returns. 11882and tests the value when the command returns.
11956Buffer modification stores t in this variable. */); 11883Buffer modification stores t in this variable. */);
11957 Vdeactivate_mark = Qnil; 11884 Vdeactivate_mark = Qnil;
11958 Qdeactivate_mark = intern_c_string ("deactivate-mark"); 11885 DEFSYM (Qdeactivate_mark, "deactivate-mark");
11959 staticpro (&Qdeactivate_mark);
11960 11886
11961 DEFVAR_LISP ("pre-command-hook", Vpre_command_hook, 11887 DEFVAR_LISP ("pre-command-hook", Vpre_command_hook,
11962 doc: /* Normal hook run before each command is executed. 11888 doc: /* Normal hook run before each command is executed.
@@ -11976,8 +11902,7 @@ otherwise the error might happen repeatedly and make Emacs nonfunctional. */);
11976 DEFVAR_LISP ("echo-area-clear-hook", ..., 11902 DEFVAR_LISP ("echo-area-clear-hook", ...,
11977 doc: /* Normal hook run when clearing the echo area. */); 11903 doc: /* Normal hook run when clearing the echo area. */);
11978#endif 11904#endif
11979 Qecho_area_clear_hook = intern_c_string ("echo-area-clear-hook"); 11905 DEFSYM (Qecho_area_clear_hook, "echo-area-clear-hook");
11980 staticpro (&Qecho_area_clear_hook);
11981 Fset (Qecho_area_clear_hook, Qnil); 11906 Fset (Qecho_area_clear_hook, Qnil);
11982 11907
11983 DEFVAR_LISP ("lucid-menu-bar-dirty-flag", Vlucid_menu_bar_dirty_flag, 11908 DEFVAR_LISP ("lucid-menu-bar-dirty-flag", Vlucid_menu_bar_dirty_flag,
diff --git a/src/lisp.h b/src/lisp.h
index a6933e70288..4859862c88f 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3046,13 +3046,13 @@ struct re_registers;
3046extern struct re_pattern_buffer *compile_pattern (Lisp_Object, 3046extern struct re_pattern_buffer *compile_pattern (Lisp_Object,
3047 struct re_registers *, 3047 struct re_registers *,
3048 Lisp_Object, int, int); 3048 Lisp_Object, int, int);
3049extern int fast_string_match (Lisp_Object, Lisp_Object); 3049extern EMACS_INT fast_string_match (Lisp_Object, Lisp_Object);
3050extern int fast_c_string_match_ignore_case (Lisp_Object, const char *); 3050extern EMACS_INT fast_c_string_match_ignore_case (Lisp_Object, const char *);
3051extern int fast_string_match_ignore_case (Lisp_Object, Lisp_Object); 3051extern EMACS_INT fast_string_match_ignore_case (Lisp_Object, Lisp_Object);
3052extern EMACS_INT fast_looking_at (Lisp_Object, EMACS_INT, EMACS_INT, 3052extern EMACS_INT fast_looking_at (Lisp_Object, EMACS_INT, EMACS_INT,
3053 EMACS_INT, EMACS_INT, Lisp_Object); 3053 EMACS_INT, EMACS_INT, Lisp_Object);
3054extern EMACS_INT scan_buffer (int, EMACS_INT, EMACS_INT, EMACS_INT, 3054extern EMACS_INT scan_buffer (int, EMACS_INT, EMACS_INT, EMACS_INT,
3055 int *, int); 3055 EMACS_INT *, int);
3056extern EMACS_INT scan_newline (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, 3056extern EMACS_INT scan_newline (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT,
3057 EMACS_INT, int); 3057 EMACS_INT, int);
3058extern EMACS_INT find_next_newline (EMACS_INT, int); 3058extern EMACS_INT find_next_newline (EMACS_INT, int);
diff --git a/src/print.c b/src/print.c
index c076e1ec973..f68f04ac5fa 100644
--- a/src/print.c
+++ b/src/print.c
@@ -520,29 +520,6 @@ temp_output_buffer_setup (const char *bufname)
520 520
521 specbind (Qstandard_output, buf); 521 specbind (Qstandard_output, buf);
522} 522}
523
524/* FIXME: Use Lisp's with-output-to-temp-buffer instead! */
525Lisp_Object
526internal_with_output_to_temp_buffer (const char *bufname, Lisp_Object (*function) (Lisp_Object), Lisp_Object args)
527{
528 int count = SPECPDL_INDEX ();
529 Lisp_Object buf, val;
530 struct gcpro gcpro1;
531
532 GCPRO1 (args);
533 record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
534 temp_output_buffer_setup (bufname);
535 buf = Vstandard_output;
536 UNGCPRO;
537
538 val = (*function) (args);
539
540 GCPRO1 (val);
541 temp_output_buffer_show (buf);
542 UNGCPRO;
543
544 return unbind_to (count, val);
545}
546 523
547static void print (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag); 524static void print (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag);
548static void print_preprocess (Lisp_Object obj); 525static void print_preprocess (Lisp_Object obj);
diff --git a/src/process.c b/src/process.c
index a9a8eb79ede..6cddbf6d1a9 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1239,244 +1239,6 @@ Returns nil if format of ADDRESS is invalid. */)
1239 1239
1240 return Qnil; 1240 return Qnil;
1241} 1241}
1242
1243static Lisp_Object
1244list_processes_1 (Lisp_Object query_only)
1245{
1246 register Lisp_Object tail;
1247 Lisp_Object proc, minspace;
1248 register struct Lisp_Process *p;
1249 char tembuf[300];
1250 int w_proc, w_buffer, w_tty;
1251 int exited = 0;
1252 Lisp_Object i_status, i_buffer, i_tty, i_command;
1253
1254 w_proc = 4; /* Proc */
1255 w_buffer = 6; /* Buffer */
1256 w_tty = 0; /* Omit if no ttys */
1257
1258 for (tail = Vprocess_alist; CONSP (tail); tail = XCDR (tail))
1259 {
1260 int i;
1261
1262 proc = Fcdr (XCAR (tail));
1263 p = XPROCESS (proc);
1264 if (NILP (p->type))
1265 continue;
1266 if (!NILP (query_only) && p->kill_without_query)
1267 continue;
1268 if (STRINGP (p->name)
1269 && ( i = SCHARS (p->name), (i > w_proc)))
1270 w_proc = i;
1271 if (!NILP (p->buffer))
1272 {
1273 if (NILP (BVAR (XBUFFER (p->buffer), name)))
1274 {
1275 if (w_buffer < 8)
1276 w_buffer = 8; /* (Killed) */
1277 }
1278 else if ((i = SCHARS (BVAR (XBUFFER (p->buffer), name)), (i > w_buffer)))
1279 w_buffer = i;
1280 }
1281 if (STRINGP (p->tty_name)
1282 && (i = SCHARS (p->tty_name), (i > w_tty)))
1283 w_tty = i;
1284 }
1285
1286 XSETFASTINT (i_status, w_proc + 1);
1287 XSETFASTINT (i_buffer, XFASTINT (i_status) + 9);
1288 if (w_tty)
1289 {
1290 XSETFASTINT (i_tty, XFASTINT (i_buffer) + w_buffer + 1);
1291 XSETFASTINT (i_command, XFASTINT (i_tty) + w_tty + 1);
1292 }
1293 else
1294 {
1295 i_tty = Qnil;
1296 XSETFASTINT (i_command, XFASTINT (i_buffer) + w_buffer + 1);
1297 }
1298
1299 XSETFASTINT (minspace, 1);
1300
1301 set_buffer_internal (XBUFFER (Vstandard_output));
1302 BVAR (current_buffer, undo_list) = Qt;
1303
1304 BVAR (current_buffer, truncate_lines) = Qt;
1305
1306 write_string ("Proc", -1);
1307 Findent_to (i_status, minspace); write_string ("Status", -1);
1308 Findent_to (i_buffer, minspace); write_string ("Buffer", -1);
1309 if (!NILP (i_tty))
1310 {
1311 Findent_to (i_tty, minspace); write_string ("Tty", -1);
1312 }
1313 Findent_to (i_command, minspace); write_string ("Command", -1);
1314 write_string ("\n", -1);
1315
1316 write_string ("----", -1);
1317 Findent_to (i_status, minspace); write_string ("------", -1);
1318 Findent_to (i_buffer, minspace); write_string ("------", -1);
1319 if (!NILP (i_tty))
1320 {
1321 Findent_to (i_tty, minspace); write_string ("---", -1);
1322 }
1323 Findent_to (i_command, minspace); write_string ("-------", -1);
1324 write_string ("\n", -1);
1325
1326 for (tail = Vprocess_alist; CONSP (tail); tail = XCDR (tail))
1327 {
1328 Lisp_Object symbol;
1329
1330 proc = Fcdr (XCAR (tail));
1331 p = XPROCESS (proc);
1332 if (NILP (p->type))
1333 continue;
1334 if (!NILP (query_only) && p->kill_without_query)
1335 continue;
1336
1337 Finsert (1, &p->name);
1338 Findent_to (i_status, minspace);
1339
1340 if (p->raw_status_new)
1341 update_status (p);
1342 symbol = p->status;
1343 if (CONSP (p->status))
1344 symbol = XCAR (p->status);
1345
1346 if (EQ (symbol, Qsignal))
1347 Fprinc (symbol, Qnil);
1348 else if (NETCONN1_P (p) || SERIALCONN1_P (p))
1349 {
1350 if (EQ (symbol, Qexit))
1351 write_string ("closed", -1);
1352 else if (EQ (p->command, Qt))
1353 write_string ("stopped", -1);
1354 else if (EQ (symbol, Qrun))
1355 write_string ("open", -1);
1356 else
1357 Fprinc (symbol, Qnil);
1358 }
1359 else if (SERIALCONN1_P (p))
1360 {
1361 write_string ("running", -1);
1362 }
1363 else
1364 Fprinc (symbol, Qnil);
1365
1366 if (EQ (symbol, Qexit))
1367 {
1368 Lisp_Object tem;
1369 tem = Fcar (Fcdr (p->status));
1370 if (XFASTINT (tem))
1371 {
1372 sprintf (tembuf, " %d", (int) XFASTINT (tem));
1373 write_string (tembuf, -1);
1374 }
1375 }
1376
1377 if (EQ (symbol, Qsignal) || EQ (symbol, Qexit) || EQ (symbol, Qclosed))
1378 exited++;
1379
1380 Findent_to (i_buffer, minspace);
1381 if (NILP (p->buffer))
1382 insert_string ("(none)");
1383 else if (NILP (BVAR (XBUFFER (p->buffer), name)))
1384 insert_string ("(Killed)");
1385 else
1386 Finsert (1, &BVAR (XBUFFER (p->buffer), name));
1387
1388 if (!NILP (i_tty))
1389 {
1390 Findent_to (i_tty, minspace);
1391 if (STRINGP (p->tty_name))
1392 Finsert (1, &p->tty_name);
1393 }
1394
1395 Findent_to (i_command, minspace);
1396
1397 if (EQ (p->status, Qlisten))
1398 {
1399 Lisp_Object port = Fplist_get (p->childp, QCservice);
1400 if (INTEGERP (port))
1401 port = Fnumber_to_string (port);
1402 if (NILP (port))
1403 port = Fformat_network_address (Fplist_get (p->childp, QClocal), Qnil);
1404 sprintf (tembuf, "(network %s server on %s)\n",
1405 (DATAGRAM_CHAN_P (p->infd) ? "datagram" : "stream"),
1406 (STRINGP (port) ? SSDATA (port) : "?"));
1407 insert_string (tembuf);
1408 }
1409 else if (NETCONN1_P (p))
1410 {
1411 /* For a local socket, there is no host name,
1412 so display service instead. */
1413 Lisp_Object host = Fplist_get (p->childp, QChost);
1414 if (!STRINGP (host))
1415 {
1416 host = Fplist_get (p->childp, QCservice);
1417 if (INTEGERP (host))
1418 host = Fnumber_to_string (host);
1419 }
1420 if (NILP (host))
1421 host = Fformat_network_address (Fplist_get (p->childp, QCremote), Qnil);
1422 sprintf (tembuf, "(network %s connection to %s)\n",
1423 (DATAGRAM_CHAN_P (p->infd) ? "datagram" : "stream"),
1424 (STRINGP (host) ? SSDATA (host) : "?"));
1425 insert_string (tembuf);
1426 }
1427 else if (SERIALCONN1_P (p))
1428 {
1429 Lisp_Object port = Fplist_get (p->childp, QCport);
1430 Lisp_Object speed = Fplist_get (p->childp, QCspeed);
1431 insert_string ("(serial port ");
1432 if (STRINGP (port))
1433 insert_string (SSDATA (port));
1434 else
1435 insert_string ("?");
1436 if (INTEGERP (speed))
1437 {
1438 sprintf (tembuf, " at %ld b/s", (long) XINT (speed));
1439 insert_string (tembuf);
1440 }
1441 insert_string (")\n");
1442 }
1443 else
1444 {
1445 Lisp_Object tem = p->command;
1446 while (1)
1447 {
1448 Lisp_Object tem1 = Fcar (tem);
1449 if (NILP (tem1))
1450 break;
1451 Finsert (1, &tem1);
1452 tem = Fcdr (tem);
1453 if (NILP (tem))
1454 break;
1455 insert_string (" ");
1456 }
1457 insert_string ("\n");
1458 }
1459 }
1460 if (exited)
1461 {
1462 status_notify (NULL);
1463 redisplay_preserve_echo_area (13);
1464 }
1465 return Qnil;
1466}
1467
1468DEFUN ("list-processes", Flist_processes, Slist_processes, 0, 1, "P",
1469 doc: /* Display a list of all processes.
1470If optional argument QUERY-ONLY is non-nil, only processes with
1471the query-on-exit flag set will be listed.
1472Any process listed as exited or signaled is actually eliminated
1473after the listing is made. */)
1474 (Lisp_Object query_only)
1475{
1476 internal_with_output_to_temp_buffer ("*Process List*",
1477 list_processes_1, query_only);
1478 return Qnil;
1479}
1480 1242
1481DEFUN ("process-list", Fprocess_list, Sprocess_list, 0, 0, 0, 1243DEFUN ("process-list", Fprocess_list, Sprocess_list, 0, 0, 0,
1482 doc: /* Return a list of all processes. */) 1244 doc: /* Return a list of all processes. */)
@@ -1499,9 +1261,9 @@ at end of BUFFER, unless you specify an output stream or filter
1499function to handle the output. BUFFER may also be nil, meaning that 1261function to handle the output. BUFFER may also be nil, meaning that
1500this process is not associated with any buffer. 1262this process is not associated with any buffer.
1501 1263
1502PROGRAM is the program file name. It is searched for in PATH. If 1264PROGRAM is the program file name. It is searched for in `exec-path'
1503nil, just associate a pty with the buffer. Remaining arguments are 1265(which see). If nil, just associate a pty with the buffer. Remaining
1504strings to give program as arguments. 1266arguments are strings to give program as arguments.
1505 1267
1506If you want to separate standard output from standard error, invoke 1268If you want to separate standard output from standard error, invoke
1507the command through a shell and redirect one of them using the shell 1269the command through a shell and redirect one of them using the shell
@@ -7668,7 +7430,6 @@ The variable takes effect when `start-process' is called. */);
7668 defsubr (&Sprocess_contact); 7430 defsubr (&Sprocess_contact);
7669 defsubr (&Sprocess_plist); 7431 defsubr (&Sprocess_plist);
7670 defsubr (&Sset_process_plist); 7432 defsubr (&Sset_process_plist);
7671 defsubr (&Slist_processes);
7672 defsubr (&Sprocess_list); 7433 defsubr (&Sprocess_list);
7673 defsubr (&Sstart_process); 7434 defsubr (&Sstart_process);
7674 defsubr (&Sserial_process_configure); 7435 defsubr (&Sserial_process_configure);
diff --git a/src/search.c b/src/search.c
index fa44e1300d7..d9be8ca0105 100644
--- a/src/search.c
+++ b/src/search.c
@@ -368,7 +368,7 @@ data if you want to preserve them. */)
368static Lisp_Object 368static Lisp_Object
369string_match_1 (Lisp_Object regexp, Lisp_Object string, Lisp_Object start, int posix) 369string_match_1 (Lisp_Object regexp, Lisp_Object string, Lisp_Object start, int posix)
370{ 370{
371 int val; 371 EMACS_INT val;
372 struct re_pattern_buffer *bufp; 372 struct re_pattern_buffer *bufp;
373 EMACS_INT pos, pos_byte; 373 EMACS_INT pos, pos_byte;
374 int i; 374 int i;
@@ -468,10 +468,10 @@ matched by parenthesis constructs in the pattern. */)
468 and return the index of the match, or negative on failure. 468 and return the index of the match, or negative on failure.
469 This does not clobber the match data. */ 469 This does not clobber the match data. */
470 470
471int 471EMACS_INT
472fast_string_match (Lisp_Object regexp, Lisp_Object string) 472fast_string_match (Lisp_Object regexp, Lisp_Object string)
473{ 473{
474 int val; 474 EMACS_INT val;
475 struct re_pattern_buffer *bufp; 475 struct re_pattern_buffer *bufp;
476 476
477 bufp = compile_pattern (regexp, 0, Qnil, 477 bufp = compile_pattern (regexp, 0, Qnil,
@@ -491,10 +491,10 @@ fast_string_match (Lisp_Object regexp, Lisp_Object string)
491 This does not clobber the match data. 491 This does not clobber the match data.
492 We assume that STRING contains single-byte characters. */ 492 We assume that STRING contains single-byte characters. */
493 493
494int 494EMACS_INT
495fast_c_string_match_ignore_case (Lisp_Object regexp, const char *string) 495fast_c_string_match_ignore_case (Lisp_Object regexp, const char *string)
496{ 496{
497 int val; 497 EMACS_INT val;
498 struct re_pattern_buffer *bufp; 498 struct re_pattern_buffer *bufp;
499 size_t len = strlen (string); 499 size_t len = strlen (string);
500 500
@@ -511,10 +511,10 @@ fast_c_string_match_ignore_case (Lisp_Object regexp, const char *string)
511 511
512/* Like fast_string_match but ignore case. */ 512/* Like fast_string_match but ignore case. */
513 513
514int 514EMACS_INT
515fast_string_match_ignore_case (Lisp_Object regexp, Lisp_Object string) 515fast_string_match_ignore_case (Lisp_Object regexp, Lisp_Object string)
516{ 516{
517 int val; 517 EMACS_INT val;
518 struct re_pattern_buffer *bufp; 518 struct re_pattern_buffer *bufp;
519 519
520 bufp = compile_pattern (regexp, 0, Vascii_canon_table, 520 bufp = compile_pattern (regexp, 0, Vascii_canon_table,
@@ -643,7 +643,7 @@ newline_cache_on_off (struct buffer *buf)
643 643
644EMACS_INT 644EMACS_INT
645scan_buffer (register int target, EMACS_INT start, EMACS_INT end, 645scan_buffer (register int target, EMACS_INT start, EMACS_INT end,
646 EMACS_INT count, int *shortage, int allow_quit) 646 EMACS_INT count, EMACS_INT *shortage, int allow_quit)
647{ 647{
648 struct region_cache *newline_cache; 648 struct region_cache *newline_cache;
649 int direction; 649 int direction;
@@ -933,7 +933,7 @@ scan_newline (EMACS_INT start, EMACS_INT start_byte,
933EMACS_INT 933EMACS_INT
934find_next_newline_no_quit (EMACS_INT from, EMACS_INT cnt) 934find_next_newline_no_quit (EMACS_INT from, EMACS_INT cnt)
935{ 935{
936 return scan_buffer ('\n', from, 0, cnt, (int *) 0, 0); 936 return scan_buffer ('\n', from, 0, cnt, (EMACS_INT *) 0, 0);
937} 937}
938 938
939/* Like find_next_newline, but returns position before the newline, 939/* Like find_next_newline, but returns position before the newline,
@@ -943,7 +943,7 @@ find_next_newline_no_quit (EMACS_INT from, EMACS_INT cnt)
943EMACS_INT 943EMACS_INT
944find_before_next_newline (EMACS_INT from, EMACS_INT to, EMACS_INT cnt) 944find_before_next_newline (EMACS_INT from, EMACS_INT to, EMACS_INT cnt)
945{ 945{
946 int shortage; 946 EMACS_INT shortage;
947 EMACS_INT pos = scan_buffer ('\n', from, to, cnt, &shortage, 1); 947 EMACS_INT pos = scan_buffer ('\n', from, to, cnt, &shortage, 1);
948 948
949 if (shortage == 0) 949 if (shortage == 0)
@@ -958,9 +958,9 @@ static Lisp_Object
958search_command (Lisp_Object string, Lisp_Object bound, Lisp_Object noerror, 958search_command (Lisp_Object string, Lisp_Object bound, Lisp_Object noerror,
959 Lisp_Object count, int direction, int RE, int posix) 959 Lisp_Object count, int direction, int RE, int posix)
960{ 960{
961 register int np; 961 register EMACS_INT np;
962 EMACS_INT lim, lim_byte; 962 EMACS_INT lim, lim_byte;
963 int n = direction; 963 EMACS_INT n = direction;
964 964
965 if (!NILP (count)) 965 if (!NILP (count))
966 { 966 {
@@ -2524,7 +2524,7 @@ since only regular expressions have distinguished subexpressions. */)
2524 /* We build up the substituted string in ACCUM. */ 2524 /* We build up the substituted string in ACCUM. */
2525 Lisp_Object accum; 2525 Lisp_Object accum;
2526 Lisp_Object middle; 2526 Lisp_Object middle;
2527 int length = SBYTES (newtext); 2527 EMACS_INT length = SBYTES (newtext);
2528 2528
2529 accum = Qnil; 2529 accum = Qnil;
2530 2530
@@ -2880,7 +2880,7 @@ Return value is undefined if the last search failed. */)
2880 len = 0; 2880 len = 0;
2881 for (i = 0; i < search_regs.num_regs; i++) 2881 for (i = 0; i < search_regs.num_regs; i++)
2882 { 2882 {
2883 int start = search_regs.start[i]; 2883 EMACS_INT start = search_regs.start[i];
2884 if (start >= 0) 2884 if (start >= 0)
2885 { 2885 {
2886 if (EQ (last_thing_searched, Qt) 2886 if (EQ (last_thing_searched, Qt)
diff --git a/src/term.c b/src/term.c
index d4e5faf01c8..ea856543a7d 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3155,13 +3155,12 @@ init_tty (const char *name, const char *terminal_type, int must_succeed)
3155 if we don't have one at the moment. */ 3155 if we don't have one at the moment. */
3156 fd = emacs_open (name, O_RDWR | O_IGNORE_CTTY | O_NOCTTY, 0); 3156 fd = emacs_open (name, O_RDWR | O_IGNORE_CTTY | O_NOCTTY, 0);
3157 else 3157 else
3158#else 3158#endif /* O_IGNORE_CTTY */
3159 /* Alas, O_IGNORE_CTTY is a GNU extension that seems to be only 3159 /* Alas, O_IGNORE_CTTY is a GNU extension that seems to be only
3160 defined on Hurd. On other systems, we need to explicitly 3160 defined on Hurd. On other systems, we need to explicitly
3161 dissociate ourselves from the controlling tty when we want to 3161 dissociate ourselves from the controlling tty when we want to
3162 open a frame on the same terminal. */ 3162 open a frame on the same terminal. */
3163 fd = emacs_open (name, O_RDWR | O_NOCTTY, 0); 3163 fd = emacs_open (name, O_RDWR | O_NOCTTY, 0);
3164#endif /* O_IGNORE_CTTY */
3165 3164
3166 tty->name = xstrdup (name); 3165 tty->name = xstrdup (name);
3167 terminal->name = xstrdup (name); 3166 terminal->name = xstrdup (name);
diff --git a/src/window.c b/src/window.c
index ebfd1b0f778..a8a6fceaaee 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3664,9 +3664,6 @@ temp_output_buffer_show (register Lisp_Object buf)
3664 BEGV = BEG; 3664 BEGV = BEG;
3665 ZV = Z; 3665 ZV = Z;
3666 SET_PT (BEG); 3666 SET_PT (BEG);
3667#if 0 /* rms: there should be no reason for this. */
3668 XBUFFER (buf)->prevent_redisplay_optimizations_p = 1;
3669#endif
3670 set_buffer_internal (old); 3667 set_buffer_internal (old);
3671 3668
3672 if (!NILP (Vtemp_buffer_show_function)) 3669 if (!NILP (Vtemp_buffer_show_function))
diff --git a/src/xdisp.c b/src/xdisp.c
index a296fb33a9f..b1209b998e2 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -763,7 +763,7 @@ static Lisp_Object get_it_property (struct it *it, Lisp_Object prop);
763static void handle_line_prefix (struct it *); 763static void handle_line_prefix (struct it *);
764 764
765static void pint2str (char *, int, EMACS_INT); 765static void pint2str (char *, int, EMACS_INT);
766static void pint2hrstr (char *, int, int); 766static void pint2hrstr (char *, int, EMACS_INT);
767static struct text_pos run_window_scroll_functions (Lisp_Object, 767static struct text_pos run_window_scroll_functions (Lisp_Object,
768 struct text_pos); 768 struct text_pos);
769static void reconsider_clip_changes (struct window *, struct buffer *); 769static void reconsider_clip_changes (struct window *, struct buffer *);
@@ -825,7 +825,8 @@ static int display_mode_element (struct it *, int, int, int, Lisp_Object, Lisp_O
825static int store_mode_line_string (const char *, Lisp_Object, int, int, int, Lisp_Object); 825static int store_mode_line_string (const char *, Lisp_Object, int, int, int, Lisp_Object);
826static const char *decode_mode_spec (struct window *, int, int, Lisp_Object *); 826static const char *decode_mode_spec (struct window *, int, int, Lisp_Object *);
827static void display_menu_bar (struct window *); 827static void display_menu_bar (struct window *);
828static int display_count_lines (EMACS_INT, EMACS_INT, int, EMACS_INT *); 828static EMACS_INT display_count_lines (EMACS_INT, EMACS_INT, EMACS_INT,
829 EMACS_INT *);
829static int display_string (const char *, Lisp_Object, Lisp_Object, 830static int display_string (const char *, Lisp_Object, Lisp_Object,
830 EMACS_INT, EMACS_INT, struct it *, int, int, int, int); 831 EMACS_INT, EMACS_INT, struct it *, int, int, int, int);
831static void compute_line_metrics (struct it *); 832static void compute_line_metrics (struct it *);
@@ -19099,11 +19100,11 @@ static const char power_letter[] =
19099 }; 19100 };
19100 19101
19101static void 19102static void
19102pint2hrstr (char *buf, int width, int d) 19103pint2hrstr (char *buf, int width, EMACS_INT d)
19103{ 19104{
19104 /* We aim to represent the nonnegative integer D as 19105 /* We aim to represent the nonnegative integer D as
19105 QUOTIENT.TENTHS * 10 ^ (3 * EXPONENT). */ 19106 QUOTIENT.TENTHS * 10 ^ (3 * EXPONENT). */
19106 int quotient = d; 19107 EMACS_INT quotient = d;
19107 int remainder = 0; 19108 int remainder = 0;
19108 /* -1 means: do not use TENTHS. */ 19109 /* -1 means: do not use TENTHS. */
19109 int tenths = -1; 19110 int tenths = -1;
@@ -19429,7 +19430,7 @@ decode_mode_spec (struct window *w, register int c, int field_width,
19429 case 'l': 19430 case 'l':
19430 { 19431 {
19431 EMACS_INT startpos, startpos_byte, line, linepos, linepos_byte; 19432 EMACS_INT startpos, startpos_byte, line, linepos, linepos_byte;
19432 int topline, nlines, height; 19433 EMACS_INT topline, nlines, height;
19433 EMACS_INT junk; 19434 EMACS_INT junk;
19434 19435
19435 /* %c and %l are ignored in `frame-title-format'. */ 19436 /* %c and %l are ignored in `frame-title-format'. */
@@ -19494,7 +19495,8 @@ decode_mode_spec (struct window *w, register int c, int field_width,
19494 EMACS_INT limit = BUF_BEGV (b); 19495 EMACS_INT limit = BUF_BEGV (b);
19495 EMACS_INT limit_byte = BUF_BEGV_BYTE (b); 19496 EMACS_INT limit_byte = BUF_BEGV_BYTE (b);
19496 EMACS_INT position; 19497 EMACS_INT position;
19497 int distance = (height * 2 + 30) * line_number_display_limit_width; 19498 EMACS_INT distance =
19499 (height * 2 + 30) * line_number_display_limit_width;
19498 19500
19499 if (startpos - distance > limit) 19501 if (startpos - distance > limit)
19500 { 19502 {
@@ -19697,17 +19699,17 @@ decode_mode_spec (struct window *w, register int c, int field_width,
19697 19699
19698 Set *BYTE_POS_PTR to 1 if we found COUNT lines, 0 if we hit LIMIT. */ 19700 Set *BYTE_POS_PTR to 1 if we found COUNT lines, 0 if we hit LIMIT. */
19699 19701
19700static int 19702static EMACS_INT
19701display_count_lines (EMACS_INT start_byte, 19703display_count_lines (EMACS_INT start_byte,
19702 EMACS_INT limit_byte, int count, 19704 EMACS_INT limit_byte, EMACS_INT count,
19703 EMACS_INT *byte_pos_ptr) 19705 EMACS_INT *byte_pos_ptr)
19704{ 19706{
19705 register unsigned char *cursor; 19707 register unsigned char *cursor;
19706 unsigned char *base; 19708 unsigned char *base;
19707 19709
19708 register int ceiling; 19710 register EMACS_INT ceiling;
19709 register unsigned char *ceiling_addr; 19711 register unsigned char *ceiling_addr;
19710 int orig_count = count; 19712 EMACS_INT orig_count = count;
19711 19713
19712 /* If we are not in selective display mode, 19714 /* If we are not in selective display mode,
19713 check only for newlines. */ 19715 check only for newlines. */
diff --git a/src/xmenu.c b/src/xmenu.c
index 6e175e69039..dbf8145f737 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1529,7 +1529,8 @@ create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv,
1529 int i; 1529 int i;
1530 Arg av[2]; 1530 Arg av[2];
1531 int ac = 0; 1531 int ac = 0;
1532 XButtonPressedEvent dummy; 1532 XEvent dummy;
1533 XButtonPressedEvent *event = &(dummy.xbutton);
1533 LWLIB_ID menu_id; 1534 LWLIB_ID menu_id;
1534 Widget menu; 1535 Widget menu;
1535 1536
@@ -1547,36 +1548,35 @@ create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv,
1547 popup_deactivate_callback, 1548 popup_deactivate_callback,
1548 menu_highlight_callback); 1549 menu_highlight_callback);
1549 1550
1550 dummy.type = ButtonPress; 1551 event->type = ButtonPress;
1551 dummy.serial = 0; 1552 event->serial = 0;
1552 dummy.send_event = 0; 1553 event->send_event = 0;
1553 dummy.display = FRAME_X_DISPLAY (f); 1554 event->display = FRAME_X_DISPLAY (f);
1554 dummy.time = CurrentTime; 1555 event->time = CurrentTime;
1555 dummy.root = FRAME_X_DISPLAY_INFO (f)->root_window; 1556 event->root = FRAME_X_DISPLAY_INFO (f)->root_window;
1556 dummy.window = dummy.root; 1557 event->window = event->subwindow = event->root;
1557 dummy.subwindow = dummy.root; 1558 event->x = x;
1558 dummy.x = x; 1559 event->y = y;
1559 dummy.y = y;
1560 1560
1561 /* Adjust coordinates to be root-window-relative. */ 1561 /* Adjust coordinates to be root-window-relative. */
1562 x += f->left_pos + FRAME_OUTER_TO_INNER_DIFF_X (f); 1562 x += f->left_pos + FRAME_OUTER_TO_INNER_DIFF_X (f);
1563 y += f->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f); 1563 y += f->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f);
1564 1564
1565 dummy.x_root = x; 1565 event->x_root = x;
1566 dummy.y_root = y; 1566 event->y_root = y;
1567 1567
1568 dummy.state = 0; 1568 event->state = 0;
1569 dummy.button = 0; 1569 event->button = 0;
1570 for (i = 0; i < 5; i++) 1570 for (i = 0; i < 5; i++)
1571 if (FRAME_X_DISPLAY_INFO (f)->grabbed & (1 << i)) 1571 if (FRAME_X_DISPLAY_INFO (f)->grabbed & (1 << i))
1572 dummy.button = i; 1572 event->button = i;
1573 1573
1574 /* Don't allow any geometry request from the user. */ 1574 /* Don't allow any geometry request from the user. */
1575 XtSetArg (av[ac], XtNgeometry, 0); ac++; 1575 XtSetArg (av[ac], XtNgeometry, 0); ac++;
1576 XtSetValues (menu, av, ac); 1576 XtSetValues (menu, av, ac);
1577 1577
1578 /* Display the menu. */ 1578 /* Display the menu. */
1579 lw_popup_menu (menu, (XEvent *) &dummy); 1579 lw_popup_menu (menu, &dummy);
1580 popup_activated_flag = 1; 1580 popup_activated_flag = 1;
1581 x_activate_timeout_atimer (); 1581 x_activate_timeout_atimer ();
1582 1582
diff --git a/src/xml.c b/src/xml.c
index d8e6f8c3faa..63041c96b24 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -113,7 +113,7 @@ parse_region (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, int html
113 doc = xmlReadMemory ((char *) BYTE_POS_ADDR (CHAR_TO_BYTE (istart)), 113 doc = xmlReadMemory ((char *) BYTE_POS_ADDR (CHAR_TO_BYTE (istart)),
114 bytes, burl, "utf-8", 114 bytes, burl, "utf-8",
115 XML_PARSE_NONET|XML_PARSE_NOWARNING| 115 XML_PARSE_NONET|XML_PARSE_NOWARNING|
116 XML_PARSE_NOERROR); 116 XML_PARSE_NOBLANKS |XML_PARSE_NOERROR);
117 117
118 if (doc != NULL) 118 if (doc != NULL)
119 { 119 {
diff --git a/src/xselect.c b/src/xselect.c
index 430b7232659..4f1a452023a 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -499,22 +499,23 @@ x_get_local_selection (Lisp_Object selection_symbol, Lisp_Object target_type, in
499static void 499static void
500x_decline_selection_request (struct input_event *event) 500x_decline_selection_request (struct input_event *event)
501{ 501{
502 XSelectionEvent reply; 502 XEvent reply_base;
503 XSelectionEvent *reply = &(reply_base.xselection);
503 504
504 reply.type = SelectionNotify; 505 reply->type = SelectionNotify;
505 reply.display = SELECTION_EVENT_DISPLAY (event); 506 reply->display = SELECTION_EVENT_DISPLAY (event);
506 reply.requestor = SELECTION_EVENT_REQUESTOR (event); 507 reply->requestor = SELECTION_EVENT_REQUESTOR (event);
507 reply.selection = SELECTION_EVENT_SELECTION (event); 508 reply->selection = SELECTION_EVENT_SELECTION (event);
508 reply.time = SELECTION_EVENT_TIME (event); 509 reply->time = SELECTION_EVENT_TIME (event);
509 reply.target = SELECTION_EVENT_TARGET (event); 510 reply->target = SELECTION_EVENT_TARGET (event);
510 reply.property = None; 511 reply->property = None;
511 512
512 /* The reason for the error may be that the receiver has 513 /* The reason for the error may be that the receiver has
513 died in the meantime. Handle that case. */ 514 died in the meantime. Handle that case. */
514 BLOCK_INPUT; 515 BLOCK_INPUT;
515 x_catch_errors (reply.display); 516 x_catch_errors (reply->display);
516 XSendEvent (reply.display, reply.requestor, False, 0L, (XEvent *) &reply); 517 XSendEvent (reply->display, reply->requestor, False, 0L, &reply_base);
517 XFlush (reply.display); 518 XFlush (reply->display);
518 x_uncatch_errors (); 519 x_uncatch_errors ();
519 UNBLOCK_INPUT; 520 UNBLOCK_INPUT;
520} 521}
@@ -617,7 +618,8 @@ static int x_reply_selection_request_cnt;
617static void 618static void
618x_reply_selection_request (struct input_event *event, int format, unsigned char *data, int size, Atom type) 619x_reply_selection_request (struct input_event *event, int format, unsigned char *data, int size, Atom type)
619{ 620{
620 XSelectionEvent reply; 621 XEvent reply_base;
622 XSelectionEvent *reply = &(reply_base.xselection);
621 Display *display = SELECTION_EVENT_DISPLAY (event); 623 Display *display = SELECTION_EVENT_DISPLAY (event);
622 Window window = SELECTION_EVENT_REQUESTOR (event); 624 Window window = SELECTION_EVENT_REQUESTOR (event);
623 int bytes_remaining; 625 int bytes_remaining;
@@ -629,15 +631,15 @@ x_reply_selection_request (struct input_event *event, int format, unsigned char
629 if (max_bytes > MAX_SELECTION_QUANTUM) 631 if (max_bytes > MAX_SELECTION_QUANTUM)
630 max_bytes = MAX_SELECTION_QUANTUM; 632 max_bytes = MAX_SELECTION_QUANTUM;
631 633
632 reply.type = SelectionNotify; 634 reply->type = SelectionNotify;
633 reply.display = display; 635 reply->display = display;
634 reply.requestor = window; 636 reply->requestor = window;
635 reply.selection = SELECTION_EVENT_SELECTION (event); 637 reply->selection = SELECTION_EVENT_SELECTION (event);
636 reply.time = SELECTION_EVENT_TIME (event); 638 reply->time = SELECTION_EVENT_TIME (event);
637 reply.target = SELECTION_EVENT_TARGET (event); 639 reply->target = SELECTION_EVENT_TARGET (event);
638 reply.property = SELECTION_EVENT_PROPERTY (event); 640 reply->property = SELECTION_EVENT_PROPERTY (event);
639 if (reply.property == None) 641 if (reply->property == None)
640 reply.property = reply.target; 642 reply->property = reply->target;
641 643
642 BLOCK_INPUT; 644 BLOCK_INPUT;
643 /* The protected block contains wait_for_property_change, which can 645 /* The protected block contains wait_for_property_change, which can
@@ -648,8 +650,8 @@ x_reply_selection_request (struct input_event *event, int format, unsigned char
648 650
649#ifdef TRACE_SELECTION 651#ifdef TRACE_SELECTION
650 { 652 {
651 char *sel = XGetAtomName (display, reply.selection); 653 char *sel = XGetAtomName (display, reply->selection);
652 char *tgt = XGetAtomName (display, reply.target); 654 char *tgt = XGetAtomName (display, reply->target);
653 TRACE3 ("%s, target %s (%d)", sel, tgt, ++x_reply_selection_request_cnt); 655 TRACE3 ("%s, target %s (%d)", sel, tgt, ++x_reply_selection_request_cnt);
654 if (sel) XFree (sel); 656 if (sel) XFree (sel);
655 if (tgt) XFree (tgt); 657 if (tgt) XFree (tgt);
@@ -664,10 +666,10 @@ x_reply_selection_request (struct input_event *event, int format, unsigned char
664 { 666 {
665 /* Send all the data at once, with minimal handshaking. */ 667 /* Send all the data at once, with minimal handshaking. */
666 TRACE1 ("Sending all %d bytes", bytes_remaining); 668 TRACE1 ("Sending all %d bytes", bytes_remaining);
667 XChangeProperty (display, window, reply.property, type, format, 669 XChangeProperty (display, window, reply->property, type, format,
668 PropModeReplace, data, size); 670 PropModeReplace, data, size);
669 /* At this point, the selection was successfully stored; ack it. */ 671 /* At this point, the selection was successfully stored; ack it. */
670 XSendEvent (display, window, False, 0L, (XEvent *) &reply); 672 XSendEvent (display, window, False, 0L, &reply_base);
671 } 673 }
672 else 674 else
673 { 675 {
@@ -693,19 +695,19 @@ x_reply_selection_request (struct input_event *event, int format, unsigned char
693 error ("Attempt to transfer an INCR to ourself!"); 695 error ("Attempt to transfer an INCR to ourself!");
694 696
695 TRACE2 ("Start sending %d bytes incrementally (%s)", 697 TRACE2 ("Start sending %d bytes incrementally (%s)",
696 bytes_remaining, XGetAtomName (display, reply.property)); 698 bytes_remaining, XGetAtomName (display, reply->property));
697 wait_object = expect_property_change (display, window, reply.property, 699 wait_object = expect_property_change (display, window, reply->property,
698 PropertyDelete); 700 PropertyDelete);
699 701
700 TRACE1 ("Set %s to number of bytes to send", 702 TRACE1 ("Set %s to number of bytes to send",
701 XGetAtomName (display, reply.property)); 703 XGetAtomName (display, reply->property));
702 { 704 {
703 /* XChangeProperty expects an array of long even if long is more than 705 /* XChangeProperty expects an array of long even if long is more than
704 32 bits. */ 706 32 bits. */
705 long value[1]; 707 long value[1];
706 708
707 value[0] = bytes_remaining; 709 value[0] = bytes_remaining;
708 XChangeProperty (display, window, reply.property, dpyinfo->Xatom_INCR, 710 XChangeProperty (display, window, reply->property, dpyinfo->Xatom_INCR,
709 32, PropModeReplace, 711 32, PropModeReplace,
710 (unsigned char *) value, 1); 712 (unsigned char *) value, 1);
711 } 713 }
@@ -714,7 +716,7 @@ x_reply_selection_request (struct input_event *event, int format, unsigned char
714 716
715 /* Tell 'em the INCR data is there... */ 717 /* Tell 'em the INCR data is there... */
716 TRACE0 ("Send SelectionNotify event"); 718 TRACE0 ("Send SelectionNotify event");
717 XSendEvent (display, window, False, 0L, (XEvent *) &reply); 719 XSendEvent (display, window, False, 0L, &reply_base);
718 XFlush (display); 720 XFlush (display);
719 721
720 had_errors = x_had_errors_p (display); 722 had_errors = x_had_errors_p (display);
@@ -725,7 +727,7 @@ x_reply_selection_request (struct input_event *event, int format, unsigned char
725 if (! had_errors) 727 if (! had_errors)
726 { 728 {
727 TRACE1 ("Waiting for ACK (deletion of %s)", 729 TRACE1 ("Waiting for ACK (deletion of %s)",
728 XGetAtomName (display, reply.property)); 730 XGetAtomName (display, reply->property));
729 wait_for_property_change (wait_object); 731 wait_for_property_change (wait_object);
730 } 732 }
731 else 733 else
@@ -741,15 +743,15 @@ x_reply_selection_request (struct input_event *event, int format, unsigned char
741 BLOCK_INPUT; 743 BLOCK_INPUT;
742 744
743 wait_object 745 wait_object
744 = expect_property_change (display, window, reply.property, 746 = expect_property_change (display, window, reply->property,
745 PropertyDelete); 747 PropertyDelete);
746 748
747 TRACE1 ("Sending increment of %d elements", i); 749 TRACE1 ("Sending increment of %d elements", i);
748 TRACE1 ("Set %s to increment data", 750 TRACE1 ("Set %s to increment data",
749 XGetAtomName (display, reply.property)); 751 XGetAtomName (display, reply->property));
750 752
751 /* Append the next chunk of data to the property. */ 753 /* Append the next chunk of data to the property. */
752 XChangeProperty (display, window, reply.property, type, format, 754 XChangeProperty (display, window, reply->property, type, format,
753 PropModeAppend, data, i); 755 PropModeAppend, data, i);
754 bytes_remaining -= i * format_bytes; 756 bytes_remaining -= i * format_bytes;
755 if (format == 32) 757 if (format == 32)
@@ -766,7 +768,7 @@ x_reply_selection_request (struct input_event *event, int format, unsigned char
766 /* Now wait for the requester to ack this chunk by deleting the 768 /* Now wait for the requester to ack this chunk by deleting the
767 property. This can run random lisp code or signal. */ 769 property. This can run random lisp code or signal. */
768 TRACE1 ("Waiting for increment ACK (deletion of %s)", 770 TRACE1 ("Waiting for increment ACK (deletion of %s)",
769 XGetAtomName (display, reply.property)); 771 XGetAtomName (display, reply->property));
770 wait_for_property_change (wait_object); 772 wait_for_property_change (wait_object);
771 } 773 }
772 774
@@ -777,8 +779,8 @@ x_reply_selection_request (struct input_event *event, int format, unsigned char
777 XSelectInput (display, window, 0L); 779 XSelectInput (display, window, 0L);
778 780
779 TRACE1 ("Set %s to a 0-length chunk to indicate EOF", 781 TRACE1 ("Set %s to a 0-length chunk to indicate EOF",
780 XGetAtomName (display, reply.property)); 782 XGetAtomName (display, reply->property));
781 XChangeProperty (display, window, reply.property, type, format, 783 XChangeProperty (display, window, reply->property, type, format,
782 PropModeReplace, data, 0); 784 PropModeReplace, data, 0);
783 TRACE0 ("Done sending incrementally"); 785 TRACE0 ("Done sending incrementally");
784 } 786 }
diff --git a/src/xterm.c b/src/xterm.c
index 3fc431c1350..b3e33b7c0bb 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -4045,7 +4045,7 @@ x_window_to_scroll_bar (Display *display, Window window_id)
4045 return XSCROLL_BAR (bar); 4045 return XSCROLL_BAR (bar);
4046 } 4046 }
4047 4047
4048 return 0; 4048 return NULL;
4049} 4049}
4050 4050
4051 4051
@@ -6008,7 +6008,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr,
6008 goto OTHER; 6008 goto OTHER;
6009#endif /* USE_X_TOOLKIT */ 6009#endif /* USE_X_TOOLKIT */
6010 { 6010 {
6011 XSelectionClearEvent *eventp = (XSelectionClearEvent *) &event; 6011 XSelectionClearEvent *eventp = &(event.xselectionclear);
6012 6012
6013 inev.ie.kind = SELECTION_CLEAR_EVENT; 6013 inev.ie.kind = SELECTION_CLEAR_EVENT;
6014 SELECTION_EVENT_DISPLAY (&inev.sie) = eventp->display; 6014 SELECTION_EVENT_DISPLAY (&inev.sie) = eventp->display;
@@ -6025,8 +6025,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr,
6025 goto OTHER; 6025 goto OTHER;
6026#endif /* USE_X_TOOLKIT */ 6026#endif /* USE_X_TOOLKIT */
6027 { 6027 {
6028 XSelectionRequestEvent *eventp 6028 XSelectionRequestEvent *eventp = &(event.xselectionrequest);
6029 = (XSelectionRequestEvent *) &event;
6030 6029
6031 inev.ie.kind = SELECTION_REQUEST_EVENT; 6030 inev.ie.kind = SELECTION_REQUEST_EVENT;
6032 SELECTION_EVENT_DISPLAY (&inev.sie) = eventp->display; 6031 SELECTION_EVENT_DISPLAY (&inev.sie) = eventp->display;
generated by cgit v1.2.1 (git 2.18.0) at 2026-03-30 21:56:43 +0000