September 2005 - xemacs-cvs＠xemacs.org - XEmacs Mailing List Archives

CVS update by viteno xemacs ... 19 years, 3 months

CVS Monitor

User: viteno Date: 05/09/20 23:51:17 Modified: xemacs version.sh Log: Update xemacs_extra_name. Revision Changes Path 1.1289 +1 -1 XEmacs/xemacs/version.sh Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.1288 retrieving revision 1.1289 diff -u -p -r1.1288 -r1.1289 --- version.sh 2005/09/19 21:51:04 1.1288 +++ version.sh 2005/09/20 21:51:16 1.1289 ＠＠ -8,5 +8,5 ＠＠ emacs_kit_version= infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -xemacs_extra_name="(+CVS-20050919)" +xemacs_extra_name="(+CVS-20050920)" xemacs_release_date="2005-02-18"

1 participants
0 comments

CVS update by michaelk packages/xemacs-packages/viper, viper-util.el, viper-ex.el ... 19 years, 3 months

CVS Monitor

User: michaelk Date: 05/09/20 19:58:32 Modified: packages/xemacs-packages/viper viper.texi viper.el viper-util.el viper-macs.el viper-init.el viper-ex.el viper-cmd.el ChangeLog Log: * viper-cmd.el (viper-change-state): don't move over the field boundaries in the minibuffer. (viper-set-minibuffer-style): add viper-minibuffer-post-command-hook. (viper-minibuffer-post-command-hook): new hook. (viper-line): don't move cursor at bolp. * viper-ex.el (ex-pwd, viper-info-on-file): fixed message * viper-init.el: add alias to make-variable-buffer-local to avoid compiler warnings. * viper-macs.el (ex-map): better messages. * viper-utils.el (viper-beginning-of-field): new function. * viper.el: replace make-variable-buffer-local with viper-make-variable-buffer-local everywhere, to avoid warnings. Revision Changes Path 1.29 +3 -3 XEmacs/packages/xemacs-packages/viper/viper.texi Index: viper.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/viper/viper.texi,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- viper.texi 2005/08/06 17:05:10 1.28 +++ viper.texi 2005/09/20 17:58:30 1.29 ＠＠ -7,12 +7,12 ＠＠＠setfilename ../info/viper ＠copying -Copyright ＠copyright{} 1995, 1996, 1997, 2001, 2002 Free Software -Foundation, Inc. +Copyright ＠copyright{} 1995, 1996, 1997, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. ＠quotation Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, with the Front-Cover texts being ``A GNU Manual'', and with the Back-Cover Texts as in (a) below. A copy of the 1.32 +5 -4 XEmacs/packages/xemacs-packages/viper/viper.el Index: viper.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/viper/viper.el,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- viper.el 2005/08/06 20:31:27 1.31 +++ viper.el 2005/09/20 17:58:30 1.32 ＠＠ -9,7 +9,7 ＠＠ ;; Author: Michael Kifer <kifer(a)cs.stonybrook.edu> ;; Keywords: emulations -(defconst viper-version "3.11.5 of August 6, 2005" +(defconst viper-version "3.11.5 of September 19, 2005" "The current version of Viper") ;; This file is part of GNU Emacs. ＠＠ -606,7 +606,7 ＠＠ This startup message appears whenever yo (viper-set-expert-level 'dont-change-unless))) (if viper-xemacs-p - (make-variable-buffer-local 'bar-cursor)) + (viper-make-variable-buffer-local 'bar-cursor)) (if (eq major-mode 'viper-mode) (setq major-mode 'fundamental-mode)) ＠＠ -769,6 +769,7 ＠＠ It also can't undo some Viper settings." (remove-hook 'comint-mode-hook 'viper-comint-mode-hook) (remove-hook 'minibuffer-setup-hook 'viper-minibuffer-setup-sentinel) (remove-hook 'change-major-mode-hook 'viper-major-mode-change-sentinel) + (remove-hook 'post-command-hook 'viper-minibuffer-post-command-hook) ;; unbind Viper mouse bindings (viper-unbind-mouse-search-key) ＠＠ -1008,7 +1009,7 ＠＠ It also can't undo some Viper settings." ;; ***This is needed only in case emulation-mode-map-alists is not defined (unless (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists)) - (make-variable-buffer-local 'minor-mode-map-alist)) + (viper-make-variable-buffer-local 'minor-mode-map-alist)) ;; Viper changes the default mode-line-buffer-identification (setq-default mode-line-buffer-identification '(" %b")) ＠＠ -1017,7 +1018,7 ＠＠ It also can't undo some Viper settings." (setq next-line-add-newlines nil require-final-newline t) - (make-variable-buffer-local 'require-final-newline) + (viper-make-variable-buffer-local 'require-final-newline) ;; don't bark when mark is inactive (if viper-emacs-p 1.24 +8 -0 XEmacs/packages/xemacs-packages/viper/viper-util.el Index: viper-util.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/viper/viper-util.el,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- viper-util.el 2005/08/06 17:05:11 1.23 +++ viper-util.el 2005/09/20 17:58:30 1.24 ＠＠ -1405,6 +1405,7 ＠＠ This option is appropriate if you like E viper-SEP-char-class (or within-line "\n") (if within-line (viper-line-pos 'end))))) + (defsubst viper-skip-all-separators-backward (&optional within-line) (if (eq viper-syntax-preference 'strict-vi) (if within-line ＠＠ -1433,6 +1434,7 ＠＠ This option is appropriate if you like E ;; Emacs may consider some of these as words, but we don't want them viper-non-word-characters (viper-line-pos 'end)))) + (defun viper-skip-nonalphasep-backward () (if (eq viper-syntax-preference 'strict-vi) (skip-chars-backward ＠＠ -1501,6 +1503,12 ＠＠ This option is appropriate if you like E (setq total (+ total local))) total )) + +;; tells when point is at the beginning of field +(defun viper-beginning-of-field () + (or (bobp) + (not (eq (get-char-property (point) 'field) + (get-char-property (1- (point)) 'field))))) ;; this is copied from cl-extra.el 1.11 +5 -5 XEmacs/packages/xemacs-packages/viper/viper-macs.el Index: viper-macs.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/viper/viper-macs.el,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- viper-macs.el 2005/08/06 17:05:11 1.10 +++ viper-macs.el 2005/09/20 17:58:30 1.11 ＠＠ -118,7 +118,7 ＠＠ a key is a symbol, e.g., `a', `\\1', `f2 (define-key viper-vi-intercept-map "\C-x)" 'viper-end-mapping-kbd-macro) (define-key viper-insert-intercept-map "\C-x)" 'viper-end-mapping-kbd-macro) (define-key viper-emacs-intercept-map "\C-x)" 'viper-end-mapping-kbd-macro) - (message "Mapping %S in %s state. Hit `C-x )' to complete the mapping" + (message "Mapping %S in %s state. Type macro definition followed by `C-x )'" (viper-display-macro macro-name) (if ins "Insert" "Vi"))) )) ＠＠ -170,7 +170,7 ＠＠ a key is a symbol, e.g., `a', `\\1', `f2 ((stringp macro-name) (setq macro-name (vconcat macro-name))) (t (setq macro-name (vconcat (prin1-to-string macro-name))))) - (message ":map%s <Name>" variant)(sit-for 2) + (message ":map%s <Macro Name>" variant)(sit-for 2) (while (not (member key '(?\C-m ?\n (control m) (control j) return linefeed))) ＠＠ -186,7 +186,7 ＠＠ a key is a symbol, e.g., `a', `\\1', `f2 variant (if (> (length key-seq) 0) (prin1-to-string (viper-display-macro key-seq)) ""))) - (message message) + (message "%s" message) (setq event (viper-read-key)) ;;(setq event (viper-read-event)) (setq key ＠＠ -263,7 +263,7 ＠＠ a key is a symbol, e.g., `a', `\\1', `f2 (prin1-to-string (viper-display-macro key-seq)) ""))) - (message message) + (message "%s" message) (setq event (viper-read-key)) ;;(setq event (viper-read-event)) (setq key ＠＠ -442,7 +442,7 ＠＠ If SCOPE is nil, the user is asked to sp scope) viper-custom-file-name)) - (message msg) + (message "%s" msg) )) (setq new-elt 1.19 +5 -0 XEmacs/packages/xemacs-packages/viper/viper-init.el Index: viper-init.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/viper/viper-init.el,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- viper-init.el 2005/08/06 17:05:12 1.18 +++ viper-init.el 2005/09/20 17:58:30 1.19 ＠＠ -115,6 +115,11 ＠＠ In all likelihood, you don't need to bot ;;; Macros +;; Fool the compiler to avoid warnings. +;; Viper calls make-variable-buffer-local from within other functions, which +;; triggers compiler warnings. +(defalias 'viper-make-variable-buffer-local 'make-variable-buffer-local) + (defmacro viper-deflocalvar (var default-value &optional documentation) `(progn (defvar ,var ,default-value 1.24 +2 -2 XEmacs/packages/xemacs-packages/viper/viper-ex.el Index: viper-ex.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/viper/viper-ex.el,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- viper-ex.el 2005/08/06 17:05:12 1.23 +++ viper-ex.el 2005/09/20 17:58:30 1.24 ＠＠ -1590,7 +1590,7 ＠＠ reversed." ;; Ex print working directory (defun ex-pwd () - (message default-directory)) + (message "%s" default-directory)) ;; Ex quit command (defun ex-quit () ＠＠ -2230,7 +2230,7 ＠＠ Type 'mak ' (including the space) to run (if (buffer-modified-p) "[Modified]" "[Unchanged]"))) (if (< (+ 1 (length info) (length file)) (window-width (minibuffer-window))) - (message (concat file " " info)) + (message "%s" (concat file " " info)) (save-window-excursion (with-output-to-temp-buffer " *viper-info*" (princ (concat "\n" file "\n\n\t" info "\n\n"))) 1.30 +9 -3 XEmacs/packages/xemacs-packages/viper/viper-cmd.el Index: viper-cmd.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/viper/viper-cmd.el,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -r1.29 -r1.30 --- viper-cmd.el 2005/08/06 17:05:12 1.29 +++ viper-cmd.el 2005/09/20 17:58:30 1.30 ＠＠ -358,7 +358,7 ＠＠ 'viper-insertion-ring)) (if viper-ESC-moves-cursor-back - (or (bolp) (backward-char 1)))) + (or (bolp) (viper-beginning-of-field) (backward-char 1)))) )) ;; insert or replace ＠＠ -1996,7 +1996,8 ＠＠ Undo previous insertion and inserts new. ;;; Minibuffer business (defsubst viper-set-minibuffer-style () - (add-hook 'minibuffer-setup-hook 'viper-minibuffer-setup-sentinel)) + (add-hook 'minibuffer-setup-hook 'viper-minibuffer-setup-sentinel) + (add-hook 'post-command-hook 'viper-minibuffer-post-command-hook)) (defun viper-minibuffer-setup-sentinel () ＠＠ -2039,7 +2040,12 ＠＠ Undo previous insertion and inserts new. (minibuffer-prompt-end) (point-min))) +(defun viper-minibuffer-post-command-hook() + (when (active-minibuffer-window) + (when (< (point) (viper-minibuffer-real-start)) + (goto-char (viper-minibuffer-real-start))))) + ;; Interpret last event in the local map first; if fails, use exit-minibuffer. ;; Run viper-minibuffer-exit-hook before exiting. (defun viper-exit-minibuffer () ＠＠ -2570,7 +2576,7 ＠＠ These keys are ESC, RET, and LineFeed" ;; last line of buffer when this line has no \n. (viper-add-newline-at-eob-if-necessary) (viper-execute-com 'viper-line val com)) - (if (and (eobp) (not (bobp))) (forward-line -1)) + (if (and (eobp) (bolp) (not (bobp))) (forward-line -1)) ) (defun viper-yank-line (arg) 1.62 +20 -0 XEmacs/packages/xemacs-packages/viper/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/viper/ChangeLog,v retrieving revision 1.61 retrieving revision 1.62 diff -u -p -r1.61 -r1.62 --- ChangeLog 2005/08/08 18:43:08 1.61 +++ ChangeLog 2005/09/20 17:58:31 1.62 ＠＠ -1,3 +1,23 ＠＠ +2005-09-20 Michael Kifer <kifer(a)cs.stonybrook.edu> + + * viper-cmd.el (viper-change-state): don't move over the field + boundaries in the minibuffer. + (viper-set-minibuffer-style): add viper-minibuffer-post-command-hook. + (viper-minibuffer-post-command-hook): new hook. + (viper-line): don't move cursor at bolp. + + * viper-ex.el (ex-pwd, viper-info-on-file): fixed message + + * viper-init.el: add alias to make-variable-buffer-local to avoid + compiler warnings. + + * viper-macs.el (ex-map): better messages. + + * viper-utils.el (viper-beginning-of-field): new function. + + * viper.el: replace make-variable-buffer-local with + viper-make-variable-buffer-local everywhere, to avoid warnings. + 2005-08-08 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 1.42 released.

1 participants
0 comments

CVS update by michaelk packages/xemacs-packages/ediff, ediff-wind.el, ediff-ptch.el, ediff-init.el, ediff-diff.el ... 19 years, 3 months

CVS Monitor

User: michaelk Date: 05/09/20 19:54:37 Modified: packages/xemacs-packages/ediff ediff.texi ediff.el ediff-wind.el ediff-vers.el ediff-util.el ediff-ptch.el ediff-mult.el ediff-merg.el ediff-init.el ediff-hook.el ediff-help.el ediff-diff.el ChangeLog Log: * ediff-ptch.el (ediff-file-name-sans-prefix): treat nil as an empty string. (ediff-fixup-patch-map): better heuristic for intuiting the file names to patch. (ediff-prompt-for-patch-file): more intuitive prompt. * ediff-util.el: use insert-buffer-substring. * ediff-vers.el (cvs-run-ediff-on-file-descriptor): bug fix. Revision Changes Path 1.32 +3 -3 XEmacs/packages/xemacs-packages/ediff/ediff.texi Index: ediff.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff.texi,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -r1.31 -r1.32 --- ediff.texi 2005/07/10 18:48:24 1.31 +++ ediff.texi 2005/09/20 17:54:28 1.32 ＠＠ -25,12 +25,12 ＠＠ This file documents Ediff, a comprehensive visual interface to Unix diff and patch utilities. -Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software -Foundation, Inc. +Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + 2003, 2004, 2005 Free Software Foundation, Inc. ＠quotation Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, with the Front-Cover texts being ``A GNU Manual'', and with the Back-Cover Texts as in (a) below. A copy of the 1.30 +4 -3 XEmacs/packages/xemacs-packages/ediff/ediff.el Index: ediff.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff.el,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -r1.29 -r1.30 --- ediff.el 2005/07/19 05:11:36 1.29 +++ ediff.el 2005/09/20 17:54:28 1.30 ＠＠ -1,13 +1,14 ＠＠ ;;; ediff.el --- a comprehensive visual interface to diff & patch -;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02, 03, 05 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer(a)cs.stonybrook.edu> ;; Created: February 2, 1994 ;; Keywords: comparing, merging, patching, tools, unix -(defconst ediff-version "2.80" "The current version of Ediff") -(defconst ediff-date "July 8, 2005" "Date of last update") +(defconst ediff-version "2.80.1" "The current version of Ediff") +(defconst ediff-date "September 19, 2005" "Date of last update") ;; This file is part of GNU Emacs. 1.19 +2 -1 XEmacs/packages/xemacs-packages/ediff/ediff-wind.el Index: ediff-wind.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-wind.el,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- ediff-wind.el 2005/07/10 18:48:24 1.18 +++ ediff-wind.el 2005/09/20 17:54:29 1.19 ＠＠ -1,6 +1,7 ＠＠ ;;; ediff-wind.el --- window manipulation utilities -;; Copyright (C) 1994, 95, 96, 97, 2000, 01, 02 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer(a)cs.stonybrook.edu> 1.14 +6 -2 XEmacs/packages/xemacs-packages/ediff/ediff-vers.el Index: ediff-vers.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-vers.el,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- ediff-vers.el 2005/07/10 18:48:24 1.13 +++ ediff-vers.el 2005/09/20 17:54:29 1.14 ＠＠ -1,6 +1,7 ＠＠ ;;; ediff-vers.el --- version control interface to Ediff -;;; Copyright (C) 1995, 96, 97, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer(a)cs.stonybrook.edu> ＠＠ -298,7 +299,10 ＠＠ ((eq type 'MODIFIED) (ediff-buffers (find-file-noselect tmp-file) - (find-file-noselect (cvs-fileinfo->full-path fileinfo)) + (if (featurep 'xemacs) + ;; XEmacs doesn't seem to have cvs-fileinfo->full-name + (find-file-noselect (cvs-fileinfo->full-path fileinfo)) + (find-file-noselect (cvs-fileinfo->full-name fileinfo))) nil ; startup-hooks 'ediff-revisions))) (if (stringp tmp-file) (delete-file tmp-file)) 1.28 +5 -5 XEmacs/packages/xemacs-packages/ediff/ediff-util.el Index: ediff-util.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-util.el,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- ediff-util.el 2005/07/10 18:48:24 1.27 +++ ediff-util.el 2005/09/20 17:54:29 1.28 ＠＠ -1,7 +1,7 ＠＠ ;;; ediff-util.el --- the core commands and utilities of ediff ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2004 Free Software Foundation, Inc. +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer(a)cs.stonybrook.edu> ＠＠ -367,7 +367,7 ＠＠ to invocation.") (ediff-unique-buffer-name "*ediff-merge" "*"))) (save-excursion (set-buffer buffer-C) - (insert-buffer buf) + (insert-buffer-substring buf) (funcall (ediff-with-current-buffer buf major-mode)) (widen) ; merge buffer is always widened (add-hook 'local-write-file-hooks 'ediff-set-merge-mode nil t) ＠＠ -2075,7 +2075,7 ＠＠ ARG is a prefix argument. If nil, copy (ediff-clear-fine-differences n)) ;; Make sure that the message about saving and how to restore is seen ;; by the user - (message messg)) + (message "%s" messg)) )) ;; Save Nth diff of buffer BUF-TYPE $A, B, or C$. ＠＠ -2720,7 +2720,7 ＠＠ only if this merge job is part of a grou (format "Another buffer is visiting file %s. Too dangerous to save the merge buffer" file))) (beep) - (message warn-message) + (message "%s" warn-message) (with-output-to-temp-buffer ediff-msg-buffer (princ "\n\n") (princ warn-message) ＠＠ -3286,7 +3286,7 ＠＠ Hit \\[ediff-recenter] to reset the wind (princ warn-message) (princ "\n\n")) (if (y-or-n-p - (message warn-message)) + (message "%s" warn-message)) (with-current-buffer buff (save-buffer) (kill-buffer (current-buffer))) 1.15 +94 -52 XEmacs/packages/xemacs-packages/ediff/ediff-ptch.el Index: ediff-ptch.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-ptch.el,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- ediff-ptch.el 2005/07/10 18:48:25 1.14 +++ ediff-ptch.el 2005/09/20 17:54:29 1.15 ＠＠ -1,6 +1,7 ＠＠ ;;; ediff-ptch.el --- Ediff's patch support -;; Copyright (C) 1996, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer(a)cs.stonybrook.edu> ＠＠ -162,10 +163,16 ＠＠ program." ;; strip prefix from filename ;; returns /dev/null, if can't strip prefix (defsubst ediff-file-name-sans-prefix (filename prefix) - (save-match-data - (if (string-match (concat "^" (regexp-quote prefix)) filename) - (substring filename (match-end 0)) - (concat "/null/" filename)))) + (if prefix + (save-match-data + (if (string-match (concat "^" (if (stringp prefix) + (regexp-quote prefix) + "")) + filename) + (substring filename (match-end 0)) + (concat "/null/" filename))) + filename) + ) ＠＠ -259,11 +266,14 ＠＠ program." count))) ;; Fix up the file names in the list using the argument FILENAME -;; Algorithm: find the first file's directory and cut it out from each file -;; name in the patch. Prepend the directory of FILENAME to each file in the -;; patch. In addition, the first file in the patch is replaced by FILENAME. -;; Each file is actually a file-pair of files found in the context diff header -;; In the end, for each pair, we select the shortest existing file. +;; Algorithm: find the files' directories in the patch and, if a directory is +;; absolute, cut it out from the corresponding file name in the patch. +;; Relative directories are not cut out. +;; Prepend the directory of FILENAME to each resulting file (which came +;; originally from the patch). +;; In addition, the first file in the patch document is replaced by FILENAME. +;; Each file is actually a pair of files found in the context diff header +;; In the end, for each pair, we ask the user which file to patch. ;; Note: Ediff doesn't recognize multi-file patches that are separated ;; with the `Index:' line. It treats them as a single-file patch. ;; ＠＠ -274,30 +284,41 ＠＠ program." ;; directory part of filename (file-name-as-directory filename) (file-name-directory filename))) - ;; Filename-spec is objA; at this point it is represented as - ;; (file1 . file2). We get it using ediff-get-session-objA - ;; directory part of the first file in the patch - (base-dir1 (file-name-directory - (car (ediff-get-session-objA-name (car ediff-patch-map))))) - ;; directory part of the 2nd file in the patch - (base-dir2 (file-name-directory - (cdr (ediff-get-session-objA-name (car ediff-patch-map))))) + ;; In case 2 files are possible patch targets, the user will be offered + ;; to choose file1 or file2. In a multifile patch, if the user chooses + ;; 1 or 2, this choice is preserved to decide future alternatives. + chosen-alternative ) ;; chop off base-dirs (mapcar (lambda (session-info) - (let ((proposed-file-names - (ediff-get-session-objA-name session-info))) + (let* ((proposed-file-names + ;; Filename-spec is objA; it is represented as + ;; (file1 . file2). Get it using ediff-get-session-objA. + (ediff-get-session-objA-name session-info)) + ;; base-dir1 is the dir part of the 1st file in the patch + (base-dir1 (file-name-directory (car proposed-file-names))) + ;; directory part of the 2nd file in the patch + (base-dir2 (file-name-directory (cdr proposed-file-names))) + ) + ;; If both base-dir1 and base-dir2 are relative, assume that + ;; these dirs lead to the actual files starting at the present + ;; directory. So, we don't strip these relative dirs from the + ;; file names. This is a heuristic intended to improve guessing + (unless (or (file-name-absolute-p base-dir1) + (file-name-absolute-p base-dir2)) + (setq base-dir1 "" + base-dir2 "")) (or (string= (car proposed-file-names) "/dev/null") (setcar proposed-file-names (ediff-file-name-sans-prefix (car proposed-file-names) base-dir1))) - (or (string= - (cdr proposed-file-names) "/dev/null") - (setcdr proposed-file-names - (ediff-file-name-sans-prefix - (cdr proposed-file-names) base-dir2))) - )) + (or (string= + (cdr proposed-file-names) "/dev/null") + (setcdr proposed-file-names + (ediff-file-name-sans-prefix + (cdr proposed-file-names) base-dir2))) + )) ediff-patch-map) ;; take the given file name into account ＠＠ -313,8 +334,8 ＠＠ program." (ediff-get-session-objA-name session-info))) (if (and (string-match "^/null/" (car proposed-file-names)) (string-match "^/null/" (cdr proposed-file-names))) - ;; couldn't strip base-dir1 and base-dir2 - ;; hence, something is wrong + ;; couldn't intuit the file name to patch, so + ;; something is amiss (progn (with-output-to-temp-buffer ediff-msg-buffer (ediff-with-current-buffer standard-output ＠＠ -366,17 +387,29 ＠＠ other files, enter /dev/null (f1-exists (file-exists-p file1)) (f2-exists (file-exists-p file2))) (cond - ((and (< (length file2) (length file1)) - f2-exists) + ((and + ;; The patch program prefers the shortest file as the patch + ;; target. However, this is a questionable heuristic. In an + ;; interactive program, like ediff, we can offer the user a + ;; choice. + ;; (< (length file2) (length file1)) + (not f1-exists) + f2-exists) ;; replace file-pair with the winning file2 (setcar session-file-object file2)) - ((and (< (length file1) (length file2)) - f1-exists) + ((and + ;; (< (length file1) (length file2)) + (not f2-exists) + f1-exists) ;; replace file-pair with the winning file1 (setcar session-file-object file1)) ((and f1-exists f2-exists (string= file1 file2)) (setcar session-file-object file1)) + ((and f1-exists f2-exists (eq chosen-alternative 1)) + (setcar session-file-object file1)) + ((and f1-exists f2-exists (eq chosen-alternative 2)) + (setcar session-file-object file2)) ((and f1-exists f2-exists) (with-output-to-temp-buffer ediff-msg-buffer (ediff-with-current-buffer standard-output ＠＠ -392,10 +425,15 ＠＠ Please advice: Type `y' to use %s as the target; Type `n' to use %s as the target. " - file1 file2 file2 file1))) + file1 file2 file1 file2))) (setcar session-file-object - (if (y-or-n-p (format "Use %s ? " file2)) - file2 file1))) + (if (y-or-n-p (format "Use %s ? " file1)) + (progn + (setq chosen-alternative 1) + file1) + (setq chosen-alternative 2) + file2)) + ) (f2-exists (setcar session-file-object file2)) (f1-exists (setcar session-file-object file1)) (t ＠＠ -406,7 +444,7 ＠＠ Please advice: (if (string= file1 file2) (princ (format " %s -is the target for this patch. However, this file does not exist." +is assumed to be the target for this patch. However, this file does not exist." file1)) (princ (format " %s ＠＠ -440,22 +478,26 ＠＠ are two possible targets for this patch. ;; prompt for file, get the buffer (defun ediff-prompt-for-patch-file () - (let ((dir (cond (ediff-patch-default-directory) ; try patch default dir - (ediff-use-last-dir ediff-last-dir-patch) + (let ((dir (cond (ediff-use-last-dir ediff-last-dir-patch) + (ediff-patch-default-directory) ; try patch default dir (t default-directory))) - (coding-system-for-read ediff-coding-system-for-read)) - (find-file-noselect - (read-file-name - (format "Patch is in file:%s " - (cond ((and buffer-file-name - (equal (expand-file-name dir) - (file-name-directory buffer-file-name))) - (concat - " (default " - (file-name-nondirectory buffer-file-name) - ")")) - (t ""))) - dir buffer-file-name 'must-match)) + (coding-system-for-read ediff-coding-system-for-read) + patch-file-name) + (setq patch-file-name + (read-file-name + (format "Patch is in file:%s " + (cond ((and buffer-file-name + (equal (expand-file-name dir) + (file-name-directory buffer-file-name))) + (concat + " (default " + (file-name-nondirectory buffer-file-name) + ")")) + (t ""))) + dir buffer-file-name 'must-match)) + (if (file-directory-p patch-file-name) + (error "Patch file cannot be a directory: %s" patch-file-name) + (find-file-noselect patch-file-name)) )) ＠＠ -646,7 +688,7 ＠＠ optional argument, then use it." (ediff-maybe-checkout buf-to-patch) (ediff-with-current-buffer patch-diagnostics - (insert-buffer patch-buf) + (insert-buffer-substring patch-buf) (message "Applying patch ... ") ;; fix environment for gnu patch, so it won't make numbered extensions (setq backup-style (getenv "VERSION_CONTROL")) 1.23 +2 -1 XEmacs/packages/xemacs-packages/ediff/ediff-mult.el Index: ediff-mult.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-mult.el,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- ediff-mult.el 2005/07/10 18:48:25 1.22 +++ ediff-mult.el 2005/09/20 17:54:29 1.23 ＠＠ -1,6 +1,7 ＠＠ ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff -;; Copyright (C) 1995, 96, 97, 98, 99, 2000, 01, 02, 05 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer(a)cs.stonybrook.edu> 1.11 +2 -1 XEmacs/packages/xemacs-packages/ediff/ediff-merg.el Index: ediff-merg.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-merg.el,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- ediff-merg.el 2005/07/10 18:48:25 1.10 +++ ediff-merg.el 2005/09/20 17:54:29 1.11 ＠＠ -1,6 +1,7 ＠＠ ;;; ediff-merg.el --- merging utilities -;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer(a)cs.stonybrook.edu> 1.34 +6 -6 XEmacs/packages/xemacs-packages/ediff/ediff-init.el Index: ediff-init.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-init.el,v retrieving revision 1.33 retrieving revision 1.34 diff -u -p -r1.33 -r1.34 --- ediff-init.el 2005/07/10 18:48:25 1.33 +++ ediff-init.el 2005/09/20 17:54:29 1.34 ＠＠ -1,7 +1,7 ＠＠ ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer(a)cs.stonybrook.edu> ＠＠ -559,24 +559,24 ＠＠ See the documentation string of `ediff-f ;; Highlighting -(defcustom ediff-before-flag-bol (if ediff-xemacs-p (make-glyph "->>") "->>") +(defcustom ediff-before-flag-bol (if (featurep 'xemacs) (make-glyph "->>") "->>") "*Flag placed before a highlighted block of differences, if block starts at beginning of a line." :type 'string :tag "Region before-flag at beginning of line" :group 'ediff) -(defcustom ediff-after-flag-eol (if ediff-xemacs-p (make-glyph "<<-") "<<-") +(defcustom ediff-after-flag-eol (if (featurep 'xemacs) (make-glyph "<<-") "<<-") "*Flag placed after a highlighted block of differences, if block ends at end of a line." :type 'string :tag "Region after-flag at end of line" :group 'ediff) -(defcustom ediff-before-flag-mol (if ediff-xemacs-p (make-glyph "->>") "->>") +(defcustom ediff-before-flag-mol (if (featurep 'xemacs) (make-glyph "->>") "->>") "*Flag placed before a highlighted block of differences, if block starts in mid-line." :type 'string :tag "Region before-flag in the middle of line" :group 'ediff) -(defcustom ediff-after-flag-mol (if ediff-xemacs-p (make-glyph "<<-") "<<-") +(defcustom ediff-after-flag-mol (if (featurep 'xemacs) (make-glyph "<<-") "<<-") "*Flag placed after a highlighted block of differences, if block ends in mid-line." :type 'string :tag "Region after-flag in the middle of line" ＠＠ -1464,7 +1464,7 ＠＠ This default should work without changes :group 'ediff) ;; needed to simulate frame-char-width in XEmacs. -(defvar ediff-H-glyph (if ediff-xemacs-p (make-glyph "H"))) +(defvar ediff-H-glyph (if (featurep 'xemacs) (make-glyph "H"))) ;; Temporary file used for refining difference regions in buffer A. 1.14 +2 -1 XEmacs/packages/xemacs-packages/ediff/ediff-hook.el Index: ediff-hook.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-hook.el,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- ediff-hook.el 2005/07/10 18:48:25 1.13 +++ ediff-hook.el 2005/09/20 17:54:30 1.14 ＠＠ -1,6 +1,7 ＠＠ ;;; ediff-hook.el --- setup for Ediff's menus and autoloads -;; Copyright (C) 1995, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer(a)cs.stonybrook.edu> 1.11 +2 -1 XEmacs/packages/xemacs-packages/ediff/ediff-help.el Index: ediff-help.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-help.el,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- ediff-help.el 2005/07/10 18:48:25 1.10 +++ ediff-help.el 2005/09/20 17:54:30 1.11 ＠＠ -1,6 +1,7 ＠＠ ;;; ediff-help.el --- Code related to the contents of Ediff help buffers -;; Copyright (C) 1996, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer(a)cs.stonybrook.edu> 1.26 +2 -1 XEmacs/packages/xemacs-packages/ediff/ediff-diff.el Index: ediff-diff.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-diff.el,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- ediff-diff.el 2005/07/19 05:11:36 1.25 +++ ediff-diff.el 2005/09/20 17:54:30 1.26 ＠＠ -1,6 +1,7 ＠＠ ;;; ediff-diff.el --- diff-related utilities -;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +;; 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer(a)cs.stonybrook.edu> 1.88 +13 -1 XEmacs/packages/xemacs-packages/ediff/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ChangeLog,v retrieving revision 1.87 retrieving revision 1.88 diff -u -p -r1.87 -r1.88 --- ChangeLog 2005/07/19 08:56:49 1.87 +++ ChangeLog 2005/09/20 17:54:30 1.88 ＠＠ -1,7 +1,19 ＠＠ +2005-09-20 Michael Kifer <kifer(a)cs.stonybrook.edu> + + * ediff-ptch.el (ediff-file-name-sans-prefix): treat nil as an empty + string. + (ediff-fixup-patch-map): better heuristic for intuiting the file names + to patch. + (ediff-prompt-for-patch-file): more intuitive prompt. + + * ediff-util.el: use insert-buffer-substring. + + * ediff-vers.el (cvs-run-ediff-on-file-descriptor): bug fix. + 2005-07-19 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 1.54 released. - + 2005-07-19 Michael Kifer <kifer(a)cs.stonybrook.edu> * ediff.el (ediff-patch-buffer): changed the docstring.

1 participants
0 comments

CVS update by stephent xemacs/tests ... 19 years, 3 months

CVS Monitor

User: stephent Date: 05/09/20 18:06:28 Branch: xemacs sjt-xft xemacs/etc sjt-xft xemacs/lib-src sjt-xft xemacs/lisp sjt-xft xemacs/lwlib sjt-xft xemacs/man sjt-xft xemacs/man/internals sjt-xft xemacs/man/lispref sjt-xft xemacs/modules sjt-xft xemacs/modules/ldap sjt-xft xemacs/modules/sample/external sjt-xft xemacs/modules/sample/internal sjt-xft xemacs/netinstall sjt-xft xemacs/nt sjt-xft xemacs/nt/installer/Wise sjt-xft xemacs/src sjt-xft xemacs/tests sjt-xft Modified: xemacs/tests ChangeLog Log: Synch sjt-xft to 21.5.22, update configure and src/depend. Revision Changes Path 1.218.2.3 +839 -798 XEmacs/xemacs/CHANGES-beta Index: CHANGES-beta =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/CHANGES-beta,v retrieving revision 1.218.2.2 retrieving revision 1.218.2.3 diff -u -p -r1.218.2.2 -r1.218.2.3 --- CHANGES-beta 2005/07/13 04:42:44 1.218.2.2 +++ CHANGES-beta 2005/09/20 16:04:31 1.218.2.3 ＠＠ -1,563 +1,604 ＠＠ +to 21.5.22 "cucumber" + +Major features + +--New: support for Unnnn-style keysyms on X11. -- Aidan Kehoe + +User-Visible Bug Fixes and Minor Improvements + +-- Fix: window configuration subsystem. -- Michael Sperber, Fabrice Popineau + +Build Infrastructure + +-- Fix: add generated dumper files to .cvsignore. -- Marcus Crestani +-- Fix: add generated makefiles to .cvsignore in ./modules. -- Craig Lanning + +Documentation + +-- Fix: lispref - compose processing now goes direct to character, not + keysym. -- Aidan Kehoe +-- Improve: lispref - Mule explanations. -- Aidan Kehoe +-- Improve: lispref - remove discussion of pure storage, long disabled. + -- Aidan Kehoe +-- New: lispref - face aliasing. -- Didier Verna + +Lisp API + +-- New: face aliasing. -- Didier Verna + +Internal API and Implementation + +-- Fix: DLL implementation for Mac OS X "Tiger". -- Atanu Ghosh +-- Fix: false load path shadows after package update. -- Jeff Mincy, + Adrian Aichner +-- Fix: make CCL check for existence before using characters. -- Aidan Kehoe +-- Fix: memory descriptions for gap variables for better 64-bit support. + -- Darryl Okahata +-- Fix: various cleanups for MC_ALLOC. -- Marcus Crestani +-- Improve: use characters instead of keysyms in x-compose.el. Remove + iso8859 .els from dumped-lisp.el. -- Aidan Kehoe + to 21.5.21 "corn" Major features --- New: An alternative memory allocator. (Marcus Crestani) +-- New: An alternative memory allocator. -- Marcus Crestani User-Visible Bug Fixes and Minor Improvements --- Fix: Calculations in font-spatial-to-canonical. (Ralf Angeli) --- Fix: Honor coding system argument when creating a file. (Aidan Kehoe) --- Fix: Prevent stripping of items from Command menu. (Ralf Angeli) --- Fix: Selection handling on Win32. (Fabrice Popineau) --- Improve: Better defaults for mail-user-agent. (Aidan Kehoe) --- Improve: Deprecate use of Emacs X resource class. (Aidan Kehoe) --- Improve: Initialize fontlock properly in *scratch*. (Aidan Kehoe) --- Improve: Make %backup%~ honor auto-save-directory. (Steve Youngs, - Jamie Zawinski) --- Improve: Recognize some constructed Unicode keysyms. (Aidan Kehoe) --- Improve: Synch dired features from GNU Emacs. (Mike Sperber, - Richard Stallman, Luc Teirlinck, Stefan Monnier, Andreas Schwab) --- Improve: Syntax and case mapping for ISO 8859 parts 14-16. (Aidan Kehoe) --- Improve: Warn about unbound Unicode keysyms. (Aidan Kehoe) +-- Fix: Calculations in font-spatial-to-canonical. -- Ralf Angeli +-- Fix: Honor coding system argument when creating a file. -- Aidan Kehoe +-- Fix: Prevent stripping of items from Command menu. -- Ralf Angeli +-- Fix: Selection handling on Win32. -- Fabrice Popineau +-- Improve: Better defaults for mail-user-agent. -- Aidan Kehoe +-- Improve: Deprecate use of Emacs X resource class. -- Aidan Kehoe +-- Improve: Initialize fontlock properly in *scratch*. -- Aidan Kehoe +-- Improve: Make %backup%~ honor auto-save-directory. -- Steve Youngs, + Jamie Zawinski +-- Improve: Recognize some constructed Unicode keysyms. -- Aidan Kehoe +-- Improve: Synch dired features from GNU Emacs. -- Mike Sperber, + Richard Stallman, Luc Teirlinck, Stefan Monnier, Andreas Schwab +-- Improve: Syntax and case mapping for ISO 8859 parts 14-16. -- Aidan Kehoe +-- Improve: Warn about unbound Unicode keysyms. -- Aidan Kehoe Build Infrastructure --- Fix: Asserts can't contain active code. (Melvin Hadasht) --- Fix: Avoid "head -#", coreutils doesn't like it. (Vin Shelton) --- Fix: Build for non-DEBUG_XEMACS native Windows build. (Marcus Crestani) --- Fix: Cater to OpenBSD /bin/sh. (Malcolm Purvis) --- Fix: Check $ac_cv_build not $canonical for libossaudio. (Aidan Kehoe) +-- Fix: Asserts can't contain active code. -- Melvin Hadasht +-- Fix: Avoid "head -#", coreutils doesn't like it. -- Vin Shelton +-- Fix: Build for non-DEBUG_XEMACS native Windows build. -- Marcus Crestani +-- Fix: Cater to OpenBSD /bin/sh. -- Malcolm Purvis +-- Fix: Check $ac_cv_build not $canonical for libossaudio. -- Aidan Kehoe -- Fix: Define elfw(type) for unexec on Alpha and amd64 for FreeBSD. - (Andrey Slusar) --- Fix: Make get-user-response available regardless of config. (Mike Sperber) + -- Andrey Slusar +-- Fix: Make get-user-response available regardless of config. -- Mike Sperber -- Fix: Make srcdir absolute, include X header, terminate lines. - (Malcolm Purvis) --- Fix: Remove do-nothing --no-gnu-linker in Solaris builds. (Vin Shelton) --- Fix: Specifying optimization flags implies optimization. (Stephen Turnbull) --- Fix: Use HAVE_DECL_SYS_SIGLIST, not SYS_SIGLIST_DECLARED. (Volker Zell) + -- Malcolm Purvis +-- Fix: Remove do-nothing --no-gnu-linker in Solaris builds. -- Vin Shelton +-- Fix: Specifying optimization flags implies optimization. -- Stephen Turnbull +-- Fix: Use HAVE_DECL_SYS_SIGLIST, not SYS_SIGLIST_DECLARED. -- Volker Zell -- Fix: configure needs to include X11/Intrinsic.h to check for Xaw. - (Robert Delius Royar, Aidan Kehoe, Jerry James) --- Fix: egetenv needs process.h in device-x.c. (Marcus Crestani) --- New: Conditionally compile insert-data-in-exec. (Marcus Crestani) + -- Robert Delius Royar, Aidan Kehoe, Jerry James +-- Fix: egetenv needs process.h in device-x.c. -- Marcus Crestani +-- New: Conditionally compile insert-data-in-exec. -- Marcus Crestani Documentation --- Fix: Add "--with" prefix in docstrings in configure.ac. (Aidan Kehoe) --- Fix: Documentation typos. (Aidan Kehoe, Adrian Aichner) --- Improve: Mention and deprecate atomic extents in docstring. (Aidan Kehoe) --- Improve: Texinfo docs. (Aidan Kehoe, Stephen Turnbull, Ben Wing) +-- Fix: Add "--with" prefix in docstrings in configure.ac. -- Aidan Kehoe +-- Fix: Documentation typos. -- Aidan Kehoe, Adrian Aichner +-- Improve: Mention and deprecate atomic extents in docstring. -- Aidan Kehoe +-- Improve: Texinfo docs. -- Aidan Kehoe, Stephen Turnbull, Ben Wing Lisp API -- Improve: Use override-redirect to suppress WM decorations. - (Stephen Turnbull) --- New: More stats for show-memory-usage. (Marcus Crestani) + -- Stephen Turnbull +-- New: More stats for show-memory-usage. -- Marcus Crestani Internal API and Implementation -- Fix: Argument count in issue_call_trapping_problems_warning. - (Stephen Turnbull) --- Fix: Avoid use of nonexistent insert-for-yank. (Aidan Kehoe) --- Fix: Buffer overflow in pdump backtrace array. (Jerry James) --- Fix: Control-1 handling in CCL. (Aidan Kehoe) --- Fix: fakemail for FreeBSD >= 4. (Andrey Slusar) --- Improve: Dynamic diagnostic backtrace for KKCC. (Marcus Crestani) + -- Stephen Turnbull +-- Fix: Avoid use of nonexistent insert-for-yank. -- Aidan Kehoe +-- Fix: Buffer overflow in pdump backtrace array. -- Jerry James +-- Fix: Control-1 handling in CCL. -- Aidan Kehoe +-- Fix: fakemail for FreeBSD >= 4. -- Andrey Slusar +-- Improve: Dynamic diagnostic backtrace for KKCC. -- Marcus Crestani to 21.5.20 "cilantro" Major Features --- New: Handle various X selection targets properly. (Aidan Kehoe) +-- New: Handle various X selection targets properly. -- Aidan Kehoe User-Visible Bug Fixes and Minor Improvements --- Fix: Handle active regions properly. (Adrian Aichner) --- Fix: pui-list-packages handles longer filenames. (Norbert Koch) +-- Fix: Handle active regions properly. -- Adrian Aichner +-- Fix: pui-list-packages handles longer filenames. -- Norbert Koch Build Infrastructure --- Improve: Port configure to autoconf 2.59. (Malcolm Purvis) --- Fix: make-docfile.c misparsed UNUSED macro in defuns. (Stephen Turnbull) --- Fix: Don't copy non-existent BUGS file on NT. (Adrian Aichner) --- Fix: Typo in PDUMP section of Makefile.in.in. (Mike Alexander) +-- Improve: Port configure to autoconf 2.59. -- Malcolm Purvis +-- Fix: make-docfile.c misparsed UNUSED macro in defuns. -- Stephen Turnbull +-- Fix: Don't copy non-existent BUGS file on NT. -- Adrian Aichner +-- Fix: Typo in PDUMP section of Makefile.in.in. -- Mike Alexander Documentation --- Improve: Update info/dir. (Adrian Aichner) --- Improve: Automate updating of release date in about.el. (Stephen Turnbull) --- New: about.el entry for Simon Josefsson. (Simon Joseffson) --- Fix: Typos. (Adrian Aichner) --- Improve: Sort memory usage report sections by usage. (Adrian Aichner) --- Improve: Glyphs documentation. (Ben Wing) --- Improve: Description of build configuration system. (Malcolm Purvis) --- New: Description of build configuration system. (Stephen Turnbull) --- New: Lispref node on CCL Example. (Aidan Kehoe) --- Improve: Describe \c and \C in Syntax of Regexps. (Aidan Kehoe) --- Improve: Future Work -- Better Rendering Support. (Stephen Turnbull) --- Improve: Comments. (Stephen Turnbull, Aidan Kehoe) +-- Improve: Update info/dir. -- Adrian Aichner +-- Improve: Automate updating of release date in about.el. -- Stephen Turnbull +-- New: about.el entry for Simon Josefsson. (Simon Joseffson +-- Fix: Typos. (Adrian Aichner +-- Improve: Sort memory usage report sections by usage. -- Adrian Aichner +-- Improve: Glyphs documentation. -- Ben Wing +-- Improve: Description of build configuration system. -- Malcolm Purvis +-- New: Description of build configuration system. -- Stephen Turnbull +-- New: Lispref node on CCL Example. -- Aidan Kehoe +-- Improve: Describe \c and \C in Syntax of Regexps. -- Aidan Kehoe +-- Improve: Future Work -- Better Rendering Support. -- Stephen Turnbull +-- Improve: Comments. -- Stephen Turnbull, Aidan Kehoe Lisp API --- New: GNU semi-compatible decode-char and encode-char. (Aidan Kehoe) +-- New: GNU semi-compatible decode-char and encode-char. (Aidan Kehoe Internal API and Implementation --- Fix: Avoid consing in operate-on-matching-lines. (Adrian Aichner) --- Fix: Correctly disable geometry negotiation in tabs widget. (Stephen Turnbull) --- New: Backtrace feature for KKCC. (Marcus Crestani) --- Fix: Type casts in database.c. (Marcus Crestani) --- Fix: Adjust s&m to FreeBSD 6.x reality. (Andrey Slusar) +-- Fix: Avoid consing in operate-on-matching-lines. -- Adrian Aichner +-- Fix: Correctly disable geometry negotiation in tabs widget. -- Stephen Turnbull +-- New: Backtrace feature for KKCC. -- Marcus Crestani +-- Fix: Type casts in database.c. -- Marcus Crestani +-- Fix: Adjust s&m to FreeBSD 6.x reality. -- Andrey Slusar Quality Assurance Infrastructure --- New: USED_IF_BIGFLOAT macro. (Jerry James) --- New: region-tests.el. (Adrian Aichner) --- New: autoconf/regressiontest.pl. (Malcolm Purvis) +-- New: USED_IF_BIGFLOAT macro. -- Jerry James +-- New: region-tests.el. -- Adrian Aichner +-- New: autoconf/regressiontest.pl. -- Malcolm Purvis to 21.5.19 "chives" Major Features --- Improve: major reorganization of source tree docs. (Ben Wing) --- Improve: behaviors get new code and many new implementations. (Ben Wing) +-- Improve: major reorganization of source tree docs. -- Ben Wing +-- Improve: behaviors get new code and many new implementations. -- Ben Wing User-Visible Bug Fixes and Minor Improvements --- Fix: security hole (CAN-2005-0100) in movemail. (Vin Shelton) --- Fix: data truncation in i.c. (Ben Wing) --- Fix: region deletion bug. (Stephen Turnbull) --- Fix: crash in Frecord_buffer. (Yoshiki Hayashi) --- Fix: Metacity maximize bug. (Stephen Turnbull) --- Fix: data truncation bugs in unix_send_process. (David Evers, Jerry James) --- Fix: recognise AltGr as a valid modifier in GTK. (Malcolm Purvis) --- Fix: recognize ISO keysyms. (Ville Skyttä) +-- Fix: security hole (CAN-2005-0100) in movemail. -- Vin Shelton +-- Fix: data truncation in i.c. -- Ben Wing +-- Fix: region deletion bug. -- Stephen Turnbull +-- Fix: crash in Frecord_buffer. -- Yoshiki Hayashi +-- Fix: Metacity maximize bug. -- Stephen Turnbull +-- Fix: data truncation bugs in unix_send_process. -- David Evers, Jerry James +-- Fix: recognise AltGr as a valid modifier in GTK. -- Malcolm Purvis +-- Fix: recognize ISO keysyms. -- Ville Skyttä -- New: on Windows, dump Unicode tables to allow non-ASCII invocation. - (Ben Wing) --- New: splash screen. (Ben Wing) --- New: support treating shortcuts under Windows as symbolic links. (Ben Wing) --- Improve: GNU-compatible coding system aliases. (Aidan Kehoe) --- Improve: help system. (Ben Wing) --- Improve: mouse-track. (Ben Wing) --- Improve: support ISO 8859/16 by default. (Aidan Kehoe) + -- Ben Wing +-- New: splash screen. -- Ben Wing +-- New: support treating shortcuts under Windows as symbolic links. -- Ben Wing +-- Improve: GNU-compatible coding system aliases. -- Aidan Kehoe +-- Improve: help system. -- Ben Wing +-- Improve: mouse-track. -- Ben Wing +-- Improve: support ISO 8859/16 by default. -- Aidan Kehoe Build Infrastructure -- Fix: copy BUGS, README, COPYING and Installation on installation on - Windows. (Ben Wing) --- Fix: installation for Cygwin. (Marcus Crestani) --- Fix: various build problems. (Ben Wing) --- Fix: various things in configure. (Ben Wing) --- New: default pdump on for Cygwin. (Marcus Crestani) --- New: support NetBSD sound via Linux API. (Aidan Kehoe) --- Improve: generation of CFLAGS (Jerry James, Ben Wing) --- Improve: parallel build support. (Malcolm Purvis) + Windows. -- Ben Wing +-- Fix: installation for Cygwin. -- Marcus Crestani +-- Fix: various build problems. -- Ben Wing +-- Fix: various things in configure. -- Ben Wing +-- New: default pdump on for Cygwin. -- Marcus Crestani +-- New: support NetBSD sound via Linux API. -- Aidan Kehoe +-- Improve: generation of CFLAGS (Jerry James, Ben Wing +-- Improve: parallel build support. -- Malcolm Purvis -- Improve: support --package-prefix as simple interface to --package-path - facility. (Ben Wing) --- Improve: support mmdf and pop arguments to --mail-locking. (Ben Wing) + facility. -- Ben Wing +-- Improve: support mmdf and pop arguments to --mail-locking. -- Ben Wing Documentation --- Fix: beta.texi. (Stephen Turnbull, Robert Royar) --- Fix: typos. (Alexey Mahotkin, Andreas Eder) --- New: "Future Work -- Better Rendering Support". (Stephen turnbull) --- New: "Future Work" collects feature proposals in Internals. (Ben Wing) --- New: empty ChangeLog entry. (Ben Wing) --- New: personal photos. (Malcolm Purvis) --- Improve: Lispref (Shyamal Prasad, Stephen Turnbull, Aidan Kehoe) --- Improve: Users' Guide. (Ben Wing) --- Improve: about.el. (Malcolm Purvis, Ben Wing) --- Improve: docstrings. (Ben Wing, Stephen Turnbull, Adrian Aichner, - Aidan Kehoe) --- Improve: gnuserv docs. (Stephen J. Turnbull) --- Improve: incorporate source tree docs in FAQ. (Ben Wing) --- Improve: major overhauls of FAQ, Internals. (Ben Wing) --- Improve: various comments. (Ben Wing) +-- Fix: beta.texi. -- Stephen Turnbull, Robert Royar +-- Fix: typos. -- Alexey Mahotkin, Andreas Eder +-- New: "Future Work -- Better Rendering Support". -- Stephen Turnbull +-- New: "Future Work" collects feature proposals in Internals. -- Ben Wing +-- New: empty ChangeLog entry. -- Ben Wing +-- New: personal photos. -- Malcolm Purvis +-- Improve: Lispref (Shyamal Prasad, Stephen Turnbull, Aidan Kehoe +-- Improve: Users' Guide. -- Ben Wing +-- Improve: about.el. -- Malcolm Purvis, Ben Wing +-- Improve: docstrings. -- Ben Wing, Stephen Turnbull, Adrian Aichner, + Aidan Kehoe +-- Improve: gnuserv docs. -- Stephen J. Turnbull +-- Improve: incorporate source tree docs in FAQ. -- Ben Wing +-- Improve: major overhauls of FAQ, Internals. -- Ben Wing +-- Improve: various comments. -- Ben Wing Lisp API -- Improve: sync bytecomp-runtime.el (make-obsolete, make-obsolete-variable). - (Ville Skyttä) + -- Ville Skyttä -- Improve: sync paragraphs.el, custom.el, subr.el, newcomment.el, - fill.el, page.el, register.el. (Ben Wing) --- New: move regexp-opt.el and easy-mmode.el from packages to core. (Ben Wing) + fill.el, page.el, register.el. -- Ben Wing +-- New: move regexp-opt.el and easy-mmode.el from packages to core. -- Ben Wing -- New: next/previous-single-char-property-change and make - next/previous-single-property-change work like in FSF. (Ben Wing) --- New: xemacs-font-lock-c-keywords and friends. (Ben Wing) + next/previous-single-property-change work like in FSF. -- Ben Wing +-- New: xemacs-font-lock-c-keywords and friends. -- Ben Wing Internal API and Implementation --- Fix: ^M brokenness in res.rc. (Ben Wing) --- Fix: adapt to recent changes in Cygwin. (Ben Wing) +-- Fix: ^M brokenness in res.rc. -- Ben Wing +-- Fix: adapt to recent changes in Cygwin. -- Ben Wing -- Fix: byte-char conversion, should speed up Mule if there are - non-ASCII characters in the buffer. (Ben Wing) --- Fix: coding cookie recognition in .elc. (Ben Wing) --- Fix: data-in-executable problems. (Olivier Galibert, Ben Wing) --- Fix: find-coding-system-magic-cookie-in-file. (Ben Wing) --- Fix: leaking process handles. (Ben Wing) + non-ASCII characters in the buffer. -- Ben Wing +-- Fix: coding cookie recognition in .elc. -- Ben Wing +-- Fix: data-in-executable problems. -- Olivier Galibert, Ben Wing +-- Fix: find-coding-system-magic-cookie-in-file. -- Ben Wing +-- Fix: leaking process handles. -- Ben Wing -- Fix: only call device method compute_scrollbar_instance_usage() if it - is defined. (Zajcev Evgeny) + is defined. -- Zajcev Evgeny -- Fix: protect callers of MSFT syscalls from MSFT API randomization. - (Ben Wing) --- Fix: typos. (Robert Royar) --- Fix: warnings. (Aidan Kehoe, Ben Wing) --- New: Hashcode type. (Ben Wing) --- New: color API. (Ben Wing) --- New: rename abort() macro to ABORT() to placate VC 7. (Ben Wing) --- Improve: GCPRO macros. (Ben Wing) --- Improve: Mule-ize various things. (Ben Wing) + -- Ben Wing +-- Fix: typos. -- Robert Royar +-- Fix: warnings. -- Aidan Kehoe, Ben Wing +-- New: Hashcode type. -- Ben Wing +-- New: color API. -- Ben Wing +-- New: rename abort() macro to ABORT() to placate VC 7. -- Ben Wing +-- Improve: GCPRO macros. -- Ben Wing +-- Improve: Mule-ize various things. -- Ben Wing -- Improve: Suppress aliasing warning in free_hook; Jerry says not a fix? - (Ben Wing) --- Improve: UNUSED parameter marking, UNO support. (Malcolm Purvis, - Jerry James) --- Improve: Unicode-ize various things. (Ben Wing) --- Improve: critical section protection. (Ben Wing) + -- Ben Wing +-- Improve: UNUSED parameter marking, UNO support. -- Malcolm Purvis, + Jerry James +-- Improve: Unicode-ize various things. -- Ben Wing +-- Improve: critical section protection. -- Ben Wing -- Improve: debug info on attempt to throw outside of a function where - call_trapping_problems() has been used. (Ben Wing) --- Improve: menubar support. (Ben Wing) --- Improve: more orthogonality in emacs-root-finding. (Mike Sperber) --- Improve: move etc/aliases.ksh to xemacs-builds CVS module. (Ben Wing) --- Improve: move etc/chr.png, etc/chrm.png to etc/photos/ (Ben Wing) --- Improve: partially rework Unicode support. (Ben Wing) --- Improve: path handling correctness. (Ben Wing) + call_trapping_problems() has been used. -- Ben Wing +-- Improve: menubar support. -- Ben Wing +-- Improve: more orthogonality in emacs-root-finding. -- Mike Sperber +-- Improve: move etc/aliases.ksh to xemacs-builds CVS module. -- Ben Wing +-- Improve: move etc/chr.png, etc/chrm.png to etc/photos/ (Ben Wing +-- Improve: partially rework Unicode support. -- Ben Wing +-- Improve: path handling correctness. -- Ben Wing -- Improve: rangetabs get different types of ranges (open/closed start - and end). Change default to be start-closed, end-open. (Ben Wing) --- Improve: refactor Initialization changes: (Ben Wing) --- Improve: refer to init.el not .emacs in menus. (Stephen Turnbull) --- Improve: s&m files by removing autodetected stuff. (Ben Wing) --- Improve: support dumping bignums. (Jerry James, Olivier Galibert) --- Improve: support for crashing gently. (Ben Wing) --- Improve: type and keyword pedantry. (Jerry James, Ben Wing) --- Improve: update etags from upstream. (Jerry James) --- Remove: EXTERNAL_LIST_LOOP because it can infloop. (Ben Wing) + and end). Change default to be start-closed, end-open. -- Ben Wing +-- Improve: refactor Initialization changes: (Ben Wing +-- Improve: refer to init.el not .emacs in menus. -- Stephen Turnbull +-- Improve: s&m files by removing autodetected stuff. -- Ben Wing +-- Improve: support dumping bignums. -- Jerry James, Olivier Galibert +-- Improve: support for crashing gently. -- Ben Wing +-- Improve: type and keyword pedantry. -- Jerry James, Ben Wing +-- Improve: update etags from upstream. -- Jerry James +-- Remove: EXTERNAL_LIST_LOOP because it can infloop. -- Ben Wing -- Remove: etc/gnu.xpm, etc/gnu.xbm, etc/sink.xbm, etc/ms-kermit, - etc/ms-kermit-7bit (Ben Wing) --- Remove: unneeded/unused code. (Ben Wing, Stephen Turnbull) + etc/ms-kermit-7bit (Ben Wing +-- Remove: unneeded/unused code. -- Ben Wing, Stephen Turnbull Quality Assurance Infrastructure --- Fix: conflict with builtin in .gdbinit. (Golubev I. N.) --- New: regexp tests. (Stephen Turnbull, Vin Shelton) --- New: os-tests.el. (Stephen Turnbull) --- Improve: profiling support. (Ben Wing) +-- Fix: conflict with builtin in .gdbinit. -- Golubev I. N. +-- New: regexp tests. -- Stephen Turnbull, Vin Shelton +-- New: os-tests.el. -- Stephen Turnbull +-- Improve: profiling support. -- Ben Wing to 21.5.18 "chestnut" Major Features --- Improve: GTK support gets many fixes and improvements - Purvis. --- Improve: pdump gets data in executable support, -si option - Galibert. --- New: GTK gets default gtkrc - Purvis. --- New: bignum support - James (lead), Sivakumar, Turnbull. +-- Improve: GTK support gets many fixes and improvements -- Purvis. +-- Improve: pdump gets data in executable support, -si option -- Galibert. +-- New: GTK gets default gtkrc -- Purvis. +-- New: bignum support -- James (lead), Sivakumar, Turnbull. User-Visible Bug Fixes and Minor Improvements --- Fix: 'no-conversion is special in eol detection - Turnbull. --- Fix: `display-completion-list' does not overflow window - Grundmann. --- Fix: X error handler must not call stderr_out - Clements. --- Fix: bogus error in `apropros' - Turnbull. --- Fix: bogus error in `package-require' - Youngs. --- Fix: buffer editing by `call-process-region' - Aichner. --- Fix: coredump from bogus position computation in syntax cache - Euler. --- Fix: coredump from redisplay wrapping in signal.c - James. --- Fix: coredump in giflib - Hines. --- Fix: etags.el correctly handles tags with name fields - Grundmann. --- Fix: prevent minibuffer from hijacking marks - Sperber. --- Fix: respect `allow-deletion-of-last-visible-frame' - Zajcev. --- Fix: sync revert-buffer to 21.4 - Turnbull, Sparapani. --- Improve: error message formatting - Gatzemeier. --- Improve: etags.el optimized for exuberant ctags - Grundmann. --- Improve: isearch-abort preserves interim successes - Turnbull, Zawinski. --- Improve: package info reporting - Youngs. --- Improve: window configuration handling - Rychter. +-- Fix: 'no-conversion is special in eol detection -- Turnbull. +-- Fix: `display-completion-list' does not overflow window -- Grundmann. +-- Fix: X error handler must not call stderr_out -- Clements. +-- Fix: bogus error in `apropros' -- Turnbull. +-- Fix: bogus error in `package-require' -- Youngs. +-- Fix: buffer editing by `call-process-region' -- Aichner. +-- Fix: coredump from bogus position computation in syntax cache -- Euler. +-- Fix: coredump from redisplay wrapping in signal.c -- James. +-- Fix: coredump in giflib -- Hines. +-- Fix: etags.el correctly handles tags with name fields -- Grundmann. +-- Fix: prevent minibuffer from hijacking marks -- Sperber. +-- Fix: respect `allow-deletion-of-last-visible-frame' -- Zajcev. +-- Fix: sync revert-buffer to 21.4 -- Turnbull, Sparapani. +-- Improve: error message formatting -- Gatzemeier. +-- Improve: etags.el optimized for exuberant ctags -- Grundmann. +-- Improve: isearch-abort preserves interim successes -- Turnbull, Zawinski. +-- Improve: package info reporting -- Youngs. +-- Improve: window configuration handling -- Rychter. Build Infrastructure --- Fix: 64-bit support - Purvis, SuSE. --- Fix: configure.in syntax, logic - Turnbull, James, Purvis. --- Fix: make install went interactive - Aichner. --- Fix: rebuild finder-inf.el - Turnbull. --- Improve: Makefile diagnostics - Turnbull. --- Improve: Windows build support - Aichner. --- Improve: configure compiler warning setup - James, Purvis. --- Improve: configure diagnostics - Turnbull. --- Improve: configure feature detection - Purvis, James, Turnbull. --- Improve: configure report - Turnbull, James. --- Improve: icc support - James. --- Improve: install procedure - Galibert. --- New: configure supports Playstation2 - Myrkraverk. --- New: support for parallel builds - Purvis. +-- Fix: 64-bit support -- Purvis, SuSE. +-- Fix: configure.in syntax, logic -- Turnbull, James, Purvis. +-- Fix: make install went interactive -- Aichner. +-- Fix: rebuild finder-inf.el -- Turnbull. +-- Improve: Makefile diagnostics -- Turnbull. +-- Improve: Windows build support -- Aichner. +-- Improve: configure compiler warning setup -- James, Purvis. +-- Improve: configure diagnostics -- Turnbull. +-- Improve: configure feature detection -- Purvis, James, Turnbull. +-- Improve: configure report -- Turnbull, James. +-- Improve: icc support -- James. +-- Improve: install procedure -- Galibert. +-- New: configure supports Playstation2 -- Myrkraverk. +-- New: support for parallel builds -- Purvis. Documentation --- Improve: about.el version reporting - Turnbull. --- Improve: comments and docstrings - Turnbull, Aichner, Gatzemeier. --- New: lispref.texi documents bignum support - Turnbull, James. --- New: lispref.texi documents text field support - James. --- Update: FAQ - Turnbull. --- Update: NEWS - Turnbull. --- Update: PACKAGES - Koch. --- Update: about.el - Turnbull. --- Update: internals.texi - James, Turnbull. --- Update: lispref.texi - Turnbull, Okahata. --- Update: menus to XEmacs config file reality - Turnbull. +-- Improve: about.el version reporting -- Turnbull. +-- Improve: comments and docstrings -- Turnbull, Aichner, Gatzemeier. +-- New: lispref.texi documents bignum support -- Turnbull, James. +-- New: lispref.texi documents text field support -- James. +-- Update: FAQ -- Turnbull. +-- Update: NEWS -- Turnbull. +-- Update: PACKAGES -- Koch. +-- Update: about.el -- Turnbull. +-- Update: internals.texi -- James, Turnbull. +-- Update: lispref.texi -- Turnbull, Okahata. +-- Update: menus to XEmacs config file reality -- Turnbull. Lisp API --- Improve: pixel position reporting - Okahata. +-- Improve: pixel position reporting -- Okahata. Internal API and Implementation --- Fix: C macro definition for icc - James. --- Fix: C++ build problems - James, Verna. --- Fix: Cygwin bug workaround conditionalized - James. --- Fix: Lisp internal type manipulation - James. --- Fix: bogus CVS conflict in package-ui.el - Aichner. --- Fix: callproc.c vestiges removed - James. --- Fix: format conversions in pdump report - Turnbull. --- Fix: function argument usage - James. --- Fix: incomplete macro in external widget support - Golubev. --- Fix: lwlib GC handling - James. --- Fix: lwlib computation of widget changes - James. --- Fix: mark unused parameters - James, Wing. --- Fix: remove duplicate functions - Turnbull. --- Fix: remove unused variables - James. --- Fix: specifier validation - James. --- Fix: update byte compiler function database - James. --- Fix: warning suppression - James, Gatzemeier. +-- Fix: C macro definition for icc -- James. +-- Fix: C++ build problems -- James, Verna. +-- Fix: Cygwin bug workaround conditionalized -- James. +-- Fix: Lisp internal type manipulation -- James. +-- Fix: bogus CVS conflict in package-ui.el -- Aichner. +-- Fix: callproc.c vestiges removed -- James. +-- Fix: format conversions in pdump report -- Turnbull. +-- Fix: function argument usage -- James. +-- Fix: incomplete macro in external widget support -- Golubev. +-- Fix: lwlib GC handling -- James. +-- Fix: lwlib computation of widget changes -- James. +-- Fix: mark unused parameters -- James, Wing. +-- Fix: remove duplicate functions -- Turnbull. +-- Fix: remove unused variables -- James. +-- Fix: specifier validation -- James. +-- Fix: update byte compiler function database -- James. +-- Fix: warning suppression -- James, Gatzemeier. -- Fix: workaround Darwin's distaste for ISO 8859/2 filenames. --- Improve: custom database save - Aichner, Niksic. --- Improve: itimer implementation - James, Jones, Buchholz, Yamaoka. --- Improve: test-harness.el Assert macro - James. --- New: LTDL support in ELLs - James. --- Update: INSTALL Canna, Make descriptions - James, Purvis. --- Update: SERVICE sync with upstream - James. --- Update: derived.el, subr.el, cl*.el sync to Emacs 21.3 - James. --- Update: etags sync with upstream v17.6 - James. +-- Improve: custom database save -- Aichner, Niksic. +-- Improve: itimer implementation -- James, Jones, Buchholz, Yamaoka. +-- Improve: test-harness.el Assert macro -- James. +-- New: LTDL support in ELLs -- James. +-- Update: INSTALL Canna, Make descriptions -- James, Purvis. +-- Update: SERVICE sync with upstream -- James. +-- Update: derived.el, subr.el, cl*.el sync to Emacs 21.3 -- James. +-- Update: etags sync with upstream v17.6 -- James. Quality Assurance Infrastructure --- Fix: regression tests using most-negative-fixnum - James. --- Improve: faster Mule tests - Turnbull. --- New: Uno support - James. --- New: regression tests - Turnbull, Youngs, Yamaoka, Shelton, James. +-- Fix: regression tests using most-negative-fixnum -- James. +-- Improve: faster Mule tests -- Turnbull. +-- New: Uno support -- James. +-- New: regression tests -- Turnbull, Youngs, Yamaoka, Shelton, James. to 21.5.17 "chayote" Build --- New: configure reports cc and libc versions - Kletnieks, Turnbull. --- New: configure supports icc - James. --- New: configure supports typeof extension - James. --- New: use XCFLAGS to allow different flags for XEMACS_CC - Turnbull. --- Improve: module build process - James.-- Fix: compiler warnings - Turnbull. --- Fix: configure CFLAGS detection - James, Turnbull. --- Fix: configure arg parsing on Solaris - Niksic, Shelton, Turnbull. --- Fix: configure warning and progress messages - Turnbull. --- Fix: force regeneration of Lisp on every build - Turnbull. --- Fix: minitar compiler warnings, errors - Aichner. --- Fix: mislocation of installexe.sh - James. --- Fix: missing $(ldflags) in libsrc - James. --- Fix: remove dead references to GNU DLD - James. --- Fix: remove obsolete makefile cruft - Turnbull. +-- New: configure reports cc and libc versions -- Kletnieks, Turnbull. +-- New: configure supports icc -- James. +-- New: configure supports typeof extension -- James. +-- New: use XCFLAGS to allow different flags for XEMACS_CC -- Turnbull. +-- Improve: module build process -- James. +-- Fix: compiler warnings -- Turnbull. +-- Fix: configure CFLAGS detection -- James, Turnbull. +-- Fix: configure arg parsing on Solaris -- Niksic, Shelton, Turnbull. +-- Fix: configure warning and progress messages -- Turnbull. +-- Fix: force regeneration of Lisp on every build -- Turnbull. +-- Fix: minitar compiler warnings, errors -- Aichner. +-- Fix: mislocation of installexe.sh -- James. +-- Fix: missing $(ldflags) in libsrc -- James. +-- Fix: remove dead references to GNU DLD -- James. +-- Fix: remove obsolete makefile cruft -- Turnbull. Documentation --- Improve: charset registry docs - Golubev. --- Improve: specifier and internals docs - Turnbull. --- Improve: test-harness reporting - Aichner, Shelton, Turnbull. --- New: weak data structure testing - Kaltenbach. --- Remove: own photos and personal information - Youngs. --- Update: library versions in Windows docs - James. --- Update: package list - Koch. --- Fix: TeXinfo syntax - Golubev, Turnbull. --- Fix: clarifications - Turnbull. --- Fix: typos - Aichner, Golubev, Turnbull. --- Fix: workaround version issues in NAS headers - Turnbull. +-- Improve: charset registry docs -- Golubev. +-- Improve: specifier and internals docs -- Turnbull. +-- Improve: test-harness reporting -- Aichner, Shelton, Turnbull. +-- New: weak data structure testing -- Kaltenbach. +-- Remove: own photos and personal information -- Youngs. +-- Update: library versions in Windows docs -- James. +-- Update: package list -- Koch. +-- Fix: TeXinfo syntax -- Golubev, Turnbull. +-- Fix: clarifications -- Turnbull. +-- Fix: typos -- Aichner, Golubev, Turnbull. +-- Fix: workaround version issues in NAS headers -- Turnbull. Lisp API -- New: device-num-screens, device-backing-store, device-save-under, - add-to-invisibility-spec, remove-from-invisibility-spec - James. + add-to-invisibility-spec, remove-from-invisibility-spec -- James. -- New: lazy (widget), widget-child-value-get, widget-child-value-inline, widget-child-validate, widget-type-value-create, widget-type-default-get, - widget-type-match - Abrahamsen, Youngs. --- New: package-get-list-packages-where - Youngs. --- New: pui-display-maintainer command - Youngs. --- New: pui-help-echo displays both installed and available versions - Youngs. --- Synch: frame.el to GNU Emacs 21.3 - James. --- Fix: cl-do-prettyprint formatting of prog* - Youngs. --- Fix: update coding system name usage - James. + widget-type-match -- Abrahamsen, Youngs. +-- New: package-get-list-packages-where -- Youngs. +-- New: pui-display-maintainer command -- Youngs. +-- New: pui-help-echo displays both installed and available versions -- Youngs. +-- Synch: frame.el to GNU Emacs 21.3 -- James. +-- Fix: cl-do-prettyprint formatting of prog* -- Youngs. +-- Fix: update coding system name usage -- James. Internals --- Improve: KKCC - Kaltenbach. --- Improve: compiler.h for use with modules - James. --- Improve: make QUIT-related APIs visible to modules - James. --- New: support more device metrics on X11 - James. --- New: support symbols in Darwin shared libraries - Purvis. --- New: widget-default-create uses char-table - Haddock. --- New: xfree gets a type parameter for error-checking - James. --- Fix: (remove) duplicated code - James. --- Fix: GCPRO_STACK in byte interpreter - Turnbull. --- Fix: GTK marshalling code - Purvis. --- Fix: aliasing problems - Turnbull. --- Fix: bad interaction in initialization of args with pdumper - Benson. --- Fix: bit fields need to be unsigned in unicode detectors - James. --- Fix: coding system for GPG verification - Youngs. --- Fix: hard-coded options to use APIs - Pakoulin. --- Fix: improper use of XSetArg in frame-x.c - Turnbull. --- Fix: lstream close code - Euler. --- Fix: paragraph detection in Japanese - Yamaoka, Turnbull. --- Fix: regexps using \{ - Monnier, Turnbull. --- Fix: set dirty flag in mirror window at proper time - Galibert. --- Fix: several missing GC wrappers which caused crashes - James. --- Fix: some GCPROed variables were declared register - McPherson. --- Fix: stale info in realpath computation - James. --- Fix: two infloops in GC - James. --- Fix: usage of prin1 and princ in help - Eide, Shelton. +-- Improve: KKCC -- Kaltenbach. +-- Improve: compiler.h for use with modules -- James. +-- Improve: make QUIT-related APIs visible to modules -- James. +-- New: support more device metrics on X11 -- James. +-- New: support symbols in Darwin shared libraries -- Purvis. +-- New: widget-default-create uses char-table -- Haddock. +-- New: xfree gets a type parameter for error-checking -- James. +-- Fix: (remove) duplicated code -- James. +-- Fix: GCPRO_STACK in byte interpreter -- Turnbull. +-- Fix: GTK marshalling code -- Purvis. +-- Fix: aliasing problems -- Turnbull. +-- Fix: bad interaction in initialization of args with pdumper -- Benson. +-- Fix: bit fields need to be unsigned in unicode detectors -- James. +-- Fix: coding system for GPG verification -- Youngs. +-- Fix: hard-coded options to use APIs -- Pakoulin. +-- Fix: improper use of XSetArg in frame-x.c -- Turnbull. +-- Fix: lstream close code -- Euler. +-- Fix: paragraph detection in Japanese -- Yamaoka, Turnbull. +-- Fix: regexps using \{ -- Monnier, Turnbull. +-- Fix: set dirty flag in mirror window at proper time -- Galibert. +-- Fix: several missing GC wrappers which caused crashes -- James. +-- Fix: some GCPROed variables were declared register -- McPherson. +-- Fix: stale info in realpath computation -- James. +-- Fix: two infloops in GC -- James. +-- Fix: usage of prin1 and princ in help -- Eide, Shelton. to 21.5.16 "celeriac" Build --- Don't detect GNU DLD - James. --- Better detection of sound on Solaris9 - Buchholz. --- Add support detecting SunOS 5.10 in configure - Buchholz. +-- Don't detect GNU DLD -- James. +-- Better detection of sound on Solaris9 -- Buchholz. +-- Add support detecting SunOS 5.10 in configure -- Buchholz. -- Use '-bundle' when testing ability to build shared libs, but use - '-bundle_loader' in ellcc - Begel. --- Output separate declaration and definition for dump_id - James. --- Add Makefile targets to build PDF docs - Wambold. + '-bundle_loader' in ellcc -- Begel. +-- Output separate declaration and definition for dump_id -- James. +-- Add Makefile targets to build PDF docs -- Wambold. -- Don't mangle the unload function in `unload_postgresql' and - `unload_ldap' when compiling with C++ - James. --- Use extern "C" for C++ builds - James. --- Conditionally compile messages missing from the Cygwin headers - James. --- Add cast to quiet compiler in unexcw.c - James. --- Quiet compiler warnings about struct stat in syswindows.h - James. --- Test \{m,n\} in regexp-tests - Turnbull. + `unload_ldap' when compiling with C++ -- James. +-- Use extern "C" for C++ builds -- James. +-- Conditionally compile messages missing from the Cygwin headers -- James. +-- Add cast to quiet compiler in unexcw.c -- James. +-- Quiet compiler warnings about struct stat in syswindows.h -- James. +-- Test \{m,n\} in regexp-tests -- Turnbull. Documentation --- Propose bash as workaround for buggy Solaris sh in PROBLEMS - Sparapani. +-- Propose bash as workaround for buggy Solaris sh in PROBLEMS -- Sparapani. -- Fix the PRINTED-MANUAL-TITLE arg for cross ref to "The XEmacs User's Manual" - - Aichner. --- New node: "A Reader's Guide to XEmacs Coding Conventions" - Turnbull. --- New node: "Customizing Message Display" - Golubev. + -- Aichner. +-- New node: "A Reader's Guide to XEmacs Coding Conventions" -- Turnbull. +-- New node: "Customizing Message Display" -- Golubev. Internals --- In ellcc.c don't mangle external symbols in generated doc file - James. +-- In ellcc.c don't mangle external symbols in generated doc file -- James. -- Add PARTIALLY parameter to support Fpos_visible_in_window_p parameter in - redisplay - James. --- Use 'point_would_be_visible' parameter in `scrollbar_reset_cursor' - James. --- Add PARTIALLY parameter fo `Fpos_visible_in_window_p' - James. --- Use new 'point_would_be_visible' parameter in `window_scroll' - James. --- dll_open now takes a Lisp_Object - James. --- Remove useless call to dll_init - James. --- char to CIbyte conversion in emodules.c, sysdll.c - James. --- Do not mangle module initialisation function names - James. --- char to Extbyte conversion in sysdll.c - James. --- Return a Lisp_Object instead of a string in `dll_error' - James. --- Make eval-related functions visible to modules - James. + redisplay -- James. +-- Use 'point_would_be_visible' parameter in `scrollbar_reset_cursor' -- James. +-- Add PARTIALLY parameter fo `Fpos_visible_in_window_p' -- James. +-- Use new 'point_would_be_visible' parameter in `window_scroll' -- James. +-- dll_open now takes a Lisp_Object -- James. +-- Remove useless call to dll_init -- James. +-- char to CIbyte conversion in emodules.c, sysdll.c -- James. +-- Do not mangle module initialisation function names -- James. +-- char to Extbyte conversion in sysdll.c -- James. +-- Return a Lisp_Object instead of a string in `dll_error' -- James. +-- Make eval-related functions visible to modules -- James. -- Allow specifying elisp function for waithing user input while displaying - message while in minibuffer - Golubev. --- Use OS_RELEASE=os_release_major*100+os_release_minor in s/sol2.h - Buchholz. --- Add lrecord_memory_descriptions - Crestani. --- Remove GetLongPathNameW - Harris. --- A couple of new macros to compare w32api versions - James. --- KKCC fixes - Crestani. + message while in minibuffer -- Golubev. +-- Use OS_RELEASE=os_release_major*100+os_release_minor in s/sol2.h -- Buchholz. +-- Add lrecord_memory_descriptions -- Crestani. +-- Remove GetLongPathNameW -- Harris. +-- A couple of new macros to compare w32api versions -- James. +-- KKCC fixes -- Crestani. Lisp API --- Allow user to specify alternative function for displaying message - Golubev. --- New var to specify the maximum received fonts - LewisMoss. --- Allow gnuserv to fallback to GTK if X device fails - LewisMoss. --- Eval the initialisation value of `eol-detection-enabled-p' - Alexander. --- Make sure `setbuffer-file-coding-system' sets the eol type - Alexander. --- Remove unnecessary definitions of 'null-device' - Turnbull. --- Actually implement the specified semantics for 'defvar' - Sperber. --- Fix `shrink-to-fit' by calling `shrink-window-if-larger-than-buffer' - Aichner. +-- Allow user to specify alternative function for displaying message -- Golubev. +-- New var to specify the maximum received fonts -- LewisMoss. +-- Allow gnuserv to fallback to GTK if X device fails -- LewisMoss. +-- Eval the initialisation value of `eol-detection-enabled-p' -- Alexander. +-- Make sure `setbuffer-file-coding-system' sets the eol type -- Alexander. +-- Remove unnecessary definitions of 'null-device' -- Turnbull. +-- Actually implement the specified semantics for 'defvar' -- Sperber. +-- Fix `shrink-to-fit' by calling `shrink-window-if-larger-than-buffer' -- Aichner. to 21.5.15 "celery" Build --- Autoconf configure updates - James, Turnbull. --- Makefile updates - James. --- Minor updates to make-docfile.c - Begel. --- Wrap assert_failed with EXTERN_C for modules - James. --- Updates to modules Makefile.common - James. +-- Autoconf configure updates -- James, Turnbull. +-- Makefile updates -- James. +-- Minor updates to make-docfile.c -- Begel. +-- Wrap assert_failed with EXTERN_C for modules -- James. +-- Updates to modules Makefile.common -- James. -- Include emodules.h when building modules in postgresql.c - and ldap.c - James. --- Updates to xemacs.mak - Aichner. + and ldap.c -- James. +-- Updates to xemacs.mak -- Aichner. -- Add some extern "C" declarations for C++ module builds - - James. --- Add casts for C++ builds in mule-canna.c - James. + -- James. +-- Add casts for C++ builds in mule-canna.c -- James. -- Add type casts in database.c to satisy C++ compilers. -- Log result summary of tests when the testsuite is running - noninteractive - Aichner. --- Add some tests for weak-lists - Crestani, Kaltenbach. + noninteractive -- Aichner. +-- Add some tests for weak-lists -- Crestani, Kaltenbach. Documentation --- Update README.(HYPERBOLE|OO-BROWSER) - Turnbull. --- Update etc/PACKAGES - Turnbull, Koch, Youngs. --- Update etc/sample.Xresources - Turnbull. --- Major update and audit of all documents relating to PUI - Youngs. +-- Update README.(HYPERBOLE|OO-BROWSER) -- Turnbull. +-- Update etc/PACKAGES -- Turnbull, Koch, Youngs. +-- Update etc/sample.Xresources -- Turnbull. +-- Major update and audit of all documents relating to PUI -- Youngs. -- Mention `line-move-ignore-invisible' (display.texi "Invisible Text") - - Kyllingstad. + -- Kyllingstad. -- Document that end-glyph is still displayed when invisible - is set (extents.texi "Extent Properties") - Kyllingstad. + is set (extents.texi "Extent Properties") -- Kyllingstad. -- Document that only begin-glyph is highlighted (extents.texi "Extents - and Events") - Kyllingstad. --- Various typo and docstring fixes - Turnbull, Sperber. --- Add missing '＠end' defun in lists.texi - Shelton. --- Document ?\x00 read syntax and range limitations on ?\000 and - ?\x00 read syntaxes (objects.texi "Character Type") - Turnbull. + and Events") -- Kyllingstad. +-- Various typo and docstring fixes -- Turnbull, Sperber. +-- Add missing '＠end' defun in lists.texi -- Shelton. +-- Document ?\x00 read syntax and range limitations on ?\000 and + ?\x00 read syntaxes (objects.texi "Character Type") -- Turnbull. -- Document `true-list-p' (lists.texi "List-related Predicates") - - Turnbull. + -- Turnbull. Internals --- KKCC updates - Crestani, Kyllingstad. +-- KKCC updates -- Crestani, Kyllingstad. -- Define DECLARE_MODULE_API_LRECORD when not ERROR_CHECK_TYPES - - James. --- Updates to DSO code - James. --- Remove unused (X)OPAQUE_MARKFUN definitions - James. --- GCPRO updates - Sperber. --- Mouse wheel fixes in event-msw.c - Kyllingstad. --- Use 'HAVE_DLD_INIT' instead of 'HAVE_INIT_DLD' in sysdll.c - James. --- Rewrite ephemeron marker code - Sperber. --- Fix printing of symbol names in .gdbinit - Golubev. --- Fixes to `update_frame_toolbars_geometry' - Sperber. --- Fix missing commas in `fonts' initialiser - Golubev. --- Add `opaque_ptr_description' - Crestani. --- Add `allocate_big_string_chars' - Turnbull, Buchholz. + -- James. +-- Updates to DSO code -- James. +-- Remove unused (X)OPAQUE_MARKFUN definitions -- James. +-- GCPRO updates -- Sperber. +-- Mouse wheel fixes in event-msw.c -- Kyllingstad. +-- Use 'HAVE_DLD_INIT' instead of 'HAVE_INIT_DLD' in sysdll.c -- James. +-- Rewrite ephemeron marker code -- Sperber. +-- Fix printing of symbol names in .gdbinit -- Golubev. +-- Fixes to `update_frame_toolbars_geometry' -- Sperber. +-- Fix missing commas in `fonts' initialiser -- Golubev. +-- Add `opaque_ptr_description' -- Crestani. +-- Add `allocate_big_string_chars' -- Turnbull, Buchholz. Lisp API --- New alias `apropos-customize' -> `customize-apropos' - Aichner. --- Remove unecessary arg from `pui-set-local-package-get-directory - Youngs. --- New key bindings in mwheel.el - Kyllingstad. --- Make `insert-directory' to be more like FSF version - Sperber. --- Window configuration fixes in isearch code - Sperber. --- Implement simple object finalisation in post-gc.el - Sperber. --- Updates to etags.el - Turnbull. --- Updates to cl-macs.el - Pakoulin. --- Fix "do-nothing" bug in `derived-mode-merge-syntax-tables' - Turnbull. --- Fixes to `restore-saved-window' - James. --- Handle missing "EMACSPACKAGEPATH" env var in - `package-get-package-index-file-location' - Aichner. --- Fix substring errors in `package-admin-find-top-directory' - Aichner. +-- New alias `apropos-customize' -> `customize-apropos' -- Aichner. +-- Remove unecessary arg from `pui-set-local-package-get-directory -- Youngs. +-- New key bindings in mwheel.el -- Kyllingstad. +-- Make `insert-directory' to be more like FSF version -- Sperber. +-- Window configuration fixes in isearch code -- Sperber. +-- Implement simple object finalisation in post-gc.el -- Sperber. +-- Updates to etags.el -- Turnbull. +-- Updates to cl-macs.el -- Pakoulin. +-- Fix "do-nothing" bug in `derived-mode-merge-syntax-tables' -- Turnbull. +-- Fixes to `restore-saved-window' -- James. +-- Handle missing "EMACSPACKAGEPATH" env var in + `package-get-package-index-file-location' -- Aichner. +-- Fix substring errors in `package-admin-find-top-directory' -- Aichner. -- Fix `byte-compile-lambda' so it only discards the docstring if it is - not also the value of the lambda - Turnbull. --- Don't insist in lib-src directory in `path-emacs-root-p' on WinNT - Aichner. --- Don't include '(' in `font-lock-function-name-face' - Aichner. + not also the value of the lambda -- Turnbull. +-- Don't insist in lib-src directory in `path-emacs-root-p' on WinNT -- Aichner. +-- Don't include '(' in `font-lock-function-name-face' -- Aichner. to 21.5.14 "cassava" ＠＠ -570,31 +611,31 ＠＠ use, see `package-get-package-index-file Build --- Autoconf tweaks for building modules on MacOSX - James. --- GCC fixes in ellcc.c - James. --- Module Makefile fixes - Begel, James. --- Fix shadow warning in regex.c - James. +-- Autoconf tweaks for building modules on MacOSX -- James. +-- GCC fixes in ellcc.c -- James. +-- Module Makefile fixes -- Begel, James. +-- Fix shadow warning in regex.c -- James. Documentation --- New TeXinfo node "Searching and Matching" - Turnbull. --- New section "Legacy Versions" in FAQ - Turnbull. --- New FAQ question Q8.0.1 - Turnbull. --- Update split-string specs in "Regexp Search" - Turnbull. +-- New TeXinfo node "Searching and Matching" -- Turnbull. +-- New section "Legacy Versions" in FAQ -- Turnbull. +-- New FAQ question Q8.0.1 -- Turnbull. +-- Update split-string specs in "Regexp Search" -- Turnbull. Internals --- Package index file updated - Koch. --- Add some debug checks in file-coding.c - Turnbull. +-- Package index file updated -- Koch. +-- Add some debug checks in file-coding.c -- Turnbull. Lisp API -- Make error message report the sym checked in `autoload-featurep-protect-autoloads' -- Turnbull. --- `split-string' tweaks - Turnbull. --- Make the location of the package-index file user customisable - Youngs. --- Turn on package-index file PGP verification - Youngs. --- Only use message if interactive for functions in replace.el - Josefsson. +-- `split-string' tweaks -- Turnbull. +-- Make the location of the package-index file user customisable -- Youngs. +-- Turn on package-index file PGP verification -- Youngs. +-- Only use message if interactive for functions in replace.el -- Josefsson. to 21.5.13 "cauliflower" ＠＠ -607,41 +648,41 ＠＠ Here are the highlights: Build --- Don't look for Motif if it's already been found - Buchholz. --- Darwin, Cygwin, BerkDB autoconf fixes - Turnbull. --- Make DEFUNed functions be tags - Buchholz. --- Allow compiling with Motif 1 and linking with Motif 2 - Buchholz. --- Update regexp tests - Turnbull. --- Don't autodetect ESD (Enlightened Sound Daemon) - Turnbull. +-- Don't look for Motif if it's already been found -- Buchholz. +-- Darwin, Cygwin, BerkDB autoconf fixes -- Turnbull. +-- Make DEFUNed functions be tags -- Buchholz. +-- Allow compiling with Motif 1 and linking with Motif 2 -- Buchholz. +-- Update regexp tests -- Turnbull. +-- Don't autodetect ESD (Enlightened Sound Daemon) -- Turnbull. Documentation --- New section in PROBLEMS auxilary programs for Windows - Turnbull. +-- New section in PROBLEMS auxilary programs for Windows -- Turnbull. -- FAQ updates - Q6.4.3 New aux programs for Windows - Turnbull. --- Document failed match preserves data - Turnbull. + Q6.4.3 New aux programs for Windows -- Turnbull. +-- Document failed match preserves data -- Turnbull. Internals --- Don't use the u_int8_t etc typedefs on FreeBSD in database.c - Pluim. --- Better support for externally defined lrecord types - Begel. --- Only call `xm_update_progress' if Motif is defined - Youngs. --- Define __STDC__ for BerkeleyDB - Buchholz. --- Fix bug where XEmacs couldn't find its .dmp file - Buchholz. --- Move `filemodestring' from lisp.h to sysfile.h - Golubev. --- Clean ups against the possibility of sys/stat.h defining stat - Turnbull. --- Search/match updates - Turnbull. +-- Don't use the u_int8_t etc typedefs on FreeBSD in database.c -- Pluim. +-- Better support for externally defined lrecord types -- Begel. +-- Only call `xm_update_progress' if Motif is defined -- Youngs. +-- Define __STDC__ for BerkeleyDB -- Buchholz. +-- Fix bug where XEmacs couldn't find its .dmp file -- Buchholz. +-- Move `filemodestring' from lisp.h to sysfile.h -- Golubev. +-- Clean ups against the possibility of sys/stat.h defining stat -- Turnbull. +-- Search/match updates -- Turnbull. Lisp API --- Fix bug preventing installing new packages - Youngs. --- Put exit message on separate line in `command-error' - Turnbull. --- Temporarily turn off PGP verification of package-index - Youngs. --- Remove keymapings for 'function-key-error' - James. --- Fix bug that mapped RET to LFD in TTYs - James. +-- Fix bug preventing installing new packages -- Youngs. +-- Put exit message on separate line in `command-error' -- Turnbull. +-- Temporarily turn off PGP verification of package-index -- Youngs. +-- Remove keymapings for 'function-key-error' -- James. +-- Fix bug that mapped RET to LFD in TTYs -- James. to 21.5.12 "carrot" ＠＠ -655,103 +696,103 ＠＠ Here are the highlights: Build --- Updates to configure.in - Steuck, James, Skyttä, Wing. --- Major updates to Makefile.in.in - Wing. --- Allow for separate build and source directories - Wing. --- Fix some compiler warnings - Wing. --- Major clean up of xemacs.mak and friends - Wing, Aichner. --- Fix some Solaris 2.7 CC compiler warnings - Persico. --- Fix for building on Mac - Palmer. +-- Updates to configure.in -- Steuck, James, Skyttä, Wing. +-- Major updates to Makefile.in.in -- Wing. +-- Allow for separate build and source directories -- Wing. +-- Fix some compiler warnings -- Wing. +-- Major clean up of xemacs.mak and friends -- Wing, Aichner. +-- Fix some Solaris 2.7 CC compiler warnings -- Persico. +-- Fix for building on Mac -- Palmer. -- Work around a problem compiling with '--use-union-type' on Intel's - ICC compiler - Buchholz. --- Fix problems with rel-alloc compilation - Wing. --- Sequentialize dependencies even more in update-elc-2 - Sperber. + ICC compiler -- Buchholz. +-- Fix problems with rel-alloc compilation -- Wing. +-- Sequentialize dependencies even more in update-elc-2 -- Sperber. -- Don't fatal() in 'report_sheap_usage' when need to rerun Make - - Wing. --- Various updates to the test suite - Turnbull. + Wing. +-- Various updates to the test suite -- Turnbull. Documentation -- Updates to - INSTALL - Turnbull, Wing. - PROBLEMS - Turnbull, Wing. --- Global substition of .Xresources for .Xdefaults - Turnbull. --- Update packages in ./etc/BETA - Skyttä. --- Doc string updates - Korytov, Turnbull, Wing. --- TeXinfo updates - Aichner, Turnbull, Wing, Youngs. + INSTALL -- Turnbull, Wing. + PROBLEMS -- Turnbull, Wing. +-- Global substition of .Xresources for .Xdefaults -- Turnbull. +-- Update packages in ./etc/BETA -- Skyttä. +-- Doc string updates -- Korytov, Turnbull, Wing. +-- TeXinfo updates -- Aichner, Turnbull, Wing, Youngs. Internals --- Fix stale match data after failed search bug - Turnbull. +-- Fix stale match data after failed search bug -- Turnbull. -- Reformat function definitions correctly in menubar-gtk.c and - event-gtk.c - Turnbull. + event-gtk.c -- Turnbull. -- Fix bug matching ASCII character classes to Mule characters - - Ueno. --- Frame updates for MS Win - Alexander. + Ueno. +-- Frame updates for MS Win -- Alexander. -- Add .dylib as an acceptable shared library file extension to - support MacOS X - Begel. --- Fix bug in database.c for Berkdb 4.1 - Turnbull. --- Regex fixes - Turnbull, Wing. --- Coding system updates - Wing. --- Add clear-left-side functionality in print.c - Wing. --- Seg fault rather than abort on Cygwin in 'assert_failed' - Wing. --- Delete popup-data object - Wing. --- Delete menubar_data field from frames - Wing. --- Clean up handling of lwlib callback data GCPRO'ing - Wing. + support MacOS X -- Begel. +-- Fix bug in database.c for Berkdb 4.1 -- Turnbull. +-- Regex fixes -- Turnbull, Wing. +-- Coding system updates -- Wing. +-- Add clear-left-side functionality in print.c -- Wing. +-- Seg fault rather than abort on Cygwin in 'assert_failed' -- Wing. +-- Delete popup-data object -- Wing. +-- Delete menubar_data field from frames -- Wing. +-- Clean up handling of lwlib callback data GCPRO'ing -- Wing. -- Use ALLOCA() in regex.c to avoid excessive stack allocation - - Wing. --- Fix subtle problem with REL_ALLOC() - Wing. + Wing. +-- Fix subtle problem with REL_ALLOC() -- Wing. -- Change *run_hook*_trapping_problems to take a warning class, not a - string - Wing. --- Mule-ize encrypt/decrypt-string code - Wing. --- Delete all support for bit-rotten CANNOT_DUMP - Wing. + string -- Wing. +-- Mule-ize encrypt/decrypt-string code -- Wing. +-- Delete all support for bit-rotten CANNOT_DUMP -- Wing. -- Fix crash due to attempt to free objects across dump/undump - - Wing. + Wing. -- Don't get in an infinite loop running post-redisplay actions - - Wing. --- Make gc_currently_forbidden static - Wing. --- Defer redrawing if already in redisplay - Wing. --- Add debug code for locking a dynarr to catch invalid mods - Wing. + Wing. +-- Make gc_currently_forbidden static -- Wing. +-- Defer redrawing if already in redisplay -- Wing. +-- Add debug code for locking a dynarr to catch invalid mods -- Wing. -- Ensure that various glyph functions that eval within redisplay - protect the evals - Wing. --- Defer specifier-changed updating till after redisplay - Wing. + protect the evals -- Wing. +-- Defer specifier-changed updating till after redisplay -- Wing. -- Require that every place inside of redisplay catch errors itself - - Wing. --- Introduce separate means of holding frame-size changes - Wing. + Wing. +-- Introduce separate means of holding frame-size changes -- Wing. -- Introduce "post-redisplay" methods for deferring things till after - redisplay - Wing. --- Disable all quit checking in redisplay - Wing. + redisplay -- Wing. +-- Disable all quit checking in redisplay -- Wing. -- Use _wexecve() when under Windows NT for Unicode correctness - Wing. --- Update list of possibly valid console types - Wing. +-- Update list of possibly valid console types -- Wing. -- Turn on Vstack_trace_on_error 'Frun_emacs_from_temacs' so that errors are debuggable even when occurring extremely early in - reinitialization - Wing. --- Define new function `emacs-run-status' - Wing. + reinitialization -- Wing. +-- Define new function `emacs-run-status' -- Wing. -- Fix crash caused by an edge condition in the syntax-cache macros - - Wing. --- Eliminate HAVE_WIN32_CODING_SYSTEMS, use WIN32_ANY instead - Wing. + Wing. +-- Eliminate HAVE_WIN32_CODING_SYSTEMS, use WIN32_ANY instead -- Wing. -- Don't check_quit() unless we're unbinding a real Lisp - `unwind-protect' - Wing. + `unwind-protect' -- Wing. -- Make absolutely sure there is no quit checking while we are in a - "critical section" during frame deletion - Wing. + "critical section" during frame deletion -- Wing. Lisp API --- Fix infloop in font-lock for java files - Choi. --- Fix split-string - Turnbull. --- Support '(filename)nodename' as argument to 'info' - Steib. --- Major clean up of the PUI code - Youngs. --- Use 'equal' instead of '=' in 'saved-window-equal' - James. --- Updates to wid-edit.el - Turnbull. +-- Fix infloop in font-lock for java files -- Choi. +-- Fix split-string -- Turnbull. +-- Support '(filename)nodename' as argument to 'info' -- Steib. +-- Major clean up of the PUI code -- Youngs. +-- Use 'equal' instead of '=' in 'saved-window-equal' -- James. +-- Updates to wid-edit.el -- Turnbull. -- Better layout for Tools -> Packages -> Download Site menu - - Aichner. --- More sites added to packages download sites menu - Aichner. + Aichner. +-- More sites added to packages download sites menu -- Aichner. -- Byte-compiler warning clean up and lots of synching with FSF 21.2 - code - Wing. + code -- Wing. -- Move lots of high-level code for computing paths into - setup-paths.el from various places - Wing. --- Mule and coding system updates - Wing, Turnbull. + setup-paths.el from various places -- Wing. +-- Mule and coding system updates -- Wing, Turnbull. to 21.5.11 "cabbage" ＠＠ -772,135 +813,135 ＠＠ Here are the highlights: Build --- Updates to test suite - Turnbull. --- Use -no-autoloads with update-elc-2 - Wing. --- Check for strupr and strlwr - Sperber. --- Delete auto-autoloads.el* & cutom-load.el* files on make clean - Turnbull. --- Fix --srcdir processing - Turnbull. --- Define DLSYM_NEEDS_UNDERSCORE on Darwin - Turnbull. --- Use opsys=aix4-2 for AIX 5 and above - Buchholz. --- Make ellcc search XEmacs directories for include files 1st - James. --- Set stack-trace-on-error, load-always-display-messages - Wing. --- Overhaul update-elc.el, cus-dep, autoload (speed ups) - Wing. --- Various compiler warning fixes - Wing. --- FreeBSD updates in modules/Makefile.common - Pluim. --- Warning fix in eldap.c - James. --- Support C++ & KKCC compilation in Windows - Wing. --- Various fixups in nt/config.in.samp - Wing. --- Fixes in xemacs.mak - Wing. --- Clean up compile errors with C++ under Windows - Wing. --- Re-order sections in ldflags for gcc 3.2 - Okhapkin. --- Restore USE_XFONTSET - Turnbull. --- New symbol: DLSYM_NEEDS_UNDERSCORE - Turnbull. --- Guard against multiple definitions of _ALL_SOURCE - Buchholz. --- QUICK_BUILD updates - Wing. +-- Updates to test suite -- Turnbull. +-- Use -no-autoloads with update-elc-2 -- Wing. +-- Check for strupr and strlwr -- Sperber. +-- Delete auto-autoloads.el* & cutom-load.el* files on make clean -- Turnbull. +-- Fix --srcdir processing -- Turnbull. +-- Define DLSYM_NEEDS_UNDERSCORE on Darwin -- Turnbull. +-- Use opsys=aix4-2 for AIX 5 and above -- Buchholz. +-- Make ellcc search XEmacs directories for include files 1st -- James. +-- Set stack-trace-on-error, load-always-display-messages -- Wing. +-- Overhaul update-elc.el, cus-dep, autoload (speed ups) -- Wing. +-- Various compiler warning fixes -- Wing. +-- FreeBSD updates in modules/Makefile.common -- Pluim. +-- Warning fix in eldap.c -- James. +-- Support C++ & KKCC compilation in Windows -- Wing. +-- Various fixups in nt/config.in.samp -- Wing. +-- Fixes in xemacs.mak -- Wing. +-- Clean up compile errors with C++ under Windows -- Wing. +-- Re-order sections in ldflags for gcc 3.2 -- Okhapkin. +-- Restore USE_XFONTSET -- Turnbull. +-- New symbol: DLSYM_NEEDS_UNDERSCORE -- Turnbull. +-- Guard against multiple definitions of _ALL_SOURCE -- Buchholz. +-- QUICK_BUILD updates -- Wing. Documentation --- Major update to configure.usage - Wing. --- New developer bio's - James, Skyttä, Golubev. +-- Major update to configure.usage -- Wing. +-- New developer bio's -- James, Skyttä, Golubev. -- Amendments/additions to PROBLEMS: - - PostgreSQL DSO with --error-checking=all - James. - - Consolidate Motif problems into one section - Turnbull. + - PostgreSQL DSO with --error-checking=all -- James. + - Consolidate Motif problems into one section -- Turnbull. -- Amendments/additions to INSTALL: - - Recommend Mule - Turnbull. - - Deprecate stripped binaries - Turnbull. + - Recommend Mule -- Turnbull. + - Deprecate stripped binaries -- Turnbull. -- General tidy up of etc/BETA, rewrite sections dealing with packages - and building from scratch - Youngs. --- General doc fixes, typos etc - Youngs, Turnbull, Palmer, Wing. --- Fix xref in Auto-Saving - Aichner. --- Update Local.rules File section in packages.texi - Youngs. --- Clarify package hierarchy structure - Turnbull. --- Major fixup of internals.texi - Wing. --- Lots of Mule rewriting in lispref/mule.texi - Wing. --- Document USE_UNION_TYPE evilness - Wing. --- Document event-matches-key-specifier-p better - Wing. --- Change illegal (for C) '//' comments to '/* */' - Shelton, Turnbull. + and building from scratch -- Youngs. +-- General doc fixes, typos etc -- Youngs, Turnbull, Palmer, Wing. +-- Fix xref in Auto-Saving -- Aichner. +-- Update Local.rules File section in packages.texi -- Youngs. +-- Clarify package hierarchy structure -- Turnbull. +-- Major fixup of internals.texi -- Wing. +-- Lots of Mule rewriting in lispref/mule.texi -- Wing. +-- Document USE_UNION_TYPE evilness -- Wing. +-- Document event-matches-key-specifier-p better -- Wing. +-- Change illegal (for C) '//' comments to '/* */' -- Shelton, Turnbull. Internals --- Synch rcs2log to GNU upstream - Youngs. +-- Synch rcs2log to GNU upstream -- Youngs. -- Use symbolic name `XtExposeCompressMaximal' instead of `TRUE' in - xlwMenuClassRec - Buchholz. --- In xm_update_progress, don't define unless LWLIB_WIDGETS_MOTIF - Buchholz. --- Rename class -> class_ & new -> new_ - Wing. --- KKCC update in postgresql.c - Wing. --- KKCC update in eldap.c - James. --- Fix for unix_create_process - Ueno. --- Set stack reserve size during unexec() - Piper. --- Use 'struct htentry' not 'struct hentry' in elhash.c - Wing. + xlwMenuClassRec -- Buchholz. +-- In xm_update_progress, don't define unless LWLIB_WIDGETS_MOTIF -- Buchholz. +-- Rename class -> class_ & new -> new_ -- Wing. +-- KKCC update in postgresql.c -- Wing. +-- KKCC update in eldap.c -- James. +-- Fix for unix_create_process -- Ueno. +-- Set stack reserve size during unexec() -- Piper. +-- Use 'struct htentry' not 'struct hentry' in elhash.c -- Wing. -- New macros ALIST_LOOP_3, ALIST_LOOP_4. --- Fix 'xemacs -batch -l dunnet' under Cygwin - Wing. --- Implement delaying of XFlush() if pending expose events - Wing. --- Fix some longstanding bugs in X quit handling - Wing. --- Correct the message output upon crashing to be more up-to-date - Wing. +-- Fix 'xemacs -batch -l dunnet' under Cygwin -- Wing. +-- Implement delaying of XFlush() if pending expose events -- Wing. +-- Fix some longstanding bugs in X quit handling -- Wing. +-- Correct the message output upon crashing to be more up-to-date -- Wing. -- Add dp() & db() as short synonyms of debug_print() & - debug_backtrace() - Wing. --- Add C++ error-checking code to verify problems with GCPRO/UNGCPRO - Wing. --- Change the way gap arrays are allocated (for KKCC) - Wing. + debug_backtrace() -- Wing. +-- Add C++ error-checking code to verify problems with GCPRO/UNGCPRO -- Wing. +-- Change the way gap arrays are allocated (for KKCC) -- Wing. -- Now lcrecords set the type of items sitting on the free list to - lcrecord_type_free - Wing. + lcrecord_type_free -- Wing. -- All lcrecord allocation functions now zero out the returned - lcrecords - Wing. --- Additional asserts in FREE_FIXED_TYPE - Wing. --- Make bit vectors lcrecords, like vectors - Wing. --- MARKED_SLOT() call no longer includes semicolon - Wing. --- Factor out some code duplicated in KKCC and pdump - Wing. --- KKCC updates - Wing. --- Add a fifth field "flags" to memory_description - Wing. --- Add support for "description maps" - Wing. + lcrecords -- Wing. +-- Additional asserts in FREE_FIXED_TYPE -- Wing. +-- Make bit vectors lcrecords, like vectors -- Wing. +-- MARKED_SLOT() call no longer includes semicolon -- Wing. +-- Factor out some code duplicated in KKCC and pdump -- Wing. +-- KKCC updates -- Wing. +-- Add a fifth field "flags" to memory_description -- Wing. +-- Add support for "description maps" -- Wing. -- Redo XD_UNION so it works inline and change format to provide info - for pdump - Wing. --- Textual changes: - - lrecord_description -> memory_description - Wing. - - struct_description -> sized_memory_description - Wing. --- Initialize protect_me field of popup_data in set_frame_menubar - Sperber --- GTK updates - Sperber. + for pdump -- Wing. +-- Textual changes: + - lrecord_description -> memory_description -- Wing. + - struct_description -> sized_memory_description -- Wing. +-- Initialize protect_me field of popup_data in set_frame_menubar -- Sperber +-- GTK updates -- Sperber. -- Don't lead to a crash if dealing with a dead - window/frame/device/console - Sperber. --- Prevent crash for combination windows - Sperber. --- Window fixes in Fdelete_window - Sperber. --- Module updates in emodules.h - James. --- Fprovide from 'vars_of_file_coding' not 'syms_of_file_coding' - Turnbull. --- Fix syntax of macro in 'mark_object_maybe_checking_free - Turnbull. --- Eliminate bogus require-prints-loading-message - Wing. --- Turn on `load-warn-when-source-newer' by default - Wing. + window/frame/device/console -- Sperber. +-- Prevent crash for combination windows -- Sperber. +-- Window fixes in Fdelete_window -- Sperber. +-- Module updates in emodules.h -- James. +-- Fprovide from 'vars_of_file_coding' not 'syms_of_file_coding' -- Turnbull. +-- Fix syntax of macro in 'mark_object_maybe_checking_free -- Turnbull. +-- Eliminate bogus require-prints-loading-message -- Wing. +-- Turn on `load-warn-when-source-newer' by default -- Wing. -- Fix up crashes when selecting menubar items due to lack of GCPROing - - Wing. --- Implement tail-recursion in KKCC - Wing. --- Fix UTF-(8|16) detector - Wing. + -- Wing. +-- Implement tail-recursion in KKCC -- Wing. +-- Fix UTF-(8|16) detector -- Wing. -- Fix problems with reentrant calling of lwlib and associated crashes - when selecting menu items - Wing. --- Improve redisplay handling of preemption - Wing. --- Return the parameter from strlvr, strupr, depend on !HAVE_STRUPR - James. --- In sysdll.c included lisp.h to define needed alloca_array - Begel. --- Pull GC_CHECK_NOT_FREE out of USE_KKCC - Sperber. --- Abort when any attempts to output a stream console are made - Wing. --- Formatting fixes in redisplay-output.c - Wing. --- Clean up redisplay a bit - Wing. --- Fix scrollbar code TTY devices don't have them - Sperber. --- Major reworking of profile code - Wing. --- Dramatically improve redisplay speed over slow X connections - Buchholz. --- Move syntax table description from buffer.c to syntax.c - Wing. --- Updates to char,mirror,syntax tables code - Wing. --- Niggly whitespace fixups - Wing. + when selecting menu items -- Wing. +-- Improve redisplay handling of preemption -- Wing. +-- Return the parameter from strlvr, strupr, depend on !HAVE_STRUPR -- James. +-- In sysdll.c included lisp.h to define needed alloca_array -- Begel. +-- Pull GC_CHECK_NOT_FREE out of USE_KKCC -- Sperber. +-- Abort when any attempts to output a stream console are made -- Wing. +-- Formatting fixes in redisplay-output.c -- Wing. +-- Clean up redisplay a bit -- Wing. +-- Fix scrollbar code TTY devices don't have them -- Sperber. +-- Major reworking of profile code -- Wing. +-- Dramatically improve redisplay speed over slow X connections -- Buchholz. +-- Move syntax table description from buffer.c to syntax.c -- Wing. +-- Updates to char,mirror,syntax tables code -- Wing. +-- Niggly whitespace fixups -- Wing. Lisp API --- Updates to (japan|cryil)-util.el - Turnbull. --- Updates to how XEmacs computes various paths - Sperber. --- Window configuration fixes - Sperber, Wing. --- Make Info-insert-dir end n separator - Buchholz. --- Drastically reorganise autoload.el - Turnbull. --- Omit M-S-home/end from motion keys - Wing. --- Synch wid-edit to GNU/Emacs 21.3.50 - Turnbull. --- Updates to hyper-apropos - Wing. --- Reorganise Help -> Info submenu - Wing. --- Fix bug when end > start in text-props - Wing. --- Fix walk-windows - Wing. --- Fix for call to set-language-unicode-precedence-list - Nyyss~nen. --- Synch up byte-optimize.el - Wing. --- Include FUNLIST argument to generate-c-file-autoloads-1 - Wing. +-- Updates to (japan|cryil)-util.el -- Turnbull. +-- Updates to how XEmacs computes various paths -- Sperber. +-- Window configuration fixes -- Sperber, Wing. +-- Make Info-insert-dir end n separator -- Buchholz. +-- Drastically reorganise autoload.el -- Turnbull. +-- Omit M-S-home/end from motion keys -- Wing. +-- Synch wid-edit to GNU/Emacs 21.3.50 -- Turnbull. +-- Updates to hyper-apropos -- Wing. +-- Reorganise Help -> Info submenu -- Wing. +-- Fix bug when end > start in text-props -- Wing. +-- Fix walk-windows -- Wing. +-- Fix for call to set-language-unicode-precedence-list -- Nyyss~nen. +-- Synch up byte-optimize.el -- Wing. +-- Include FUNLIST argument to generate-c-file-autoloads-1 -- Wing. to 21.5.10 "burdock" ＠＠ -917,166 +958,166 ＠＠ DSO's. We have Jerry James to thank/bla Build --- Reset sheap-adjustment to zero - Piper. --- Make --pdump default to yes on Linux - Turnbull. --- Only use -Wpacked in GCC v3 - Wing. --- Remove LISP_FLOAT_TYPE definition. - James. --- Temporarily disable DSO's under Cygwin - Wing. --- Updates to DSO building code (Makefile.in, configure.in etc) - Wing, James. --- Separate compiler warning flags from CFLAGS - Wing. --- Delete auto-autoloads.e* & custom-load.e* on 'make clean' - Turnbull. --- Disable detection of 'getaddrinfo' for HP-UX 11.XX - Turnbull. --- Include modules directories in 'make tags' - Youngs. --- Fix shadowing warnings in make-docfile.c - Wing. +-- Reset sheap-adjustment to zero -- Piper. +-- Make --pdump default to yes on Linux -- Turnbull. +-- Only use -Wpacked in GCC v3 -- Wing. +-- Remove LISP_FLOAT_TYPE definition. -- James. +-- Temporarily disable DSO's under Cygwin -- Wing. +-- Updates to DSO building code (Makefile.in, configure.in etc) -- Wing, James. +-- Separate compiler warning flags from CFLAGS -- Wing. +-- Delete auto-autoloads.e* & custom-load.e* on 'make clean' -- Turnbull. +-- Disable detection of 'getaddrinfo' for HP-UX 11.XX -- Turnbull. +-- Include modules directories in 'make tags' -- Youngs. +-- Fix shadowing warnings in make-docfile.c -- Wing. -- Move the common stuff from postgresql/ldap Makefile.in.in & configure.ac's into a "common" Makefile and configure script - Wing. --- Major cleanup of ellcc - Wing, James. --- Add Makefile var to pick up '--site-libraries' in DSO's - Youngs. +-- Major cleanup of ellcc -- Wing, James. +-- Add Makefile var to pick up '--site-libraries' in DSO's -- Youngs. -- Avoid unnecessary deviations from UNIX 'describe-installation' in - xemacs.mak - Aichner. --- Don't confirm overwriting files in xemacs.mak - Aichner. --- Support 'xemacs_extra_name' in xemacs.mak - Aichner. --- Some gcc/g++ 3 fixes - Wing. --- Warning fixes - Wing. --- Fix some C++ errors - Wing. + xemacs.mak -- Aichner. +-- Don't confirm overwriting files in xemacs.mak -- Aichner. +-- Support 'xemacs_extra_name' in xemacs.mak -- Aichner. +-- Some gcc/g++ 3 fixes -- Wing. +-- Warning fixes -- Wing. +-- Fix some C++ errors -- Wing. -- Allow for C needing volatile and C++ that can't have volatile, - remove previous volatile hacks - Wing. --- Try for a working Cygwin build with old unexec - Wing. --- Warning suppression - Turnbull. --- New Mule character class regexp tests - Turnbull, Ueno. --- Better handling of known bugs in tests - Turnbull. --- Add test for stale subexpr match-data - Turnbull. --- Update syntax-table tests - Turnbull. --- Add word-boundary regexp tests - Turnbull. + remove previous volatile hacks -- Wing. +-- Try for a working Cygwin build with old unexec -- Wing. +-- Warning suppression -- Turnbull. +-- New Mule character class regexp tests -- Turnbull, Ueno. +-- Better handling of known bugs in tests -- Turnbull. +-- Add test for stale subexpr match-data -- Turnbull. +-- Update syntax-table tests -- Turnbull. +-- Add word-boundary regexp tests -- Turnbull. Documentation -- Updates to PROBLEMS file - Running/Linux - Lesstif 0.93.36 - Turnbull - Running/IRIX - Irix 6.5 coredumps - Turnbull - Running/Cygwin - "No cygXpm-noX" fatal error - Turnbull - Missing charsets - Remove ambiguity - Turnbull - Running, General - FontSet warnings - Turnbull - MacOS/X - Stack limitation - Turnbull - Digital Unix - Generalise - Turnbull - AIX - USE_KKCC lossage - Turnbull. --- Update instructions in info/dir - Wallington. --- Recommend TeXinfo 4.2 in INSTALL - Turnbull. --- Add example in sample.Xdefaults - Boffi. --- Typo fixes - Yamaoka, Youngs, Turnbull, Wing. --- Docstring fixes - Turnbull, Piper, Skyttä, Wing. --- Update description of XEmacs Patches and Design ML's - Turnbull. --- Incorportate ChangeLog.X into ChangeLog - Wing. + Running/Linux - Lesstif 0.93.36 -- Turnbull + Running/IRIX - Irix 6.5 coredumps -- Turnbull + Running/Cygwin - "No cygXpm-noX" fatal error -- Turnbull + Missing charsets - Remove ambiguity -- Turnbull + Running, General - FontSet warnings -- Turnbull + MacOS/X - Stack limitation -- Turnbull + Digital Unix - Generalise -- Turnbull + AIX - USE_KKCC lossage -- Turnbull. +-- Update instructions in info/dir -- Wallington. +-- Recommend TeXinfo 4.2 in INSTALL -- Turnbull. +-- Add example in sample.Xdefaults -- Boffi. +-- Typo fixes -- Yamaoka, Youngs, Turnbull, Wing. +-- Docstring fixes -- Turnbull, Piper, Skyttä, Wing. +-- Update description of XEmacs Patches and Design ML's -- Turnbull. +-- Incorportate ChangeLog.X into ChangeLog -- Wing. -- FAQ additions/amendments: - Debugging FAQ improvements - Wing. - Mention union type bugs - Turnbull. - Debugging HOWTO improvements - Turnbull. - Decoding Lisp objects in the debugger - Turnbull. - Fix location of FAQ on website - Skyttä. - Add missing menu entry for Q3.2.7 - Verna. - Displaying non-ASCII - Turnbull. - Mention bug report commands - Turnbull. - Revise Q1.3.[1-6] - Turnbull. - New FAQ for "no cygXpm-noX" fatal error - Turnbull. --- New TeXinfo nodes: - "Widget Internals" - Turnbull. - "Simple Specifier Usage" - Turnbull. - "Compilation Options" - Turnbull. --- Document charset Unification and Tables - Turnbull. --- Better short description of Mule in Mule submenu - Turnbull. --- Regression Testing XEmacs design hints & rewrite - Turnbull. --- Document 'face-frob-from-locale-first' - Golubev. --- Document 'set-face-background-pixmap-file' - Verna. + Debugging FAQ improvements -- Wing. + Mention union type bugs -- Turnbull. + Debugging HOWTO improvements -- Turnbull. + Decoding Lisp objects in the debugger -- Turnbull. + Fix location of FAQ on website -- Skyttä. + Add missing menu entry for Q3.2.7 -- Verna. + Displaying non-ASCII -- Turnbull. + Mention bug report commands -- Turnbull. + Revise Q1.3.[1-6] -- Turnbull. + New FAQ for "no cygXpm-noX" fatal error -- Turnbull. +-- New TeXinfo nodes: + "Widget Internals" -- Turnbull. + "Simple Specifier Usage" -- Turnbull. + "Compilation Options" -- Turnbull. +-- Document charset Unification and Tables -- Turnbull. +-- Better short description of Mule in Mule submenu -- Turnbull. +-- Regression Testing XEmacs design hints & rewrite -- Turnbull. +-- Document 'face-frob-from-locale-first' -- Golubev. +-- Document 'set-face-background-pixmap-file' -- Verna. -- Add urefs to Doug Lea's * Wolfram Gloger's home pages in "Low-Level - Modules" - Turnbull. --- Update "Available Packages" - Skyttä. --- Document 'append' arg of 'add-to-list' - Skyttä. --- Add optimisation hints in "Techniques for XEmacs Developers" - Turnbull. + Modules" -- Turnbull. +-- Update "Available Packages" -- Skyttä. +-- Document 'append' arg of 'add-to-list' -- Skyttä. +-- Add optimisation hints in "Techniques for XEmacs Developers" -- Turnbull. Internals --- Add *menubar*FontSet and *popup*FontSet entries - Turnbull, Skyttä. --- Extract ldap and postgresql code from core and put them into DSO's - James. +-- Add *menubar*FontSet and *popup*FontSet entries -- Turnbull, Skyttä. +-- Extract ldap and postgresql code from core and put them into DSO's -- James. -- 'Fset_window_point' Correct to GNU/Emacs behaviour (fixes some bugs - in Gnus) - Wing. --- Inhibit GC in critical sections - Wing. --- Fix calculation in 'report_sheap_usage' - Piper. --- Implement and use new var 'garbage_collection_messages' - Wallington. --- Fix 'open_database' for Berkeley DB 4.1.x - Allen. --- Updates to frame code - Sperber. + in Gnus) -- Wing. +-- Inhibit GC in critical sections -- Wing. +-- Fix calculation in 'report_sheap_usage' -- Piper. +-- Implement and use new var 'garbage_collection_messages' -- Wallington. +-- Fix 'open_database' for Berkeley DB 4.1.x -- Allen. +-- Updates to frame code -- Sperber. -- Change C debugger entrance: error message, then stack trace, then - exiting message, then force debugger - Wing. --- Use EQ not EQUAL in 'mswindows_init_frame_1' - Wing. --- Better redisplay-related asserts - Wing. --- Don't generate large warning strings when they'll be discarded - Wing. --- Implement 'debug-on-error' as documented - Wing. --- Fix docs relating to QUIT which can't GC under any circumstances - Wing. --- More robust package compilation and debugging - Wing. --- Overhaul profile code - Wing. --- Fix crashes due to incorrectly ported GNU/Emacs code - Wing. --- Clean up realpath.c - Wing. --- DdeCreateStringHandle needs to be manual due to new Cygwin bug - Wing. --- Fix some Cygwin complaints - Wing. --- Unconditionally use LISP_FLOAT_TYPE code - James. --- Improve crash message in 'shut_down_emacs' - Turnbull. --- Update NAS code for NAS 1.6 and later - Toy. --- Fix "unused variable" warnings in mule-canna.c - Turnbull. --- Prototype 'enqueue_focus_event' - Turnbull. --- Use BORDER_FIDDLE_FACTOR instead of 10 in 'layout_layout' - Piper. --- Add optional 'noerror' arg to 'Frequire' - Wallington. + exiting message, then force debugger -- Wing. +-- Use EQ not EQUAL in 'mswindows_init_frame_1' -- Wing. +-- Better redisplay-related asserts -- Wing. +-- Don't generate large warning strings when they'll be discarded -- Wing. +-- Implement 'debug-on-error' as documented -- Wing. +-- Fix docs relating to QUIT which can't GC under any circumstances -- Wing. +-- More robust package compilation and debugging -- Wing. +-- Overhaul profile code -- Wing. +-- Fix crashes due to incorrectly ported GNU/Emacs code -- Wing. +-- Clean up realpath.c -- Wing. +-- DdeCreateStringHandle needs to be manual due to new Cygwin bug -- Wing. +-- Fix some Cygwin complaints -- Wing. +-- Unconditionally use LISP_FLOAT_TYPE code -- James. +-- Improve crash message in 'shut_down_emacs' -- Turnbull. +-- Update NAS code for NAS 1.6 and later -- Toy. +-- Fix "unused variable" warnings in mule-canna.c -- Turnbull. +-- Prototype 'enqueue_focus_event' -- Turnbull. +-- Use BORDER_FIDDLE_FACTOR instead of 10 in 'layout_layout' -- Piper. +-- Add optional 'noerror' arg to 'Frequire' -- Wallington. -- Only resize 'layout_query_geometry' dynamically if static sizes - haven't been set - Piper. --- Fix infloop upon a gdm logout - Sigelman. --- Fix scope of 'num_nonshy_regs' - Turnbull. --- Fix "stale match data" bug - Turnbull. --- Don't call 'XtDisplay' on a destroyed widget - Golubev. --- Update specifier code - Sperber. --- Update process code - Sperber. --- Move ldap/postgresql code out to DSO's - James. + haven't been set -- Piper. +-- Fix infloop upon a gdm logout -- Sigelman. +-- Fix scope of 'num_nonshy_regs' -- Turnbull. +-- Fix "stale match data" bug -- Turnbull. +-- Don't call 'XtDisplay' on a destroyed widget -- Golubev. +-- Update specifier code -- Sperber. +-- Update process code -- Sperber. +-- Move ldap/postgresql code out to DSO's -- James. -- Normalise Ffile_truename and drive spec on cygwing to win32 format - - Piper. --- Use 'closesocket' instead of 'CloseHandle' in 'winsock_closer' - Alexander. --- Coding system updates - Ikiuo. + -- Piper. +-- Use 'closesocket' instead of 'CloseHandle' in 'winsock_closer' -- Alexander. +-- Coding system updates -- Ikiuo. Lisp API --- Update window-xemacs.el to fix 'goto-line' - Wing. --- Add garbage collection messages - Wallington. --- Re-implement window configurations in Emacs Lisp - Sperber. --- Enhance background-pixmap-file code - Verna. +-- Update window-xemacs.el to fix 'goto-line' -- Wing. +-- Add garbage collection messages -- Wallington. +-- Re-implement window configurations in Emacs Lisp -- Sperber. +-- Enhance background-pixmap-file code -- Verna. -- New macro 'save-window-excursion' to eventually replace bytecode - instruction - Sperber. --- Move window.el et al up the order in dumped-lisp.el - Sperber. + instruction -- Sperber. +-- Move window.el et al up the order in dumped-lisp.el -- Sperber. -- Don't use 'save-window-excursion' in - 'shrink-window-if-larger-than-buffer' - Sperber. --- Updates to pixel-size code in dialog.el - Sperber. --- Remove nonworking 'breakpoint-on-error' - Wing. + 'shrink-window-if-larger-than-buffer' -- Sperber. +-- Updates to pixel-size code in dialog.el -- Sperber. +-- Remove nonworking 'breakpoint-on-error' -- Wing. -- Extract out 'with-displaying-help-buffer' into a more general mechanism - - Wing. --- Don't catch errors when noninteractive in startup.el - Wing. --- Fix warnings in code-files.el, loadhist.el, & package-get.el - Wing. --- Simplify code in '*-reset-device-font-menus' - James. --- Synch font-menu.el to the 21.4 version - Turnbull. --- Preserve return value from 'call-process' - Sperber. --- New functions in replace.el that operate on regions - Evans. --- Run 'delete-frame-hook' in general dialogs only - Piper. --- Add a margin parameter in autoload.el for DSO autoloads - James. --- Conditionalise autoloads for DSO's on the existence of the DSO - James. --- Always set module directories/paths in dump-paths.el - James. --- Bring list of package sites up to date - Skyttä. + -- Wing. +-- Don't catch errors when noninteractive in startup.el -- Wing. +-- Fix warnings in code-files.el, loadhist.el, & package-get.el -- Wing. +-- Simplify code in '*-reset-device-font-menus' -- James. +-- Synch font-menu.el to the 21.4 version -- Turnbull. +-- Preserve return value from 'call-process' -- Sperber. +-- New functions in replace.el that operate on regions -- Evans. +-- Run 'delete-frame-hook' in general dialogs only -- Piper. +-- Add a margin parameter in autoload.el for DSO autoloads -- James. +-- Conditionalise autoloads for DSO's on the existence of the DSO -- James. +-- Always set module directories/paths in dump-paths.el -- James. +-- Bring list of package sites up to date -- Skyttä. -- Add "Find Variable" menu entry for 'hyper-apropos-find-variable' - Wallington --- Fix 'view-lossage' interactive spec - Wallington. --- Synch 'with-output-to-string' with GNU/Emacs 21 - Wallington. --- Bind C-xrd to 'delete-rectangle' - Yamaoka. +-- Fix 'view-lossage' interactive spec -- Wallington. +-- Synch 'with-output-to-string' with GNU/Emacs 21 -- Wallington. +-- Bind C-xrd to 'delete-rectangle' -- Yamaoka. -- Move entries in 'auto-mode-alist' out to packages for the modes - that are in packages - Skyttä + that are in packages -- Skyttä -- New compatible alias for 'lookup-syntax-properties' - ('parse-sexp-lookup-properties') - Turnbull. --- Enable C autoloads for DSO's - James. --- Update revert-buffer code - Piper. --- Add new coding system 'utf-8-bom' - Ikiuo. + ('parse-sexp-lookup-properties') -- Turnbull. +-- Enable C autoloads for DSO's -- James. +-- Update revert-buffer code -- Piper. +-- Add new coding system 'utf-8-bom' -- Ikiuo. to 21.5.9 "brussels sprouts" ＠＠ -1088,43 +1129,43 ＠＠ There are of course, the usual swag of b document updates. -- Add an extra element to the version string that can be used to - include a date in the version string - Youngs. --- Improve help string for --with-widgets configure option - Skyttä. + include a date in the version string -- Youngs. +-- Improve help string for --with-widgets configure option -- Skyttä. -- Define runtime & build problems, and rewrite "Hannibal Lecter" - stuff in PROBLEMS - Turnbull. --- Add builtin and constant faces to font-lock-face-list - Skyttä. --- Japanese language fixes - Yamaoka. + stuff in PROBLEMS -- Turnbull. +-- Add builtin and constant faces to font-lock-face-list -- Skyttä. +-- Japanese language fixes -- Yamaoka. -- Fix find-library to allow Mule XEmacsen to find compressed - libraries - Youngs. --- New alias for 'delete-indentation' (join-line) - Wallington. --- Support docstring for define-derived-mode - Turnbull --- Doc fix for keybindings in term.texi and misc.texi - Skyttä. --- Bring package list up to date in packages.texi - Skyttä. --- Document purecopy as a no-op - Josefsson. --- New document chapter "Regression Testing XEmacs" - Turnbull. --- Add "USE_KKCC" option to ./nt/xemacs.mak - Aichner. + libraries -- Youngs. +-- New alias for 'delete-indentation' (join-line) -- Wallington. +-- Support docstring for define-derived-mode -- Turnbull +-- Doc fix for keybindings in term.texi and misc.texi -- Skyttä. +-- Bring package list up to date in packages.texi -- Skyttä. +-- Document purecopy as a no-op -- Josefsson. +-- New document chapter "Regression Testing XEmacs" -- Turnbull. +-- Add "USE_KKCC" option to ./nt/xemacs.mak -- Aichner. -- New GC algorithms implemented (Turn them on with --use-kkcc - configure option) - Sperber, Crestani, Kaltenbach, Bush. --- Define HAVE_WCHAR_H for native Win32 builds - Harris. --- Fix x_locate_pixmap_file make sure path is not 0 - MacLennan. --- Fix memory leak - Verna. + configure option) -- Sperber, Crestani, Kaltenbach, Bush. +-- Define HAVE_WCHAR_H for native Win32 builds -- Harris. +-- Fix x_locate_pixmap_file make sure path is not 0 -- MacLennan. +-- Fix memory leak -- Verna. -- Add missing call to 'xfree (newname)' in 'make_coding_system_1 - - Verna. --- Fix --with-mule --with-gtk builds - Barta. --- Make SEPCHAR a required arg to Fsplit_string_by_char - Palmer. + -- Verna. +-- Fix --with-mule --with-gtk builds -- Barta. +-- Make SEPCHAR a required arg to Fsplit_string_by_char -- Palmer. -- Make locate_file indicate success with nonnegative return if MODE - is nonnegative - James. --- Fix splitting window horizontally not splitting evenly - James. --- ORDINARY_LINK OK for Linux - James. + is nonnegative -- James. +-- Fix splitting window horizontally not splitting evenly -- James. +-- ORDINARY_LINK OK for Linux -- James. -- Don't bogusly reinitialise ascii_character property in - maybe_define_x_key_as_self_inserting_character - Astapov. + maybe_define_x_key_as_self_inserting_character -- Astapov. -- Add warning to SOE_DEBUG about not using until debugging functions - are rewritten - Turnbull. --- Update 'do_autoload' to GCPRO both arguments - Turnbull. + are rewritten -- Turnbull. +-- Update 'do_autoload' to GCPRO both arguments -- Turnbull. -- Update automated tests so they don't barf if required packages - aren't present - Turnbull. --- Organise NSIG setting code for SVR4 in a better way - James. --- Various typo fixes - Skyttä, Turnbull, James. + aren't present -- Turnbull. +-- Organise NSIG setting code for SVR4 in a better way -- James. +-- Various typo fixes -- Skyttä, Turnbull, James. to 21.5.8 "broccoli" ＠＠ -1137,50 +1178,50 ＠＠ contributors. And I haven't sorted the categories. Maybe next release... -- New configure option "--use-kkcc" for the upcoming new GC - algorithms - Sperber. + algorithms -- Sperber. -- Identify "--with-modules" as an autodetected configure option - - James. --- Add a couple of configuration questions to PROBLEMS - Turnbull. --- Test for wchar.h in configure - Sperber. --- Update package-index files - Youngs. --- s/Xemacs/XEmacs/ doc fixes - Aichner. --- Sync make-docfile.c with GNU - James. --- Updates to gutter-items - Palmieri. --- Sync setenv with GNU - Wallington. --- Remove package-get's dependence on APEL - Youngs. --- Fix case fold bug in replace-in-string - Verna. --- Updates to code-process.el and process.el - Alexander. --- Updates to mule/kinsoku.el - Yamaoka. --- Updates to define-derived-mode - Wallington. --- Printer fixes - Piper. --- Updates to window-xemacs.el & frame.el - James. --- Doc fix gutter-items.el - Piper. --- Sync ":set-after" in custom with GNU - Piper. --- Sort the lists in enabled-behavior-list - Galibert --- Updates to lwlib-Xm.c - Piper. --- Various doc fixes to the TeXinfo docs - Aichner. --- GC fixes - Sperber. --- Updates to lisp.h, symbols.c for DSO's - James. --- Fix to mswindows_need_event - Alexander. --- Declare Fcdr_safe to be callable from C - Turnbull. --- Ffunctionp return nil for autoloaded macros & keymaps - Niksic. --- Subwindow fixes - Ueno. --- Include wchar.h only if available, define wclsen if not - Sperber. --- Fixes to Fstart_process_internal - Sperber. --- Fixes to init_ralloc for pdump - Sperber. --- Remove duplicated definition of Lisp_Devmode - Bush. --- Fixes to toolbar/redisplay - Piper. --- Windows DDE fixes - Moore. + James. +-- Add a couple of configuration questions to PROBLEMS -- Turnbull. +-- Test for wchar.h in configure -- Sperber. +-- Update package-index files -- Youngs. +-- s/Xemacs/XEmacs/ doc fixes -- Aichner. +-- Sync make-docfile.c with GNU -- James. +-- Updates to gutter-items -- Palmieri. +-- Sync setenv with GNU -- Wallington. +-- Remove package-get's dependence on APEL -- Youngs. +-- Fix case fold bug in replace-in-string -- Verna. +-- Updates to code-process.el and process.el -- Alexander. +-- Updates to mule/kinsoku.el -- Yamaoka. +-- Updates to define-derived-mode -- Wallington. +-- Printer fixes -- Piper. +-- Updates to window-xemacs.el & frame.el -- James. +-- Doc fix gutter-items.el -- Piper. +-- Sync ":set-after" in custom with GNU -- Piper. +-- Sort the lists in enabled-behavior-list -- Galibert +-- Updates to lwlib-Xm.c -- Piper. +-- Various doc fixes to the TeXinfo docs -- Aichner. +-- GC fixes -- Sperber. +-- Updates to lisp.h, symbols.c for DSO's -- James. +-- Fix to mswindows_need_event -- Alexander. +-- Declare Fcdr_safe to be callable from C -- Turnbull. +-- Ffunctionp return nil for autoloaded macros & keymaps -- Niksic. +-- Subwindow fixes -- Ueno. +-- Include wchar.h only if available, define wclsen if not -- Sperber. +-- Fixes to Fstart_process_internal -- Sperber. +-- Fixes to init_ralloc for pdump -- Sperber. +-- Remove duplicated definition of Lisp_Devmode -- Bush. +-- Fixes to toolbar/redisplay -- Piper. +-- Windows DDE fixes -- Moore. -- Fixes to 'query_string_geometry' and 'widget_logical_unit_height' - Piper. -- Fix problem with XEmacs freezing with certain virtual window - managers on Windows - Rankin. + managers on Windows -- Rankin. -- Conditionalise calls to syms_of_dired_mswindows & vars_of_dired_mswindows on WIN32_NATIVE instead of HAVE_MSW_C_DIRED - - Harris. --- Process related fixes - Sperber. --- Fix #includes in input-method-motif.c - Galibert. --- Fixes to automated tests - Sperber. + -- Harris. +-- Process related fixes -- Sperber. +-- Fix #includes in input-method-motif.c -- Galibert. +-- Fixes to automated tests -- Sperber. to 21.5.7 "broccoflower" ＠＠ -1328,7 +1369,7 ＠＠ Internals -- Fix: create new process-synchronize-point to avoid dynamic binding problems; fix bogosity in setting process sentinels -- ben, mike -- Fix: make a lot of code use common includes and implementations - (see 2002-06-20 src/ChangeLog) -- ben + -- see 2002-06-20 src/ChangeLog) -- ben -- Fix: move global-map to keydefs.el -- ben -- Fix: new signal/C-g handling (src/ChangeLog 2002-05-28) -- ben -- Fix: numerous problems with the case-table implementation -- ben ＠＠ -1760,7 +1801,7 ＠＠ to 21.5.1 "anise" -- Fix shy group regexp code -- etc. etc. --- The `short-name' argument to make-charset now works correctly +-- The `short-name' argument to make-charset now works correctly -- Yoshiaki Kasahara -- `custom' changes -- Didier Verna -- SET_FACE_PROPERTY bug fix -- Jerry James 1.418.2.14 +29 -17 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.418.2.13 retrieving revision 1.418.2.14 diff -u -p -r1.418.2.13 -r1.418.2.14 --- ChangeLog 2005/07/13 04:42:44 1.418.2.13 +++ ChangeLog 2005/09/20 16:04:31 1.418.2.14 ＠＠ -1,3 +1,15 ＠＠ +2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> + + * XEmacs 21.5.22 "cucumber" is released. + +2005-07-20 Didier Verna <didier(a)xemacs.org> + + * CHANGES-beta: Remove the face aliasing feature announcement. + +2005-07-19 Didier Verna <didier(a)xemacs.org> + + * CHANGES-beta: Announce the face aliasing feature. + 2005-05-28 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.21 "corn" is released. ＠＠ -56,8 +68,8 ＠＠ 2005-03-30 Aidan Kehoe <kehoea(a)parhasard.net> * configure: #include <X11/Intrinsic.h.> -> #include - <X11/Intrinsic.h>, thank you Robert Delius Royar. - + <X11/Intrinsic.h>, thank you Robert Delius Royar. + 2005-03-15 Jerry James <james(a)xemacs.org> * configure.ac: Include <X11/Intrinsic.h> when checking for ＠＠ -73,9 +85,9 ＠＠ 2005-03-24 Aidan Kehoe <kehoea(a)parhasard.net> - * configure: Regenerate. + * configure: Regenerate. * configure.ac (XE_COMPLEX_ARG_ENABLE): --OPTION -> --with-OPTION - in various docstrings and error messages. + in various docstrings and error messages. 2005-03-15 Stephen J. Turnbull <stephen(a)xemacs.org> ＠＠ -86,7 +98,7 ＠＠ 2005-03-15 Malcolm Purvis <malcolmp(a)xemacs.org> - * configure.ac: Fix problems with OpenBSD /bin/sh. + * configure.ac: Fix problems with OpenBSD /bin/sh. 2005-03-13 Aidan Kehoe <kehoea(a)parhasard.net> ＠＠ -113,7 +125,7 ＠＠ 2005-03-01 Aidan Kehoe <kehoea(a)parhasard.net> - * configure: Regenerated. + * configure: Regenerated. * configure.in (XE_COMPUTE_RUNPATH): Check for the availability of XtRegisterDrawable. ＠＠ -172,7 +184,7 ＠＠ 2005-01-21 Aidan Kehoe <kehoea(a)parhasard.net> * configure: - * configure.in (XE_COMPUTE_RUNPATH): + * configure.in (XE_COMPUTE_RUNPATH): NetBSD can use Linux's sound API, but it needs an extra library at link time to do so. ＠＠ -452,7 +464,7 ＠＠ * aclocal.m4 (XE_SHLIB_STUFF): Use -bundle when testing the ability to build shared libraries, but use -bundle_loader in ellcc. Properly handle other flags for MacOS X. - + 2003-09-03 Steve Youngs <youngs(a)xemacs.org> * XEmacs 21.5.15 "celery" is released. ＠＠ -508,7 +520,7 ＠＠ * aclocal.m4 (XE_SHLIB_STUFF): Properly define ellcc flags for MacOS X. It was stopping certain libs from making their way into the - Makefiles. + Makefiles. * configure: Regenerate. ＠＠ -625,7 +637,7 ＠＠ Add comment about Cygwin, unexec and sysmalloc. Move some non-general stuff out of general. Make a section for x86. - + * configure.in (AC_INIT_NOTICE): * configure.in (XE_COMPUTE_RUNPATH): Add check for broken alloca in funcalls. ＠＠ -819,7 +831,7 ＠＠ 2002-10-31 John Paul Wallington <jpw(a)shootybangbang.com> - * info/dir (File): button1 on a highlighted word doesn't + * info/dir (File): button1 on a highlighted word doesn't follow that cross-reference. 2002-10-31 Stephen J. Turnbull <stephen(a)xemacs.org> ＠＠ -837,7 +849,7 ＠＠ * configure.in (Check for POSIX functions): New section head. getaddrinfo is detected on HP-UX 11.XX, but appears to be non-functional. Disable it. Based on work by Darryl Okahata. - + 2002-10-18 Stephen J. Turnbull <stephen(a)xemacs.org> * PROBLEMS (Running/Cygwin): "No cygXpm-noX" fatal error. ＠＠ -891,7 +903,7 ＠＠ * version.sh (xemacs_extra_name): New var to identify XEmacs version > release < next release. ie, release+cvs. - * configure.in: Test for xemacs_extra_name. + * configure.in: Test for xemacs_extra_name. * configure: Re-generate. ＠＠ -914,7 +926,7 ＠＠ 2002-07-09 Mike Sperber <mike(a)xemacs.org> - * configure.usage: + * configure.usage: * configure.in: Add --use-kkcc option for new GC algorithms. 2002-06-04 Jerry James <james(a)xemacs.org> ＠＠ -977,7 +989,7 ＠＠ * configure.in: Detect MacOS/X "Darwin". Thanks to Greg Parker <gparker(a)cs.stanford.edu>. - + 2002-03-30 Steve Youngs <youngs(a)xemacs.org> * etc/package-index.LATEST.pgp: Update to current reality. ＠＠ -998,7 +1010,7 ＠＠ 2001-12-13 William M. Perry <wmperry(a)gnu.org> * configure.in (GTK): add -Wno-shadow. - + 2002-01-23 Jarl Friis <jarl(a)diku.dk> * etc/BETA (http): Informing of xemacs-patches mailing list. Added ＠＠ -1063,7 +1075,7 ＠＠ 2002-03-31 Ben Wing <ben(a)xemacs.org> * TODO.ben-mule-21-5 (bugs): Update. - + * configure.in (USAGE_ERROR): * configure.in (CANONICALIZE_PATH): * configure.in (XE_COMPUTE_RUNPATH): 1.1.2.2 +0 -1 XEmacs/xemacs/Attic/ChangeLog.Xft Index: ChangeLog.Xft =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/Attic/ChangeLog.Xft,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -p -r1.1.2.1 -r1.1.2.2 --- ChangeLog.Xft 2005/03/15 05:18:54 1.1.2.1 +++ ChangeLog.Xft 2005/09/20 16:04:32 1.1.2.2 ＠＠ -1,4 +1,3 ＠＠ -<<<<<<< ChangeLog 2005-03-05 Malcolm Purvis <malcolmp(a)xemacs.org> * configure.ac: Correct the filename of the old copy of configure. 1.232.2.11 +629 -328 XEmacs/xemacs/configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.232.2.10 retrieving revision 1.232.2.11 diff -u -p -r1.232.2.10 -r1.232.2.11 --- configure 2005/07/13 04:42:46 1.232.2.10 +++ configure 2005/09/20 16:04:32 1.232.2.11 ＠＠ -1221,7 +1221,7 ＠＠ esac else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd "$ac_popdir" + cd $ac_popdir done fi ＠＠ -4144,7 +4144,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -4202,7 +4203,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -4318,7 +4320,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -4372,7 +4375,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -4417,7 +4421,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -4461,7 +4466,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -5159,7 +5165,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -5217,7 +5224,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -5333,7 +5341,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -5387,7 +5396,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -5432,7 +5442,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -5476,7 +5487,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -5890,7 +5902,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -5948,7 +5961,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -6064,7 +6078,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -6118,7 +6133,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -6163,7 +6179,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -6207,7 +6224,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -6621,7 +6639,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -6679,7 +6698,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -6795,7 +6815,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -6849,7 +6870,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -6894,7 +6916,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -6938,7 +6961,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -7315,7 +7339,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -7709,7 +7734,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -7753,7 +7779,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -8167,7 +8194,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -8429,7 +8457,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -8606,7 +8635,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -8662,7 +8692,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -8954,7 +8985,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9124,7 +9156,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9209,7 +9242,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9363,7 +9397,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9427,7 +9462,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9592,7 +9628,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9661,7 +9698,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9729,7 +9767,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9822,7 +9861,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9897,7 +9937,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9958,7 +9999,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10023,7 +10065,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10126,7 +10169,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10191,7 +10235,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10256,7 +10301,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10319,7 +10365,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10376,7 +10423,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10422,7 +10470,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10492,7 +10541,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10552,7 +10602,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10617,7 +10668,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10663,7 +10715,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10737,7 +10790,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10846,7 +10900,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10943,7 +10998,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10985,7 +11041,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11042,7 +11099,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11168,7 +11226,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11230,7 +11289,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11270,7 +11330,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11326,7 +11387,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11366,7 +11428,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11430,7 +11493,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11461,8 +11525,10 ＠＠ See \`config.log' for more details." >&2 esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF ＠＠ -11580,7 +11646,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11642,7 +11709,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11682,7 +11750,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11738,7 +11807,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11778,7 +11848,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11842,7 +11913,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11873,8 +11945,10 ＠＠ See \`config.log' for more details." >&2 esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF ＠＠ -11986,7 +12060,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12048,7 +12123,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12088,7 +12164,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12144,7 +12221,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12184,7 +12262,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12248,7 +12327,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12279,8 +12359,10 ＠＠ See \`config.log' for more details." >&2 esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF ＠＠ -12392,7 +12474,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12454,7 +12537,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12494,7 +12578,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12550,7 +12635,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12590,7 +12676,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12654,7 +12741,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12685,8 +12773,10 ＠＠ See \`config.log' for more details." >&2 esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF ＠＠ -12798,7 +12888,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12860,7 +12951,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12900,7 +12992,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12956,7 +13049,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12996,7 +13090,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13060,7 +13155,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13091,8 +13187,10 ＠＠ See \`config.log' for more details." >&2 esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF ＠＠ -13204,7 +13302,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13266,7 +13365,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13306,7 +13406,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13362,7 +13463,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13402,7 +13504,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13466,7 +13569,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13497,8 +13601,10 ＠＠ See \`config.log' for more details." >&2 esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF ＠＠ -13694,7 +13800,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13760,7 +13867,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13821,7 +13929,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13914,7 +14023,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -14019,7 +14129,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -14131,7 +14242,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -14315,7 +14427,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -14382,7 +14495,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -14480,7 +14594,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -14594,7 +14709,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -14741,7 +14857,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -14802,7 +14919,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -14863,7 +14981,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -14947,12 +15066,9 ＠＠ if test "$with_x11" != "no"; then done fi - -if test "x$ac_path_x_has_been_run" != xyes; then echo "$as_me:$LINENO: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 -ac_path_x_has_been_run=yes # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then ＠＠ -15045,7 +15161,7 ＠＠ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for a specified header file. + # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ ＠＠ -15119,7 +15235,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15179,15 +15296,10 ＠＠ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - # It might be that x_includes is empty (headers are found in the - # standard search path. Then output the corresponding message - ac_out_x_includes=$x_includes - test "x$x_includes" = x && ac_out_x_includes="in standard search path" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 + echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi -fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. ＠＠ -15235,7 +15347,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15286,7 +15399,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15362,7 +15476,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15417,7 +15532,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15485,7 +15601,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15593,7 +15710,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15657,7 +15775,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15725,7 +15844,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15829,7 +15949,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15893,7 +16014,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15990,7 +16112,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -16054,7 +16177,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -16151,7 +16275,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -16215,7 +16340,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -16294,7 +16420,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -16372,7 +16499,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -16517,7 +16645,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -16742,7 +16871,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -16896,7 +17026,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -16964,7 +17095,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -17039,7 +17171,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -17107,7 +17240,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -17261,7 +17395,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -17329,7 +17464,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -17514,7 +17650,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -17577,7 +17714,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -17642,7 +17780,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -17717,7 +17856,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -17799,7 +17939,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -17955,7 +18096,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -18115,7 +18257,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -18184,7 +18327,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -18253,7 +18397,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -18333,7 +18478,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -18500,7 +18646,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -18593,7 +18740,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -18744,7 +18892,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -18842,7 +18991,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -18976,7 +19126,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -19025,7 +19176,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -19073,7 +19225,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -19141,7 +19294,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -19275,7 +19429,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -19324,7 +19479,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -19388,7 +19544,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -19524,7 +19681,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -19759,7 +19917,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -19886,7 +20045,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -20304,7 +20464,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -20403,7 +20564,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -20564,7 +20726,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -20648,7 +20811,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -20799,7 +20963,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -20936,7 +21101,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21079,7 +21245,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21231,7 +21398,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21298,7 +21466,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21365,7 +21534,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21432,7 +21602,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21499,7 +21670,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21617,7 +21789,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21695,7 +21868,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21846,7 +22020,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21920,7 +22095,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -22099,7 +22275,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -22161,7 +22338,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -22312,7 +22490,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -22399,7 +22578,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -22466,7 +22646,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -22533,7 +22714,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -22598,7 +22780,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -22749,7 +22932,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -22855,7 +23039,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -22915,7 +23100,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23066,7 +23252,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23199,7 +23386,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23350,7 +23538,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23423,7 +23612,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23574,7 +23764,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23680,7 +23871,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23746,7 +23938,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23824,7 +24017,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23890,7 +24084,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23961,7 +24156,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -24097,7 +24293,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -24162,7 +24359,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -24217,7 +24415,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -24363,7 +24562,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -24418,7 +24618,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -24564,7 +24765,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -24618,7 +24820,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -24768,7 +24971,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -24822,7 +25026,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -24973,7 +25178,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -25134,7 +25340,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -25279,7 +25486,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -25633,7 +25841,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -25787,7 +25996,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -25865,7 +26075,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -25935,7 +26146,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -26036,7 +26248,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -26110,7 +26323,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -26253,7 +26467,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -26436,7 +26651,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -26507,7 +26723,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -26581,7 +26798,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -26647,7 +26865,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -26713,7 +26932,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -26779,7 +26999,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -26864,7 +27085,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -26932,7 +27154,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -27078,7 +27301,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -27225,7 +27449,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -27376,7 +27601,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -27445,7 +27671,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -27534,7 +27761,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -27747,7 +27975,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -27866,7 +28095,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -27964,7 +28194,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -28030,7 +28261,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -28101,7 +28333,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -28254,7 +28487,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -28403,7 +28637,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -28552,7 +28787,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -28704,7 +28940,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -28889,7 +29126,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -28955,7 +29193,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -29140,7 +29379,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -29208,7 +29448,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -29367,7 +29608,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -29435,7 +29677,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -29590,7 +29833,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -29652,7 +29896,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -29706,7 +29951,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -29860,7 +30106,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -29919,7 +30166,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -29990,7 +30238,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -30031,7 +30280,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -30095,7 +30345,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -30176,7 +30427,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -30317,7 +30569,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -30707,7 +30960,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -30769,7 +31023,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -30916,7 +31171,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -30977,7 +31233,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -31127,7 +31384,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -31311,7 +31569,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -31366,7 +31625,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -31503,7 +31763,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -31645,7 +31906,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -31700,7 +31962,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -31800,7 +32063,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -31855,7 +32119,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -31992,7 +32257,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -32142,7 +32408,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -32284,7 +32551,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -32434,7 +32702,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -32586,7 +32855,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -32769,7 +33039,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -32845,7 +33116,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -32931,7 +33203,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -33084,7 +33357,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -33187,7 +33461,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -33333,7 +33608,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -33508,7 +33784,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -33611,7 +33888,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -33678,7 +33956,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -33819,7 +34098,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -33968,7 +34248,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -34132,7 +34413,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -34208,7 +34490,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -34274,7 +34557,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -34352,7 +34636,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -34498,7 +34783,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -34588,7 +34874,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -34746,7 +35033,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -34850,7 +35138,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -34916,7 +35205,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -35005,7 +35295,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -35166,7 +35457,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -35233,7 +35525,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -35314,7 +35607,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -35407,7 +35701,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -35486,7 +35781,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -35632,7 +35928,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -35709,7 +36006,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -35855,7 +36153,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -35922,7 +36221,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -36031,7 +36331,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -36132,7 +36433,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -37943,6 +38245,11 ＠＠ esac *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ ＠＠ -37981,12 +38288,6 ＠＠ echo "$as_me: error: cannot find input f fi;; esac done` || { (exit 1); exit 1; } - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub 1.984.2.6 +4 -4 XEmacs/xemacs/version.sh Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.984.2.5 retrieving revision 1.984.2.6 diff -u -p -r1.984.2.5 -r1.984.2.6 --- version.sh 2005/07/13 04:43:39 1.984.2.5 +++ version.sh 2005/09/20 16:04:53 1.984.2.6 ＠＠ -2,11 +2,11 ＠＠ emacs_is_beta=t emacs_major_version=21 emacs_minor_version=5 -emacs_beta_version=21 -xemacs_codename="corn" +emacs_beta_version=22 +xemacs_codename="cucumber" emacs_kit_version= infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -xemacs_extra_name="(+Xft+CVS-20050527)" -xemacs_release_date="2005-05-28" +xemacs_extra_name="(+Xft)" +xemacs_release_date="2005-09-14" 1.48.2.3 +9 -0 XEmacs/xemacs/etc/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/ChangeLog,v retrieving revision 1.48.2.2 retrieving revision 1.48.2.3 diff -u -p -r1.48.2.2 -r1.48.2.3 --- ChangeLog 2005/07/13 04:44:19 1.48.2.2 +++ ChangeLog 2005/09/20 16:05:18 1.48.2.3 ＠＠ -1,3 +1,12 ＠＠ +2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> + + * XEmacs 21.5.22 "cucumber" is released. + +2005-07-17 Aidan Kehoe <kehoea(a)parhasard.net> + + * NEWS: Add information on the last argument to event-to-character + being ignored. + 2005-05-28 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.21 "corn" is released. 1.73.2.2 +11 -0 XEmacs/xemacs/etc/NEWS Index: NEWS =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/NEWS,v retrieving revision 1.73.2.1 retrieving revision 1.73.2.2 diff -u -p -r1.73.2.1 -r1.73.2.2 --- NEWS 2005/07/13 04:44:20 1.73.2.1 +++ NEWS 2005/09/20 16:05:18 1.73.2.2 ＠＠ -57,6 +57,17 ＠＠ course of the next major release, though resources at some point. +* Lisp and internal changes in XEmacs 21.5 +========================================== + +** The ALLOW-NON-ASCII argument to event-to-character is not used. + +While it is still accepted, for compatibilty with older code, +event-to-character no longer takes note of this argument, since the specific +type of mapping between characters and keysyms that it affected is no longer +in place. + + * Changes in XEmacs 21.4 ======================== 1.5.2.1 +1 -0 XEmacs/xemacs/lib-src/.cvsignore Index: .cvsignore =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/.cvsignore,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -p -r1.5 -r1.5.2.1 --- .cvsignore 2003/03/16 21:02:01 1.5 +++ .cvsignore 2005/09/20 16:05:20 1.5.2.1 ＠＠ -27,3 +27,4 ＠＠ DOC *.idb *.ilk make-dump-id +insert-data-in-exec 1.178.2.5 +8 -0 XEmacs/xemacs/lib-src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v retrieving revision 1.178.2.4 retrieving revision 1.178.2.5 diff -u -p -r1.178.2.4 -r1.178.2.5 --- ChangeLog 2005/07/13 04:44:25 1.178.2.4 +++ ChangeLog 2005/09/20 16:05:20 1.178.2.5 ＠＠ -1,3 +1,11 ＠＠ +2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> + + * XEmacs 21.5.22 "cucumber" is released. + +2005-06-28 Marcus Crestani <crestani(a)xemacs.org> + + * .cvsignore: Add insert-data-in-exec. + 2005-05-28 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.21 "corn" is released. 1.599.2.8 +54 -0 XEmacs/xemacs/lisp/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v retrieving revision 1.599.2.7 retrieving revision 1.599.2.8 diff -u -p -r1.599.2.7 -r1.599.2.8 --- ChangeLog 2005/07/13 04:44:28 1.599.2.7 +++ ChangeLog 2005/09/20 16:05:22 1.599.2.8 ＠＠ -1,3 +1,57 ＠＠ +2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> + + * XEmacs 21.5.22 "cucumber" is released. + +2005-08-06 Mike Sperber <mike(a)xemacs.org> + + * window-xemacs.el (really-set-window-configuration): Only set + the frame top and left if they've changed. + +2005-08-04 Mike Sperber <mike(a)xemacs.org> + + * window-xemacs.el (window-configuration-equal): Compare frame top + and left via `equal' rather than '=', as it can be nil. + +2005-07-24 Fabrice Popineau <Fabrice.Popineau(a)supelec.fr> + + * window-xemacs.el (really-set-window-configuration): + * window-xemacs.el (current-window-configuration): + * window-xemacs.el (window-configuration-equal): + * window-xemacs.el (window-configuration): Add `frame-top' and + `frame-left' field to windows configurations, and save and restore + them. + +2005-06-26 Aidan Kehoe <kehoea(a)parhasard.net> + + * cmdloop.el (read-quoted-char): + * isearch-mode.el (isearch-char-to-string): + Remove the fourth argument from event-to-character. + + * dumped-lisp.el (preloaded-file-list): + No longer dump x-iso8859-1.el--we don't need it any more. + + * x-init.el (x-initialize-keyboard): + * keymap.el (events-to-keys): + * events.el: + Rename the ascii-character keysym property to character-of-keysym. + + * gtk-compose.el: + Don't depend on gtk-iso8859-1.el + + * x-compose.el: + Move to using character literals rather than X11 keysyms as macro + expansions. Loses the ability to use another character encoding + for the Latin-1 characters in X11 composition with a bit of + programming, which no-one uses; also happily reduces dependence on + x-iso8859-1.el, which is no longer of use. + +2005-06-06 Adrian Aichner <adrian(a)xemacs.org> + + * package-get.el (package-get-init-package): + package-get-init-package buglet (21.4.17) by Jeff Mincy + <mincy(a)rcn.com> fixing false temporary load-path shadows reported + after package installation and simplifying code. + 2005-05-28 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.21 "corn" is released. 1.16.2.2 +1 -1 XEmacs/xemacs/lisp/cmdloop.el Index: cmdloop.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/cmdloop.el,v retrieving revision 1.16.2.1 retrieving revision 1.16.2.2 diff -u -p -r1.16.2.1 -r1.16.2.2 --- cmdloop.el 2005/03/15 05:20:42 1.16.2.1 +++ cmdloop.el 2005/09/20 16:05:24 1.16.2.2 ＠＠ -567,7 +567,7 ＠＠ RET terminates the character code and is any other non-digit terminates the character code and is then used as input.")) (and prompt (display-message 'prompt (format "%s-" prompt))) (setq event (next-command-event) - char (or (event-to-character event nil nil t) + char (or (event-to-character event) (signal 'error (list "key read cannot be inserted in a buffer" event)))) 1.49.2.3 +1 -3 XEmacs/xemacs/lisp/dumped-lisp.el Index: dumped-lisp.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/dumped-lisp.el,v retrieving revision 1.49.2.2 retrieving revision 1.49.2.3 diff -u -p -r1.49.2.2 -r1.49.2.3 --- dumped-lisp.el 2005/03/15 05:20:43 1.49.2.2 +++ dumped-lisp.el 2005/09/20 16:05:24 1.49.2.3 ＠＠ -248,8 +248,7 ＠＠ in dumped-lisp.el and is not itself list ;; preload the X code. (when (featurep '(and x scrollbar)) "x-scrollbar") (when (featurep 'x) - '("x-iso8859-1" - "x-mouse" + '("x-mouse" "x-select" "x-misc" "x-init" ＠＠ -261,7 +260,6 ＠＠ in dumped-lisp.el and is not itself list "gtk-widgets" "gdk" "gtk-init" - "gtk-iso8859-1" "gtk-select" "gtk-mouse" "gtk-glyphs" 1.3.24.1 +54 -34 XEmacs/xemacs/lisp/events.el Index: events.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/events.el,v retrieving revision 1.3 retrieving revision 1.3.24.1 diff -u -p -r1.3 -r1.3.24.1 --- events.el 1998/10/10 08:04:00 1.3 +++ events.el 2005/09/20 16:05:24 1.3.24.1 ＠＠ -120,39 +120,59 ＠＠ See `keyboard-translate-table' for more (while pairs (puthash (pop pairs) (pop pairs) keyboard-translate-table))) -(put 'tab 'ascii-character ?\t) -(put 'linefeed 'ascii-character ?\n) -(put 'clear 'ascii-character 12) -(put 'return 'ascii-character ?\r) -(put 'escape 'ascii-character ?\e) -(put 'space 'ascii-character ? ) - - ;; Do the same voodoo for the keypad keys. I used to bind these to keyboard - ;; macros (for instance, kp-0 was bound to "0") so that they would track the - ;; bindings of the corresponding keys by default, but that made the display - ;; of M-x describe-bindings much harder to read, so now we'll just bind them - ;; to self-insert by default. Not a big difference... - -(put 'kp-0 'ascii-character ?0) -(put 'kp-1 'ascii-character ?1) -(put 'kp-2 'ascii-character ?2) -(put 'kp-3 'ascii-character ?3) -(put 'kp-4 'ascii-character ?4) -(put 'kp-5 'ascii-character ?5) -(put 'kp-6 'ascii-character ?6) -(put 'kp-7 'ascii-character ?7) -(put 'kp-8 'ascii-character ?8) -(put 'kp-9 'ascii-character ?9) - -(put 'kp-space 'ascii-character ? ) -(put 'kp-tab 'ascii-character ?\t) -(put 'kp-enter 'ascii-character ?\r) -(put 'kp-equal 'ascii-character ?=) -(put 'kp-multiply 'ascii-character ?*) -(put 'kp-add 'ascii-character ?+) -(put 'kp-separator 'ascii-character ?,) -(put 'kp-subtract 'ascii-character ?-) -(put 'kp-decimal 'ascii-character ?.) -(put 'kp-divide 'ascii-character ?/) +(defun set-character-of-keysym (keysym character) + "Make CHARACTER be inserted when KEYSYM is pressed, +and the key has been bound to `self-insert-command'. " + (check-argument-type 'symbolp keysym) + (check-argument-type 'characterp character) + (put keysym 'character-of-keysym character)) + +(defun get-character-of-keysym (keysym) + "Return the character inserted when KEYSYM is pressed, +and the key is bound to `self-insert-command'. " + (check-argument-type 'symbolp keysym) + (event-to-character (make-event 'key-press (list 'key keysym)))) + +;; We could take the first few of these out by removing the "/* Optimize for +;; ASCII keysyms */" code in event-Xt.c, and I've a suspicion that may be +;; the right thing to do anyway. + +(loop for (keysym char) in + '((tab ?\t) + (linefeed ?\n) + (clear ?\014) + (return ?\r) + (escape ?\e) + (space ? ) + + ;; Do the same voodoo for the keypad keys. I used to bind these to + ;; keyboard macros (for instance, kp-0 was bound to "0") so that they + ;; would track the bindings of the corresponding keys by default, but + ;; that made the display of M-x describe-bindings much harder to read, + ;; so now we'll just bind them to self-insert by default. Not a big + ;; difference... + + (kp-0 ?0) + (kp-1 ?1) + (kp-2 ?2) + (kp-3 ?3) + (kp-4 ?4) + (kp-5 ?5) + (kp-6 ?6) + (kp-7 ?7) + (kp-8 ?8) + (kp-9 ?9) + + (kp-space ? ) + (kp-tab ?\t) + (kp-enter ?\r) + (kp-equal ?=) + (kp-multiply ?*) + (kp-add ?+) + (kp-separator ?,) + (kp-subtract ?-) + (kp-decimal ?.) + (kp-divide ?/)) + do (set-character-of-keysym keysym char)) ;;; events.el ends here 1.15.2.7 +171 -106 XEmacs/xemacs/lisp/font.el Index: font.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/font.el,v retrieving revision 1.15.2.6 retrieving revision 1.15.2.7 diff -u -p -r1.15.2.6 -r1.15.2.7 --- font.el 2005/09/08 06:56:16 1.15.2.6 +++ font.el 2005/09/20 16:05:24 1.15.2.7 ＠＠ -54,6 +54,7 ＠＠ (globally-declare-boundp '(global-face-data x-font-regexp x-font-regexp-foundry-and-family + fc-font-regexp mswindows-font-regexp)) (require 'cl) ＠＠ -105,6 +106,8 ＠＠ (defconst font-window-system-mappings '((x . (x-font-create-name x-font-create-object)) (gtk . (x-font-create-name x-font-create-object)) + ;; #### FIXME should this handle fontconfig font objects? + (fc . (fc-font-create-name fc-font-create-object)) (ns . (ns-font-create-name ns-font-create-object)) (mswindows . (mswindows-font-create-name mswindows-font-create-object)) (pm . (x-font-create-name x-font-create-object)) ; Change? FIXME ＠＠ -250,6 +253,7 ＠＠ for use in the 'weight' field of an X fo (aset table (+ i ?a) (+ i ?A)) (setq i (1+ i))) ;; Now ISO translations + ;; #### FIXME what's this for?? (setq i 224) (while (< i 247) ;; Agrave - Ouml (aset table i (- i 32)) ＠＠ -335,8 +339,8 ＠＠ The type may be the strings \"px\", \"pi (mm-width (float (or (device-mm-width device) 293))) (retval nil)) (cond - ;; the following string-match is broken, there will never be a - ;; left operand detected + ;; #### this is pretty bogus and should probably be made gone + ;; or supported at a higher level ((string-match "^ *\$[-+*/]\$ *" spec) ; math! whee! (let ((math-func (intern (match-string 1 spec))) (other (font-spatial-to-canonical ＠＠ -367,7 +371,7 ＠＠ The type may be the strings \"px\", \"pi ((string= type "mm") (setq retval (* num (/ 72.0 25.4)))) ((string= type "cm") - (setq retval (* num 10 (/ 72.0 25.4)))) + (setq retval (* num (/ 72.0 2.54)))) (t (setq retval num)) ) ＠＠ -451,6 +455,42 ＠＠ The type may be the strings \"px\", \"pi args (cdr args))) retval)))) +(defvar font-default-cache nil) + +;;;###autoload +(defun font-default-font-for-device (&optional device) + (or device (setq device (selected-device))) + (font-truename + (make-font-specifier + (face-font-name 'default device)))) + +;;;###autoload +(defun font-default-object-for-device (&optional device) + (let ((font (font-default-font-for-device device))) + (or (cdr-safe (assoc font font-default-cache)) + (let ((object (font-create-object font))) + (push (cons font object) font-default-cache) + object)))) + +;;;###autoload +(defun font-default-family-for-device (&optional device) + (font-family (font-default-object-for-device (or device (selected-device))))) + +;;;###autoload +(defun font-default-registry-for-device (&optional device) + (font-registry (font-default-object-for-device (or device (selected-device))))) + +;;;###autoload +(defun font-default-encoding-for-device (&optional device) + (font-encoding (font-default-object-for-device (or device (selected-device))))) + +;;;###autoload +(defun font-default-size-for-device (&optional device) + ;; face-height isn't the right thing (always 1 pixel too high?) + ;; (if font-running-xemacs + ;; (format "%dpx" (face-height 'default device)) + (font-size (font-default-object-for-device (or device (selected-device))))) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; The window-system dependent code (TTY-style) ＠＠ -544,32 +584,6 ＠＠ The type may be the strings \"px\", \"pi (defun x-font-create-object (fontname &optional device) "Return a font descriptor object for FONTNAME, appropriate for X devices." - (if (featurep 'xft-fonts) - (if (xlfd-font-name-p fontname) - (x-font-create-object-core fontname device) - (x-font-create-object-xft fontname device)) - (x-font-create-object-core fontname device))) - -(defun x-font-create-object-xft (fontname &optional device) - (let* ((name fontname) - (device (or device (default-x-device))) - (pattern (fc-font-real-pattern name device)) - (font-obj (make-font)) - (family (fc-pattern-get-family pattern 0)) - (size (fc-pattern-get-size pattern 0)) - (weight (fc-pattern-get-weight pattern 0))) - (set-font-family font-obj - (and (not (equal family 'fc-result-no-match)) - family)) - (set-font-size font-obj - (and (not (equal size 'fc-result-no-match)) - size)) - (set-font-weight font-obj - (and (not (equal weight 'fc-result-no-match)) - (fc-font-weight-translate-from-constant weight))) - font-obj)) - -(defun x-font-create-object-core (fontname &optional device) (let ((case-fold-search t)) (if (or (not (stringp fontname)) (not (string-match font-x-font-regexp fontname))) ＠＠ -630,56 +644,7 ＠＠ The type may be the strings \"px\", \"pi (sort (font-unique (nconc scaled normal)) 'string-lessp)))) (cons "monospace" (mapcar 'car font-x-family-mappings)))) -(defvar font-default-cache nil) - -;;;###autoload -(defun font-default-font-for-device (&optional device) - (or device (setq device (selected-device))) - (font-truename - (make-font-specifier - (face-font-name 'default device)))) - -;;;###autoload -(defun font-default-object-for-device (&optional device) - (let ((font (font-default-font-for-device device))) - (or (cdr-safe (assoc font font-default-cache)) - (let ((object (font-create-object font))) - (push (cons font object) font-default-cache) - object)))) - -;;;###autoload -(defun font-default-family-for-device (&optional device) - (font-family (font-default-object-for-device (or device (selected-device))))) - -;;;###autoload -(defun font-default-registry-for-device (&optional device) - (font-registry (font-default-object-for-device (or device (selected-device))))) - -;;;###autoload -(defun font-default-encoding-for-device (&optional device) - (font-encoding (font-default-object-for-device (or device (selected-device))))) - -;;;###autoload -(defun font-default-size-for-device (&optional device) - ;; face-height isn't the right thing (always 1 pixel too high?) - ;; (if font-running-xemacs - ;; (format "%dpx" (face-height 'default device)) - (font-size (font-default-object-for-device (or device (selected-device))))) - (defun x-font-create-name (fontobj &optional device) - (if (featurep 'xft-fonts) - (x-font-create-name-xft fontobj device) - (x-font-create-name-core fontobj device))) - -(defun x-font-create-name-xft (fontobj &optional device) - (let* ((pattern (make-fc-pattern))) - (if (font-family fontobj) - (fc-pattern-add-family pattern (font-family fontobj))) - (if (font-size fontobj) - (fc-pattern-add-size pattern (font-size fontobj))) - (fc-name-unparse pattern))) - -(defun x-font-create-name-core (fontobj &optional device) "Return a font name constructed from FONTOBJ, appropriate for X devices." (if (and (not (or (font-family fontobj) (font-weight fontobj) ＠＠ -751,6 +716,134 ＠＠ The type may be the strings \"px\", \"pi (if done font-name))))) +;;; Cache building code +;;;###autoload +(defun x-font-build-cache (&optional device) + (let ((hash-table (make-hash-table :test 'equal :size 15)) + (fonts (mapcar 'x-font-create-object + (font-list "-*-*-*-*-*-*-*-*-*-*-*-*-*-*"))) + (plist nil) + (cur nil)) + (while fonts + (setq cur (car fonts) + fonts (cdr fonts) + plist (cl-gethash (car (font-family cur)) hash-table)) + (if (not (memq (font-weight cur) (plist-get plist 'weights))) + (setq plist (plist-put plist 'weights (cons (font-weight cur) + (plist-get plist 'weights))))) + (if (not (member (font-size cur) (plist-get plist 'sizes))) + (setq plist (plist-put plist 'sizes (cons (font-size cur) + (plist-get plist 'sizes))))) + (if (and (font-oblique-p cur) + (not (memq 'oblique (plist-get plist 'styles)))) + (setq plist (plist-put plist 'styles (cons 'oblique (plist-get plist 'styles))))) + (if (and (font-italic-p cur) + (not (memq 'italic (plist-get plist 'styles)))) + (setq plist (plist-put plist 'styles (cons 'italic (plist-get plist 'styles))))) + (cl-puthash (car (font-family cur)) plist hash-table)) + hash-table)) + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; The rendering engine-dependent code (Xft-style) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +;;; #### FIXME actually, this section should be fc-*, right? + +(defvar font-xft-font-regexp + ;; #### FIXME what the fuck?!? + (when (and (boundp 'xft-font-regexp) xft-font-regexp) + (concat "\\`" + "[^:-]*" ; optional foundry and family + ; incorrect, escaping exists + "\$-[0-9]*\\(\\.[0-9]*\$?\\)?" ; optional size (points) + "\$:[^:]*\$*" ; optional properties + ; not necessarily key=value!! + "\\'" + ))) + +(defvar font-xft-family-mappings + ;; #### FIXME this shouldn't be needed or used for Xft + '(("serif" . ("new century schoolbook" + "utopia" + "charter" + "times" + "lucidabright" + "garamond" + "palatino" + "times new roman" + "baskerville" + "bookman" + "bodoni" + "computer modern" + "rockwell" + )) + ("sans-serif" . ("lucida" + "helvetica" + "gills-sans" + "avant-garde" + "univers" + "optima")) + ("elfin" . ("tymes")) + ("monospace" . ("courier" + "fixed" + "lucidatypewriter" + "clean" + "terminal")) + ("cursive" . ("sirene" + "zapf chancery")) + ) + "A list of font family mappings on Xft devices.") + +(defun xft-font-create-object (fontname &optional device) + "Return a font descriptor object for FONTNAME, appropriate for Xft." + (let* ((name fontname) + (device (or device (default-x-device))) + (pattern (fc-font-real-pattern name device)) + (font-obj (make-font)) + (family (fc-pattern-get-family pattern 0)) + (size (fc-pattern-get-size pattern 0)) + (weight (fc-pattern-get-weight pattern 0))) + (set-font-family font-obj + (and (not (equal family 'fc-result-no-match)) + family)) + (set-font-size font-obj + (and (not (equal size 'fc-result-no-match)) + size)) + (set-font-weight font-obj + (and (not (equal weight 'fc-result-no-match)) + (fc-font-weight-translate-from-constant weight))) + font-obj)) + +;; #### FIXME Xft fonts are not defined by the device. +;; ... Does that mean the whole model here is bogus? +(defun xft-font-families-for-device (&optional device no-resetp) + (ignore-errors (require 'x-font-menu)) ; #### FIXME xft-font-menu? + (or device (setq device (selected-device))) + (if (boundp 'device-fonts-cache) ; #### FIXME does this make sense? + (let ((menu (or (cdr-safe (assq device device-fonts-cache))))) + (if (and (not menu) (not no-resetp)) + (progn + (reset-device-font-menus device) + (xft-font-families-for-device device t)) + ;; #### FIXME clearly bogus for Xft + (let ((scaled (mapcar #'(lambda (x) (if x (aref x 0))) + (aref menu 0))) + (normal (mapcar #'(lambda (x) (if x (aref x 0))) + (aref menu 1)))) + (sort (font-unique (nconc scaled normal)) 'string-lessp)))) + ;; #### FIXME clearly bogus for Xft + (cons "monospace" (mapcar 'car font-xft-family-mappings)))) + +(defun xft-font-create-name (fontobj &optional device) + (let* ((pattern (make-fc-pattern))) + (if (font-family fontobj) + (fc-pattern-add-family pattern (font-family fontobj))) + (if (font-size fontobj) + (fc-pattern-add-size pattern (font-size fontobj))) + (fc-name-unparse pattern))) + + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; The window-system dependent code (NS-style) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ＠＠ -954,34 +1047,6 ＠＠ for use in the 'weight' field of an mswi encoding "")) done (try-font-name font-name device)))) (if done font-name))))) - - -;;; Cache building code -;;;###autoload -(defun x-font-build-cache (&optional device) - (let ((hash-table (make-hash-table :test 'equal :size 15)) - (fonts (mapcar 'x-font-create-object - (font-list "-*-*-*-*-*-*-*-*-*-*-*-*-*-*"))) - (plist nil) - (cur nil)) - (while fonts - (setq cur (car fonts) - fonts (cdr fonts) - plist (cl-gethash (car (font-family cur)) hash-table)) - (if (not (memq (font-weight cur) (plist-get plist 'weights))) - (setq plist (plist-put plist 'weights (cons (font-weight cur) - (plist-get plist 'weights))))) - (if (not (member (font-size cur) (plist-get plist 'sizes))) - (setq plist (plist-put plist 'sizes (cons (font-size cur) - (plist-get plist 'sizes))))) - (if (and (font-oblique-p cur) - (not (memq 'oblique (plist-get plist 'styles)))) - (setq plist (plist-put plist 'styles (cons 'oblique (plist-get plist 'styles))))) - (if (and (font-italic-p cur) - (not (memq 'italic (plist-get plist 'styles)))) - (setq plist (plist-put plist 'styles (cons 'italic (plist-get plist 'styles))))) - (cl-puthash (car (font-family cur)) plist hash-table)) - hash-table)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 1.2.20.1 +0 -1 XEmacs/xemacs/lisp/gtk-compose.el Index: gtk-compose.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/gtk-compose.el,v retrieving revision 1.2 retrieving revision 1.2.20.1 diff -u -p -r1.2 -r1.2.20.1 --- gtk-compose.el 2001/04/12 18:21:22 1.2 +++ gtk-compose.el 2005/09/20 16:05:24 1.2.20.1 ＠＠ -1,4 +1,3 ＠＠ -(require 'gtk-iso8859-1) (require 'x-compose) (provide 'gtk-compose) 1.14.2.1 +1 -1 XEmacs/xemacs/lisp/isearch-mode.el Index: isearch-mode.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/isearch-mode.el,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -u -p -r1.14 -r1.14.2.1 --- isearch-mode.el 2004/05/10 07:04:34 1.14 +++ isearch-mode.el 2005/09/20 16:05:25 1.14.2.1 ＠＠ -1813,7 +1813,7 ＠＠ have special meaning in a regexp." (defun isearch-char-to-string (c) (if (eventp c) - (make-string 1 (event-to-character c nil nil t)) + (make-string 1 (event-to-character c)) (make-string 1 c))) ;(defun isearch-text-char-description (c) 1.11.2.1 +2 -3 XEmacs/xemacs/lisp/keymap.el Index: keymap.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/keymap.el,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -u -p -r1.11 -r1.11.2.1 --- keymap.el 2003/03/02 09:38:39 1.11 +++ keymap.el 2005/09/20 16:05:25 1.11.2.1 ＠＠ -338,10 +338,9 ＠＠ Optional arg NO-MICE means that button e ;; any ambiguity. (setq c (event-to-character ce)) (if (and c - character-set-property (key-press-event-p ce)) (cond ((symbolp (event-key ce)) - (if (get (event-key ce) character-set-property) + (if (get (event-key ce) 'character-of-keysym) ;; Don't use a string for `backspace' and `tab' to ;; avoid that unpleasant little ambiguity. (setq c nil))) ＠＠ -349,7 +348,7 ＠＠ Optional arg NO-MICE means that button e (integerp (event-key ce))) (let* ((te (character-to-event c))) (if (and (symbolp (event-key te)) - (get (event-key te) character-set-property)) + (get (event-key te) 'character-of-keysym)) ;; Don't "normalize" (control i) to tab ;; to avoid the ambiguity in the other direction (setq c nil)) 1.68.2.1 +1 -8 XEmacs/xemacs/lisp/package-get.el Index: package-get.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/package-get.el,v retrieving revision 1.68 retrieving revision 1.68.2.1 diff -u -p -r1.68 -r1.68.2.1 --- package-get.el 2004/06/25 21:24:36 1.68 +++ package-get.el 2005/09/20 16:05:25 1.68.2.1 ＠＠ -841,14 +841,7 ＠＠ Return `t' upon complete success, `nil' (progn ;; Add lispdir to load-path if it doesn't already exist. ;; NOTE: this does not take symlinks, etc., into account. - (if (let ((dirs load-path)) - (catch 'done - (while dirs - (if (string-equal (car dirs) lispdir) - (throw 'done nil)) - (setq dirs (cdr dirs))) - t)) - (setq load-path (cons lispdir load-path))) + (add-to-list 'load-path (file-name-as-directory lispdir)) (if (not (package-get-load-package-file lispdir "auto-autoloads")) (package-get-load-package-file lispdir "_pkg")) t) 1.20.2.2 +16 -0 XEmacs/xemacs/lisp/window-xemacs.el Index: window-xemacs.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/window-xemacs.el,v retrieving revision 1.20.2.1 retrieving revision 1.20.2.2 diff -u -p -r1.20.2.1 -r1.20.2.2 --- window-xemacs.el 2005/03/15 05:20:58 1.20.2.1 +++ window-xemacs.el 2005/09/20 16:05:26 1.20.2.2 ＠＠ -119,6 +119,7 ＠＠ buffer appears in it currently)." (defstruct window-configuration frame + frame-top frame-left frame-pixel-width frame-pixel-height current-buffer minibuffer-pixel-height ＠＠ -135,6 +136,10 ＠＠ are identical." (window-configuration-frame-pixel-width conf-2)) (= (window-configuration-frame-pixel-height conf-1) (window-configuration-frame-pixel-height conf-2)) + (equal (window-configuration-frame-top conf-1) + (window-configuration-frame-top conf-2)) + (equal (window-configuration-frame-left conf-1) + (window-configuration-frame-left conf-2)) (eq (window-configuration-current-buffer conf-1) (window-configuration-current-buffer conf-2)) (saved-window-equal (window-configuration-saved-root-window conf-1) ＠＠ -213,6 +218,8 ＠＠ its value is -not- saved." (make-window-configuration :frame frame + :frame-top (frame-property frame 'top) + :frame-left (frame-property frame 'left) :frame-pixel-width (frame-pixel-width frame) :frame-pixel-height (frame-pixel-height frame) :current-buffer (current-buffer) ＠＠ -284,6 +291,15 ＠＠ by `current-window-configuration'." (frame-reduce-to-one-window frame) (set-window-configuration-frame-size configuration) + + ; avoid setting these if they're already up-to-date + ; This also avoids potential inaccuracies in these settings --Mike + (let ((left (window-configuration-frame-left configuration)) + (top (window-configuration-frame-top configuration))) + (if (not (equal left (frame-property frame 'left))) + (set-frame-property frame 'left left)) + (if (not (equal top (frame-property frame 'top))) + (set-frame-property frame 'top top))) ;; these may have changed because of the delete (let ((root-window (frame-root-window frame))) 1.3.16.1 +351 -312 XEmacs/xemacs/lisp/x-compose.el Index: x-compose.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/x-compose.el,v retrieving revision 1.3 retrieving revision 1.3.16.1 diff -u -p -r1.3 -r1.3.16.1 --- x-compose.el 2001/04/12 18:21:39 1.3 +++ x-compose.el 2005/09/20 16:05:26 1.3.16.1 ＠＠ -1,6 +1,6 ＠＠ ;;; x-compose.el --- Compose-key processing in XEmacs -;; Copyright (C) 1992, 1993, 1997 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1997, 2005 Free Software Foundation, Inc. ;; Author: Jamie Zawinski <jwz(a)jwz.org> ;; Maintainer: XEmacs Development Team ＠＠ -100,9 +100,11 ＠＠ ;; not have: at any point you can type C-h to get a list of the possible ;; completions of what you have typed so far. -;;; Code: +;; Giacomo Boffi's problem of +;; 20050324103919.8D22E4901(a)boffi95.stru.polimi.it is caused by Xlib doing +;; the compose processing. To turn that off, I'm not certain what's -(require 'x-iso8859-1) +;;; Code: (macrolet ((define-compose-map (keymap-symbol) ＠＠ -157,85 +159,113 ＠＠ ;;; The contents of the "dead key" maps. These are shared by the ;;; compose-map. +;;; These used to all have nice readable X11-oriented keysym names as the +;;; macro definition in the third argument, but I moved the interpretation +;;; of those mappings (that is, Aacute to \301, &c.) to runtime in the X11 +;;; code on first sight of the symbols--which is the more general solution, +;;; what with Unicode keysyms, publishing, technical and so on, there's no +;;; need to have them hanging around as symbols all the time--so they're no +;;; longer available to Lisp before X11 sees them, something this relied on. + +;;; The transformation was done like so; + +;;; (while (re-search-forward "\\[\$[a-zA-Z]+\$\\])$" nil t) +;;; (replace-match (format "(?\\%o)" +;;; (get (intern (match-string 1)) 'character-of-keysym)) +;;; t t nil 1)) + +;;; with a lot of repeated calling of setxkbmap to esoteric keymaps--so +;;; x_reset_key_mapping gets called for all the keys on the keyboard--yacute +;;; getting picked up from the Czech keymap, idiaeresis from the Dutch one, +;;; and many more (al, ca, cz, de, dvorak, ee, es, fi, fr, hu, +;;; ie(UnicodeExpert), it, nl, pt, ro, tr, us, vn, if it interests you.) + +;;; The parentheses inside the vector are because otherwise the macro gets +;;; interpreted as a meta character, the Latin-1 codes being in exactly that +;;; range. Perhaps that bears documenting somewhere. Also, why is help +;;; turned off for these (x-compose) sequences by default? + +;;; (Aidan Kehoe, 2005-05-18) + (define-key compose-acute-map [space] "'") -(define-key compose-acute-map [?'] [acute]) -(define-key compose-acute-map [?A] [Aacute]) -(define-key compose-acute-map [E] [Eacute]) -(define-key compose-acute-map [I] [Iacute]) -(define-key compose-acute-map [O] [Oacute]) -(define-key compose-acute-map [U] [Uacute]) -(define-key compose-acute-map [Y] [Yacute]) -(define-key compose-acute-map [a] [aacute]) -(define-key compose-acute-map [e] [eacute]) -(define-key compose-acute-map [i] [iacute]) -(define-key compose-acute-map [o] [oacute]) -(define-key compose-acute-map [u] [uacute]) -(define-key compose-acute-map [y] [yacute]) +(define-key compose-acute-map [?'] [(?\264)]) +(define-key compose-acute-map [?A] [(?\301)]) +(define-key compose-acute-map [E] [(?\311)]) +(define-key compose-acute-map [I] [(?\315)]) +(define-key compose-acute-map [O] [(?\323)]) +(define-key compose-acute-map [U] [(?\332)]) +(define-key compose-acute-map [Y] [(?\335)]) +(define-key compose-acute-map [a] [(?\341)]) +(define-key compose-acute-map [e] [(?\351)]) +(define-key compose-acute-map [i] [(?\355)]) +(define-key compose-acute-map [o] [(?\363)]) +(define-key compose-acute-map [u] [(?\372)]) +(define-key compose-acute-map [y] [(?\375)]) (define-key compose-grave-map [space] "`") -(define-key compose-grave-map [?`] [grave]) -(define-key compose-grave-map [A] [Agrave]) -(define-key compose-grave-map [E] [Egrave]) -(define-key compose-grave-map [I] [Igrave]) -(define-key compose-grave-map [O] [Ograve]) -(define-key compose-grave-map [U] [Ugrave]) -(define-key compose-grave-map [a] [agrave]) -(define-key compose-grave-map [e] [egrave]) -(define-key compose-grave-map [i] [igrave]) -(define-key compose-grave-map [o] [ograve]) -(define-key compose-grave-map [u] [ugrave]) +(define-key compose-grave-map [?`] [(?\140)]) +(define-key compose-grave-map [A] [(?\300)]) +(define-key compose-grave-map [E] [(?\310)]) +(define-key compose-grave-map [I] [(?\314)]) +(define-key compose-grave-map [O] [(?\322)]) +(define-key compose-grave-map [U] [(?\331)]) +(define-key compose-grave-map [a] [(?\340)]) +(define-key compose-grave-map [e] [(?\350)]) +(define-key compose-grave-map [i] [(?\354)]) +(define-key compose-grave-map [o] [(?\362)]) +(define-key compose-grave-map [u] [(?\371)]) (define-key compose-cedilla-map [space] ",") -(define-key compose-cedilla-map [?,] [cedilla]) -(define-key compose-cedilla-map [C] [Ccedilla]) -(define-key compose-cedilla-map [c] [ccedilla]) - -(define-key compose-diaeresis-map [space] [diaeresis]) -(define-key compose-diaeresis-map [?\"] [diaeresis]) -(define-key compose-diaeresis-map [A] [Adiaeresis]) -(define-key compose-diaeresis-map [E] [Ediaeresis]) -(define-key compose-diaeresis-map [I] [Idiaeresis]) -(define-key compose-diaeresis-map [O] [Odiaeresis]) -(define-key compose-diaeresis-map [U] [Udiaeresis]) -(define-key compose-diaeresis-map [a] [adiaeresis]) -(define-key compose-diaeresis-map [e] [ediaeresis]) -(define-key compose-diaeresis-map [i] [idiaeresis]) -(define-key compose-diaeresis-map [o] [odiaeresis]) -(define-key compose-diaeresis-map [u] [udiaeresis]) -(define-key compose-diaeresis-map [y] [ydiaeresis]) +(define-key compose-cedilla-map [?,] [(?\270)]) +(define-key compose-cedilla-map [C] [(?\307)]) +(define-key compose-cedilla-map [c] [(?\347)]) + +(define-key compose-diaeresis-map [space] [(?\250)]) +(define-key compose-diaeresis-map [?\"] [(?\250)]) +(define-key compose-diaeresis-map [A] [(?\304)]) +(define-key compose-diaeresis-map [E] [(?\313)]) +(define-key compose-diaeresis-map [I] [(?\317)]) +(define-key compose-diaeresis-map [O] [(?\326)]) +(define-key compose-diaeresis-map [U] [(?\334)]) +(define-key compose-diaeresis-map [a] [(?\344)]) +(define-key compose-diaeresis-map [e] [(?\353)]) +(define-key compose-diaeresis-map [i] [(?\357)]) +(define-key compose-diaeresis-map [o] [(?\366)]) +(define-key compose-diaeresis-map [u] [(?\374)]) +(define-key compose-diaeresis-map [y] [(?\377)]) (define-key compose-circumflex-map [space] "^") (define-key compose-circumflex-map [?/] "|") -(define-key compose-circumflex-map [?!] [brokenbar]) -(define-key compose-circumflex-map [?-] [macron]) -(define-key compose-circumflex-map [?_] [macron]) -(define-key compose-circumflex-map [?0] [degree]) -(define-key compose-circumflex-map [?1] [onesuperior]) -(define-key compose-circumflex-map [?2] [twosuperior]) -(define-key compose-circumflex-map [?3] [threesuperior]) -(define-key compose-circumflex-map [?.] [periodcentered]) -(define-key compose-circumflex-map [A] [Acircumflex]) -(define-key compose-circumflex-map [E] [Ecircumflex]) -(define-key compose-circumflex-map [I] [Icircumflex]) -(define-key compose-circumflex-map [O] [Ocircumflex]) -(define-key compose-circumflex-map [U] [Ucircumflex]) -(define-key compose-circumflex-map [a] [acircumflex]) -(define-key compose-circumflex-map [e] [ecircumflex]) -(define-key compose-circumflex-map [i] [icircumflex]) -(define-key compose-circumflex-map [o] [ocircumflex]) -(define-key compose-circumflex-map [u] [ucircumflex]) +(define-key compose-circumflex-map [?!] [(?\246)]) +(define-key compose-circumflex-map [?-] [(?\257)]) +(define-key compose-circumflex-map [?_] [(?\257)]) +(define-key compose-circumflex-map [?0] [(?\260)]) +(define-key compose-circumflex-map [?1] [(?\271)]) +(define-key compose-circumflex-map [?2] [(?\262)]) +(define-key compose-circumflex-map [?3] [(?\263)]) +(define-key compose-circumflex-map [?.] [(?\267)]) +(define-key compose-circumflex-map [A] [(?\302)]) +(define-key compose-circumflex-map [E] [(?\312)]) +(define-key compose-circumflex-map [I] [(?\316)]) +(define-key compose-circumflex-map [O] [(?\324)]) +(define-key compose-circumflex-map [U] [(?\333)]) +(define-key compose-circumflex-map [a] [(?\342)]) +(define-key compose-circumflex-map [e] [(?\352)]) +(define-key compose-circumflex-map [i] [(?\356)]) +(define-key compose-circumflex-map [o] [(?\364)]) +(define-key compose-circumflex-map [u] [(?\373)]) (define-key compose-tilde-map [space] "~") -(define-key compose-tilde-map [A] [Atilde]) -(define-key compose-tilde-map [N] [Ntilde]) -(define-key compose-tilde-map [O] [Otilde]) -(define-key compose-tilde-map [a] [atilde]) -(define-key compose-tilde-map [n] [ntilde]) -(define-key compose-tilde-map [o] [otilde]) - -(define-key compose-ring-map [space] [degree]) -(define-key compose-ring-map [A] [Aring]) -(define-key compose-ring-map [a] [aring]) +(define-key compose-tilde-map [A] [(?\303)]) +(define-key compose-tilde-map [N] [(?\321)]) +(define-key compose-tilde-map [O] [(?\325)]) +(define-key compose-tilde-map [a] [(?\343)]) +(define-key compose-tilde-map [n] [(?\361)]) +(define-key compose-tilde-map [o] [(?\365)]) + +(define-key compose-ring-map [space] [(?\260)]) +(define-key compose-ring-map [A] [(?\305)]) +(define-key compose-ring-map [a] [(?\345)]) ;;; The rest of the compose-map. These are the composed characters ＠＠ -245,17 +275,17 ＠＠ (define-key compose-map " ^" "^") (define-key compose-map " `" "`") (define-key compose-map " ~" "~") -(define-key compose-map " " [nobreakspace]) -(define-key compose-map " \"" [diaeresis]) -(define-key compose-map " :" [diaeresis]) -(define-key compose-map " *" [degree]) - -(define-key compose-map "!!" [exclamdown]) -(define-key compose-map "!^" [brokenbar]) -(define-key compose-map "!S" [section]) -(define-key compose-map "!s" [section]) -(define-key compose-map "!P" [paragraph]) -(define-key compose-map "!p" [paragraph]) +(define-key compose-map " " [(?\240)]) +(define-key compose-map " \"" [(?\250)]) +(define-key compose-map " :" [(?\250)]) +(define-key compose-map " *" [(?\260)]) + +(define-key compose-map "!!" [(?\241)]) +(define-key compose-map "!^" [(?\246)]) +(define-key compose-map "!S" [(?\247)]) +(define-key compose-map "!s" [(?\247)]) +(define-key compose-map "!P" [(?\266)]) +(define-key compose-map "!p" [(?\266)]) (define-key compose-map "((" "[") (define-key compose-map "(-" "{") ＠＠ -264,242 +294,242 ＠＠ (define-key compose-map ")-" "}") (define-key compose-map "++" "#") -(define-key compose-map "+-" [plusminus]) +(define-key compose-map "+-" [(?\261)]) (define-key compose-map "-(" "{") (define-key compose-map "-)" "}") (define-key compose-map "--" "-") -(define-key compose-map "-L" [sterling]) -(define-key compose-map "-l" [sterling]) -(define-key compose-map "-Y" [yen]) -(define-key compose-map "-y" [yen]) -(define-key compose-map "-," [notsign]) -(define-key compose-map "-|" [notsign]) -(define-key compose-map "-^" [macron]) -(define-key compose-map "-+" [plusminus]) -(define-key compose-map "-:" [division]) -(define-key compose-map "-D" [ETH]) -(define-key compose-map "-d" [eth]) -(define-key compose-map "-a" [ordfeminine]) +(define-key compose-map "-L" [(?\243)]) +(define-key compose-map "-l" [(?\243)]) +(define-key compose-map "-Y" [(?\245)]) +(define-key compose-map "-y" [(?\245)]) +(define-key compose-map "-," [(?\254)]) +(define-key compose-map "-|" [(?\254)]) +(define-key compose-map "-^" [(?\257)]) +(define-key compose-map "-+" [(?\261)]) +(define-key compose-map "-:" [(?\367)]) +(define-key compose-map "-D" [(?\320)]) +(define-key compose-map "-d" [(?\360)]) +(define-key compose-map "-a" [(?\252)]) -(define-key compose-map ".^" [periodcentered]) +(define-key compose-map ".^" [(?\267)]) (define-key compose-map "//" "\\") (define-key compose-map "/<" "\\") (define-key compose-map "/^" "|") -(define-key compose-map "/C" [cent]) -(define-key compose-map "/c" [cent]) -(define-key compose-map "/U" [mu]) -(define-key compose-map "/u" [mu]) -(define-key compose-map "/O" [Ooblique]) -(define-key compose-map "/o" [oslash]) - -(define-key compose-map "0X" [currency]) -(define-key compose-map "0x" [currency]) -(define-key compose-map "0S" [section]) -(define-key compose-map "0s" [section]) -(define-key compose-map "0C" [copyright]) -(define-key compose-map "0c" [copyright]) -(define-key compose-map "0R" [registered]) -(define-key compose-map "0r" [registered]) -(define-key compose-map "0^" [degree]) - -(define-key compose-map "1^" [onesuperior]) -(define-key compose-map "14" [onequarter]) -(define-key compose-map "12" [onehalf]) +(define-key compose-map "/C" [(?\242)]) +(define-key compose-map "/c" [(?\242)]) +(define-key compose-map "/U" [(?\265)]) +(define-key compose-map "/u" [(?\265)]) +(define-key compose-map "/O" [(?\330)]) +(define-key compose-map "/o" [(?\370)]) + +(define-key compose-map "0X" [(?\244)]) +(define-key compose-map "0x" [(?\244)]) +(define-key compose-map "0S" [(?\247)]) +(define-key compose-map "0s" [(?\247)]) +(define-key compose-map "0C" [(?\251)]) +(define-key compose-map "0c" [(?\251)]) +(define-key compose-map "0R" [(?\256)]) +(define-key compose-map "0r" [(?\256)]) +(define-key compose-map "0^" [(?\260)]) + +(define-key compose-map "1^" [(?\271)]) +(define-key compose-map "14" [(?\274)]) +(define-key compose-map "12" [(?\275)]) -(define-key compose-map "2^" [twosuperior]) +(define-key compose-map "2^" [(?\262)]) -(define-key compose-map "3^" [threesuperior]) -(define-key compose-map "34" [threequarters]) +(define-key compose-map "3^" [(?\263)]) +(define-key compose-map "34" [(?\276)]) -(define-key compose-map ":-" [division]) +(define-key compose-map ":-" [(?\367)]) (define-key compose-map "</" "\\") -(define-key compose-map "<<" [guillemotleft]) +(define-key compose-map "<<" [(?\253)]) -(define-key compose-map "=L" [sterling]) -(define-key compose-map "=l" [sterling]) -(define-key compose-map "=Y" [yen]) -(define-key compose-map "=y" [yen]) +(define-key compose-map "=L" [(?\243)]) +(define-key compose-map "=l" [(?\243)]) +(define-key compose-map "=Y" [(?\245)]) +(define-key compose-map "=y" [(?\245)]) -(define-key compose-map ">>" [guillemotright]) +(define-key compose-map ">>" [(?\273)]) -(define-key compose-map "??" [questiondown]) +(define-key compose-map "??" [(?\277)]) (define-key compose-map "AA" "＠") (define-key compose-map "Aa" "＠") -(define-key compose-map "A_" [ordfeminine]) -(define-key compose-map "A`" [Agrave]) -(define-key compose-map "A'" [Aacute]) -(define-key compose-map "A^" [Acircumflex]) -(define-key compose-map "A~" [Atilde]) -(define-key compose-map "A\"" [Adiaeresis]) -(define-key compose-map "A*" [Aring]) -(define-key compose-map "AE" [AE]) - -(define-key compose-map "C/" [cent]) -(define-key compose-map "C|" [cent]) -(define-key compose-map "C0" [copyright]) -(define-key compose-map "CO" [copyright]) -(define-key compose-map "Co" [copyright]) -(define-key compose-map "C," [Ccedilla]) - -(define-key compose-map "D-" [ETH]) - -(define-key compose-map "E`" [Egrave]) -(define-key compose-map "E'" [Eacute]) -(define-key compose-map "E^" [Ecircumflex]) -(define-key compose-map "E\"" [Ediaeresis]) - -(define-key compose-map "I`" [Igrave]) -(define-key compose-map "I'" [Iacute]) -(define-key compose-map "I^" [Icircumflex]) -(define-key compose-map "I\"" [Idiaeresis]) - -(define-key compose-map "L-" [sterling]) -(define-key compose-map "L=" [sterling]) - -(define-key compose-map "N~" [Ntilde]) - -(define-key compose-map "OX" [currency]) -(define-key compose-map "Ox" [currency]) -(define-key compose-map "OS" [section]) -(define-key compose-map "Os" [section]) -(define-key compose-map "OC" [copyright]) -(define-key compose-map "Oc" [copyright]) -(define-key compose-map "OR" [registered]) -(define-key compose-map "Or" [registered]) -(define-key compose-map "O_" [masculine]) -(define-key compose-map "O`" [Ograve]) -(define-key compose-map "O'" [Oacute]) -(define-key compose-map "O^" [Ocircumflex]) -(define-key compose-map "O~" [Otilde]) -(define-key compose-map "O\"" [Odiaeresis]) -(define-key compose-map "O/" [Ooblique]) - -(define-key compose-map "P!" [paragraph]) - -(define-key compose-map "R0" [registered]) -(define-key compose-map "RO" [registered]) -(define-key compose-map "Ro" [registered]) - -(define-key compose-map "S!" [section]) -(define-key compose-map "S0" [section]) -(define-key compose-map "SO" [section]) -(define-key compose-map "So" [section]) -(define-key compose-map "SS" [ssharp]) - -(define-key compose-map "TH" [THORN]) - -(define-key compose-map "U`" [Ugrave]) -(define-key compose-map "U'" [Uacute]) -(define-key compose-map "U^" [Ucircumflex]) -(define-key compose-map "U\"" [Udiaeresis]) - -(define-key compose-map "X0" [currency]) -(define-key compose-map "XO" [currency]) -(define-key compose-map "Xo" [currency]) - -(define-key compose-map "Y-" [yen]) -(define-key compose-map "Y=" [yen]) -(define-key compose-map "Y'" [Yacute]) - -(define-key compose-map "_A" [ordfeminine]) -(define-key compose-map "_a" [ordfeminine]) -(define-key compose-map "_^" [macron]) -(define-key compose-map "_O" [masculine]) -(define-key compose-map "_o" [masculine]) +(define-key compose-map "A_" [(?\252)]) +(define-key compose-map "A`" [(?\300)]) +(define-key compose-map "A'" [(?\301)]) +(define-key compose-map "A^" [(?\302)]) +(define-key compose-map "A~" [(?\303)]) +(define-key compose-map "A\"" [(?\304)]) +(define-key compose-map "A*" [(?\305)]) +(define-key compose-map "AE" [(?\306)]) + +(define-key compose-map "C/" [(?\242)]) +(define-key compose-map "C|" [(?\242)]) +(define-key compose-map "C0" [(?\251)]) +(define-key compose-map "CO" [(?\251)]) +(define-key compose-map "Co" [(?\251)]) +(define-key compose-map "C," [(?\307)]) + +(define-key compose-map "D-" [(?\320)]) + +(define-key compose-map "E`" [(?\310)]) +(define-key compose-map "E'" [(?\311)]) +(define-key compose-map "E^" [(?\312)]) +(define-key compose-map "E\"" [(?\313)]) + +(define-key compose-map "I`" [(?\314)]) +(define-key compose-map "I'" [(?\315)]) +(define-key compose-map "I^" [(?\316)]) +(define-key compose-map "I\"" [(?\317)]) + +(define-key compose-map "L-" [(?\243)]) +(define-key compose-map "L=" [(?\243)]) + +(define-key compose-map "N~" [(?\321)]) + +(define-key compose-map "OX" [(?\244)]) +(define-key compose-map "Ox" [(?\244)]) +(define-key compose-map "OS" [(?\247)]) +(define-key compose-map "Os" [(?\247)]) +(define-key compose-map "OC" [(?\251)]) +(define-key compose-map "Oc" [(?\251)]) +(define-key compose-map "OR" [(?\256)]) +(define-key compose-map "Or" [(?\256)]) +(define-key compose-map "O_" [(?\272)]) +(define-key compose-map "O`" [(?\322)]) +(define-key compose-map "O'" [(?\323)]) +(define-key compose-map "O^" [(?\324)]) +(define-key compose-map "O~" [(?\325)]) +(define-key compose-map "O\"" [(?\326)]) +(define-key compose-map "O/" [(?\330)]) + +(define-key compose-map "P!" [(?\266)]) + +(define-key compose-map "R0" [(?\256)]) +(define-key compose-map "RO" [(?\256)]) +(define-key compose-map "Ro" [(?\256)]) + +(define-key compose-map "S!" [(?\247)]) +(define-key compose-map "S0" [(?\247)]) +(define-key compose-map "SO" [(?\247)]) +(define-key compose-map "So" [(?\247)]) +(define-key compose-map "SS" [(?\337)]) + +(define-key compose-map "TH" [(?\336)]) + +(define-key compose-map "U`" [(?\331)]) +(define-key compose-map "U'" [(?\332)]) +(define-key compose-map "U^" [(?\333)]) +(define-key compose-map "U\"" [(?\334)]) + +(define-key compose-map "X0" [(?\244)]) +(define-key compose-map "XO" [(?\244)]) +(define-key compose-map "Xo" [(?\244)]) + +(define-key compose-map "Y-" [(?\245)]) +(define-key compose-map "Y=" [(?\245)]) +(define-key compose-map "Y'" [(?\335)]) + +(define-key compose-map "_A" [(?\252)]) +(define-key compose-map "_a" [(?\252)]) +(define-key compose-map "_^" [(?\257)]) +(define-key compose-map "_O" [(?\272)]) +(define-key compose-map "_o" [(?\272)]) (define-key compose-map "aA" "＠") (define-key compose-map "aa" "＠") -(define-key compose-map "a_" [ordfeminine]) -(define-key compose-map "a-" [ordfeminine]) -(define-key compose-map "a`" [agrave]) -(define-key compose-map "a'" [aacute]) -(define-key compose-map "a^" [acircumflex]) -(define-key compose-map "a~" [atilde]) -(define-key compose-map "a\"" [adiaeresis]) -(define-key compose-map "a*" [aring]) -(define-key compose-map "ae" [ae]) - -(define-key compose-map "c/" [cent]) -(define-key compose-map "c|" [cent]) -(define-key compose-map "c0" [copyright]) -(define-key compose-map "cO" [copyright]) -(define-key compose-map "co" [copyright]) -(define-key compose-map "c," [ccedilla]) - -(define-key compose-map "d-" [eth]) - -(define-key compose-map "e`" [egrave]) -(define-key compose-map "e'" [eacute]) -(define-key compose-map "e^" [ecircumflex]) -(define-key compose-map "e\"" [ediaeresis]) - -(define-key compose-map "i`" [igrave]) -(define-key compose-map "i'" [iacute]) -(define-key compose-map "i^" [icircumflex]) -(define-key compose-map "i\"" [idiaeresis]) -(define-key compose-map "i:" [idiaeresis]) - -(define-key compose-map "l-" [sterling]) -(define-key compose-map "l=" [sterling]) - -(define-key compose-map "n~" [ntilde]) - -(define-key compose-map "oX" [currency]) -(define-key compose-map "ox" [currency]) -(define-key compose-map "oC" [copyright]) -(define-key compose-map "oc" [copyright]) -(define-key compose-map "oR" [registered]) -(define-key compose-map "or" [registered]) -(define-key compose-map "oS" [section]) -(define-key compose-map "os" [section]) -(define-key compose-map "o_" [masculine]) -(define-key compose-map "o`" [ograve]) -(define-key compose-map "o'" [oacute]) -(define-key compose-map "o^" [ocircumflex]) -(define-key compose-map "o~" [otilde]) -(define-key compose-map "o\"" [odiaeresis]) -(define-key compose-map "o/" [oslash]) - -(define-key compose-map "p!" [paragraph]) - -(define-key compose-map "r0" [registered]) -(define-key compose-map "rO" [registered]) -(define-key compose-map "ro" [registered]) - -(define-key compose-map "s!" [section]) -(define-key compose-map "s0" [section]) -(define-key compose-map "sO" [section]) -(define-key compose-map "so" [section]) -(define-key compose-map "ss" [ssharp]) - -(define-key compose-map "th" [thorn]) - -(define-key compose-map "u`" [ugrave]) -(define-key compose-map "u'" [uacute]) -(define-key compose-map "u^" [ucircumflex]) -(define-key compose-map "u\"" [udiaeresis]) -(define-key compose-map "u/" [mu]) - -(define-key compose-map "x0" [currency]) -(define-key compose-map "xO" [currency]) -(define-key compose-map "xo" [currency]) -(define-key compose-map "xx" [multiply]) - -(define-key compose-map "y-" [yen]) -(define-key compose-map "y=" [yen]) -(define-key compose-map "y'" [yacute]) -(define-key compose-map "y\"" [ydiaeresis]) - -(define-key compose-map "|C" [cent]) -(define-key compose-map "|c" [cent]) -(define-key compose-map "||" [brokenbar]) +(define-key compose-map "a_" [(?\252)]) +(define-key compose-map "a-" [(?\252)]) +(define-key compose-map "a`" [(?\340)]) +(define-key compose-map "a'" [(?\341)]) +(define-key compose-map "a^" [(?\342)]) +(define-key compose-map "a~" [(?\343)]) +(define-key compose-map "a\"" [(?\344)]) +(define-key compose-map "a*" [(?\345)]) +(define-key compose-map "ae" [(?\346)]) + +(define-key compose-map "c/" [(?\242)]) +(define-key compose-map "c|" [(?\242)]) +(define-key compose-map "c0" [(?\251)]) +(define-key compose-map "cO" [(?\251)]) +(define-key compose-map "co" [(?\251)]) +(define-key compose-map "c," [(?\347)]) + +(define-key compose-map "d-" [(?\360)]) + +(define-key compose-map "e`" [(?\350)]) +(define-key compose-map "e'" [(?\351)]) +(define-key compose-map "e^" [(?\352)]) +(define-key compose-map "e\"" [(?\353)]) + +(define-key compose-map "i`" [(?\354)]) +(define-key compose-map "i'" [(?\355)]) +(define-key compose-map "i^" [(?\356)]) +(define-key compose-map "i\"" [(?\357)]) +(define-key compose-map "i:" [(?\357)]) + +(define-key compose-map "l-" [(?\243)]) +(define-key compose-map "l=" [(?\243)]) + +(define-key compose-map "n~" [(?\361)]) + +(define-key compose-map "oX" [(?\244)]) +(define-key compose-map "ox" [(?\244)]) +(define-key compose-map "oC" [(?\251)]) +(define-key compose-map "oc" [(?\251)]) +(define-key compose-map "oR" [(?\256)]) +(define-key compose-map "or" [(?\256)]) +(define-key compose-map "oS" [(?\247)]) +(define-key compose-map "os" [(?\247)]) +(define-key compose-map "o_" [(?\272)]) +(define-key compose-map "o`" [(?\362)]) +(define-key compose-map "o'" [(?\363)]) +(define-key compose-map "o^" [(?\364)]) +(define-key compose-map "o~" [(?\365)]) +(define-key compose-map "o\"" [(?\366)]) +(define-key compose-map "o/" [(?\370)]) + +(define-key compose-map "p!" [(?\266)]) + +(define-key compose-map "r0" [(?\256)]) +(define-key compose-map "rO" [(?\256)]) +(define-key compose-map "ro" [(?\256)]) + +(define-key compose-map "s!" [(?\247)]) +(define-key compose-map "s0" [(?\247)]) +(define-key compose-map "sO" [(?\247)]) +(define-key compose-map "so" [(?\247)]) +(define-key compose-map "ss" [(?\337)]) + +(define-key compose-map "th" [(?\376)]) + +(define-key compose-map "u`" [(?\371)]) +(define-key compose-map "u'" [(?\372)]) +(define-key compose-map "u^" [(?\373)]) +(define-key compose-map "u\"" [(?\374)]) +(define-key compose-map "u/" [(?\265)]) + +(define-key compose-map "x0" [(?\244)]) +(define-key compose-map "xO" [(?\244)]) +(define-key compose-map "xo" [(?\244)]) +(define-key compose-map "xx" [(?\327)]) + +(define-key compose-map "y-" [(?\245)]) +(define-key compose-map "y=" [(?\245)]) +(define-key compose-map "y'" [(?\375)]) +(define-key compose-map "y\"" [(?\377)]) + +(define-key compose-map "|C" [(?\242)]) +(define-key compose-map "|c" [(?\242)]) +(define-key compose-map "||" [(?\246)]) -;; Suppose we type these three physical keys: [Multi_key " a] +;; [[ Suppose we type these three physical keys: [Multi_key " a] ;; Xlib can deliver these keys as the following sequences of keysyms: ;; ;; - [Multi_key " a] (no surprise here) ＠＠ -510,20 +540,29 ＠＠ ;; decide whether it's really doing compose processing or not (or ;; actually, different parts of Xlib disagree). ;; -;; So we'll just convert [Multi_key " adiaeresis] to [adiaeresis] -(defun xlib-input-method-bug-workaround (keymap) - (map-keymap - (lambda (key value) - (cond - ((keymapp value) - (xlib-input-method-bug-workaround value)) - ((and (sequencep value) - (eq 1 (length value)) - (null (lookup-key keymap value))) - (define-key keymap value value)))) - keymap)) -(xlib-input-method-bug-workaround compose-map) -(unintern 'xlib-input-method-bug-workaround) +;; So we'll just convert [Multi_key " adiaeresis] to [adiaeresis] ]] + +(eval-when-compile + (when nil ;; Commenting out. + + ;; This _used_ to work with our X11-oriented keysyms above. With them + ;; gone, it won't. The X11 bug it works around should be long dead. (Ha! + ;; Wasn't it cockroaches that would have ruled the planet after World + ;; War III?) + + (defun xlib-input-method-bug-workaround (keymap) + (map-keymap + (lambda (key value) + (cond + ((keymapp value) + (xlib-input-method-bug-workaround value)) + ((and (sequencep value) + (eq 1 (length value)) + (null (lookup-key keymap value))) + (define-key keymap value value)))) + keymap)) + (xlib-input-method-bug-workaround compose-map) + (unintern 'xlib-input-method-bug-workaround))) ;; While we're at it, a similar mechanism will make colon equivalent ;; to doublequote for diaeresis processing. Some Xlibs do this. ＠＠ -582,7 +621,7 ＠＠ which it understands) are: (if (and (vectorp mod-char) (= (length mod-char) 1)) (setq mod-char (aref mod-char 0))) (if (and mod-char (symbolp mod-char)) - (setq mod-char (or (get mod-char character-set-property) mod-char))) + (setq mod-char (or (get mod-char 'character-of-keysym) mod-char))) (if (and mod-char (> count 0)) (delete-char -1) (setq mod-char c)) ＠＠ -655,8 +694,8 ＠＠ which it understands) are: (defun compose-help-mapper (key binding) (if (and (symbolp key) - (get key character-set-property)) - (setq key (get key character-set-property))) + (get key 'character-of-keysym)) + (setq key (get key 'character-of-keysym))) (if (eq binding 'compose-help) ; suppress that... nil (if (keymapp binding) ＠＠ -675,7 +714,7 ＠＠ which it understands) are: (indent-to 16) (let ((code (and (vectorp binding) (= 1 (length binding)) - (get (aref binding 0) character-set-property)))) + (get (aref binding 0) 'character-of-keysym)))) (if code (insert (make-string 1 code)) (if (stringp binding) 1.13.6.2 +6 -5 XEmacs/xemacs/lisp/x-init.el Index: x-init.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/x-init.el,v retrieving revision 1.13.6.1 retrieving revision 1.13.6.2 diff -u -p -r1.13.6.1 -r1.13.6.2 --- x-init.el 2005/07/13 04:44:45 1.13.6.1 +++ x-init.el 2005/09/20 16:05:26 1.13.6.2 ＠＠ -192,7 +192,11 ＠＠ (x-define-dead-key XK_mute_asciicircum compose-circumflex-map) (x-define-dead-key XK_mute_asciitilde compose-tilde-map) - ;; Xfree86 seems to use lower case and a hyphen + ;; [[ XFree86 seems to use lower case and a hyphen ]] Not true; they use + ;; lower case and an underscore. XEmacs converts the underscore to a + ;; hyphen in x_keysym_to_emacs_keysym because the keysym is in the + ;; "Keyboard" character set, which is just totally fucking random, + ;; considering it doesn't happen for any other character sets. (x-define-dead-key dead-acute compose-acute-map) (x-define-dead-key dead-grave compose-grave-map) (x-define-dead-key dead-cedilla compose-cedilla-map) ＠＠ -240,7 +244,7 ＠＠ (let (unknown-code-points sym-string) (dolist (x-keysym (hash-table-key-list (x-keysym-hash-table))) (setq sym-string (if (stringp x-keysym) x-keysym (symbol-name x-keysym))) - (when (and (not (get (intern sym-string) 'ascii-character)) + (when (and (not (get (intern sym-string) 'character-of-keysym)) (string-match "^U[0-9A-F]+$" sym-string)) (pushnew (concat sym-string " ") unknown-code-points :test 'equal))) (when unknown-code-points ＠＠ -288,9 +292,6 ＠＠ based on Unicode. " (defun init-pre-x-win () "Initialize X Windows at startup (pre). Don't call this." (when (not pre-x-win-initted) - (require 'x-iso8859-1) - (setq character-set-property 'x-iso8859/1) ; see x-iso8859-1.el - (setq initial-frame-plist (if initial-frame-unmapped-p '(initially-unmapped t) nil)) 1.64.2.11 +4 -0 XEmacs/xemacs/lwlib/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v retrieving revision 1.64.2.10 retrieving revision 1.64.2.11 diff -u -p -r1.64.2.10 -r1.64.2.11 --- ChangeLog 2005/07/13 04:45:06 1.64.2.10 +++ ChangeLog 2005/09/20 16:05:33 1.64.2.11 ＠＠ -1,3 +1,7 ＠＠ +2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> + + * XEmacs 21.5.22 "cucumber" is released. + 2005-05-28 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.21 "corn" is released. 1.269.2.8 +75 -34 XEmacs/xemacs/man/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v retrieving revision 1.269.2.7 retrieving revision 1.269.2.8 diff -u -p -r1.269.2.7 -r1.269.2.8 --- ChangeLog 2005/07/13 04:45:09 1.269.2.7 +++ ChangeLog 2005/09/20 16:05:34 1.269.2.8 ＠＠ -1,3 +1,44 ＠＠ +2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> + + * XEmacs 21.5.22 "cucumber" is released. + +2005-07-20 Didier Verna <didier(a)xemacs.org> + + * lispref/faces.texi (Basic Face Functions): Rephrase the face + aliasing paragraph following a suggestion from Stephen J. + Turnbull. + +2005-07-19 Didier Verna <didier(a)xemacs.org> + + * lispref/faces.texi (Basic Face Functions): Document the face + aliasing feature. + +2005-07-17 Aidan Kehoe <kehoea(a)parhasard.net> + + * lispref/commands.texi (Converting Events): + Give details on the deprecated ALLOW-NON-ASCII argument to + event-to-character, and why you shouldn't use it. + +2005-06-26 Aidan Kehoe <kehoea(a)parhasard.net> + + * lispref/commands.texi (Converting Events): + * lispref/keymaps.texi (Key Sequences): + Stop pretending ASCII is an eight-bit character set, and remove + documentation of event-to-character's vanished fourth argument. + + * internals/internals.texi (Old Future Work -- Improvements in + support for non-ASCII (European) keysyms under X): + Rename the ascii-character property. + +2005-06-19 Aidan Kehoe <kehoea(a)parhasard.net> + + * lispref/building.texi (Building XEmacs and Object Allocation): + Pure storage has been gone for half a decade or more. + * lispref/mule.texi (Internationalization Terminology): + Phrase stuff a little more clearly, compare Mule with Unicode. + * lispref/lispref.texi (Top): + Take out info on pure storage. + 2005-05-28 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.21 "corn" is released. ＠＠ -5,13 +46,13 ＠＠ 2005-05-10 Aidan Kehoe <kehoea(a)parhasard.net> * xemacs-faq.texi (Q3.2.5): (setq text-mode-hook - 'turn-on-auto-fill) is not a good idea. + 'turn-on-auto-fill) is not a good idea. 2005-05-10 Aidan Kehoe <kehoea(a)parhasard.net> - * xemacs/sending.texi (Sending Mail):Document that sendmail.el is - underfeatured and not getting better anytime soon; suggest using - another mailer. + * xemacs/sending.texi (Sending Mail):Document that sendmail.el is + underfeatured and not getting better anytime soon; suggest using + another mailer. 2005-05-05 Aidan Kehoe <kehoea(a)parhasard.net> ＠＠ -23,9 +64,9 ＠＠ None of the keymaps I have access to have linefeed keys; they all use Return. As such, for new users, C-j is really the only option for evaluation in Lisp interaction mode, and should be documented - as such. - -2005-04-18 Stephen J. Turnbull <stephen(a)xemacs.org> + as such. + +2005-04-18 Turnbull Stephen <stephen(a)xemacs.org> * internals/internals.texi (Better Rendering Support -- Modern Font Support): ＠＠ -60,18 +101,18 ＠＠ * lispref/mule.texi (CCL Example): char-int -> char-to-int, and hex 41 is decimal 65, both problems - with my previous patch pointed out by Stephen. + with my previous patch pointed out by Stephen. * lispref/mule.texi (The actual coding system): Give information on the make-coding-system call, and where the - actual package can be found. - + actual package can be found. + 2005-03-24 Aidan Kehoe <kehoea(a)parhasard.net> * xemacs/custom.texi (X Resources): "Emacs" as the application class -> "XEmacs" as the application class, mention the old resource class determination behaviour, and - how one can temporarily re-instate it. - + how one can temporarily re-instate it. + 2005-03-15 Stephen J. Turnbull <stephen(a)xemacs.org> * internals/internals.texi (The XEmacs Split): ＠＠ -97,7 +138,7 ＠＠ 2005-01-19 Aidan Kehoe <kehoea(a)parhasard.net> * lispref/mule.texi (CCL Example): Detail an implementation of the - web's URL encoding as a CCL coding system example. + web's URL encoding as a CCL coding system example. 2005-02-22 Stephen J. Turnbull <stephen(a)xemacs.org> ＠＠ -121,7 +162,7 ＠＠ * lispref/searching.texi (Syntax of Regexps): Mention the \c and \C regular expression constructs; cross - reference to the Category Table documentation. + reference to the Category Table documentation. 2005-02-22 Stephen J. Turnbull <stephen(a)xemacs.org> ＠＠ -265,26 +306,26 ＠＠ 2005-02-02 Robert Delius Royar <xemacs(a)frinabulax.org> * beta.texi (Top): - Add reference to Index in catalog to prevent + Add reference to Index in catalog to prevent errors compiling with GNU makeinfo 4.5. * beta.texi (Syncing with GNU Emacs): - Add forward reference to Index in next node to prevent + Add forward reference to Index in next node to prevent errors compiling with GNU makeinfo 4.5. * beta.texi (Index): Add backward reference to Syncing with GNU Emacs to - replace obsolete reference to Defining Variables to + replace obsolete reference to Defining Variables to prevent errors compiling with GNU makeinfo 4.5. 2005-01-31 Ben Wing <ben(a)xemacs.org> * xemacs/help.texi (Misc Help): Delete references to DISTRIB. Point to FAQ. - + * xemacs/new.texi: Update sample code for version checking. - + * xemacs/xemacs.texi (Distrib): * xemacs/xemacs.texi (Intro): Delete references to DISTRIB. Point directly to web site. ＠＠ -299,7 +340,7 ＠＠ * Makefile (pdf_files): * Makefile ($(INFODIR)/beta.info): Add beta.texi and built files. - + * xemacs-faq.texi (Top): * xemacs-faq.texi (Introduction): * xemacs-faq.texi (Q1.0.3): ＠＠ -395,7 +436,7 ＠＠ manual. Also introduce C/AWK modes in prog-modes package * xemacs/programs.texi (C Ident): Removed - it was obsolete. prog-modes package documentation now contains - indentation description for old C mode + indentation description for old C mode * xemacs/major.texi (Mode Hooks): Add description of major mode hooks. Cleaned up and updated programming mode descriptions. * xemacs/xemacs.texi (Top): Updated Detailed Node listing for new ＠＠ -421,9 +462,9 ＠＠ of a command further up the list, give information on a trivial (interactive) declaration, and cross-reference to the key binding detail. Cf. 87vf9wgd08.fsf(a)tleepslib.sk.tsukuba.ac.jp - (comp.emacs.xemacs, 2005-01-18). + (comp.emacs.xemacs, 2005-01-18). * man/lispref/eval.texi man/lispref/lispref.texi - man/lispref/macros.texi man/lispref/symbols.texi + man/lispref/macros.texi man/lispref/symbols.texi man/lispref/variables.texi: Fix cross references. 2004-12-28 Ben Wing <ben(a)xemacs.org> ＠＠ -991,7 +1032,7 ＠＠ * internals/internals.texi (Future Work -- Better Rendering Support): New node. - (Top): + (Top): (Future Work): (Future Work -- Lisp Engine Replacement): Add pointers to new node. ＠＠ -1379,7 +1420,7 ＠＠ * internals/index.texi: Deleted. Incorporated into internals.texi. Having a separate index file messes up texinfo-master-menu. - + * internals/internals.texi: * internals/internals.texi (Top): * internals/internals.texi (Introduction): ＠＠ -1818,7 +1859,7 ＠＠ New nodes. * lispref/lispref.texi (Top): - * lispref/numbers.texi (Numbers): + * lispref/numbers.texi (Numbers): Add nodes "Ratio Basics" and "The Bignum Extension" to menus. 2004-01-26 Stephen J. Turnbull <stephen(a)xemacs.org> ＠＠ -1832,9 +1873,9 ＠＠ * lispref/gutter.texi (Gutter Descriptor Format): Node deleted. (Gutter): - (Gutter Intro): - (Creating Gutter): - (Specifying a Gutter): + (Gutter Intro): + (Creating Gutter): + (Specifying a Gutter): Pluralize node name to Creating Gutters. (Creating Gutters): Improve explanation of gutter descriptors. (Other Gutter Variables): Remove extraneous text. ＠＠ -1955,7 +1996,7 ＠＠ * lispref/mule.texi (Charset Property Functions): Charset registry can be set. (Predefined Charsets): Add registry to Vietnamese charset names. - + 2003-09-26 Steve Youngs <youngs(a)xemacs.org> * XEmacs 21.5.16 "celeriac" is released. ＠＠ -2002,7 +2043,7 ＠＠ entry. (Package Terminology): Whitespace clean up. (Installing Packages): Whitespace clean up and add some ＠code - formatters. + formatters. Re-organise the menu so that installation via PUI is first and Sumo is last. (Automatically): mule-base is no longer a requirement for using ＠＠ -2015,12 +2056,12 ＠＠ (Building Packages): Remove duplicated stuff that is in lispref/packaging.texi, xref to it instead. (Local.rules File): xref to the appropriate node in - lispref/packaging.texi. + lispref/packaging.texi. (Available Packages): Update to current reality. (all): Removed. (srckit): Removed. (binkit): Removed. - + * xemacs/reading.texi (Reading Mail): Mention Gnus and MEW. * new-users-guide/custom2.texi (Init File): big-menubar.el is in ＠＠ -2157,7 +2198,7 ＠＠ * xemacs/packages.texi (Automatically): Refer to 'pui-set-local-package-get-directory' instead of - 'pui-add-install-directory'. + 'pui-add-install-directory'. Remove comment about PGP not being intergrated into PUI. Document balloon-help in PUI. Add heading "Keeping Packages Up To Date". 1.52.2.7 +1 -1 XEmacs/xemacs/man/internals/internals.texi Index: internals.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/internals/internals.texi,v retrieving revision 1.52.2.6 retrieving revision 1.52.2.7 diff -u -p -r1.52.2.6 -r1.52.2.7 --- internals.texi 2005/07/13 04:45:30 1.52.2.6 +++ internals.texi 2005/09/20 16:05:36 1.52.2.7 ＠＠ -28257,7 +28257,7 ＠＠ the known X keysym names and the corresp ＠quotation For every key on the keyboard that has a known character correspondence, - we define the ascii-character property of the keysym, and make the + we define the character-of-keysym property of the keysym, and make the default binding for the key be self-insert-command. The following magic is basically intimate knowledge of X11/keysymdef.h. 1.5.6.1 +5 -67 XEmacs/xemacs/man/lispref/building.texi Index: building.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/building.texi,v retrieving revision 1.5 retrieving revision 1.5.6.1 diff -u -p -r1.5 -r1.5.6.1 --- building.texi 2002/08/12 07:45:38 1.5 +++ building.texi 2005/09/20 16:05:43 1.5.6.1 ＠＠ -17,7 +17,6 ＠＠ aspects related to the internals of XEma ＠menu * Building XEmacs:: How to preload Lisp libraries into XEmacs. -* Pure Storage:: A kludge to make preloaded Lisp functions sharable. * Garbage Collection:: Reclaiming space for Lisp objects no longer used. ＠end menu ＠＠ -34,9 +33,8 ＠＠ information is pertinent to XEmacs maint The ＠cite{XEmacs Internals Manual} contains more information about this. Compilation of the C source files in the ＠file{src} directory -produces an executable file called ＠file{temacs}, also called a -＠dfn{bare impure XEmacs}. It contains the XEmacs Lisp interpreter and I/O -routines, but not the editing commands. +produces an executable file called ＠file{temacs}. It contains the +XEmacs Lisp interpreter and I/O routines, but not the editing commands. ＠cindex ＠file{loadup.el} Before XEmacs is actually usable, a number of Lisp files need to be ＠＠ -80,17 +78,12 ＠＠ out ＠file{xemacs}. If both of these are out of luck unless you're able to bootstrap ＠file{xemacs} from ＠file{temacs}. Note that ＠samp{make all-elc} actually loads the alternative loadup file ＠file{loadup-el.el}, which works like -(a)file{loadup.el} but disables the pure-copying process and forces -XEmacs to ignore any compiled Lisp files even if they exist.) +(a)file{loadup.el} but forces XEmacs to ignore any compiled Lisp files +even if they exist.) ＠cindex ＠file{site-load.el} You can specify additional files to preload by writing a library named -(a)file{site-load.el} that loads them. You may need to increase the value -of ＠code{PURESIZE}, in ＠file{src/puresize.h}, to make room for the -additional files. You should ＠emph{not} modify this file directly, -however; instead, use the ＠samp{--puresize} configuration option. (If -you run out of pure space while dumping ＠file{xemacs}, you will be told -how much pure space you actually will need.) However, the advantage of +(a)file{site-load.el} that loads them. However, the advantage of preloading additional files decreases as machines get faster. On modern machines, it is often not advisable, especially if the Lisp code is on a file system local to the machine running XEmacs. ＠＠ -176,61 +169,6 ＠＠ The major version number of Emacs, as an ＠defvar emacs-minor-version The minor version number of Emacs, as an integer. For XEmacs version 20.1, the value is 1. -＠end defvar - -＠node Pure Storage -＠appendixsec Pure Storage -＠cindex pure storage - - XEmacs Lisp uses two kinds of storage for user-created Lisp objects: -＠dfn{normal storage} and ＠dfn{pure storage}. Normal storage is where -all the new data created during an XEmacs session is kept; see the -following section for information on normal storage. Pure storage is -used for certain data in the preloaded standard Lisp files---data that -should never change during actual use of XEmacs. - - Pure storage is allocated only while ＠file{temacs} is loading the -standard preloaded Lisp libraries. In the file ＠file{xemacs}, it is -marked as read-only (on operating systems that permit this), so that the -memory space can be shared by all the XEmacs jobs running on the machine -at once. Pure storage is not expandable; a fixed amount is allocated -when XEmacs is compiled, and if that is not sufficient for the preloaded -libraries, ＠file{temacs} aborts with an error message. If that happens, -you must increase the compilation parameter ＠code{PURESIZE} using the -＠samp{--puresize} option to ＠file{configure}. This normally won't -happen unless you try to preload additional libraries or add features to -the standard ones. - -＠defun purecopy object -This function makes a copy of ＠var{object} in pure storage and returns -it. It copies strings by simply making a new string with the same -characters in pure storage. It recursively copies the contents of -vectors and cons cells. It does not make copies of other objects such -as symbols, but just returns them unchanged. It signals an error if -asked to copy markers. - -This function is a no-op in XEmacs, and its use is deprecated. -＠end defun - -＠defvar pure-bytes-used -The value of this variable is the number of bytes of pure storage -allocated so far. Typically, in a dumped XEmacs, this number is very -close to the total amount of pure storage available---if it were not, -we would preallocate less. -＠end defvar - -＠defvar purify-flag -This variable determines whether ＠code{defun} should make a copy of the -function definition in pure storage. If it is non-＠code{nil}, then the -function definition is copied into pure storage. - -This flag is ＠code{t} while loading all of the basic functions for -building XEmacs initially (allowing those functions to be sharable and -non-collectible). Dumping XEmacs as an executable always writes -＠code{nil} in this variable, regardless of the value it actually has -before and after dumping. - -You should not change this flag in a running XEmacs. ＠end defvar ＠node Garbage Collection 1.11.6.1 +20 -12 XEmacs/xemacs/man/lispref/commands.texi Index: commands.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/commands.texi,v retrieving revision 1.11 retrieving revision 1.11.6.1 diff -u -p -r1.11 -r1.11.6.1 --- commands.texi 2002/07/06 18:56:28 1.11 +++ commands.texi 2005/09/20 16:05:43 1.11.6.1 ＠＠ -1482,11 +1482,11 ＠＠ in a list containing the character. Beware that ＠code{character-to-event} and ＠code{event-to-character} are not strictly inverse functions, since events contain much more -information than the ＠sc{ascii} character set can encode. +information than the XEmacs internal character encoding can store. ＠end defun -＠defun event-to-character event &optional allow-extra-modifiers allow-meta allow-non-ascii -This function returns the closest ＠sc{ascii} approximation to +＠defun event-to-character event &optional allow-extra-modifiers allow-meta allow-no-ascii +This function returns the closest character approximation to ＠var{event}. If the event isn't a keypress, this returns ＠code{nil}. If ＠var{allow-extra-modifiers} is non-＠code{nil}, then this is lenient ＠＠ -1501,15 +1501,23 ＠＠ be represented by turning on the high bi otherwise, ＠code{nil} will be returned for events containing the ＠key{Meta} modifier. -If ＠var{allow-non-ascii} is non-＠code{nil}, then characters which are -present in the prevailing character set (＠pxref{Keymaps, variable -＠code{character-set-property}}) will be returned as their code in that -character set, instead of the return value being restricted to -＠sc{ascii}. - -Note that specifying both ＠var{allow-meta} and ＠var{allow-non-ascii} is -ambiguous, as both use the high bit; ＠key{M-x} and ＠key{oslash} will be -indistinguishable. +Specifying ＠var{allow-meta} will give ambiguous results---＠key{M-x} and +＠key{oslash} will return the same thing, for example---so you should +probably not use it. + +＠var{allow-non-ascii} is ignored; in previous versions of XEmacs, it +controlled whether one particular type of mapping between X11 keysyms +and characters would take place. The intention was that this flag could +be clear and you could be sure that if you got a Latin-1 character with +the high bit set back, you could assume that the lower seven bits of the +character were the ASCII code of the character in question, and that the +Meta key was pressed at the same time. This didn't work in the general +case, however, because it left the other type of X11 keysym-to-character +mapping in place, ready to give you a Latin-1 character for a Latin-1 +key. If you feel the need to use such a flag, sit back and think about +abstracting your code, and if you still feel the need, bear in mind that +it will be buggy in earlier versions of XEmacs. + ＠end defun ＠defun events-to-keys events &optional no-mice 1.5.2.1 +11 -0 XEmacs/xemacs/man/lispref/faces.texi Index: faces.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/faces.texi,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -p -r1.5 -r1.5.2.1 --- faces.texi 2004/06/14 10:24:45 1.5 +++ faces.texi 2005/09/20 16:05:44 1.5.2.1 ＠＠ -141,6 +141,17 ＠＠ copy just parts of the old face rather t in ＠code{copy-specifier} (＠pxref{Specifiers}). ＠end defun + + Finally, you have the possibility to give faces different names by +means of aliases. One typical use of this feature is to change the name +of a face while preserving backward compatibility. If a symbol has the +＠code{face-alias} property set to another symbol, then this other symbol +will be used as the real face name instead. Recursive aliases (aliases +of aliases) are allowed, but the depth of indirection is limited to 32 +to prevent alias loops. + + + ＠node Face Properties ＠subsection Face Properties 1.4.20.1 +16 -6 XEmacs/xemacs/man/lispref/keymaps.texi Index: keymaps.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/keymaps.texi,v retrieving revision 1.4 retrieving revision 1.4.20.1 diff -u -p -r1.4 -r1.4.20.1 --- keymaps.texi 2001/04/12 18:22:16 1.4 +++ keymaps.texi 2005/09/20 16:05:44 1.4.20.1 ＠＠ -245,12 +245,22 ＠＠ these. keysym and some set of modifiers (such as ＠key{CONTROL} and ＠key{META}). A ＠dfn{keysym} is what is printed on the keys on your keyboard. - A keysym may be represented by a symbol, or (if and only if it is -equivalent to an ＠sc{ascii} character in the range 32 - 255) by a -character or its equivalent ＠sc{ascii} code. The ＠kbd{A} key may be -represented by the symbol ＠code{A}, the character ＠code{?A}, or by the -number 65. The ＠kbd{break} key may be represented only by the symbol -＠code{break}. + A keysym may be represented by a symbol, by a character, or by a +character's Mule code. The ＠kbd{A} key may be represented by the symbol +＠code{A}, the character ＠code{?A}, or by the number 65. The ＠kbd{break} +key may be represented only by the symbol ＠code{break}, and non-ASCII +X11 keys in general are limited to the symbol form with XEmacs. +＠footnote{A quirk of our X11 implementation means that non-ASCII keysyms +have different internal representations in the X11 (with GTK) and other +worlds (like the TTY, or Microsoft Windows), so, for example, binding +＠kbd{EuroSign} to a command will normally work, but will not invoke that +command if someone presses the Euro sign in a TTY console; conversely, +binding ＠code{(make-char 'latin-iso8859-15 #xa4)} or ＠code{(char-to-int +(make-char 'latin-iso8859-15 #xa4))} to a command will call that command +on a TTY console, but not in an X11 window of the same process.} +＠footnote{See the documentation for `set-input-mode' and +`set-console-tty-coding-system' if you're having trouble inputting +non-ASCII characters in the TTY.} A keystroke may be represented by a list: the last element of the list is the key (a symbol, character, or number, as above) and the preceding 1.20.2.4 +0 -1 XEmacs/xemacs/man/lispref/lispref.texi Index: lispref.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/lispref.texi,v retrieving revision 1.20.2.3 retrieving revision 1.20.2.4 diff -u -p -r1.20.2.3 -r1.20.2.4 --- lispref.texi 2005/04/18 03:52:45 1.20.2.3 +++ lispref.texi 2005/09/20 16:05:44 1.20.2.4 ＠＠ -1199,7 +1199,6 ＠＠ Tips Building XEmacs and Object Allocation * Building XEmacs:: How to preload Lisp libraries into XEmacs. -* Pure Storage:: A kludge to make preloaded Lisp functions sharable. * Garbage Collection:: Reclaiming space for Lisp objects no longer used. ＠end menu 1.11.2.3 +33 -23 XEmacs/xemacs/man/lispref/mule.texi Index: mule.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/mule.texi,v retrieving revision 1.11.2.2 retrieving revision 1.11.2.3 diff -u -p -r1.11.2.2 -r1.11.2.3 --- mule.texi 2005/07/13 04:45:51 1.11.2.2 +++ mule.texi 2005/09/20 16:05:44 1.11.2.3 ＠＠ -141,29 +141,39 ＠＠ directly match ASCII printing characters An ＠dfn{encoding} is a way of numerically representing characters from one or more character sets into a stream of like-sized numerical values called ＠dfn{words} -- typically 8-bit bytes, but sometimes 16-bit or -32-bit quantities. It's very important to clearly distinguish between -charsets and encodings. For a simple charset like ASCII, there is only -one encoding normally used -- each character is represented by a single -byte, with the same value as its code point. For more complicated -charsets, however, or when a single encoding needs to represent more -than charset, things are not so obvious. Unicode version 2, for -example, is a large charset with thousands of characters, each indexed -by a 16-bit number, often represented in hex, e.g. 0x05D0 for the Hebrew -letter "aleph". One obvious encoding (actually two encodings, depending -on which of the two possible byte orderings is chosen) simply uses two -bytes per character. This encoding is convenient for internal -processing of Unicode text; however, it's incompatible with ASCII, and -thus external text (files, e-mail, etc.) that is encoded this way is -completely uninterpretable by programs lacking Unicode support. For -this reason, a different, ASCII-compatible encoding, e.g. UTF-8, is -usually used for external text. UTF-8 represents Unicode characters -with one to three bytes (often extended to six bytes to handle -characters with up to 31-bit indices). Unicode characters 00 to 7F -(identical with ASCII) are directly represented with one byte, and other -characters with two or more bytes, each in the range 80 to FF. -Applications that don't understand Unicode will still be able to process -ASCII characters represented in UTF-8-encoded text, and will typically -ignore (and hopefully preserve) the high-bit characters. +32-bit quantities. In a context where dealing with Japanese motivates +much of XEmacs' design in this area, it's important to clearly +distinguish between charsets and encodings. For a simple charset like +ASCII, there is only one encoding normally used -- each character is +represented by a single byte, with the same value as its code point. +For more complicated charsets, however, or when a single encoding needs +to represent more than charset, things are not so obvious. Unicode +version 2, for example, is a large charset with thousands of characters, +each indexed by a 16-bit number, often represented in hex, e.g. 0x05D0 +for the Hebrew letter "aleph". One obvious encoding (actually two +encodings, depending on which of the two possible byte orderings is +chosen) simply uses two bytes per character. This encoding is +convenient for internal processing of Unicode text; however, it's +incompatible with ASCII, and thus external text (files, e-mail, etc.) +that is encoded this way is completely uninterpretable by programs +lacking Unicode support. For this reason, a different, ASCII-compatible +encoding, e.g. UTF-8, is usually used for external text. UTF-8 +represents Unicode characters with one to three bytes (often extended to +six bytes to handle characters with up to 31-bit indices). Unicode +characters 00 to 7F (identical with ASCII) are directly represented with +one byte, and other characters with two or more bytes, each in the range +80 to FF. Applications that don't understand Unicode will still be able +to process ASCII characters represented in UTF-8-encoded text, and will +typically ignore (and hopefully preserve) the high-bit characters. + +Similarly, Shift-JIS and EUC-JP are different encodings normally used to +encode the same character set(s), these character sets being subsets of +Unicode. However, the obvious approach of unifying XEmacs' internal +encoding across character sets, as was part of the motivation behind +Unicode, wasn't taken. This means that characters in these character +sets that are identical to characters in other character sets---for +example, the Greek alphabet is in the large Japanese character sets and +at least one European character set--are unfortunately disjoint. Naive use of code points is also not possible if more than one character set is to be used in the encoding. For example, printed 1.36.2.3 +11 -0 XEmacs/xemacs/modules/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ChangeLog,v retrieving revision 1.36.2.2 retrieving revision 1.36.2.3 diff -u -p -r1.36.2.2 -r1.36.2.3 --- ChangeLog 2005/07/13 04:46:00 1.36.2.2 +++ ChangeLog 2005/09/20 16:05:48 1.36.2.3 ＠＠ -1,3 +1,14 ＠＠ +2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> + + * XEmacs 21.5.22 "cucumber" is released. + +2005-06-09 Craig Lanning <CraigL(a)sc.rr.com> + + * ldap/.cvsignore: + * sample/external/.cvsignore: + * sample/internal/.cvsignore: + Added GNUmakefile, Makefile, and Makefile.in + 2005-05-28 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.21 "corn" is released. 1.2.20.1 +3 -0 XEmacs/xemacs/modules/ldap/.cvsignore Index: .cvsignore =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ldap/.cvsignore,v retrieving revision 1.2 retrieving revision 1.2.20.1 diff -u -p -r1.2 -r1.2.20.1 --- .cvsignore 2001/04/12 18:22:36 1.2 +++ .cvsignore 2005/09/20 16:05:49 1.2.20.1 ＠＠ -1,2 +1,5 ＠＠ *.ell *_i.c +GNUmakefile +Makefile +Makefile.in 1.1.6.1 +3 -0 XEmacs/xemacs/modules/sample/external/.cvsignore Index: .cvsignore =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/sample/external/.cvsignore,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -p -r1.1 -r1.1.6.1 --- .cvsignore 2002/09/10 15:27:24 1.1 +++ .cvsignore 2005/09/20 16:05:50 1.1.6.1 ＠＠ -1,2 +1,5 ＠＠ *.ell *_i.c +GNUmakefile +Makefile +Makefile.in 1.1.6.1 +3 -0 XEmacs/xemacs/modules/sample/internal/.cvsignore Index: .cvsignore =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/sample/internal/.cvsignore,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -p -r1.1 -r1.1.6.1 --- .cvsignore 2002/09/10 15:27:27 1.1 +++ .cvsignore 2005/09/20 16:05:51 1.1.6.1 ＠＠ -1,2 +1,5 ＠＠ *.ell *_i.c +GNUmakefile +Makefile +Makefile.in 1.31.2.3 +4 -0 XEmacs/xemacs/netinstall/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/netinstall/ChangeLog,v retrieving revision 1.31.2.2 retrieving revision 1.31.2.3 diff -u -p -r1.31.2.2 -r1.31.2.3 --- ChangeLog 2005/07/13 04:46:04 1.31.2.2 +++ ChangeLog 2005/09/20 16:05:52 1.31.2.3 ＠＠ -2,6 +2,10 ＠＠ * ChangeLog: Nuke the CVS revision keywords. +2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> + + * XEmacs 21.5.22 "cucumber" is released. + 2005-05-28 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.21 "corn" is released. 1.175.2.3 +4 -0 XEmacs/xemacs/nt/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/ChangeLog,v retrieving revision 1.175.2.2 retrieving revision 1.175.2.3 diff -u -p -r1.175.2.2 -r1.175.2.3 --- ChangeLog 2005/07/13 04:46:06 1.175.2.2 +++ ChangeLog 2005/09/20 16:05:53 1.175.2.3 ＠＠ -1,3 +1,7 ＠＠ +2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> + + * XEmacs 21.5.22 "cucumber" is released. + 2005-05-28 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.21 "corn" is released. 1.20.2.4 +4 -0 XEmacs/xemacs/nt/installer/Wise/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/installer/Wise/ChangeLog,v retrieving revision 1.20.2.3 retrieving revision 1.20.2.4 diff -u -p -r1.20.2.3 -r1.20.2.4 --- ChangeLog 2005/07/13 04:46:10 1.20.2.3 +++ ChangeLog 2005/09/20 16:05:55 1.20.2.4 ＠＠ -1,3 +1,7 ＠＠ +2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> + + * XEmacs 21.5.22 "cucumber" is released. + 2005-05-28 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.21 "corn" is released. 1.9.2.1 +3 -0 XEmacs/xemacs/src/.cvsignore Index: .cvsignore =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/.cvsignore,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -p -r1.9 -r1.9.2.1 --- .cvsignore 2003/03/18 00:54:00 1.9 +++ .cvsignore 2005/09/20 16:05:56 1.9.2.1 ＠＠ -27,3 +27,6 ＠＠ xemacs.opt *.tmp makeinfo_test.bat REBUILD_AUTOLOADS +dump-size +xemacs.def +xemacs.def.in 1.758.2.27 +360 -111 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.758.2.26 retrieving revision 1.758.2.27 diff -u -p -r1.758.2.26 -r1.758.2.27 --- ChangeLog 2005/08/03 06:09:23 1.758.2.26 +++ ChangeLog 2005/09/20 16:05:56 1.758.2.27 ＠＠ -1,3 +1,252 ＠＠ +2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> + + * XEmacs 21.5.22 "cucumber" is released. + +2005-07-29 Darryl Okahata <darrylo(a)xemacs.org> + + * extents.c (lispobj_gap_array_description_1): fix the memory + descriptions for the "gap", "offset_past_gap", and "els_past_gap" + members. Before, they were incorrectly defined as "XD_INT" + objects. They've been corrected to use "XD_ELEMCOUNT" and + "XD_BYTECOUNT", as that is how they are defined in the actual + Gap_Array declaration. This is important on systems where + sizeof(int) != sizeof(long), such as some 64-bit systems. + +2005-07-24 Fabrice Popineau <Fabrice.Popineau(a)supelec.fr> + + * frame-msw.c (mswindows_set_frame_size): Don't have a frame size + change trigger restoring the frame. + +2005-07-20 Didier Verna <didier(a)xemacs.org> + + Following suggestions from Stephen J. Turnbull: + * faces.c (Qcyclic_face_alias): New name for + Qcyclic_face_aliasing. + * faces.c (Ffind_face): Use it. Rename FACE_ALIASING_MAX_DEPTH to + FACE_ALIAS_MAX_DEPTH. + * faces.c (syms_of_faces): Ditto. + +2005-07-19 Didier Verna <didier(a)xemacs.org> + + * faces.c (Ffind_face): Implement face aliasing. + * faces.c (syms_of_faces): Define Qface_alias symbol, and + Qcyclic_face_aliasing error symbol. + +2005-07-17 Aidan Kehoe <kehoea(a)parhasard.net> + + * cmds.c (Fself_insert_command): + * editfns.c (Fchar_to_string): + * event-stream.c (Fnext_event): + * event-stream.c (execute_command_event): + * events.c (Fevent_to_character): + * keymap.c (Ftext_char_description): + * lisp.h: + Add back the last argument to event-to-character; document that + it's unused. + +2005-07-11 Atanu Ghosh <atanu(a)icsi.berkeley.edu> + + * sysdll.c (dll_open): Under MacOS X return NULL under the + filename is NULL. Fixes problems finding local symbols under 10.4 + (Tiger) + +2005-07-07 Aidan Kehoe <kehoea(a)parhasard.net> + + * console-msw.c: + * console-msw.c (mswindows_perhaps_init_unseen_key_defaults): + * console-msw.c (vars_of_console_mswindows): + Rename Qseen_characters to Vmswindows_seen_characters, dump it + when pdump is in use. + + * console-tty.c (tty_perhaps_init_unseen_key_defaults): + * console-tty.c (vars_of_console_tty): + Rename Qseen_characters to Vttyxo_seen_characters, dump it + when pdump is in use. + +2005-06-29 Marcus Crestani <crestani(a)xemacs.org> + + Fix C++ build for unexec. + * unexelf.c: Adjust fatal and unexec to the declarations in + lisp.h. + * unexelf.c (unexec): Remove unneeded arguments from fatal calls. + +2005-07-03 Aidan Kehoe <kehoea(a)parhasard.net> + + * event-Xt.c: + * event-gtk.c: + * events.c (event_to_character): + * general-slots.h: + Move the Qkey_mapping variable to general-slots.h, now that it's + used outside the platform specific keyboard warning code. + +2005-06-28 Marcus Crestani <crestani(a)xemacs.org> + + * console-x.c (x_perhaps_init_unseen_key_defaults): Use + build_intstring to avoid type error. + * event-Xt.c (x_keysym_to_emacs_keysym): Add cast to avoid type + error. + +2005-06-28 Marcus Crestani <crestani(a)xemacs.org> + + * .cvsignore: Add dump-size, xemacs.def, xemacs.def.in. + +2005-06-28 Marcus Crestani <crestani(a)xemacs.org> + + * gpmevent.c: Remove workaround. + * gpmevent.c (Fgpm_enable): Use GET_DEFUN_LISP_OBJECT to get + Lisp_Object of a built-in function. + * gpmevent.c (syms_of_gpmevent): Remove workaround. + * lisp.h (GET_DEFUN_LISP_OBJECT): New. Returns Lisp_Object of a + DEFUN. + * tooltalk.c (init_tooltalk): Use GET_DEFUN_LISP_OBJECT to get + Lisp_Object of a built-in function. + +2005-06-26 Aidan Kehoe <kehoea(a)parhasard.net> + + * event-stream.c (command_builder_find_leaf): + * mule-ccl.c (POSSIBLE_LEADING_BYTE_P): + * mule-ccl.c (ccl_driver): + Couple of build fixes. + +2005-06-26 Aidan Kehoe <kehoea(a)parhasard.net> + + * mule-ccl.c (POSSIBLE_LEADING_BYTE_P): Add. + * mule-ccl.c: Check that a character set exists before using it + to create a character. + +2005-06-26 Aidan Kehoe <kehoea(a)parhasard.net> + + * cmds.c (Fself_insert_command): + No 4th arg to event_to_character. + + * console-impl.h (struct console_methods): Add a new member + method, perhaps_init_unseen_key_defaults, which is to allow the + console to take appropriate action--often a default binding to + self-insert-command--when notified about a character it may not + have seen before. + + * console-gtk.c: + Add gtk_perhaps_init_unseen_key_defaults, a new console method, + and a hash table it uses. + + * console-msw.c: + Add mswindows_perhaps_init_unseen_key_defaults, a new console + method, and a hash table it uses. + + * console-tty.c: + Add tty_perhaps_init_unseen_key_defaults, a new console method, + and a hash table used by it. + + * console-x.c: + * console-x.c (x_perhaps_init_unseen_key_defaults): New. + Given a key, if it maps to a character and we weren't previously + aware that it could be generated on console CON, and if it's + unbound in the global map, bind it to self-insert-command. Return + Qt if the binding was done; Qnil if not. + + * device-gtk.c: + * device-gtk.c (vars_of_device_gtk): + Add a hash table var used by gtk_perhaps_init_unseen_key_defaults. + + * editfns.c (Fchar_to_string): + Call Fevent_to_character with three arguments, not four; don't + express a belief that the only XEmacs character encoding is + ASCII. + + * event-Xt.c: + * event-Xt.c (maybe_define_x_key_as_self_inserting_character): + ascii-character -> character-of-keysym property renaming. + + * event-Xt.c (x_has_keysym): + Make it visible to the console code, make it a little more Mule-safe. + + * event-Xt.c (index_to_name): + Move to Mule declaration conventions. + + * event-Xt.c (x_reset_modifier_mapping): + Move large comment from Jamie before this function. + + * event-Xt.c (x_keysym_to_emacs_keysym): + Move to Mule declaration conventions and coding practices. + + * event-Xt.c (x_event_to_emacs_event): + Add some comments, and the initial steps necessary for Russian C-x + support. + + * event-msw.c (mswindows_wnd_proc): + Don't conditionalize Russian C-x support on Mule. (I'm not certain + if this is correct on MSW, but it's the approach I'm taking on + X11.) + + * event-stream.c: + Add Russian C-x support, a var to enable and disable it, remove + composed-character-default-binding in favour of + self-insert-command, rename + command_builder_find_leaf_no_mule_processing to + command_builder_find_leaf_no_jit_binding, change + command_builder_find_leaf to tell the console-specific code to + perhaps add a binding for keys its never seen before, and then + retry the lookup if it would otherwise fail. + + * event-stream.c (execute_command_event): + event-to-character has three arguments now, not four. + + * event-stream.c (vars_of_event_stream): + Formatting clean up for inhibit-input-event-recoding. + + * event-xlike-inc.c: + * event-xlike-inc.c (endif): + Move x_keysym_to_character here from event-Xt.c so it can be used + by GTK 1.0 as well; greatly expand it, to handle many more + characters than previously. + + * events.c: + Rename the ascii-character property, remove + character-set-property, remove the now unused fourth argument to + event_to_character, ditto for the event-to-character, + + * events.h (enum alternative_key_chars): + * events.h (struct Lisp_Key_Data): + Russian C-x processing is no longer Mule specific. (Though I'm not + certain why a Russian speaker would be using a non-Mule build.) + + * keymap.c: + * keymap.c (event_matches_key_specifier_p): + * keymap.c (map_keymap_sort_predicate): + * keymap.c (Ftext_char_description): + * keymap.c (elide_next_two_p): + * keymap.c (describe_map): + Rename ascii-character to character-of-keysym, stop pretending the + internal encoding of XEmacs is purely ASCII, + + * lisp.h: + * sysdep.c (tty_init_sys_modes_on_device): + One less argument to event-to-character. + +2005-06-23 Marcus Crestani <crestani(a)xemacs.org> + + * dumper.c (pdump_load_finish): Use EMACS_INT for elt_count. + +2005-06-19 Aidan Kehoe <kehoea(a)parhasard.net> + + * file-coding.c: + * mule-coding.c: + The vernacular in Taiwan, and thus the language for which Big5 is + most used, is Mandarin. Taiwanese does exist, but since the + Chinese civil war, it's used less and less in Taiwan. + +2005-06-06 Marcus Crestani <crestani(a)xemacs.org> + + * lisp.h (DEFUN): Define S##fname here. + * lisp.h (DEFUN_NORETURN): Define S##fname here. + * symeval.h (DEFSUBR_MC_ALLOC): Use already defined S##fname. + +2005-06-01 Marcus Crestani <crestani(a)xemacs.org> + + * ralloc.c: + * ralloc.c (r_alloc_free): Call refill_memory_reserve only if + MC_ALLOC is not defined. + 2005-05-28 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.21 "corn" is released. ＠＠ -32,7 +281,7 ＠＠ 2005-05-10 Aidan Kehoe <kehoea(a)parhasard.net> * extents.c: Clarify that the atomic extent property is a kludge - and will go away if and when we implement something better. + and will go away if and when we implement something better. 2005-05-06 Dr. Volker Zell <Dr.Volker.Zell(a)oracle.com> ＠＠ -42,13 +291,13 ＠＠ 2005-05-05 Aidan Kehoe <kehoea(a)parhasard.net> * extents.c: Add some info on atomic-extents.el to the - set-extent-property docstring. + set-extent-property docstring. 2005-05-05 Aidan Kehoe <kehoea(a)parhasard.net> * select.c: - * sound.c: - Spelling fixes to docstrings. + * sound.c: + Spelling fixes to docstrings. 2005-04-27 Stephen J. Turnbull <stephen(a)xemacs.org> ＠＠ -113,16 +362,16 ＠＠ New lrecord allocation and free functions: - * alloc.c (alloc_lrecord): New. Allocates an lrecord, includes + * alloc.c (alloc_lrecord): New. Allocates an lrecord, includes type checking and initializing of the lrecord_header. * alloc.c (noseeum_alloc_lrecord): Same as above, but increments the NOSEEUM cons counter. - * alloc.c (free_lrecord): New. Calls the finalizer and frees the + * alloc.c (free_lrecord): New. Calls the finalizer and frees the lrecord. * lrecord.h: Add lrecord allocation prototypes and comments. Remove old lrecord FROB block allocation: - + * alloc.c (allocate_lisp_storage): Former function to expand heap. Not needed anymore, remove. * alloc.c: Completely remove `Fixed-size type macros' ＠＠ -144,7 +393,7 ＠＠ * alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC): Remove. Allocate old lrecords with new allocator: - + * alloc.c: DECLARE_FIXED_TYPE_ALLOC removed for all lrecords defined in alloc.c. * alloc.c (Fcons): Allocate with new allocator. ＠＠ -215,7 +464,7 ＠＠ * alloc.c (gc_sweep): Remove all the old lcrecord and lrecord related stuff. Sweeping now works like this: compact string chars, finalize, sweep. - * alloc.c (common_init_alloc_early): Remove old lrecord + * alloc.c (common_init_alloc_early): Remove old lrecord initializations, remove breathing_space. * emacs.c (Fdump_emacs): Remove release_breathing_space. * lisp.h: Remove prototype for release_breathing_space. ＠＠ -240,12 +489,12 ＠＠ Unify lrecords and lcrecords: - * lisp.h (struct Lisp_String): Adjust string union hack to + * lisp.h (struct Lisp_String): Adjust string union hack to new lrecord header. * lrecord.h: Adjust comments. * lrecord.h (struct lrecord_header): The new lrecord header includes type, lisp-readonly, free, and uid. - * lrecord.h (set_lheader_implementation): Adjust to new + * lrecord.h (set_lheader_implementation): Adjust to new lrecord_header. * lrecord.h (struct lrecord_implementation): The field basic_p for indication of an old lrecord is not needed anymore, remove. ＠＠ -254,9 +503,9 ＠＠ basic_p. * lrecord.h (copy_sized_lrecord): Remove distinction between old lrecords and lcrecords. - * lrecord.h (copy_lrecord): Remove distinction between old + * lrecord.h (copy_lrecord): Remove distinction between old lrecords and lcrecords. - * lrecord.h (zero_sized_lrecord): Remove distinction between + * lrecord.h (zero_sized_lrecord): Remove distinction between old lrecords and lcrecords. * lrecord.h (zero_lrecord): Remove distinction between old lrecords and lcrecords. ＠＠ -265,7 +514,7 ＠＠ * alloc.c (basic_alloc_lcrecord): Not needed anymore, remove. * alloc.c (very_old_free_lcrecord): Not needed anymore, remove. - * alloc.c (copy_lisp_object): No more distinction between + * alloc.c (copy_lisp_object): No more distinction between lrecords and lcrecords. * alloc.c (all_lcrecords): Not needed anymore, remove. * alloc.c (make_vector_internal): Allocate as lrecord. ＠＠ -281,13 +530,13 ＠＠ * alloc.c (free_lcrecord): Remove. * alloc.c (lcrecord_stats): Remove. * alloc.c (tick_lcrecord_stats): Remove. - * alloc.c (disksave_object_finalization_1): Add call to + * alloc.c (disksave_object_finalization_1): Add call to mc_finalize_for_disksave. Remove the lcrecord way to visit all objects. * alloc.c (kkcc_marking): Remove XD_FLAG_FREE_LISP_OBJECT * alloc.c (sweep_lcrecords_1): Remove. * alloc.c (common_init_alloc_early): Remove everything related - to lcrecords, remove old lrecord initializations, + to lcrecords, remove old lrecord initializations, * alloc.c (init_lcrecord_lists): Not needed anymore, remove. * alloc.c (reinit_alloc_early): Remove everything related to lcrecords. ＠＠ -295,7 +544,7 ＠＠ lcrecords. * buffer.c (allocate_buffer): Allocate as lrecord. * buffer.c (nuke_all_buffer_slots): Use lrecord functions. - * buffer.c (common_init_complex_vars_of_buffer): Allocate as + * buffer.c (common_init_complex_vars_of_buffer): Allocate as lrecord. * buffer.h (struct buffer): Add lrecord_header. * casetab.c (allocate_case_table): Allocate as lrecord. ＠＠ -311,11 +560,11 ＠＠ * chartab.h (struct Lisp_Char_Table): Add lrecord_header. * console-impl.h (struct console): Add lrecord_header. * console-msw-impl.h (struct Lisp_Devmode): Add lrecord_header. - * console-msw-impl.h (struct mswindows_dialog_id): Add + * console-msw-impl.h (struct mswindows_dialog_id): Add lrecord_header. * console.c (allocate_console): Allocate as lrecord. * console.c (nuke_all_console_slots): Use lrecord functions. - * console.c (common_init_complex_vars_of_console): Allocate as + * console.c (common_init_complex_vars_of_console): Allocate as lrecord. * data.c (make_weak_list): Allocate as lrecord. * data.c (make_weak_box): Allocate as lrecord. ＠＠ -336,7 +585,7 ＠＠ * event-stream.c (free_command_builder): Use lrecord functions. * event-stream.c (event_stream_generate_wakeup): Allocate as lrecord. - * event-stream.c (event_stream_resignal_wakeup): Use lrecord + * event-stream.c (event_stream_resignal_wakeup): Use lrecord functions. * event-stream.c (event_stream_disable_wakeup): Use lrecord functions. ＠＠ -382,11 +631,11 ＠＠ * lstream.c (Lstream_new): Allocate as lrecord. * lstream.c (Lstream_delete): Use lrecod functions. * lstream.c (reinit_vars_of_lstream): Vlstream_free_list - initialization remove. + initialization remove. * lstream.h (struct lstream): Add lrecord_header. * emacs.c (main_1): Remove lstream initialization. * mule-charset.c (make_charset): Allocate as lrecord. - * objects-impl.h (struct Lisp_Color_Instance): Add + * objects-impl.h (struct Lisp_Color_Instance): Add lrecord_header. * objects-impl.h (struct Lisp_Font_Instance): Add lrecord_header. * objects.c (Fmake_color_instance): Allocate as lrecord. ＠＠ -396,7 +645,7 ＠＠ * opaque.c (make_opaque): Allocate as lrecord. * opaque.c (make_opaque_ptr): Allocate as lrecord. * opaque.c (free_opaque_ptr): Use lrecord functions. - * opaque.c (reinit_opaque_early): + * opaque.c (reinit_opaque_early): * opaque.c (init_opaque_once_early): Vopaque_ptr_list initialization remove. * opaque.h (Lisp_Opaque): Add lrecord_header. ＠＠ -416,7 +665,7 ＠＠ * specifier.h (struct Lisp_Specifier): Add lrecord_header. * symbols.c: * symbols.c (Fmake_variable_buffer_local): Allocate as lrecord. - * symbols.c (Fdontusethis_set_symbol_value_handler): Allocate + * symbols.c (Fdontusethis_set_symbol_value_handler): Allocate as lrecord. * symbols.c (Fdefvaralias): Allocate as lrecord. * symeval.h (struct symbol_value_magic): Add lrecord_header. ＠＠ -441,13 +690,13 ＠＠ * alloc.c (fixed_type_block_overhead): Not used anymore, remove. * buffer.c (compute_buffer_usage): Get storage size from new allocator. - * marker.c (compute_buffer_marker_usage): Get storage size from + * marker.c (compute_buffer_marker_usage): Get storage size from new allocator. - * mule-charset.c (compute_charset_usage): Get storage size from + * mule-charset.c (compute_charset_usage): Get storage size from new allocator. * scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): Get storage size from new allocator. - * scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage): + * scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage): Get storage size from new allocator. * scrollbar-x.c (x_compute_scrollbar_instance_usage): Get storage size from new allocator. ＠＠ -459,7 +708,7 ＠＠ from new allocator. * window.c (compute_window_mirror_usage): Get storage size from new allocator. - * window.c (compute_window_usage): Get storage size from new + * window.c (compute_window_usage): Get storage size from new allocator. MC_ALLOC_TYPE_STATS: ＠＠ -486,7 +735,7 ＠＠ * alloc.c (debug_string_purity): Remove. * alloc.c (debug_string_purity_print): Remove. * alloc.c (sweep_strings): Remove. - + Remove static C-readonly Lisp objects: * alloc.c (c_readonly): Not needed anymore, remove. ＠＠ -534,7 +783,7 ＠＠ * symbols.c (init_symbols_once_early): Add Qunbound to root set. Changes to the Portable Dumper: - + * alloc.c (FREE_OR_REALLOC_BEGIN): Since dumped objects can be freed with the new allocator, remove assertion for !DUMPEDP. * dumper.c: Adjust comments, increase PDUMP_HASHSIZE. ＠＠ -542,7 +791,7 ＠＠ avoid collisions. * dumper.c (pdump_objects_unmark): No more mark bits within the object, remove. - * dumper.c (mc_addr_elt): New. Element data structure for mc + * dumper.c (mc_addr_elt): New. Element data structure for mc hash table. * dumper.c (pdump_mc_hash): New hash table: `lookup table'. * dumper.c (pdump_get_mc_addr): New. Lookup for hash table. ＠＠ -551,22 +800,22 ＠＠ * dumper.c (pdump_put_mc_addr): New. Putter for hash table. * dumper.c (pdump_dump_mc_data): New. Writes the table for relocation at load time to the dump file. - * dumper.c (pdump_scan_lisp_objects_by_alignment): New. + * dumper.c (pdump_scan_lisp_objects_by_alignment): New. Visits all dumped Lisp objects. * dumper.c (pdump_scan_non_lisp_objects_by_alignment): New. Visits all other dumped objects. * dumper.c (pdump_reloc_one_mc): New. Updates all pointers of an object by using the hash table pdump_mc_hash. * dumper.c (pdump_reloc_one): Replaced by pdump_reloc_one_mc. - * dumper.c (pdump): Change the structure of the dump file, add + * dumper.c (pdump): Change the structure of the dump file, add the mc post dump relocation table to dump file. - * dumper.c (pdump_load_finish): Hand all dumped objects to the - new allocator and use the mc post dump relocation table for + * dumper.c (pdump_load_finish): Hand all dumped objects to the + new allocator and use the mc post dump relocation table for relocating the dumped objects at dump file load time, free not longer used data structures. * dumper.c (pdump_load): Free the dump file. * dumper.h: Remove pdump_objects_unmark. - * lrecord.h (DUMPEDP): Dumped objects can be freed, remove. + * lrecord.h (DUMPEDP): Dumped objects can be freed, remove. DUMP_IN_EXEC: ＠＠ -596,13 +845,13 ＠＠ * mule-ccl.c (ccl_driver): Calculate the charset and position code for control-1 characters properly, both when reading multibyte - characters and writing them. + characters and writing them. 2005-03-31 Aidan Kehoe <kehoea(a)parhasard.net> * unicode.c (set_unicode_conversion): Don't try to write to the non-existent conversion tables for ASCII and control-1, in the - interest of not segfaulting. + interest of not segfaulting. * unicode.c (unicode_convert): The "position code" for a control-1 character has #xA0 added to it when encoded in Mule, unlike #x80 for all the other non-ASCII character sets ; take this into ＠＠ -610,9 +859,9 ＠＠ 2005-03-29 Aidan Kehoe <kehoea(a)parhasard.net> - * event-Xt.c: Declare Funicode_to_char. + * event-Xt.c: Declare Funicode_to_char. * event-Xt.c (x_keysym_to_character): Use it, if we're handed a - keysym for which it's appropriate. + keysym for which it's appropriate. 2005-03-26 Jerry James <james(a)xemacs.org> ＠＠ -623,7 +872,7 ＠＠ 2005-02-24 Andrey Slusar <anrays(a)gmail.com> - * unexelf.c: define `Elfw(type)' for FreeBSD alpha and amd64. + * unexelf.c: define `Elfw(type)' for FreeBSD alpha and amd64. 2005-03-25 Marcus Crestani <crestani(a)xemacs.org> ＠＠ -634,11 +883,11 ＠＠ * device-x.c (x_init_device): Only do the old application class determination behaviour if the USE_EMACS_AS_DEFAULT_APPLICATION_CLASS environment variable is - set; otherwise, we use XEmacs. + set; otherwise, we use XEmacs. * device-x.c (vars_of_device_x): Update the docstring for - x-emacs-application-class. + x-emacs-application-class. * frame.c: default-frame-name is now "XEmacs", unless the old X11 - resources behaviour has been requested. + resources behaviour has been requested. 2005-03-15 Marcus Crestani <crestani(a)informatik.uni-tuebingen.de> ＠＠ -722,7 +971,7 ＠＠ 2005-01-13 Stephen J. Turnbull <stephen(a)xemacs.org> - * regex.c (re_match_2_internal): + * regex.c (re_match_2_internal): * regex.h (struct re_pattern_buffer): Improve comments. Add a DEBUG_PRINT2 for null matches. ＠＠ -730,24 +979,24 ＠＠ * select-x.c (x_reply_selection_request): Check that XtWindowToWidget returns NULL before calling XtRegisterDrawable, - document why. + document why. 2005-03-02 Aidan Kehoe <kehoea(a)parhasard.net> * select-x.c (x_reply_selection_request): Make the error message in the absence of HAVE_XTREGISTERDRAWABLE more polite, pass a second argument to invalid_operation to have it actually compile - in that case. + in that case. 2005-03-01 Aidan Kehoe <kehoea(a)parhasard.net> - * config.h.in: New macro, HAVE_XTREGISTERDRAWABLE. - * select-x.c (x_reply_selection_request): Use it. + * config.h.in: New macro, HAVE_XTREGISTERDRAWABLE. + * select-x.c (x_reply_selection_request): Use it. 2005-03-01 Aidan Kehoe <kehoea(a)parhasard.net> * select-x.c (x_reply_selection_request): Wrap - DEVICE_SELECTED_FRAME in XFRAME --> fixes a build failure. + DEVICE_SELECTED_FRAME in XFRAME --> fixes a build failure. 2005-03-01 Aidan Kehoe <kehoea(a)parhasard.net> ＠＠ -755,39 +1004,39 ＠＠ Unicode coding systems will lose data. Make this clear in the docstring of unicode-to-char, give sample code to implement support for some desired code points should our distributors want - to do that. + to do that. 2005-02-28 Aidan Kehoe <kehoea(a)parhasard.net> * select-gtk.c (emacs_gtk_selection_handle): * select-gtk.c (emacs_gtk_selection_clear_event_handle): - Use get_selection_raw_timestamp instead of Fget_selection_timestamp. + Use get_selection_raw_timestamp instead of Fget_selection_timestamp. * select-gtk.c (gtk_own_selection): Cross reference to some debate in select-x.c * select-x.c: * select-x.c (x_handle_selection_request): Discuss Time vs. time_t--I think Time is _always_ thirty-two-bit - and time_t is variable in size. + and time_t is variable in size. * select-x.c (x_handle_selection_clear): Replace call to Fget_selection_timestamp with call to get_selection_raw_time, check that pasted data pointer is non-zero - before trying to free it. + before trying to free it. * select.c: * select.c (Fown_selection_internal): Informative comment! Shouldn't actually be needed outside of the X - world. - * select.c (get_selection_raw_time): New function. + world. + * select.c (get_selection_raw_time): New function. * select.c (Fget_selection_timestamp): Rework to use get_selection_raw_time. * select.h: - Make get_selection_raw_time available. - + Make get_selection_raw_time available. + 2005-02-26 Aidan Kehoe <kehoea(a)parhasard.net> - * select-x.c (x_reply_selection_request): Use XtRegisterDrawable - to tell Xt not to drop PropertyChange events destined for the - selection request target window. This makes incremental selection - transfer work, instead of looping until interrupted. + * select-x.c (x_reply_selection_request): Use XtRegisterDrawable + to tell Xt not to drop PropertyChange events destined for the + selection request target window. This makes incremental selection + transfer work, instead of looping until interrupted. 2005-01-06 Andrey Slusar <anrays(a)gmail.com> ＠＠ -829,7 +1078,7 ＠＠ * dumper.c (DUMP_SLACK): * dumper.c (pdump_load): Include extra DUMP_SLACK when allocating space for exe path. - + * glyphs-eimage.c: Reformat comment. ＠＠ -913,14 +1162,14 ＠＠ * menubar.c: * menubar.c (Fcompare_menu_text): New fun to compare menu itext as if the two were normalized. - + * menubar.c (Fnormalize_menu_text): * menubar.c (syms_of_menubar): Rename; there are no external callers of this function. Remove unneeded BUFFER argument. Don't downcase. (This will be done in compare-menu-text.) Document that return value may be same string. - + 2003-02-15 Ben Wing <ben(a)xemacs.org> * syswindows.h: Define W32API_2_2 for w32api.h v2.2 or higher. ＠＠ -1002,7 +1251,7 ＠＠ * nt.c: * fileio.c: Fix sync comments. - + * config.h.in: * dired-msw.c (mswindows_get_files): * emacs.c (main_1): ＠＠ -1067,12 +1316,12 ＠＠ * nt.c (mswindows_unlink): * sysdep.c (sys_subshell): Unicode-ize. - + * realpath.c (readlink_or_correct_case): Renamed from readlink_and_correct_case. Fix some problems with Windows implementation due to incorrect understanding of workings of the function. - + * sound.c (Fplay_sound_file): * ntplay.c (nt_play_sound_file): * sound.c: ＠＠ -1088,7 +1337,7 ＠＠ * free-hook.c (check_free): Fix aliasing warning. - + 2005-01-26 Ben Wing <ben(a)xemacs.org> * redisplay.c: ＠＠ -1186,7 +1435,7 ＠＠ * bytecode.c (optimize_compiled_function): * print.c (ONE_DIGIT): Add casts to avoid warning. - + * compiler.h: Add MSC_VERSION and include definitions of DOESNT_RETURN and friends here, like for GCC. Need different definitions for VC7 ＠＠ -1202,10 +1451,10 ＠＠ Some really nasty hacks to allow TIFF and JPEG to both be compiled. #### The better solution is to move the TIFF and JPEG code to different files. - + * glyphs-msw.c (mswindows_xbm_instantiate): Define __STDC__ to avoid problems with compface.h. - + * intl-auto-encap-win32.c (qxeImmGetCandidateListCount): * intl-auto-encap-win32.c (qxeFindResourceEx): * intl-auto-encap-win32.h: ＠＠ -1216,7 +1465,7 ＠＠ Various functions change parameter types semi-randomly between VC6 and VC7, so we need to include our own versions that can handle both kinds with appropriate casting. - + * EmacsFrame.c (EmacsFrameRecomputeCellSize): * EmacsShell-sub.c: * EmacsShell-sub.c (ABORT): ＠＠ -1510,7 +1759,7 ＠＠ 2005-01-21 Robert Royar <xemacs(a)frinabulax.org> - * database.c: Repair typo in NetBSD fix. + * database.c: Repair typo in NetBSD fix. 2005-01-21 Malcolm Purvis <malcolmp(a)xemacs.org> ＠＠ -1567,7 +1816,7 ＠＠ entry. Use in profile.c to try to reduce profiling overhead. Increase initial size of profile hash tables to reduce profiling overhead. - + * buffer.c (init_initial_directory): * device-msw.c (mswindows_handle_page_setup_dialog_box): * dialog-msw.c (handle_directory_proc): ＠＠ -1623,7 +1872,7 ＠＠ dumper.c to avoid use of PATH_MAX. When necessary in nt.c, use _MAX_PATH instead of MAX_PATH to be consistent with other places. - + * text.c (dfc_convert_to_internal_format): Code to short-circuit when binary or Unicode was not working due to EOL wrapping. Fix this code to work when either no ＠＠ -1718,11 +1967,11 ＠＠ previous version. Track the char position of the gap. Add functions to do char-byte conversion downwards as well as upwards. Move comments about algorithm workings to internals manual. - + --------------------------- work on types --------------------------- - + * alloc.c: * alloc.c (gc_plist_hack): * console-x-impl.h (struct x_frame): ＠＠ -1937,7 +2186,7 ＠＠ the basic semantics of `char' that I have so far identified, so that its semantics can always be identified for the purposes of proper Mule-safe code, and the raw use of `char' always avoided. - + (1) More type renaming, for consistency of naming. Char_ASCII -> Ascbyte ＠＠ -1961,25 +2210,25 ＠＠ * lisp.h: Group generic int-type defs together with EMACS_INT defs. - + * lisp.h (EXTTEXT_ZTERM_SIZE): * lisp.h (ITEXT_SIZE): * lisp.h (NON_ASCII_INTERNAL_FORMAT): * lisp.h (UTF16_IBYTE_FORMAT): * lisp.h (WEXTTEXT_IS_WIDE) New defns. - + * lisp.h (Boolean): New type to replace places where int occurs as a boolean. It's signed because occasionally people may want to use -1 as an error value, and because unsigned ints are viral -- see comments in the internals manual against using them. - + * dynarr.c: * dynarr.c (Dynarr_realloc): * dynarr.c (Dynarr_resize): int -> Bytecount. - + --------------------------- Mule-izing --------------------------- ＠＠ -1991,7 +2240,7 ＠＠ * device-x.c (Fx_set_font_path): * device-x.c (reinit_console_type_create_device_x): Partially Mule-ize. - + * dumper.c (see above): * dumper.c (pdump_file_get): * dumper.c (pdump_resource_get): ＠＠ -2039,14 +2288,14 ＠＠ Rename win32 init function and call it even earlier, to initialize mswindows_9x_p even earlier, for use in startup code (XEUNICODE_P). - + * process.c (init_xemacs_process): Use _wenviron not environ under Windows, to get Unicode environment variables. * event-Xt.c (x_event_to_emacs_event): Mule-ize drag-n-drop related stuff. - + * dragdrop.c (dnd_url_hexify_string): * dragdrop.h: * frame-x.c: ＠＠ -2490,7 +2739,7 ＠＠ * intl-auto-encap-win32.h (OpenJobObject): * intl-auto-encap-win32.h (qxemciGetErrorString): Regenerate. - + --------------------------- Unicode-work --------------------------- ＠＠ -2511,7 +2760,7 ＠＠ * alloc.c (build_ext_string): Use dfc_external_data_len() in case of unicode coding system. - + * alloc.c: * mule-charset.c: * mule-charset.c (make_charset): ＠＠ -2549,7 +2798,7 ＠＠ * console-msw.c: * console-msw.h: Add pointer to docs in win32.c. - + * emacs.c: Add comments on sources of doc info. ＠＠ -2564,7 +2813,7 ＠＠ * intl-encap-win32.c: * text.h: * text.h (internal_format): - * file-coding.c (encode_decode_coding_region): + * file-coding.c (encode_decode_coding_region): * file-coding.c: * mule-coding.c (parse_iso2022_esc): Collect background comments and related to text matters and ＠＠ -2592,17 +2841,17 ＠＠ builds and environments under Windows and how they work. Collect this info in win32.c. Add pointers to these docs in the relevant s/* files. - + * emacs.c (mswindows_handle_hardware_exceptions_1): * emacs.c: Document places with long comments. Remove comment about exiting, move to internals manual, put in pointer. - + * event-stream.c: Move docs about event queues and focus to internals manual, put in pointer. - + * events.h: Move docs about event stream callbacks to internals manual, put in pointer. ＠＠ -2614,17 +2863,17 ＠＠ * process-nt.c: Add pointer to comment in win32-native.el. - + * lisp.h: Add comments about some comment conventions. * lisp.h (xfree): Add comment about the second argument. - + * device-msw.c (msprinter_init_device): * redisplay-msw.c (mswindows_text_width_single_run): ＠＠#### comments are out-of-date. - + --------------------------------------------------------------- PDUMP WORK (MOTIVATED BY UNICODE CHANGES) --------------------------------------------------------------- ＠＠ -2690,19 +2939,19 ＠＠ Properly implement dump_add_root_block(), which never worked before, and is necessary for dumping Unicode tables. - + Pdump name changes for accuracy: XD_STRUCT_PTR -> XD_BLOCK_PTR. XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY. XD_C_STRING -> XD_ASCII_STRING. *_structure_* -> *_block_*. - + * lrecord.h (XD_DYNARR_DESC): some comments added about dump_add_root_block() vs dump_add_root_block_ptr(). * extents.c: remove incorrect comment about pdump problems with gap array. - + --------------------------------------------------------------- ALLOCATION --------------------------------------------------------------- ＠＠ -2792,7 +3041,7 ＠＠ more convenient allocation of these commonly requested items. Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes, xnew_ibytes, etc. also XREALLOC_ARRAY, xnew. - + * alloc.c (FREE_FIXED_TYPE): * alloc.c (Fstring): * alloc.c (MALLOC_BEGIN): ＠＠ -2805,11 +3054,11 ＠＠ * alloc.c: Rewrite the allocation functions to factor out repeated code. Add assertions for freeing dumped data. - + * lisp.h (xmalloc_and_record_unwind): * lisp.h (xfree): Moved down and consolidated with other allocation stuff. - + * lisp.h: * dynarr.c (stack_like_malloc): * dynarr.c (stack_like_free): ＠＠ -2825,7 +3074,7 ＠＠ * text.c (new_dfc_convert_malloc): * text.h: Factor out some stuff for general use by alloca()-conversion funs. - + * text.h (xmalloc_ibytes): * lisp.h: Fill out convenience routines for allocating various kinds of ＠＠ -2862,7 +3111,7 ＠＠ Redo GCPRO declarations. Create a "base" set of functions that can be used to generate any kind of gcpro sets -- regular, ngcpro, nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2. - + * buffer.c (Fkill_buffer): * callint.c (quotify_args): * chartab.c (chartab_data_validate): ＠＠ -2907,7 +3156,7 ＠＠ Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3 or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2 (new macro). Removed/redid comments on EXTERNAL_LIST_LOOP. - + --------------------------------------------------------------- SPACING FIXES ＠＠ -2935,7 +3184,7 ＠＠ FIX FOR LEAKING PROCESS HANDLES: --------------------------------------------------------------- - + * process-nt.c (free_process_memory): * process-nt.c (alloc_process_memory): * process-nt.c (run_in_other_process): ＠＠ -2961,7 +3210,7 ＠＠ * console-stream.c (init_console_stream): `reinit' is unused. - + * compiler.h: * event-msw.c (mswindows_wnd_proc): * frame-msw.c (mswindows_frame_totally_visible_p): ＠＠ -3054,7 +3303,7 ＠＠ * text.c (dfc_convert_to_external_format): * text.c (dfc_convert_to_internal_format): Assert on !inhibit_non_essential_conversion_operations. - + * console-msw.c (Fmswindows_message_box): * console-msw.c (GetConsoleHwnd): * console-msw.c (mswindows_output_console_string): ＠＠ -3063,7 +3312,7 ＠＠ Don't do conversion in SetConsoleTitle or FindWindow to avoid problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT in places where problems would arise. - + --------------------------------------------------------------- CHANGES TO THE BUILD PROCEDURE: --------------------------------------------------------------- ＠＠ -3228,7 +3477,7 ＠＠ Fix some typos in comments. 2003-11-21 Stephen J. Turnbull <stephen(a)xemacs.org> - + * dired.c (Fdirectory_files): MATCH is only tried against basename. 2003-11-02 Stephen J. Turnbull <stephen(a)xemacs.org> ＠＠ -3238,7 +3487,7 ＠＠ 2003-10-31 Stephen J. Turnbull <stephen(a)xemacs.org> * procimpl.h (struct Lisp_Process): - * undo.c (Fprimitive_undo): + * undo.c (Fprimitive_undo): Remove obsolete references to ENERGIZE in comments. 2004-07-18 Stephen J. Turnbull <stephen(a)xemacs.org> 1.17.6.1 +4 -3 XEmacs/xemacs/src/cmds.c Index: cmds.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/cmds.c,v retrieving revision 1.17 retrieving revision 1.17.6.1 diff -u -p -r1.17 -r1.17.6.1 --- cmds.c 2002/06/20 21:18:22 1.17 +++ cmds.c 2005/09/20 16:06:00 1.17.6.1 ＠＠ -339,11 +339,12 ＠＠ If a prefix arg COUNT is specified, the if (CHAR_OR_CHAR_INTP (Vlast_command_char)) c = Vlast_command_char; else - c = Fevent_to_character (Vlast_command_event, Qnil, Qnil, Qt); + c = Fevent_to_character (Vlast_command_event, Qnil, Qnil, Qnil); if (NILP (c)) - invalid_operation ("Last typed character has no ASCII equivalent", - Fcopy_event (Vlast_command_event, Qnil)); + invalid_operation ( + "Last typed key has no character equivalent (that we know of)", + Fcopy_event (Vlast_command_event, Qnil)); CHECK_CHAR_COERCE_INT (c); 1.5.2.1 +78 -0 XEmacs/xemacs/src/console-gtk.c Index: console-gtk.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-gtk.c,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -p -r1.5 -r1.5.2.1 --- console-gtk.c 2004/09/20 19:19:36 1.5 +++ console-gtk.c 2005/09/20 16:06:00 1.5.2.1 ＠＠ -32,6 +32,9 ＠＠ Boston, MA 02111-1307, USA. */ #include "process.h" /* canonicalize_host_name */ #include "redisplay.h" /* for display_arg */ +#include "charset.h" +#include "elhash.h" + #include "console-gtk-impl.h" DEFINE_CONSOLE_TYPE (gtk); ＠＠ -112,6 +115,80 ＠＠ gtk_canonicalize_device_connection (Lisp RETURN_UNGCPRO (connection); } +extern Lisp_Object gtk_keysym_to_character(guint keysym); + +static Lisp_Object +gtk_perhaps_init_unseen_key_defaults (struct console *UNUSED(con), + Lisp_Object key) +{ + Lisp_Object char_to_associate = Qnil; + extern Lisp_Object Vcurrent_global_map, Qgtk_seen_characters, + Qcharacter_of_keysym; + + if (SYMBOLP(key)) + { + gchar *symbol_name; + guint keyval; + DECLARE_EISTRING(ei_symname); + + eicpy_rawz(ei_symname, XSTRING_DATA(symbol_name(XSYMBOL(key)))); + + /* No information on the coding system of the string key names in GDK, + to my knowledge. Defaulting to binary, */ + eito_external(ei_symname, Qbinary); + symbol_name = eiextdata(ei_symname); + +/* GTK 2.0 has an API we can use, and makes this available in gdkkeys.h + + This has yet to be compiled, because XEmacs' GTK support hasn't yet moved + to 2.0. So if you're porting XEmacs to GTK 2.0, bear that in mind. */ + char_to_associate +#ifdef __GDK_KEYS_H__ + = Funicode_to_char + (make_int(gdk_keyval_to_unicode + (gdk_keyval_from_name(symbol_name))), Qnil); +#else /* GTK 1.whatever doesn't. Use the X11 map. */ + = gtk_keysym_to_character(gdk_keyval_from_name(symbol_name)); +#endif + } + else + { + CHECK_CHAR(key); + } + + if (!(HASH_TABLEP(Qgtk_seen_characters))) + { + Qgtk_seen_characters = make_lisp_hash_table (128, HASH_TABLE_NON_WEAK, + HASH_TABLE_EQUAL); + } + + /* Might give the user an opaque error if make_lisp_hash_table fails, + but it shouldn't crash. */ + CHECK_HASH_TABLE(Qgtk_seen_characters); + + if (EQ(char_to_associate, Qnil) /* If there's no char to bind, */ + || (XCHAR(char_to_associate) < 0x80) /* or it's ASCII */ + || !NILP(Fgethash(key, Qgtk_seen_characters, Qnil))) /* Or we've seen + it already, */ + { + /* then don't bind the key. */ + return Qnil; + } + + if (NILP (Flookup_key (Vcurrent_global_map, key, Qnil))) + { + Fputhash(key, Qt, Qgtk_seen_characters); + Fdefine_key (Vcurrent_global_map, key, Qself_insert_command); + if (SYMBOLP(key)) + { + Fput (key, Qcharacter_of_keysym, char_to_associate); + } + return Qt; + } + + return Qnil; +} + void console_type_create_gtk (void) { ＠＠ -123,6 +200,7 ＠＠ console_type_create_gtk (void) CONSOLE_HAS_METHOD (gtk, canonicalize_device_connection); CONSOLE_HAS_METHOD (gtk, device_to_console_connection); CONSOLE_HAS_METHOD (gtk, initially_selected_for_input); + CONSOLE_HAS_METHOD (gtk, perhaps_init_unseen_key_defaults); /* CONSOLE_HAS_METHOD (gtk, delete_console); */ } 1.7.2.3 +2 -0 XEmacs/xemacs/src/console-impl.h Index: console-impl.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-impl.h,v retrieving revision 1.7.2.2 retrieving revision 1.7.2.3 diff -u -p -r1.7.2.2 -r1.7.2.3 --- console-impl.h 2005/07/13 04:46:28 1.7.2.2 +++ console-impl.h 2005/09/20 16:06:00 1.7.2.3 ＠＠ -74,6 +74,8 ＠＠ struct console_methods (Lisp_Object connection, Error_Behavior errb); Lisp_Object (*device_to_console_connection_method) (Lisp_Object connection, Error_Behavior errb); + Lisp_Object (*perhaps_init_unseen_key_defaults_method) + (struct console *, Lisp_Object keysym); /* device methods */ void (*init_device_method) (struct device *, Lisp_Object props); 1.18.2.1 +62 -0 XEmacs/xemacs/src/console-msw.c Index: console-msw.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-msw.c,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -u -p -r1.18 -r1.18.2.1 --- console-msw.c 2004/11/04 23:06:18 1.18 +++ console-msw.c 2005/09/20 16:06:01 1.18.2.1 ＠＠ -37,6 +37,7 ＠＠ Boston, MA 02111-1307, USA. */ #include "console-msw-impl.h" #include "events.h" #include "opaque.h" +#include "elhash.h" DEFINE_CONSOLE_TYPE (mswindows); DEFINE_CONSOLE_TYPE (msprinter); ＠＠ -67,6 +68,7 ＠＠ Lisp_Object Qtaskmodal; Lisp_Object Qtopmost; Lisp_Object Qyesno; Lisp_Object Qyesnocancel; +Lisp_Object Vmswindows_seen_characters; /* Lisp_Object Qabort; */ /* Lisp_Object Qcancel; */ ＠＠ -184,6 +186,61 ＠＠ mswindows_canonicalize_device_connection return mswindows_canonicalize_console_connection (connection, errb); } +/* The actual console doesn't matter, because the global map is global. See + console-x.c for a corner case, though. */ + +static Lisp_Object +mswindows_perhaps_init_unseen_key_defaults (struct console *UNUSED(con), + Lisp_Object key) +{ + Ichar val; + extern Lisp_Object Vcurrent_global_map; + + if (SYMBOLP(key)) + { + /* We've no idea what to default a symbol to on MS Windows, and most + of the keys I'm aware of that have + symbols--cf. event-msw.c--_shouldn't_ have associated chars. */ + return Qnil; + } + + CHECK_CHAR(key); + + if (!(HASH_TABLEP(Vmswindows_seen_characters))) + { + /* All the keysym we deal with are character objects; therefore, we + can use eq as the test without worrying. */ + Vmswindows_seen_characters = make_lisp_hash_table (128, + HASH_TABLE_NON_WEAK, + HASH_TABLE_EQ); + } + /* Might give the user an opaque error if make_lisp_hash_table fails, + but it shouldn't crash. */ + CHECK_HASH_TABLE(Vmswindows_seen_characters); + + val = XCHAR(key); + + /* Same logic as in x_has_keysym; I'm not convinced it's sane. */ + if (val < 0x80) + { + return Qnil; + } + + if (!NILP(Fgethash(key, Vmswindows_seen_characters, Qnil))) + { + return Qnil; + } + + if (NILP (Flookup_key (Vcurrent_global_map, key, Qnil))) + { + Fputhash(key, Qt, Vmswindows_seen_characters); + Fdefine_key (Vcurrent_global_map, key, Qself_insert_command); + return Qt; + } + + return Qnil; +} + void mswindows_hide_console (void) { ＠＠ -684,6 +741,7 ＠＠ console_type_create_mswindows (void) CONSOLE_HAS_METHOD (mswindows, canonicalize_device_connection); /* CONSOLE_HAS_METHOD (mswindows, semi_canonicalize_console_connection); */ /* CONSOLE_HAS_METHOD (mswindows, semi_canonicalize_device_connection); */ + CONSOLE_HAS_METHOD (mswindows, perhaps_init_unseen_key_defaults); INITIALIZE_CONSOLE_TYPE (msprinter, "msprinter", "console-msprinter-p"); CONSOLE_HAS_METHOD (msprinter, canonicalize_console_connection); ＠＠ -700,5 +758,9 ＠＠ reinit_console_type_create_mswindows (vo void vars_of_console_mswindows (void) { + DEFVAR_LISP ("mswindows-seen-characters", &Vmswindows_seen_characters /* +Hash table of non-ASCII characters the MS Windows subsystem has seen. +*/ ); + Vmswindows_seen_characters = Qnil; Fprovide (Qmswindows); } 1.31.2.1 +58 -0 XEmacs/xemacs/src/console-tty.c Index: console-tty.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-tty.c,v retrieving revision 1.31 retrieving revision 1.31.2.1 diff -u -p -r1.31 -r1.31.2.1 --- console-tty.c 2004/09/20 19:19:36 1.31 +++ console-tty.c 2005/09/20 16:06:01 1.31.2.1 ＠＠ -30,6 +30,7 ＠＠ Boston, MA 02111-1307, USA. */ #include "console-tty-impl.h" #include "console-stream.h" +#include "elhash.h" #include "faces.h" #include "file-coding.h" #include "frame.h" ＠＠ -49,6 +50,8 ＠＠ DECLARE_IMAGE_INSTANTIATOR_FORMAT (inher Lisp_Object Qterminal_type; Lisp_Object Qcontrolling_process; +Lisp_Object Vtty_seen_characters; + static const struct memory_description tty_console_data_description_1 [] = { { XD_LISP_OBJECT, offsetof (struct tty_console, terminal_type) }, { XD_LISP_OBJECT, offsetof (struct tty_console, instream) }, ＠＠ -344,6 +347,56 ＠＠ tty_canonicalize_device_connection (Lisp return stream_canonicalize_console_connection (connection, errb); } +static Lisp_Object +tty_perhaps_init_unseen_key_defaults (struct console *UNUSED(con), + Lisp_Object key) +{ + Ichar val; + extern Lisp_Object Vcurrent_global_map; + + if (SYMBOLP(key)) + { + /* We've no idea what to default an unknown symbol to on the TTY. */ + return Qnil; + } + + CHECK_CHAR(key); + + if (!(HASH_TABLEP(Vtty_seen_characters))) + { + /* All the keysyms we deal with are character objects; therefore, we + can use eq as the test without worrying. */ + Vtty_seen_characters = make_lisp_hash_table (128, HASH_TABLE_NON_WEAK, + HASH_TABLE_EQ); + } + + /* Might give the user an opaque error if make_lisp_hash_table fails, + but it won't crash. */ + CHECK_HASH_TABLE(Vtty_seen_characters); + + val = XCHAR(key); + + /* Same logic as in x_has_keysym; I'm not convinced it's always sane. */ + if (val < 0x80) + { + return Qnil; + } + + if (!NILP(Fgethash(key, Vtty_seen_characters, Qnil))) + { + return Qnil; + } + + if (NILP (Flookup_key (Vcurrent_global_map, key, Qnil))) + { + Fputhash(key, Qt, Vtty_seen_characters); + Fdefine_key (Vcurrent_global_map, key, Qself_insert_command); + return Qt; + } + + return Qnil; +} + /************************************************************************/ /* initialization */ ＠＠ -377,6 +430,7 ＠＠ console_type_create_tty (void) CONSOLE_HAS_METHOD (tty, canonicalize_device_connection); CONSOLE_HAS_METHOD (tty, semi_canonicalize_console_connection); CONSOLE_HAS_METHOD (tty, semi_canonicalize_device_connection); + CONSOLE_HAS_METHOD (tty, perhaps_init_unseen_key_defaults); } void ＠＠ -397,5 +451,9 ＠＠ image_instantiator_format_create_glyphs_ void vars_of_console_tty (void) { + DEFVAR_LISP ("tty-seen-characters", &Vtty_seen_characters /* +Hash table of non-ASCII characters the TTY subsystem has seen. +*/ ); + Vtty_seen_characters = Qnil; Fprovide (Qtty); } 1.13.2.1 +70 -0 XEmacs/xemacs/src/console-x.c Index: console-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-x.c,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -u -p -r1.13 -r1.13.2.1 --- console-x.c 2004/09/20 19:19:36 1.13 +++ console-x.c 2005/09/20 16:06:01 1.13.2.1 ＠＠ -31,13 +31,18 ＠＠ Boston, MA 02111-1307, USA. */ #include "lisp.h" #include "buffer.h" +#include "device.h" +#include "elhash.h" #include "process.h" /* canonicalize_host_name */ #include "redisplay.h" /* for display_arg */ +#include "device-impl.h" #include "console-x-impl.h" DEFINE_CONSOLE_TYPE (x); +extern void x_has_keysym (KeySym, Lisp_Object, int); + static int x_initially_selected_for_input (struct console *UNUSED (con)) { ＠＠ -296,6 +301,70 ＠＠ x_canonicalize_device_connection (Lisp_O RETURN_UNGCPRO (concat2 (connection, screen_str)); } +/* Given a key, if it maps to a character and we weren't previously aware + that it could be generated on console CON, and if it's unbound in the + global map, bind it to self-insert-command. Return Qt if the binding was + done; Qnil if not. */ + +static Lisp_Object +x_perhaps_init_unseen_key_defaults (struct console *con, Lisp_Object key) +{ + KeySym xkeysym; + const Extbyte *keysym_ext; + Lisp_Object key_name, previous_binding = Qnil; + extern Lisp_Object Qcharacter_of_keysym, Vcurrent_global_map; + + /* Getting the device exactly right is not horrendously important; as long + as it's an X11 device it should be okay, because the global keymap (and + whether the key is bound) _is_ global, and any previously seen keysym + will already be bound, or not, in it. However, there is a corner case + where a symbol has been typed, and then explicitly unbound; if the next + event using that symbol comes in on some other frame, it'll get bound + again. This is not realistically an issue. */ + struct device *d = XDEVICE(con->selected_device); + + if (SYMBOLP (key)) + { + key_name = symbol_name(XSYMBOL(key)); + } + else + { + Ibyte buf[MAX_ICHAR_LEN + 1]; + CHECK_CHAR(key); + + buf[set_itext_ichar(buf, XCHAR(key))] = '\0'; + key_name = build_intstring (buf); + + /* We need to do the lookup and compare later, because we can't check + the Qcharacter_of_keysym property belonging to an actual character. */ + previous_binding = Flookup_key (Vcurrent_global_map, key, Qnil); + } + + if (!NILP(Fgethash(key, DEVICE_X_KEYSYM_MAP_HASH_TABLE (d), Qnil))) + { + return Qnil; + } + + LISP_STRING_TO_EXTERNAL (key_name, keysym_ext, Qctext); + xkeysym = XStringToKeysym(keysym_ext); + if (NoSymbol == xkeysym) + { + return Qnil; + } + + x_has_keysym(xkeysym, DEVICE_X_KEYSYM_MAP_HASH_TABLE (d), 0); + + if (SYMBOLP(key)) + { + return NILP(Fget (key, Qcharacter_of_keysym, Qnil)) ? Qnil : Qt; + } + else + { + return EQ(previous_binding, Flookup_key(Vcurrent_global_map, key, Qnil)) + ? Qnil : Qt; + } +} + void console_type_create_x (void) { ＠＠ -307,6 +376,7 ＠＠ console_type_create_x (void) CONSOLE_HAS_METHOD (x, canonicalize_device_connection); CONSOLE_HAS_METHOD (x, device_to_console_connection); CONSOLE_HAS_METHOD (x, initially_selected_for_input); + CONSOLE_HAS_METHOD (x, perhaps_init_unseen_key_defaults); } 1.51.2.4 +6 -6 XEmacs/xemacs/src/depend Index: depend =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/depend,v retrieving revision 1.51.2.3 retrieving revision 1.51.2.4 diff -u -p -r1.51.2.3 -r1.51.2.4 --- depend 2005/07/13 04:46:30 1.51.2.3 +++ depend 2005/09/20 16:06:01 1.51.2.4 ＠＠ -15,7 +15,7 ＠＠ LISP_H=lisp.h compiler.h config.h dumper #endif #if defined(HAVE_MS_WINDOWS) -console-msw.o: $(LISP_H) conslots.h console-impl.h console-msw-impl.h console-msw.h console.h events.h intl-auto-encap-win32.h opaque.h systime.h syswindows.h +console-msw.o: $(LISP_H) conslots.h console-impl.h console-msw-impl.h console-msw.h console.h elhash.h events.h intl-auto-encap-win32.h opaque.h systime.h syswindows.h device-msw.o: $(LISP_H) charset.h conslots.h console-impl.h console-msw-impl.h console-msw.h console-stream.h console.h device-impl.h device.h devslots.h events.h faces.h frame.h intl-auto-encap-win32.h objects-msw.h objects.h redisplay.h sysdep.h systime.h syswindows.h dialog-msw.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console-msw-impl.h console-msw.h console.h frame-impl.h frame.h frameslots.h gui.h intl-auto-encap-win32.h opaque.h redisplay.h sysfile.h syswindows.h dired-msw.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h console-msw.h console.h intl-auto-encap-win32.h ndir.h regex.h syntax.h sysdir.h sysfile.h sysfloat.h sysproc.h syspwd.h syssignal.h systime.h syswindows.h ＠＠ -40,7 +40,7 ＠＠ EmacsShell-sub.o: $(CONFIG_H) EmacsShell EmacsShell.o: $(CONFIG_H) EmacsShell.h ExternalShell.h xintrinsicp.h balloon-x.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h balloon_help.h conslots.h console-impl.h console-x-impl.h console-x.h console.h device-impl.h device.h devslots.h xintrinsic.h balloon_help.o: $(CONFIG_H) balloon_help.h compiler.h xintrinsic.h -console-x.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console-x-impl.h console-x.h console.h process.h redisplay.h xintrinsic.h +console-x.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console-x-impl.h console-x.h console.h device-impl.h device.h devslots.h elhash.h process.h redisplay.h xintrinsic.h device-x.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console-x-impl.h console-x.h console.h device-impl.h device.h devslots.h elhash.h events.h faces.h frame-impl.h frame.h frameslots.h glyphs-x.h glyphs.h objects-x.h objects.h offix-types.h offix.h process.h redisplay.h scrollbar.h specifier.h sysdep.h sysdll.h sysfile.h systime.h window-impl.h window.h winslots.h xgccache.h xintrinsic.h xintrinsicp.h xmu.h dialog-x.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h EmacsFrame.h buffer.h bufslots.h casetab.h charset.h chartab.h commands.h conslots.h console-impl.h console-x-impl.h console-x.h console.h events.h frame-impl.h frame.h frameslots.h gui.h opaque.h redisplay.h scrollbar.h systime.h window.h xintrinsic.h frame-x.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h EmacsFrame.h EmacsFrameP.h EmacsManager.h EmacsShell.h ExternalShell.h buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console-x-impl.h console-x.h console.h device-impl.h device.h devslots.h dragdrop.h events.h extents.h faces.h frame-impl.h frame.h frameslots.h glyphs-x.h glyphs.h gutter.h objects-impl.h objects-x-impl.h objects-x.h objects.h offix-types.h offix.h redisplay.h scrollbar-x.h scrollbar.h specifier.h systime.h window-impl.h window.h winslots.h xintrinsic.h xintrinsicp.h xmotif.h xmprimitivep.h xmu.h ＠＠ -56,7 +56,7 ＠＠ toolbar-x.o: $(LISP_H) $(LWLIB_SRCDIR)/l xgccache.o: $(LISP_H) hash.h xgccache.h #endif #if defined(HAVE_TTY) -console-tty.o: $(LISP_H) charset.h coding-system-slots.h conslots.h console-impl.h console-stream.h console-tty-impl.h console-tty.h console.h faces.h file-coding.h frame.h glyphs.h lstream.h process.h redisplay.h scrollbar.h specifier.h sysdep.h sysfile.h systty.h window-impl.h window.h winslots.h +console-tty.o: $(LISP_H) charset.h coding-system-slots.h conslots.h console-impl.h console-stream.h console-tty-impl.h console-tty.h console.h elhash.h faces.h file-coding.h frame.h glyphs.h lstream.h process.h redisplay.h scrollbar.h specifier.h sysdep.h sysfile.h systty.h window-impl.h window.h winslots.h device-tty.o: $(LISP_H) charset.h conslots.h console-impl.h console-stream.h console-tty-impl.h console-tty.h console.h device-impl.h device.h devslots.h events.h faces.h frame.h lstream.h redisplay.h sysdep.h sysfile.h syssignal.h systime.h systty.h event-tty.o: $(LISP_H) conslots.h console-impl.h console-tty-impl.h console-tty.h console.h device.h events.h frame.h process.h redisplay.h sysproc.h syssignal.h systime.h systty.h syswait.h frame-tty.o: $(LISP_H) conslots.h console-impl.h console-tty-impl.h console-tty.h console.h device-impl.h device.h devslots.h events.h frame-impl.h frame.h frameslots.h redisplay.h systime.h systty.h ＠＠ -64,7 +64,7 ＠＠ objects-tty.o: $(LISP_H) charset.h consl redisplay-tty.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console-tty-impl.h console-tty.h console.h device-impl.h device.h devslots.h events.h faces.h frame-impl.h frame.h frameslots.h glyphs.h lstream.h objects-impl.h objects-tty-impl.h objects-tty.h objects.h redisplay.h scrollbar.h specifier.h sysdep.h syssignal.h systime.h systty.h window-impl.h window.h winslots.h #endif #if defined(HAVE_GTK) -console-gtk.o: $(LISP_H) conslots.h console-gtk-impl.h console-gtk.h console-impl.h console.h process.h redisplay.h +console-gtk.o: $(LISP_H) charset.h conslots.h console-gtk-impl.h console-gtk.h console-impl.h console.h elhash.h process.h redisplay.h device-gtk.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-gtk-impl.h console-gtk.h console-impl.h console.h device-impl.h device.h devslots.h elhash.h events.h faces.h frame-impl.h frame.h frameslots.h gccache-gtk.h glyphs-gtk.h glyphs.h gtk-xemacs.h objects-gtk.h objects.h redisplay.h scrollbar.h specifier.h sysdep.h sysfile.h systime.h window-impl.h window.h winslots.h dialog-gtk.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h commands.h conslots.h console-gtk-impl.h console-gtk.h console-impl.h console.h events.h frame.h gui.h opaque.h redisplay.h scrollbar.h systime.h window.h emacs-marshals.o: hash.h ＠＠ -247,7 +247,7 ＠＠ unexapollo.o: $(CONFIG_H) unexconvex.o: $(CONFIG_H) compiler.h getpagesize.h unexcw.o: $(LISP_H) sysfile.h unexec.o: $(LISP_H) getpagesize.h -unexelf.o: $(CONFIG_H) compiler.h +unexelf.o: $(LISP_H) unexelfsgi.o: $(CONFIG_H) compiler.h unexencap.o: compiler.h unexenix.o: $(CONFIG_H) compiler.h ＠＠ -266,5 +266,5 ＠＠ vm-limit.o: $(LISP_H) mem-limits.h widget.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h win32.o: $(LISP_H) backtrace.h buffer.h bufslots.h casetab.h charset.h chartab.h console-msw.h console.h hash.h intl-auto-encap-win32.h profile.h sysfile.h sysproc.h syssignal.h systime.h syswindows.h window.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h commands.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h elhash.h faces.h frame-impl.h frame.h frameslots.h glyphs.h gutter.h objects.h redisplay.h scrollbar.h specifier.h window-impl.h window.h winslots.h -xft-fonts.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h conslots.h console-impl.h console-x-impl.h console-x.h console.h device-impl.h device.h devslots.h objects-impl.h objects-x-impl.h objects-x.h objects.h specifier.h xft-fonts.h xintrinsic.h +xft-fonts.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h conslots.h console-impl.h console-x-impl.h console-x.h console.h device-impl.h device.h devslots.h hash.h objects-impl.h objects-x-impl.h objects-x.h objects.h specifier.h xft-fonts.h xintrinsic.h xmu.o: $(CONFIG_H) 1.14.2.1 +4 -0 XEmacs/xemacs/src/device-gtk.c Index: device-gtk.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-gtk.c,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -u -p -r1.14 -r1.14.2.1 --- device-gtk.c 2004/09/20 19:19:37 1.14 +++ device-gtk.c 2005/09/20 16:06:02 1.14.2.1 ＠＠ -65,6 +65,8 ＠＠ Lisp_Object Vgtk_emacs_application_class Lisp_Object Vgtk_initial_argv_list; /* #### ugh! */ Lisp_Object Vgtk_initial_geometry; +Lisp_Object Qgtk_seen_characters; + static void gtk_device_init_x_specific_cruft (struct device *d); static const struct memory_description gtk_device_data_description_1 [] = { ＠＠ -729,6 +731,8 ＠＠ This is used during startup to communica Vgtk_initial_geometry = Qnil; Vgtk_initial_argv_list = Qnil; + + Qgtk_seen_characters = Qnil; } #include <gdk/gdkx.h> 1.59.2.3 +9 -1 XEmacs/xemacs/src/device-x.c Index: device-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-x.c,v retrieving revision 1.59.2.2 retrieving revision 1.59.2.3 diff -u -p -r1.59.2.2 -r1.59.2.3 --- device-x.c 2005/07/13 04:46:31 1.59.2.2 +++ device-x.c 2005/09/20 16:06:02 1.59.2.3 ＠＠ -1812,6 +1812,14 ＠＠ The keysym name can be provided in two f - if keysym is a string, it must be the name as known to X windows. - if keysym is a symbol, it must be the name as known to XEmacs. The two names differ in capitalization and underscoring. + +This function is not entirely trustworthy, in that Xlib compose processing +can produce keysyms that XEmacs will not have seen when it examined the +keysyms available on startup. So pressing `dead-diaeresis' and then 'a' may +pass `adiaeresis' to XEmacs, or (in some implementations) even `U00E4', +where `(x-keysym-on-keyboard-p 'adiaeresis)' and `(x-keysym-on-keyboard-p +'U00E4)' would both have returned nil. Subsequent to XEmacs seeing a keysym +it was previously unaware of, the predicate will take note of it, though. */ (keysym, device)) { ＠＠ -2108,7 +2116,7 ＠＠ in the file lisp/term/x-win.el. If this variable is nil on startup, the application uses `XEmacs'. Versions previous to 21.5.21 examined the resource database and used `XEmacs' if any resources beginning with that string existed, and `Emacs' otherwise, for -greated backward compatibility. However, this has always tended to conflict +greater backward compatibility. However, this has always tended to conflict with GNU Emacs, so this behavior is deprecated--in the short term, you can restore it in a post-21.5.21 XEmacs by setting the USE_EMACS_AS_DEFAULT_APPLICATION_CLASS environment variable to some value, 1.20.2.4 +1 -1 XEmacs/xemacs/src/dumper.c Index: dumper.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dumper.c,v retrieving revision 1.20.2.3 retrieving revision 1.20.2.4 diff -u -p -r1.20.2.3 -r1.20.2.4 --- dumper.c 2005/07/13 04:46:33 1.20.2.3 +++ dumper.c 2005/09/20 16:06:03 1.20.2.4 ＠＠ -2154,7 +2154,7 ＠＠ pdump_load_finish (void) count = 2; for (;;) { - int elt_count = PDUMP_READ_ALIGNED (p, int); + EMACS_INT elt_count = PDUMP_READ_ALIGNED (p, EMACS_INT); if (elt_count) { Rawbyte *mc_addr = 0; 1.50.2.2 +1 -1 XEmacs/xemacs/src/editfns.c Index: editfns.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/editfns.c,v retrieving revision 1.50.2.1 retrieving revision 1.50.2.2 diff -u -p -r1.50.2.1 -r1.50.2.2 --- editfns.c 2004/12/11 05:15:58 1.50.2.1 +++ editfns.c 2005/09/20 16:06:03 1.50.2.2 ＠＠ -113,7 +113,7 ＠＠ Convert CHARACTER to a one-character str Lisp_Object ch2 = Fevent_to_character (character, Qt, Qnil, Qnil); if (NILP (ch2)) invalid_argument - ("character has no ASCII equivalent:", Fcopy_event (character, Qnil)); + ("key has no character equivalent:", Fcopy_event (character, Qnil)); character = ch2; } 1.81.2.4 +120 -224 XEmacs/xemacs/src/event-Xt.c Index: event-Xt.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-Xt.c,v retrieving revision 1.81.2.3 retrieving revision 1.81.2.4 diff -u -p -r1.81.2.3 -r1.81.2.4 --- event-Xt.c 2005/07/13 04:46:36 1.81.2.3 +++ event-Xt.c 2005/09/20 16:06:03 1.81.2.4 ＠＠ -71,7 +71,9 ＠＠ Boston, MA 02111-1307, USA. */ extern int mswindows_is_blocking; #endif -EXFUN (Funicode_to_char, 2); /* In unicode.c. */ +/* For Russian C-x processing. */ +#define FIRST_ALPHABETIC_QWERTY_KEYCODE 24 +#define LAST_ALPHABETIC_QWERTY_KEYCODE 58 /* used in glyphs-x.c */ void enqueue_focus_event (Widget wants_it, Lisp_Object frame, int in_p); ＠＠ -125,7 +127,6 ＠＠ void emacs_Xt_event_handler (Widget wid, static int last_quit_check_signal_tick_count; -Lisp_Object Qkey_mapping; Lisp_Object Qsans_modifiers; #define THIS_IS_X ＠＠ -136,204 +137,26 ＠＠ Lisp_Object Qsans_modifiers; /* keymap handling */ /************************************************************************/ -/* X bogusly doesn't define the interpretations of any bits besides - ModControl, ModShift, and ModLock; so the Interclient Communication - Conventions Manual says that we have to bend over backwards to figure - out what the other modifier bits mean. According to ICCCM: - - - Any keycode which is assigned ModControl is a "control" key. - - - Any modifier bit which is assigned to a keycode which generates Meta_L - or Meta_R is the modifier bit meaning "meta". Likewise for Super, Hyper, - etc. - - - Any keypress event which contains ModControl in its state should be - interpreted as a "control" character. - - - Any keypress event which contains a modifier bit in its state which is - generated by a keycode whose corresponding keysym is Meta_L or Meta_R - should be interpreted as a "meta" character. Likewise for Super, Hyper, - etc. - - - It is illegal for a keysym to be associated with more than one modifier - bit. - - This means that the only thing that emacs can reasonably interpret as a - "meta" key is a key whose keysym is Meta_L or Meta_R, and which generates - one of the modifier bits Mod1-Mod5. - - Unfortunately, many keyboards don't have Meta keys in their default - configuration. So, if there are no Meta keys, but there are "Alt" keys, - emacs will interpret Alt as Meta. If there are both Meta and Alt keys, - then the Meta keys mean "Meta", and the Alt keys mean "Alt" (it used to - mean "Symbol," but that just confused the hell out of way too many people). - - This works with the default configurations of the 19 keyboard-types I've - checked. - - Emacs detects keyboard configurations which violate the above rules, and - prints an error message on the standard-error-output. (Perhaps it should - use a pop-up-window instead.) - */ - -/* For every key on the keyboard that has a known character correspondence, - we define the ascii-character property of the keysym, and make the - default binding for the key be self-insert-command. - - The following magic is basically intimate knowledge of X11/keysymdef.h. - The keysym mappings defined by X11 are based on the iso8859 standards, - except for Cyrillic and Greek. - - In a non-Mule world, a user can still have a multi-lingual editor, by doing - (set-face-font "...-iso8859-2" (current-buffer)) - for all their Latin-2 buffers, etc. */ - -static Lisp_Object -x_keysym_to_character (KeySym keysym) -{ -#ifdef MULE - Lisp_Object charset = Qzero; -#define USE_CHARSET(var,cs) \ - ((var) = charset_by_leading_byte (LEADING_BYTE_##cs)) -#else -#define USE_CHARSET(var,lb) -#endif /* MULE */ - int code = 0; - - if ((keysym & 0xff) < 0xa0) - return Qnil; - - /* The spec says keysyms in the range #x01000100 to #x0110FFFF and - only those should correspond directly to Unicode code points, in - the range #x100-#x10FFFF; actual implementations can have the Latin - 1 code points do the same thing with keysyms - #x010000A0-#x01000100. Oops. */ - - if (keysym >= 0x010000A0 && keysym <= 0x0110FFFF) - return Funicode_to_char (make_int(keysym & 0xffffff), Qnil); - - switch (keysym >> 8) - { - case 0: /* ASCII + Latin1 */ - USE_CHARSET (charset, LATIN_ISO8859_1); - code = keysym & 0x7f; - break; - case 1: /* Latin2 */ - USE_CHARSET (charset, LATIN_ISO8859_2); - code = keysym & 0x7f; - break; - case 2: /* Latin3 */ - USE_CHARSET (charset, LATIN_ISO8859_3); - code = keysym & 0x7f; - break; - case 3: /* Latin4 */ - USE_CHARSET (charset, LATIN_ISO8859_4); - code = keysym & 0x7f; - break; - case 4: /* Katakana */ - USE_CHARSET (charset, KATAKANA_JISX0201); - if ((keysym & 0xff) > 0xa0) - code = keysym & 0x7f; - break; - case 5: /* Arabic */ - USE_CHARSET (charset, ARABIC_ISO8859_6); - code = keysym & 0x7f; - break; - case 6: /* Cyrillic */ - { - static unsigned char const cyrillic[] = /* 0x20 - 0x7f */ - {0x00, 0x72, 0x73, 0x71, 0x74, 0x75, 0x76, 0x77, - 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x00, 0x7e, 0x7f, - 0x70, 0x22, 0x23, 0x21, 0x24, 0x25, 0x26, 0x27, - 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x00, 0x2e, 0x2f, - 0x6e, 0x50, 0x51, 0x66, 0x54, 0x55, 0x64, 0x53, - 0x65, 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, - 0x5f, 0x6f, 0x60, 0x61, 0x62, 0x63, 0x56, 0x52, - 0x6c, 0x6b, 0x57, 0x68, 0x6d, 0x69, 0x67, 0x6a, - 0x4e, 0x30, 0x31, 0x46, 0x34, 0x35, 0x44, 0x33, - 0x45, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, - 0x3f, 0x4f, 0x40, 0x41, 0x42, 0x43, 0x36, 0x32, - 0x4c, 0x4b, 0x37, 0x48, 0x4d, 0x49, 0x47, 0x4a}; - USE_CHARSET (charset, CYRILLIC_ISO8859_5); - code = cyrillic[(keysym & 0x7f) - 0x20]; - break; - } - case 7: /* Greek */ - { - static unsigned char const greek[] = /* 0x20 - 0x7f */ - {0x00, 0x36, 0x38, 0x39, 0x3a, 0x5a, 0x00, 0x3c, - 0x3e, 0x5b, 0x00, 0x3f, 0x00, 0x00, 0x35, 0x2f, - 0x00, 0x5c, 0x5d, 0x5e, 0x5f, 0x7a, 0x40, 0x7c, - 0x7d, 0x7b, 0x60, 0x7e, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, - 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, - 0x50, 0x51, 0x53, 0x00, 0x54, 0x55, 0x56, 0x57, - 0x58, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, - 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, - 0x70, 0x71, 0x73, 0x72, 0x74, 0x75, 0x76, 0x77, - 0x78, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - USE_CHARSET (charset, GREEK_ISO8859_7); - code = greek[(keysym & 0x7f) - 0x20]; - break; - } - case 8: /* Technical */ - break; - case 9: /* Special */ - break; - case 10: /* Publishing */ - break; - case 11: /* APL */ - break; - case 12: /* Hebrew */ - USE_CHARSET (charset, HEBREW_ISO8859_8); - code = keysym & 0x7f; - break; - case 13: /* Thai */ - /* #### This needs to deal with character composition. */ - USE_CHARSET (charset, THAI_TIS620); - code = keysym & 0x7f; - break; - case 14: /* Korean Hangul */ - break; - case 19: /* Latin 9 - ISO8859-15 - unsupported charset. */ - break; - case 32: /* Currency */ - break; - default: - break; - } - - if (code == 0) - return Qnil; - -#ifdef MULE - return make_char (make_ichar (charset, code, 0)); -#else - return make_char (code + 0x80); -#endif -} - -/* See comment near character_to_event(). -*/ +/* See comment near character_to_event(). */ static void -maybe_define_x_key_as_self_inserting_character (KeySym keysym, Lisp_Object symbol) +maybe_define_x_key_as_self_inserting_character (KeySym keysym, + Lisp_Object symbol) { Lisp_Object character = x_keysym_to_character (keysym); if (CHARP (character)) { extern Lisp_Object Vcurrent_global_map; - extern Lisp_Object Qascii_character; + extern Lisp_Object Qcharacter_of_keysym; if (NILP (Flookup_key (Vcurrent_global_map, symbol, Qnil))) { - Fput (symbol, Qascii_character, character); + Fput (symbol, Qcharacter_of_keysym, character); Fdefine_key (Vcurrent_global_map, symbol, Qself_insert_command); } } } -static void +void x_has_keysym (KeySym keysym, Lisp_Object hash_table, int with_modifiers) { KeySym upper_lower[2]; ＠＠ -355,7 +178,7 ＠＠ x_has_keysym (KeySym keysym, Lisp_Object for (j = 0; j < (upper_lower[0] == upper_lower[1] ? 1 : 2); j++) { - char *name; + Extbyte *name; keysym = upper_lower[j]; name = XKeysymToString (keysym); ＠＠ -371,7 +194,8 ＠＠ x_has_keysym (KeySym keysym, Lisp_Object EQ (new_value, Qt))) { maybe_define_x_key_as_self_inserting_character (keysym, sym); - Fputhash (build_ext_string (name, Qbinary), new_value, hash_table); + Fputhash (build_ext_string (name, Qbinary), new_value, + hash_table); Fputhash (sym, new_value, hash_table); } } ＠＠ -426,7 +250,7 ＠＠ x_reset_key_mapping (struct device *d) } } -static const char * +static const Ascbyte * index_to_name (int indice) { switch (indice) ＠＠ -443,19 +267,44 ＠＠ index_to_name (int indice) } } -/* Boy, I really wish C had local functions... */ -struct c_doesnt_have_closures /* #### not yet used */ -{ - int warned_about_overlapping_modifiers; - int warned_about_predefined_modifiers; - int warned_about_duplicate_modifiers; - int meta_bit; - int hyper_bit; - int super_bit; - int alt_bit; - int mode_bit; -}; +/* X bogusly doesn't define the interpretations of any bits besides + ModControl, ModShift, and ModLock; so the Interclient Communication + Conventions Manual says that we have to bend over backwards to figure + out what the other modifier bits mean. According to ICCCM: + + - Any keycode which is assigned ModControl is a "control" key. + - Any modifier bit which is assigned to a keycode which generates Meta_L + or Meta_R is the modifier bit meaning "meta". Likewise for Super, Hyper, + etc. + + - Any keypress event which contains ModControl in its state should be + interpreted as a "control" character. + + - Any keypress event which contains a modifier bit in its state which is + generated by a keycode whose corresponding keysym is Meta_L or Meta_R + should be interpreted as a "meta" character. Likewise for Super, Hyper, + etc. + + - It is illegal for a keysym to be associated with more than one modifier + bit. + + This means that the only thing that emacs can reasonably interpret as a + "meta" key is a key whose keysym is Meta_L or Meta_R, and which generates + one of the modifier bits Mod1-Mod5. + + Unfortunately, many keyboards don't have Meta keys in their default + configuration. So, if there are no Meta keys, but there are "Alt" keys, + emacs will interpret Alt as Meta. If there are both Meta and Alt keys, + then the Meta keys mean "Meta", and the Alt keys mean "Alt" (it used to + mean "Symbol," but that just confused the hell out of way too many people). + + This works with the default configurations of the 19 keyboard-types I've + checked. + + Emacs detects keyboard configurations which violate the above rules, and + gives a warning. */ + static void x_reset_modifier_mapping (struct device *d) { ＠＠ -581,7 +430,7 ＠＠ x_reset_modifier_mapping (struct device be totally wrong. */ if (mode_bit) { - const char *warn = 0; + const Ascbyte *warn = 0; if (mode_bit == meta_bit) warn = "Meta", meta_bit = 0; else if (mode_bit == hyper_bit) warn = "Hyper", hyper_bit = 0; else if (mode_bit == super_bit) warn = "Super", super_bit = 0; ＠＠ -893,7 +742,9 ＠＠ emacs_Xt_mapping_action (Widget UNUSED ( static Lisp_Object x_keysym_to_emacs_keysym (KeySym keysym, int simple_p) { - char *name; + Extbyte *name; + DECLARE_EISTRING(einame); + if (keysym >= XK_exclam && keysym <= XK_asciitilde) /* We must assume that the X keysym numbers for the ASCII graphic characters are the same as their ASCII codes. */ ＠＠ -914,7 +765,6 ＠＠ x_keysym_to_emacs_keysym (KeySym keysym, case 0: return Qnil; default: if (simple_p) return Qnil; - /* !!#### not Mule-ized */ name = XKeysymToString (keysym); if (!name || !name[0]) /* This happens if there is a mismatch between the Xlib of ＠＠ -942,35 +792,40 ＠＠ x_keysym_to_emacs_keysym (KeySym keysym, case 0x1005FF11: return KEYSYM ("SunF37"); /* labeled F12 */ default: { - char buf [64]; + Ascbyte buf [64]; sprintf (buf, "unknown-keysym-0x%X", (int) keysym); return KEYSYM (buf); } } + /* If it's got a one-character name, that's good enough. */ if (!name[1]) - return make_char (name[0]); + return make_char ((Ichar)name[0]); + /* In theory the Host Portable Character Set is just ASCII, but + trusting X11 implementors to get that right is likely to lead to + tears. */ + eicpy_ext(einame, name, Qbinary); + /* If it's in the "Keyboard" character set, downcase it. The case of those keysyms is too totally random for us to force anyone to remember them. - The case of the other character sets is significant, however. - */ + The case of the other character sets is significant, however. */ if ((((unsigned int) keysym) & (~0x1FF)) == ((unsigned int) 0xFE00)) { - char buf [255]; - char *s1, *s2; - for (s1 = name, s2 = buf; *s1; s1++, s2++) { - if (*s1 == '_') { - *s2 = '-'; - } else { - *s2 = tolower (* (unsigned char *) s1); + Ibyte *iname; + eilwr(einame); + + for (iname = eidata(einame); *iname != '\0';) + { + if (*iname == '_') + { + *iname = '-'; + } + INC_IBYTEPTR(iname); } - } - *s2 = 0; - return KEYSYM (buf); } - return KEYSYM (name); + return KEYSYM ((const CIbyte *) eidata (einame)); } } ＠＠ -1139,9 +994,15 ＠＠ x_event_to_emacs_event (XEvent *x_event, struct x_device *xd = DEVICE_X_DATA (d); if (DEVICE_X_BEING_DELETED (d)) - /* #### Uh, is this 0 correct? */ - return 0; + { + /* [[ Uh, is this 0 correct? ]] + Yup--it means emacs_Xt_event_handler, the only place that calls + this, doesn't queue the emacs_event dispatch, instead immediately + deallocating it. */ + return 0; + } + set_last_server_timestamp (d, x_event); switch (x_event->type) ＠＠ -1243,9 +1104,22 ＠＠ x_event_to_emacs_event (XEvent *x_event, the keysym) if the keysym isn't a dual-case alphabetic, and if the caps lock key was down but the shift key wasn't, then turn off the shift modifier. Gag barf */ + /* #### type lossage: assuming equivalence of emacs and - X keysyms */ - /* !!#### maybe fix for Mule */ + X keysyms + + The right thing to do here is to have pass a third, pointer, + argument to x_to_emacs_keysym, where it should store the + intermediate KeySym it used to calculate the string XEmacs + keysym. Then we can call keysym_obeys_caps_lock_p with + exactly the right argument. */ + /* !!#### maybe fix for Mule + + Hard, in the absence of a full case infrastructure for + Mule characters. When + (downcase (make-char 'cyrillic-iso8859-5 73)) + works, we should revisit it. */ + if (lock_p && !shift_p && ! (CHAR_OR_CHAR_INTP (keysym) && keysym_obeys_caps_lock_p ＠＠ -1274,6 +1148,29 ＠＠ x_event_to_emacs_event (XEvent *x_event, SET_EVENT_TIMESTAMP (emacs_event, ev->time); SET_EVENT_KEY_MODIFIERS (emacs_event, modifiers); SET_EVENT_KEY_KEYSYM (emacs_event, keysym); + + if (ev->keycode >= FIRST_ALPHABETIC_QWERTY_KEYCODE + && ev->keycode <= LAST_ALPHABETIC_QWERTY_KEYCODE) + { + /* This correspondence isn't guaranteed by the standards, to + my knowledge. Also, it's incomplete--doesn't include the + upper-case characters, etc--I need to get some feedback + on it once this is out in the world and actually being + used by Russians. */ + static const Ascbyte qwerty_map[] = + { 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', + '[', ']', '\015', '\014', + 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', + ';', '\'', '`', 0, '\\', + 'z', 'x', 'c', 'v', 'b', 'n', 'm' }; + Ichar val = qwerty_map + [ev->keycode - FIRST_ALPHABETIC_QWERTY_KEYCODE]; + if (val) + { + SET_EVENT_KEY_ALT_KEYCHARS(emacs_event, KEYCHAR_QWERTY, + val); + } + } } else /* Mouse press/release event */ { ＠＠ -3186,7 +3083,6 ＠＠ emacs_Xt_event_add_widget_actions (XtApp void syms_of_event_Xt (void) { - DEFSYMBOL (Qkey_mapping); DEFSYMBOL (Qsans_modifiers); DEFSYMBOL (Qself_insert_command); } 1.28.2.2 +0 -2 XEmacs/xemacs/src/event-gtk.c Index: event-gtk.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-gtk.c,v retrieving revision 1.28.2.1 retrieving revision 1.28.2.2 diff -u -p -r1.28.2.1 -r1.28.2.2 --- event-gtk.c 2005/03/15 05:24:03 1.28.2.1 +++ event-gtk.c 2005/09/20 16:06:04 1.28.2.2 ＠＠ -94,7 +94,6 ＠＠ gboolean emacs_gtk_event_handler (GtkWid static int last_quit_check_signal_tick_count; -Lisp_Object Qkey_mapping; Lisp_Object Qsans_modifiers; /* ＠＠ -1627,7 +1626,6 ＠＠ emacs_gtk_force_event_pending (struct fr void syms_of_event_gtk (void) { - DEFSYMBOL (Qkey_mapping); DEFSYMBOL (Qsans_modifiers); } 1.100.2.3 +0 -2 XEmacs/xemacs/src/event-msw.c Index: event-msw.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-msw.c,v retrieving revision 1.100.2.2 retrieving revision 1.100.2.3 diff -u -p -r1.100.2.2 -r1.100.2.3 --- event-msw.c 2005/03/15 05:24:04 1.100.2.2 +++ event-msw.c 2005/09/20 16:06:04 1.100.2.3 ＠＠ -2774,7 +2774,6 ＠＠ mswindows_wnd_proc (HWND hwnd, UINT mess mods_with_quit); } /* while */ -#ifdef MULE /* Also figure out what the character would be in other possible keyboard layouts, in this order: ＠＠ -2912,7 +2911,6 ＠＠ mswindows_wnd_proc (HWND hwnd, UINT mess } } } -#endif /* MULE */ /* This generates WM_SYSCHAR messages, which are interpreted by DefWindowProc as the menu selections. */ 1.86.2.3 +198 -34 XEmacs/xemacs/src/event-stream.c Index: event-stream.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-stream.c,v retrieving revision 1.86.2.2 retrieving revision 1.86.2.3 diff -u -p -r1.86.2.2 -r1.86.2.3 --- event-stream.c 2005/07/13 04:46:37 1.86.2.2 +++ event-stream.c 2005/09/20 16:06:05 1.86.2.3 ＠＠ -128,6 +128,9 ＠＠ int modifier_keys_are_sticky; /* Modifier keys are sticky for this many milliseconds. */ Lisp_Object Vmodifier_keys_sticky_time; +/* If true, "Russian C-x processing" is enabled. */ +int try_alternate_layouts_for_commands; + /* Here FSF Emacs 20.7 defines Vpost_command_idle_hook, post_command_idle_delay, Vdeferred_action_list, and Vdeferred_action_function, but we don't because that stuff is crap, ＠＠ -215,11 +218,6 ＠＠ Lisp_Object Vkeyboard_translate_table; Lisp_Object Vretry_undefined_key_binding_unshifted; Lisp_Object Qretry_undefined_key_binding_unshifted; -#ifdef MULE -/* If composed input is undefined, use self-insert-char */ -Lisp_Object Vcomposed_character_default_binding; -#endif - /* Console that corresponds to our controlling terminal */ Lisp_Object Vcontrolling_terminal; ＠＠ -3169,7 +3167,7 ＠＠ maybe_kbd_translate (Lisp_Object event) if (EQ (Fhash_table_count (Vkeyboard_translate_table), Qzero)) return; - c = event_to_character (event, 0, 0, 0); + c = event_to_character (event, 0, 0); if (c != -1) { Lisp_Object traduit = Fgethash (make_char (c), Vkeyboard_translate_table, ＠＠ -3315,12 +3313,14 ＠＠ munge_keymap_translate (struct command_b return Qnil; } -/* Same as command_builder_find_leaf() below but no Russian C-x - processing and no defaulting to self-insert-command. - */ +/* Same as command_builder_find_leaf() below, but without offering the + platform-specific event code the opportunity to give a default binding of + an unseen keysym to self-insert-command, and without the fallback to + other keymaps for lookups that allows someone with a Cyrillic keyboard + to pretend it's Qwerty for C-x C-f, for example. */ static Lisp_Object -command_builder_find_leaf_no_mule_processing (struct command_builder *builder, +command_builder_find_leaf_no_jit_binding (struct command_builder *builder, int allow_misc_user_events_p, int *did_munge) { ＠＠ -3397,7 +3397,7 ＠＠ command_builder_find_leaf_no_mule_proces GCPRO1 (neubauten); downshift_event (event_chain_tail (neub->current_events)); result = - command_builder_find_leaf_no_mule_processing + command_builder_find_leaf_no_jit_binding (neub, allow_misc_user_events_p, did_munge); if (!NILP (result)) ＠＠ -3442,33 +3442,189 ＠＠ command_builder_find_leaf_no_mule_proces DID_MUNGE must be initialized before calling this function. If munging happened, DID_MUNGE will be non-zero; otherwise, it will be left alone. - */ + (The above was Ben, I think.) + + It might be nice to have lookup-key call this function, directly or + indirectly. Though it is arguably the right thing if lookup-key fails on + a keysym that the X11 event code hasn't seen. There's no way to know if + that keysym is generatable by the keyboard until it's generated, + therefore there's no reasonable expectation that it be bound before it's + generated--all the other default bindings depend on our knowing the + keyboard layout and relying on it. And describe-key works without it, so + I think we're fine. + + Some weirdness with this code--try this on a keyboard where X11 will + produce ediaeresis with dead-diaeresis and e, but it's not produced by + any other combination of keys on the keyboard; + + (defun ding-command () + (interactive) + (ding)) + + (define-key global-map 'ediaeresis 'ding-command) + + Now, pressing dead-diaeresis and then e will ding. Next; + + (define-key global-map 'ediaeresis 'self-insert-command) + + and press dead-diaeresis and then e. It'll give you "Invalid argument: + typed key has no ASCII equivalent" Then; + + (define-key global-map 'ediaeresis nil) + + and press the combination again; it'll self-insert. The moral of the + story is, if you want to suppress all bindings to a non-ASCII X11 key, + bind it to a trivial no-op command, because the automatic mapping to + self-insert-command will happen if there's no existing binding for the + symbol. I can't see a way around this. -- Aidan Kehoe, 2005-05-14 */ + static Lisp_Object command_builder_find_leaf (struct command_builder *builder, int allow_misc_user_events_p, int *did_munge) { Lisp_Object result = - command_builder_find_leaf_no_mule_processing + command_builder_find_leaf_no_jit_binding (builder, allow_misc_user_events_p, did_munge); + Lisp_Object event, console, channel, lookup_res; + int redolookup = 0, i; if (!NILP (result)) return result; -#ifdef MULE - /* #### Do Russian C-x processing here */ + /* If some of the events are keyboard events, and this is the first time + the platform event code has seen their keysyms--which will be the case + the first time we see a composed keysym on X11, for example--offer it + the chance to define them as a self-insert-command, and do the lookup + again. + + This isn't Mule-specific; in a world where x-iso8859-1.el is gone, it's + needed for non-Mule too. + + Probably this can just be limited to the checking the last + keypress. */ + + EVENT_CHAIN_LOOP (event, builder->current_events) + { + /* We can ignore key release events because the preceding presses will + have initiated the mapping. */ + if (key_press_event != XEVENT_TYPE (event)) + continue; - /* If keysym is a non-ASCII char, bind it to self-insert-char by default. */ - if (XEVENT_TYPE (builder->most_current_event) == key_press_event - && !NILP (Vcomposed_character_default_binding)) + channel = XEVENT_CHANNEL (event); + if (object_dead_p (channel)) + continue; + + console = CDFW_CONSOLE (channel); + if (NILP (console)) + console = Vselected_console; + + if (CONSOLE_LIVE_P(XCONSOLE(console))) + { + lookup_res = MAYBE_LISP_CONMETH(XCONSOLE(console), + perhaps_init_unseen_key_defaults, + (XCONSOLE(console), + XEVENT_KEY_KEYSYM(event))); + if (EQ(lookup_res, Qt)) + { + redolookup += 1; + } + } + } + + if (redolookup) { - Lisp_Object keysym = XEVENT_KEY_KEYSYM (builder->most_current_event); - if (CHARP (keysym) && !ichar_ascii_p (XCHAR (keysym))) - return Vcomposed_character_default_binding; + result = command_builder_find_leaf_no_jit_binding + (builder, allow_misc_user_events_p, did_munge); + if (!NILP (result)) + { + return result; + } } -#endif + /* The old composed-character-default-binding handling that used to be + here was wrong--if a user wants to bind a given key to something other + than self-insert-command, then they should go ahead and do it, we won't + override it, and the sane thing to do with any key that has a known + character correspondence is _always_ to default it to + self-insert-command, nothing else. + + I'm adding the variable to control whether "Russian C-x processing" is + used because I have a feeling that it's not always the most appropriate + thing to do--in cases where people are using a non-Qwerty + Roman-alphabet layout, do they really want C-x with some random letter + to call `switch-to-buffer'? I can imagine that being very confusing, + certainly for new users, and it might be that defaulting the value for + `try-alternate-layouts-for-commands' as part of the language + environment is the right thing to do, only defaulting to `t' for those + languages that don't use the Roman alphabet. + + Much of that reasoning is tentative on my part, and feel free to change + this code if you have more experience with the problem and an intuition + that differs from mine. (Aidan Kehoe, 2005-05-29)*/ + + if (!try_alternate_layouts_for_commands) + { + return Qnil; + } + + if (key_press_event == XEVENT_TYPE (builder->most_current_event)) + { + Lisp_Object ev = builder->most_current_event, newbuilder; + Ichar this_alternative; + + struct command_builder *newb; + struct gcpro gcpro1; + + /* Ignore the value for CURRENT_LANGENV, because we've checked it + already, above. */ + for (i = KEYCHAR_CURRENT_LANGENV, ++i; i < KEYCHAR_LAST; ++i) + { + this_alternative = XEVENT_KEY_ALT_KEYCHARS(ev, i); + + if (0 == this_alternative) + continue; + + newbuilder = copy_command_builder(builder, 0); + GCPRO1(newbuilder); + + newb = XCOMMAND_BUILDER(newbuilder); + + XSET_EVENT_KEY_KEYSYM(event_chain_tail + (XCOMMAND_BUILDER(newbuilder)->current_events), + make_char(this_alternative)); + + result = command_builder_find_leaf_no_jit_binding + (newb, allow_misc_user_events_p, did_munge); + + if (!NILP (result)) + { + copy_command_builder (newb, builder); + *did_munge = 1; + } + else if (event_upshifted_p + (XCOMMAND_BUILDER(newbuilder)->most_current_event) && + !NILP (Vretry_undefined_key_binding_unshifted) + && isascii(this_alternative)) + { + downshift_event (event_chain_tail + (XCOMMAND_BUILDER(newbuilder)->current_events)); + XSET_EVENT_KEY_KEYSYM(event_chain_tail + (newb->current_events), + make_char(tolower(this_alternative))); + result = command_builder_find_leaf_no_jit_binding + (newb, allow_misc_user_events_p, did_munge); + } + + free_command_builder (newb); + UNGCPRO; + + if (!NILP (result)) + return result; + } + } + return Qnil; } ＠＠ -5062,17 +5218,6 ＠＠ Currently only implemented under X Windo */ ); Vmodifier_keys_sticky_time = make_int (500); -#ifdef MULE - DEFVAR_LISP ("composed-character-default-binding", - &Vcomposed_character_default_binding /* -The default keybinding to use for key events from composed input. -Window systems frequently have ways to allow the user to compose -single characters in a language using multiple keystrokes. -XEmacs sees these as single character keypress events. -*/ ); - Vcomposed_character_default_binding = Qself_insert_command; -#endif - Vcontrolling_terminal = Qnil; staticpro (&Vcontrolling_terminal); ＠＠ -5118,13 +5263,32 ＠＠ and is one of the following: debug_emacs_events = 0; #endif - DEFVAR_BOOL ("inhibit-input-event-recording", &inhibit_input_event_recording /* + DEFVAR_BOOL ("inhibit-input-event-recording", + &inhibit_input_event_recording /* Non-nil inhibits recording of input-events to recent-keys ring. */ ); inhibit_input_event_recording = 0; Vkeyboard_translate_table = make_lisp_hash_table (100, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ); + + DEFVAR_BOOL ("try-alternate-layouts-for-commands", + &try_alternate_layouts_for_commands /* +Non-nil means that if looking up a command from a sequence of keys typed by +the user would otherwise fail, try it again with some other keyboard +layout. On X11, the only alternative to the default mapping is American +QWERTY; on Windows, other mappings may be available, depending on things +like the default language environment for the current user, for the system, +&c. + +With a Russian keyboard layout on X11, for example, this means that +C-Cyrillic_che C-Cyrillic_a, if you haven't given that sequence a binding +yourself, will invoke `find-file.' This is because `Cyrillic_che' is +physically where `x' is, and `Cyrillic_a' is where `f' is, on an American +Qwerty layout, and, of course, C-x C-f is a default emacs binding for that +command. +*/ ); + try_alternate_layouts_for_commands = 1; } void 1.1.4.1 +472 -0 XEmacs/xemacs/src/event-xlike-inc.c Index: event-xlike-inc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-xlike-inc.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -u -p -r1.1 -r1.1.4.1 --- event-xlike-inc.c 2003/02/07 11:50:53 1.1 +++ event-xlike-inc.c 2005/09/20 16:06:05 1.1.4.1 ＠＠ -27,6 +27,8 ＠＠ Boston, MA 02111-1307, USA. */ included here, not in event-xlike.c. However, event-xlike.c is always X-specific, whereas the following code isn't, in the GTK case. */ +EXFUN (Funicode_to_char, 2); /* In unicode.c. */ + static int #ifdef THIS_IS_GTK emacs_gtk_event_pending_p (int how_many) ＠＠ -159,3 +161,473 ＠＠ emacs_Xt_event_pending_p (int how_many) return 0; } + +#if defined(THIS_IS_X) || !defined(__GDK_KEYS_H__) + +/* Use an appropriate map to Unicode within x_keysym_to_character. Arguments + are evaluated multiple times. + + Breaks if an X11 keysym maps to zero in Unicode. */ + +#define USE_UNICODE_MAP(keysym, map) \ + if (keysym >= FIRST_KNOWN_##map \ + && (keysym < (FIRST_KNOWN_##map + countof(map))) \ + && map[keysym - FIRST_KNOWN_##map ]) do \ + { \ + keysym -= FIRST_KNOWN_##map ; \ + return Funicode_to_char(make_int(map[keysym]), Qnil); \ + } while (0) + +/* Maps to Unicode for X11 KeySyms, where we don't have a direct internal + mapping based on a Mule character set, or whatever. Taken from Markus + Kuhn's X11.keysyms--if you're ever comparing with that file, note the + sequences of KeySyms often leave out entries, so you'll have to fill them + in. Doesn't include support for Hangul, which it should, if the X11 + Hangul keysyms have ever been used anywhere. + + I'm not #ifdef'ing this based on wheter MULE is defined, because it's a + matter of 324 bytes in a stripped executable, and I want the + testing. :-P */ + +static UINT_16_BIT const TECHNICAL[] = + { + 0x23B7, /* #x08A1 LEFT RADICAL Technical */ + +#define FIRST_KNOWN_TECHNICAL 0x8A1 + + 0x0, /* #x08A2 TOP LEFT RADICAL Technical */ + 0x0, /* #x08A3 HORIZONTAL CONNECTOR Technical */ + 0x2320, /* #x08A4 TOP INTEGRAL Technical */ + 0x2321, /* #x08A5 BOTTOM INTEGRAL Technical */ + 0x0, /* #x08A6 VERTICAL CONNECTOR Technical */ + 0x23A1, /* #x08A7 TOP LEFT SQUARE BRACKET Technical */ + 0x23A3, /* #x08A8 BOTTOM LEFT SQUARE BRACKET Technical */ + 0x23A4, /* #x08A9 TOP RIGHT SQUARE BRACKET Technical */ + 0x23A6, /* #x08AA BOTTOM RIGHT SQUARE BRACKET Technical */ + 0x239B, /* #x08AB TOP LEFT PARENTHESIS Technical */ + 0x239D, /* #x08AC BOTTOM LEFT PARENTHESIS Technical */ + 0x239E, /* #x08AD TOP RIGHT PARENTHESIS Technical */ + 0x23A0, /* #x08AE BOTTOM RIGHT PARENTHESIS Technical */ + 0x23A8, /* #x08AF LEFT MIDDLE CURLY BRACE Technical */ + 0x23AC, /* #x08B0 RIGHT MIDDLE CURLY BRACE Technical */ + 0x0, /* #x08B1 TOP LEFT SUMMATION Technical */ + 0x0, /* #x08B2 BOTTOM LEFT SUMMATION Technical */ + 0x0, /* #x08B3 TOP VERTICAL SUMMATION CONNECTOR Technical */ + 0x0, /* #x08B4 BOTTOM VERTICAL SUMMATION CONNECTOR Technical */ + 0x0, /* #x08B5 TOP RIGHT SUMMATION Technical */ + 0x0, /* #x08B6 BOTTOM RIGHT SUMMATION Technical */ + 0x0, /* #x08B7 RIGHT MIDDLE SUMMATION Technical */ + 0x0, /* #x08B8 */ + 0x0, /* #x08B9 */ + 0x0, /* #x08BA */ + 0x0, /* #x08BB */ + 0x2264, /* #x08BC LESS THAN OR EQUAL SIGN Technical */ + 0x2260, /* #x08BD NOT EQUAL SIGN Technical */ + 0x2265, /* #x08BE GREATER THAN OR EQUAL SIGN Technical */ + 0x222B, /* #x08BF INTEGRAL Technical */ + 0x2234, /* #x08C0 THEREFORE Technical */ + 0x221D, /* #x08C1 VARIATION, PROPORTIONAL TO Technical */ + 0x221E, /* #x08C2 INFINITY Technical */ + 0x0, /* #x08C3 */ + 0x0, /* #x08C4 */ + 0x2207, /* #x08C5 NABLA, DEL Technical */ + 0x0, /* #x08C6 */ + 0x0, /* #x08C7 */ + 0x223C, /* #x08C8 IS APPROXIMATE TO Technical */ + 0x2243, /* #x08C9 SIMILAR OR EQUAL TO Technical */ + 0x0, /* #x08CA */ + 0x0, /* #x08CB */ + 0x0, /* #x08CC */ + 0x21D4, /* #x08CD IF AND ONLY IF Technical */ + 0x21D2, /* #x08CE IMPLIES Technical */ + 0x2261, /* #x08CF IDENTICAL TO Technical */ + 0x0, /* #x08D0 */ + 0x0, /* #x08D1 */ + 0x0, /* #x08D2 */ + 0x0, /* #x08D3 */ + 0x0, /* #x08D4 */ + 0x0, /* #x08D5 */ + 0x221A, /* #x08D6 RADICAL Technical */ + 0x0, /* #x08D7 */ + 0x0, /* #x08D8 */ + 0x0, /* #x08D9 */ + 0x2282, /* #x08DA IS INCLUDED IN Technical */ + 0x2283, /* #x08DB INCLUDES Technical */ + 0x2229, /* #x08DC INTERSECTION Technical */ + 0x222A, /* #x08DD UNION Technical */ + 0x2227, /* #x08DE LOGICAL AND Technical */ + 0x2228, /* #x08DF LOGICAL OR Technical */ + 0x0, /* #x08E0 */ + 0x0, /* #x08E1 */ + 0x0, /* #x08E2 */ + 0x0, /* #x08E3 */ + 0x0, /* #x08E4 */ + 0x0, /* #x08E5 */ + 0x0, /* #x08E6 */ + 0x0, /* #x08E7 */ + 0x0, /* #x08E8 */ + 0x0, /* #x08E9 */ + 0x0, /* #x08Ea */ + 0x0, /* #x08Eb */ + 0x0, /* #x08Ec */ + 0x0, /* #x08Ed */ + 0x0, /* #x08Ee */ + 0x2202, /* #x08EF PARTIAL DERIVATIVE Technical */ + 0x0, /* #x08F0 */ + 0x0, /* #x08F1 */ + 0x0, /* #x08F2 */ + 0x0, /* #x08F3 */ + 0x0, /* #x08F4 */ + 0x0, /* #x08F5 */ + 0x0192, /* #x08F6 FUNCTION Technical */ + 0x0, /* #x08F7 */ + 0x0, /* #x08F8 */ + 0x0, /* #x08F9 */ + 0x0, /* #x08FA */ + 0x2190, /* #x08FB LEFT ARROW Technical */ + 0x2191, /* #x08FC UPWARD ARROW Technical */ + 0x2192, /* #x08FD RIGHT ARROW Technical */ + 0x2193, /* #x08FE DOWNWARD ARROW Technical */ + }; + +static UINT_16_BIT const SPECIAL[] = + { + 0x25C6, /* #x09E0 SOLID DIAMOND Special */ + +#define FIRST_KNOWN_SPECIAL 0x9E0 + + 0x2592, /* #x09E1 CHECKERBOARD Special */ + 0x2409, /* #x09E2 ``HT'' Special */ + 0x240C, /* #x09E3 ``FF'' Special */ + 0x240D, /* #x09E4 ``CR'' Special */ + 0x240A, /* #x09E5 ``LF'' Special */ + 0x0, /* #x09E6 */ + 0x0, /* #x09E7 */ + 0x2424, /* #x09E8 ``NL'' Special */ + 0x240B, /* #x09E9 ``VT'' Special */ + 0x2518, /* #x09EA LOWER-RIGHT CORNER Special */ + 0x2510, /* #x09EB UPPER-RIGHT CORNER Special */ + 0x250C, /* #x09EC UPPER-LEFT CORNER Special */ + 0x2514, /* #x09ED LOWER-LEFT CORNER Special */ + 0x253C, /* #x09EE CROSSING-LINES Special */ + 0x23BA, /* #x09EF HORIZONTAL LINE, SCAN 1 Special */ + 0x23BB, /* #x09F0 HORIZONTAL LINE, SCAN 3 Special */ + 0x2500, /* #x09F1 HORIZONTAL LINE, SCAN 5 Special */ + 0x23BC, /* #x09F2 HORIZONTAL LINE, SCAN 7 Special */ + 0x23BD, /* #x09F3 HORIZONTAL LINE, SCAN 9 Special */ + 0x251C, /* #x09F4 LEFT ``T'' Special */ + 0x2524, /* #x09F5 RIGHT ``T'' Special */ + 0x2534, /* #x09F6 BOTTOM ``T'' Special */ + 0x252C, /* #x09F7 TOP ``T'' Special */ + 0x2502 /* #x09F8 VERTICAL BAR Special */ + }; + +static UINT_16_BIT const PUBLISHING[] = + { + 0x2003, /* #x0AA1 EM SPACE Publish */ + +#define FIRST_KNOWN_PUBLISHING 0xAA1 + + 0x2002, /* #x0AA2 EN SPACE Publish */ + 0x2004, /* #x0AA3 3/EM SPACE Publish */ + 0x2005, /* #x0AA4 4/EM SPACE Publish */ + 0x2007, /* #x0AA5 DIGIT SPACE Publish */ + 0x2008, /* #x0AA6 PUNCTUATION SPACE Publish */ + 0x2009, /* #x0AA7 THIN SPACE Publish */ + 0x200A, /* #x0AA8 HAIR SPACE Publish */ + 0x2014, /* #x0AA9 EM DASH Publish */ + 0x2013, /* #x0AAA EN DASH Publish */ + 0x0, /* #x0AAB */ + 0x0, /* #x0AAC SIGNIFICANT BLANK SYMBOL Publish */ + 0x0, /* #x0AAD */ + 0x2026, /* #x0AAE ELLIPSIS Publish */ + 0x2025, /* #x0AAF DOUBLE BASELINE DOT Publish */ + 0x2153, /* #x0AB0 VULGAR FRACTION ONE THIRD Publish */ + 0x2154, /* #x0AB1 VULGAR FRACTION TWO THIRDS Publish */ + 0x2155, /* #x0AB2 VULGAR FRACTION ONE FIFTH Publish */ + 0x2156, /* #x0AB3 VULGAR FRACTION TWO FIFTHS Publish */ + 0x2157, /* #x0AB4 VULGAR FRACTION THREE FIFTHS Publish */ + 0x2158, /* #x0AB5 VULGAR FRACTION FOUR FIFTHS Publish */ + 0x2159, /* #x0AB6 VULGAR FRACTION ONE SIXTH Publish */ + 0x215A, /* #x0AB7 VULGAR FRACTION FIVE SIXTHS Publish */ + 0x2105, /* #x0AB8 CARE OF Publish */ + 0x0, /* #x0AB9 */ + 0x0, /* #x0ABA */ + 0x2012, /* #x0ABB FIGURE DASH Publish */ + 0x0, /* #x0ABC LEFT ANGLE BRACKET Publish */ + 0x0, /* #x0ABD DECIMAL POINT Publish */ + 0x0, /* #x0ABE RIGHT ANGLE BRACKET Publish */ + 0x0, /* #x0ABF MARKER Publish */ + 0x0, /* #x0AC0 */ + 0x0, /* #x0AC1 */ + 0x0, /* #x0AC2 */ + 0x215B, /* #x0AC3 VULGAR FRACTION ONE EIGHTH Publish */ + 0x215C, /* #x0AC4 VULGAR FRACTION THREE EIGHTHS Publish */ + 0x215D, /* #x0AC5 VULGAR FRACTION FIVE EIGHTHS Publish */ + 0x215E, /* #x0AC6 VULGAR FRACTION SEVEN EIGHTHS Publish */ + 0x0, /* #x0AC7 */ + 0x0, /* #x0AC8 */ + 0x2122, /* #x0AC9 TRADEMARK SIGN Publish */ + 0x0, /* #x0ACA SIGNATURE MARK Publish */ + 0x0, /* #x0ACB TRADEMARK SIGN IN CIRCLE Publish */ + 0x0, /* #x0ACC LEFT OPEN TRIANGLE Publish */ + 0x0, /* #x0ACD RIGHT OPEN TRIANGLE Publish */ + 0x0, /* #x0ACE EM OPEN CIRCLE Publish */ + 0x0, /* #x0ACF EM OPEN RECTANGLE Publish */ + 0x2018, /* #x0AD0 LEFT SINGLE QUOTATION MARK Publish */ + 0x2019, /* #x0AD1 RIGHT SINGLE QUOTATION MARK Publish */ + 0x201C, /* #x0AD2 LEFT DOUBLE QUOTATION MARK Publish */ + 0x201D, /* #x0AD3 RIGHT DOUBLE QUOTATION MARK Publish */ + 0x211E, /* #x0AD4 PRESCRIPTION, TAKE, RECIPE Publish */ + 0x0, /* #x0AD5 */ + 0x2032, /* #x0AD6 MINUTES Publish */ + 0x2033, /* #x0AD7 SECONDS Publish */ + 0x0, /* #x0AD8 */ + 0x271D, /* #x0AD9 LATIN CROSS Publish */ + 0x0, /* #x0ADA HEXAGRAM Publish */ + 0x0, /* #x0ADB FILLED RECTANGLE BULLET Publish */ + 0x0, /* #x0ADC FILLED LEFT TRIANGLE BULLET Publish */ + 0x0, /* #x0ADD FILLED RIGHT TRIANGLE BULLET Publish */ + 0x0, /* #x0ADE EM FILLED CIRCLE Publish */ + 0x0, /* #x0ADF EM FILLED RECTANGLE Publish */ + 0x0, /* #x0AE0 EN OPEN CIRCLE BULLET Publish */ + 0x0, /* #x0AE1 EN OPEN SQUARE BULLET Publish */ + 0x0, /* #x0AE2 OPEN RECTANGULAR BULLET Publish */ + 0x0, /* #x0AE3 OPEN TRIANGULAR BULLET UP Publish */ + 0x0, /* #x0AE4 OPEN TRIANGULAR BULLET DOWN Publish */ + 0x0, /* #x0AE5 OPEN STAR Publish */ + 0x0, /* #x0AE6 EN FILLED CIRCLE BULLET Publish */ + 0x0, /* #x0AE7 EN FILLED SQUARE BULLET Publish */ + 0x0, /* #x0AE8 FILLED TRIANGULAR BULLET UP Publish */ + 0x0, /* #x0AE9 FILLED TRIANGULAR BULLET DOWN Publish */ + 0x0, /* #x0AEA LEFT POINTER Publish */ + 0x0, /* #x0AEB RIGHT POINTER Publish */ + 0x2663, /* #x0AEC CLUB Publish */ + 0x2666, /* #x0AED DIAMOND Publish */ + 0x2665, /* #x0AEE HEART Publish */ + 0x0, /* #x0AEF */ + 0x2720, /* #x0AF0 MALTESE CROSS Publish */ + 0x2020, /* #x0AF1 DAGGER Publish */ + 0x2021, /* #x0AF2 DOUBLE DAGGER Publish */ + 0x2713, /* #x0AF3 CHECK MARK, TICK Publish */ + 0x2717, /* #x0AF4 BALLOT CROSS Publish */ + 0x266F, /* #x0AF5 MUSICAL SHARP Publish */ + 0x266D, /* #x0AF6 MUSICAL FLAT Publish */ + 0x2642, /* #x0AF7 MALE SYMBOL Publish */ + 0x2640, /* #x0AF8 FEMALE SYMBOL Publish */ + 0x260E, /* #x0AF9 TELEPHONE SYMBOL Publish */ + 0x2315, /* #x0AFA TELEPHONE RECORDER SYMBOL Publish */ + 0x2117, /* #x0AFB PHONOGRAPH COPYRIGHT SIGN Publish */ + 0x2038, /* #x0AFC CARET Publish */ + 0x201A, /* #x0AFD SINGLE LOW QUOTATION MARK Publish */ + 0x201E, /* #x0AFE DOUBLE LOW QUOTATION MARK Publish */ + }; + +static UINT_16_BIT const APL[] = + { + 0x22A5, /* #x0BC2 DOWN TACK APL */ +#define FIRST_KNOWN_APL 0xBC2 + 0x0, /* #x0BC3 UP SHOE (CAP) APL */ + 0x230A, /* #x0BC4 DOWN STILE APL */ + 0x0, /* #x0BC5 */ + 0x0, /* #x0BC6 UNDERBAR APL */ + 0x0, /* #x0BC7 */ + 0x0, /* #x0BC8 */ + 0x0, /* #x0BC9 */ + 0x2218, /* #x0BCA JOT APL */ + 0x0, /* #x0BCB */ + 0x2395, /* #x0BCC QUAD APL */ + 0x0, /* #x0BCD */ + 0x22A4, /* #x0BCE UP TACK APL */ + 0x25CB, /* #x0BCF CIRCLE APL */ + 0x0, /* #x0BD0 */ + 0x0, /* #x0BD1 */ + 0x0, /* #x0BD2 */ + 0x2308, /* #x0BD3 UP STILE APL */ + 0x0, /* #x0BD4 */ + 0x0, /* #x0BD5 */ + 0x0, /* #x0BD6 DOWN SHOE (CUP) APL */ + 0x0, /* #x0BD7 */ + 0x0, /* #x0BD8 RIGHT SHOE APL */ + 0x0, /* #x0BD9 */ + 0x0, /* #x0BDA LEFT SHOE APL */ + 0x0, /* #x0BDB */ + 0x0, /* #x0BDC */ + 0x22A2, /* #x0BDC LEFT TACK APL */ + 0x0, /* #x0BDE */ + 0x0, /* #x0BDF */ + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, /* 0x0BB0--0x0BBB */ + 0x0, 0x0, 0x0, 0x0, + 0x22A3, /* #x0BFC RIGHT TACK APL */ + }; + +/* For every key on the keyboard that has a known character correspondence, + we define the character-of-keysym property of its XEmacs keysym, and make + the default binding for the key be self-insert-command. + + The following magic is based on intimate knowledge of some of + X11/keysymdef.h. The keysym mappings defined by X11 are based on the + iso8859 standards, except for Cyrillic and Greek. + + In a non-Mule world, a user can still have a multi-lingual editor, by + doing (set-face-font "...-iso8859-2" (current-buffer)) for all their + Latin-2 buffers, etc. and the X11 keysyms corresponding to characters in + those character sets will still do the right thing (because of the + make_char (code + 0x80) non-Mule case below.) Of course, X11 keysyms in + other character sets will not do the right thing, because XEmacs won't + support the right thing. + + This code is also called when a command lookup is about to fail, and the + X11 platform code has worked out that it previously wasn't aware the + keysym of that command could be generated by the user's keyboard; in that + case, we bind its XEmacs keysym to self-insert-command if it has a + character correspondence we know about, and tell the general event code + that we've done so, so it can try the lookup again. + + Called from the GTK code because GTK 1 has no defined way of doing the + same thing, and this works for it on X11. It should be moved back into + event-Xt.c when and if the GTK port moves to GTK 2. */ + +#ifndef THIS_IS_GTK +static Lisp_Object +x_keysym_to_character(KeySym keysym) +#else +Lisp_Object +gtk_keysym_to_character(guint keysym) +#endif +{ + Lisp_Object charset = Qzero; + int code = 0; + + /* Markus Kuhn's spec says keysyms in the range #x01000100 to #x0110FFFF + and only those should correspond directly to Unicode code points, in + the range #x100-#x10FFFF; actual implementations can have the Latin 1 + code points do the same thing with keysyms + #x010000A0-#x01000100. */ + + if (keysym >= 0x010000A0 && keysym <= 0x0110FFFF) + return Funicode_to_char (make_int(keysym & 0xffffff), Qnil); + + if ((keysym & 0xff) < 0xa0) + return Qnil; + + switch (keysym >> 8) + { + +#define USE_CHARSET(var,cs) \ + ((var) = charset_by_leading_byte (LEADING_BYTE_##cs)) + + case 0: /* ASCII + Latin1 */ + USE_CHARSET (charset, LATIN_ISO8859_1); + code = keysym & 0x7f; + break; + case 1: /* Latin2 */ + USE_CHARSET (charset, LATIN_ISO8859_2); + code = keysym & 0x7f; + break; + case 2: /* Latin3 */ + USE_CHARSET (charset, LATIN_ISO8859_3); + code = keysym & 0x7f; + break; + case 3: /* Latin4 */ + USE_CHARSET (charset, LATIN_ISO8859_4); + code = keysym & 0x7f; + break; + case 4: /* Katakana */ + USE_CHARSET (charset, KATAKANA_JISX0201); + if ((keysym & 0xff) > 0xa0) + code = keysym & 0x7f; + break; + case 5: /* Arabic */ + USE_CHARSET (charset, ARABIC_ISO8859_6); + code = keysym & 0x7f; + break; + case 6: /* Cyrillic */ + { + static UExtbyte const cyrillic[] = /* 0x20 - 0x7f */ + {0x00, 0x72, 0x73, 0x71, 0x74, 0x75, 0x76, 0x77, + 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x00, 0x7e, 0x7f, + 0x70, 0x22, 0x23, 0x21, 0x24, 0x25, 0x26, 0x27, + 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x00, 0x2e, 0x2f, + 0x6e, 0x50, 0x51, 0x66, 0x54, 0x55, 0x64, 0x53, + 0x65, 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, + 0x5f, 0x6f, 0x60, 0x61, 0x62, 0x63, 0x56, 0x52, + 0x6c, 0x6b, 0x57, 0x68, 0x6d, 0x69, 0x67, 0x6a, + 0x4e, 0x30, 0x31, 0x46, 0x34, 0x35, 0x44, 0x33, + 0x45, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, + 0x3f, 0x4f, 0x40, 0x41, 0x42, 0x43, 0x36, 0x32, + 0x4c, 0x4b, 0x37, 0x48, 0x4d, 0x49, 0x47, 0x4a}; + USE_CHARSET (charset, CYRILLIC_ISO8859_5); + code = cyrillic[(keysym & 0x7f) - 0x20]; + break; + } + case 7: /* Greek */ + { + static UExtbyte const greek[] = /* 0x20 - 0x7f */ + {0x00, 0x36, 0x38, 0x39, 0x3a, 0x5a, 0x00, 0x3c, + 0x3e, 0x5b, 0x00, 0x3f, 0x00, 0x00, 0x35, 0x2f, + 0x00, 0x5c, 0x5d, 0x5e, 0x5f, 0x7a, 0x40, 0x7c, + 0x7d, 0x7b, 0x60, 0x7e, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, + 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, + 0x50, 0x51, 0x53, 0x00, 0x54, 0x55, 0x56, 0x57, + 0x58, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, + 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x70, 0x71, 0x73, 0x72, 0x74, 0x75, 0x76, 0x77, + 0x78, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + USE_CHARSET (charset, GREEK_ISO8859_7); + code = greek[(keysym & 0x7f) - 0x20]; + break; + } + case 8: + USE_UNICODE_MAP(keysym, TECHNICAL); + break; + case 9: + USE_UNICODE_MAP(keysym, SPECIAL); + break; + case 10: + USE_UNICODE_MAP(keysym, PUBLISHING); + break; + case 11: + USE_UNICODE_MAP(keysym, APL); + break; + case 12: /* Hebrew */ + USE_CHARSET (charset, HEBREW_ISO8859_8); + code = keysym & 0x7f; + break; + case 13: /* Thai */ + /* #### This needs to deal with character composition. + Are you sure we can't leave it to the X server? */ + USE_CHARSET (charset, THAI_TIS620); + code = keysym & 0x7f; + break; + case 14: /* Korean Hangul. Would like some information on whether this + is worth doing--there don't appear to be any Korean keyboard + layouts in the XKB data files. */ + break; + + case 19: /* Latin 9 - ISO8859-15. */ + USE_CHARSET (charset, LATIN_ISO8859_15); + code = keysym & 0x7f; + break; + case 32: /* Currency. The lower sixteen bits of these keysyms happily + correspond exactly to the Unicode code points of the + associated characters */ + return Funicode_to_char(make_int(keysym & 0xffff), Qnil); + break; + default: + break; + } + + if (code == 0) + return Qnil; + +#ifdef MULE + return make_char (make_ichar (charset, code, 0)); +#else + return make_char (code + 0x80); +#endif +} + +#endif /* defined(THIS_IS_X) || !defined(__GDK_KEYS_H__) */ 1.62.2.3 +57 -55 XEmacs/xemacs/src/events.c Index: events.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/events.c,v retrieving revision 1.62.2.2 retrieving revision 1.62.2.3 diff -u -p -r1.62.2.2 -r1.62.2.3 --- events.c 2005/03/15 05:24:07 1.62.2.2 +++ events.c 2005/09/20 16:06:05 1.62.2.3 ＠＠ -67,7 +67,7 ＠＠ Lisp_Object Qmouse_event_p; Lisp_Object Qprocess_event_p; Lisp_Object Qkey_press, Qbutton_press, Qbutton_release, Qmisc_user; -Lisp_Object Qascii_character; +Lisp_Object Qcharacter_of_keysym, Qascii_character; /************************************************************************/ ＠＠ -1196,7 +1196,6 ＠＠ command_event_p (Lisp_Object event) define-key, which must be able to handle all consoles. #### What about in other circumstances? #### Should the user have access to this flag? - #### We need to go through and review all the flags in character_to_event() and event_to_character() and figure out exactly under what circumstances they should or should not be set, then go ＠＠ -1208,17 +1207,34 ＠＠ command_event_p (Lisp_Object event) #### Some of this garbage, and some of the flags, could go away if we implemented the suggestion, originally from event-Xt.c: - #### The way that keysym correspondence to characters should work: + [[ The way that keysym correspondence to characters should work: - a Lisp_Event should contain a keysym AND a character slot. - keybindings are tried with the keysym. If no binding can be found, - and there is a corresponding character, call self-insert-command. - - #### Nuke x-iso8859-1.el. - #### Nuke the Qascii_character property. - #### Nuke Vcharacter_set_property. + and there is a corresponding character, call self-insert-command. ]] - This would apparently solve a lot of different problems. -*/ + That's an X-specific way of thinking. All the other platforms--even + the TTY, make sure you've done (set-input-mode t nil 1) and set your + console coding system appropriately when checking--just use + characters as emacs keysyms, and, together with defaulting to + self-insert-command if an unbound key with a character correspondence + is typed, that works fine for them. (Yes, this ignores GTK.) + + [[ [... snipping other suggestions which I've implemented.] + Nuke the Qascii_character property. ]] + + Well, we've renamed it anyway--it was badly named. + Qcharacter_of_keysym, here we go. It's really only with X11 that how + to map between adiaeresis and (int-to-char #xE4), or ellipsis and + whatever, becomes an issue, and IMO the property approach to this is + fine. Aidan Kehoe, 2005-05-15. + + [[ This would apparently solve a lot of different problems. ]] + + I'd be interested to know what's left. Removing the allow-meta + argument from event-to-character would be a Good Thing, IMO, but + beyond that, I'm not sure what else there is to do wrt. key + mappings. Of course, feedback from users of the Russian C-x facility + is still needed. */ void character_to_event (Ichar c, Lisp_Event *event, struct console *con, ＠＠ -1294,21 +1310,10 ＠＠ character_to_event (Ichar c, Lisp_Event SET_EVENT_KEY_MODIFIERS (event, m); } -/* This variable controls what character name -> character code mapping - we are using. Window-system-specific code sets this to some symbol, - and we use that symbol as the plist key to convert keysyms into 8-bit - codes. In this way one can have several character sets predefined and - switch them by changing this. - - #### This is utterly bogus and should be removed. - */ -Lisp_Object Vcharacter_set_property; - Ichar event_to_character (Lisp_Object event, int allow_extra_modifiers, - int allow_meta, - int map_device_key_names) + int allow_meta) { Ichar c = 0; Lisp_Object code; ＠＠ -1319,25 +1324,40 ＠＠ event_to_character (Lisp_Object event, return -1; } if (!allow_extra_modifiers && - XEVENT_KEY_MODIFIERS (event) & (XEMACS_MOD_SUPER|XEMACS_MOD_HYPER|XEMACS_MOD_ALT)) + XEVENT_KEY_MODIFIERS (event) & + (XEMACS_MOD_SUPER|XEMACS_MOD_HYPER|XEMACS_MOD_ALT)) return -1; if (CHAR_OR_CHAR_INTP (XEVENT_KEY_KEYSYM (event))) c = XCHAR_OR_CHAR_INT (XEVENT_KEY_KEYSYM (event)); else if (!SYMBOLP (XEVENT_KEY_KEYSYM (event))) ABORT (); - else if (map_device_key_names && !NILP (Vcharacter_set_property) - /* Allow window-system-specific extensibility of - keysym->code mapping */ - && CHAR_OR_CHAR_INTP (code = Fget (XEVENT_KEY_KEYSYM (event), - Vcharacter_set_property, - Qnil))) - c = XCHAR_OR_CHAR_INT (code); else if (CHAR_OR_CHAR_INTP (code = Fget (XEVENT_KEY_KEYSYM (event), - Qascii_character, Qnil))) + Qcharacter_of_keysym, Qnil))) c = XCHAR_OR_CHAR_INT (code); else - return -1; + { + Lisp_Object thekeysym = XEVENT_KEY_KEYSYM (event); + if (CHAR_OR_CHAR_INTP (code = Fget (thekeysym, Qascii_character, Qnil))) + { + c = XCHAR_OR_CHAR_INT (code); + warn_when_safe(Qkey_mapping, Qwarning, + "Obsolete key binding technique.\n" + +"Some code you're using bound %s to `self-insert-command' and messed around\n" +"with its `ascii-character' property. Doing this is deprecated, and the code\n" +"should be updated to use the `set-character-of-keysym' interface.\n" +"If you're the one updating the code, first check if there's still a need\n" +"for it; we support many more X11 keysyms out of the box now than we did\n" +"in the past. ", XSTRING_DATA(XSYMBOL_NAME(thekeysym))); + /* Only show the warning once for each keysym. */ + Fput(thekeysym, Qcharacter_of_keysym, code); + } + else + { + return -1; + } + } if (XEVENT_KEY_MODIFIERS (event) & XEMACS_MOD_CONTROL) { if (c >= 'a' && c <= 'z') ＠＠ -1366,7 +1386,7 ＠＠ event_to_character (Lisp_Object event, } DEFUN ("event-to-character", Fevent_to_character, 1, 4, 0, /* -Return the closest ASCII approximation to the given event object. +Return the closest character approximation to the given event object. If the event isn't a keypress, this returns nil. If the ALLOW-EXTRA-MODIFIERS argument is non-nil, then this is lenient in its translation; it will ignore modifier keys other than control and meta, ＠＠ -1376,24 +1396,17 ＠＠ If the ALLOW-EXTRA-MODIFIERS argument is If the ALLOW-META argument is non-nil, then the Meta modifier will be represented by turning on the high bit of the byte returned; otherwise, nil will be returned for events containing the Meta modifier. -If the MAP-DEVICE-KEY-NAMES argument is non-nil, then named keysyms that - represent printable characters will be converted to that character. This - means, for example, that under X, where a circumflexed lowercase o returns - a key with the name `ocircumflex' rather than the actual character, this - name will be converted to the appropriate character. See - `character-set-property' for some sense of how this works. #### This - should not be exposed and may be removed at some point. Note that ALLOW-META may cause ambiguity between meta characters and Latin-1 characters. +ALLOW-NON-ASCII is unused, and retained for compatibility. */ - (event, allow_extra_modifiers, allow_meta, map_device_key_names)) + (event, allow_extra_modifiers, allow_meta, UNUSED(allow_non_ascii))) { Ichar c; CHECK_LIVE_EVENT (event); c = event_to_character (event, !NILP (allow_extra_modifiers), - !NILP (allow_meta), - !NILP (map_device_key_names)); + !NILP (allow_meta)); return c < 0 ? Qnil : make_char (c); } ＠＠ -2613,6 +2626,7 ＠＠ syms_of_events (void) DEFSYMBOL (Qbutton_press); DEFSYMBOL (Qbutton_release); DEFSYMBOL (Qmisc_user); + DEFSYMBOL (Qcharacter_of_keysym); DEFSYMBOL (Qascii_character); defsymbol (&QKbackspace, "backspace"); ＠＠ -2634,16 +2648,4 ＠＠ reinit_vars_of_events (void) void vars_of_events (void) { - DEFVAR_LISP ("character-set-property", &Vcharacter_set_property /* -This is used to map e.g. `ocircumflex' to the appropriate character under X. -This value of this variable (a symbol, normally `x-iso8859-1' if not nil) -if used to look up a property on the keysym in question, which should -correspond to a character. - -#### This is way bogus and will be removed soon. - -The conversion between X keysyms and characters is now handled more or less -automatically using XDisplayKeycodes(). -*/ ); - Vcharacter_set_property = Qnil; } 1.39.2.2 +30 -9 XEmacs/xemacs/src/events.h Index: events.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/events.h,v retrieving revision 1.39.2.1 retrieving revision 1.39.2.2 diff -u -p -r1.39.2.1 -r1.39.2.2 --- events.h 2005/07/13 04:46:38 1.39.2.1 +++ events.h 2005/09/20 16:06:06 1.39.2.2 ＠＠ -108,8 +108,6 ＠＠ typedef enum emacs_event_type #define first_event_type empty_event #define last_event_type dead_event -#ifdef MULE - enum alternative_key_chars { KEYCHAR_CURRENT_LANGENV, ＠＠ -122,8 +120,6 ＠＠ enum alternative_key_chars KEYCHAR_LAST }; -#endif /* MULE */ - struct Lisp_Key_Data { #ifdef EVENT_DATA_AS_OBJECTS ＠＠ -135,7 +131,6 ＠＠ struct Lisp_Key_Data Also includes buttons. For many keys, Shift is not a bit; that is implicit in the keyboard layout. */ int modifiers; -#ifdef MULE /* Alternate character interpretations for this key in different keyboard layouts. This deals with the problem of pressing C-x in the Russian layout (the so-called "Russian C-x problem"), for ＠＠ -149,12 +144,38 ＠＠ struct Lisp_Key_Data (AZERTY layout) who temporarily switches to Russian: The virtual keys underlying Russian are US-ASCII, so what the French speaker things of as C-a (the key just to the right of TAB) appears as - C-q. (#### We should probably ignore the current char and look + C-q. + + I've just implemented this in event-stream.c, and I really want to + see feedback from actual Russians about it, and whether it needs to + be much more complete than what I've done. E.g, the mapping back to + US Qwerty is hardcoded on the X11 side of things, and only deals + with the alphabetic characters. + + Also, I think it's downright confusing for people with Roman + letters on their keyboard to have random other letters than are + described as calling some command, call that command. So I want to + consider enabling it by language environment. + + [[ (#### We should probably ignore the current char and look *ONLY* in alt_keychars for all control keys. What about the English speaker who temporarily switches to the French layout and - finds C-q mapped to C-a?) */ + finds C-q mapped to C-a?) ]] + + No, we shouldn't. People who use the French layout expect that + pressing control with the key to the right of tab passes C-a to + emacs; English speakers (more exactly, Qwerty users) who + temporarily switch to the French layout encounter that issue in + every other app too, and they normally remap the keyboard in + software as soon as they can, or learn to live with Azerty. That + applies for all the Roman-alphabet keyboard layouts. Aidan Kehoe, + 2005-05-15 + + I've taken out the dependency on MULE for this feature because it's + also useful in a non-Mule XEmacs where the user has set their font + to something ending in iso8859-5. How many of those users there + are, is another question. */ Ichar alt_keychars[KEYCHAR_LAST]; -#endif /* MULE */ }; typedef struct Lisp_Key_Data Lisp_Key_Data; ＠＠ -949,7 +970,7 ＠＠ Lisp_Object key_sequence_to_event_chain (keyboard press, menu, scrollbar, mouse button) */ int command_event_p (Lisp_Object event); void define_self_inserting_symbol (Lisp_Object, Lisp_Object); -Ichar event_to_character (Lisp_Object, int, int, int); +Ichar event_to_character (Lisp_Object, int, int); struct console *event_console_or_selected (Lisp_Object event); void upshift_event (Lisp_Object event); void downshift_event (Lisp_Object event); 1.53.2.3 +3 -3 XEmacs/xemacs/src/extents.c Index: extents.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/extents.c,v retrieving revision 1.53.2.2 retrieving revision 1.53.2.3 diff -u -p -r1.53.2.2 -r1.53.2.3 --- extents.c 2005/07/13 04:46:39 1.53.2.2 +++ extents.c 2005/09/20 16:06:06 1.53.2.3 ＠＠ -1046,9 +1046,9 ＠＠ const struct sized_memory_description ga }; static const struct memory_description lispobj_gap_array_description_1[] = { - { XD_INT, offsetof (Gap_Array, gap) }, - { XD_INT, offsetof (Gap_Array, offset_past_gap) }, - { XD_INT, offsetof (Gap_Array, els_past_gap) }, + { XD_ELEMCOUNT, offsetof (Gap_Array, gap) }, + { XD_BYTECOUNT, offsetof (Gap_Array, offset_past_gap) }, + { XD_ELEMCOUNT, offsetof (Gap_Array, els_past_gap) }, { XD_BLOCK_PTR, offsetof (Gap_Array, markers), 1, { &gap_array_marker_description }, XD_FLAG_NO_KKCC }, { XD_BLOCK_ARRAY, offsetof (Gap_Array, array), XD_INDIRECT (0, 0), 1.43.2.7 +40 -10 XEmacs/xemacs/src/faces.c Index: faces.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/faces.c,v retrieving revision 1.43.2.6 retrieving revision 1.43.2.7 diff -u -p -r1.43.2.6 -r1.43.2.7 --- faces.c 2005/07/13 04:46:40 1.43.2.6 +++ faces.c 2005/09/20 16:06:06 1.43.2.7 ＠＠ -60,6 +60,8 ＠＠ Lisp_Object Vpointer_face, Vvertical_div /* Qdefault, Qhighlight, Qleft_margin, Qright_margin defined in general.c */ Lisp_Object Qmodeline, Qgui_element, Qtext_cursor, Qvertical_divider; +Lisp_Object Qface_alias, Qcyclic_face_alias; + /* In the old implementation Vface_list was a list of the face names, not the faces themselves. We now distinguish between permanent and temporary faces. Permanent faces are kept in a regular hash table, ＠＠ -629,18 +631,43 ＠＠ nil is returned. Otherwise the associat (face_or_name)) { Lisp_Object retval; + Lisp_Object face_name; + Lisp_Object face_alias; + int i; if (FACEP (face_or_name)) return face_or_name; - CHECK_SYMBOL (face_or_name); + face_name = face_or_name; + CHECK_SYMBOL (face_name); + +# define FACE_ALIAS_MAX_DEPTH 32 + + i = 0; + while (! NILP ((face_alias = Fget (face_name, Qface_alias, Qnil))) + && i < FACE_ALIAS_MAX_DEPTH) + { + face_name = face_alias; + CHECK_SYMBOL (face_alias); + i += 1; + } + + /* #### This test actually makes the aliasing max depth to 30, which is more + #### than enough IMO. -- dvl */ + if (i == FACE_ALIAS_MAX_DEPTH) + signal_error (Qcyclic_face_alias, + "Max face aliasing depth reached", + face_name); + +# undef FACE_ALIAS_MAX_DEPTH + /* Check if the name represents a permanent face. */ - retval = Fgethash (face_or_name, Vpermanent_faces_cache, Qnil); + retval = Fgethash (face_name, Vpermanent_faces_cache, Qnil); if (!NILP (retval)) return retval; /* Check if the name represents a temporary face. */ - return Fgethash (face_or_name, Vtemporary_faces_cache, Qnil); + return Fgethash (face_name, Vtemporary_faces_cache, Qnil); } DEFUN ("get-face", Fget_face, 1, 1, 0, /* ＠＠ -1906,6 +1933,9 ＠＠ syms_of_faces (void) DEFSYMBOL (Qdim); DEFSYMBOL (Qblinking); + DEFSYMBOL (Qface_alias); + DEFERROR_STANDARD (Qcyclic_face_alias, Qinvalid_state); + DEFSYMBOL (Qinit_face_from_resources); DEFSYMBOL (Qinit_global_faces); DEFSYMBOL (Qinit_device_faces); ＠＠ -2019,7 +2049,7 ＠＠ complex_vars_of_faces (void) Lisp_Object inst_list = Qnil; #if defined (HAVE_X_WINDOWS) || defined (HAVE_GTK) - + const Ascbyte *fonts[] = { #ifdef USE_XFT ＠＠ -2086,7 +2116,7 ＠＠ complex_vars_of_faces (void) "-*-*-medium-r-*--*-gb2312.1980-*", "-*-fixed-medium-r-*--*-cns11643*-*", - + "-*-fixed-medium-r-*--*-big5*-*," "-*-fixed-medium-r-*--*-sisheng_cwnn-0", ＠＠ -2099,7 +2129,7 ＠＠ complex_vars_of_faces (void) "-*-fixed-medium-r-*--*-tis620.2529-1", /************* Other fonts (nonstandard) *************/ - + "-*-fixed-medium-r-*--*-viscii1.1-1", "-*-fixed-medium-r-*--*-mulearabic-*", "-*-fixed-medium-r-*--*-muleipa-*", ＠＠ -2202,23 +2232,23 ＠＠ complex_vars_of_faces (void) ":Regular:10::" }; const Ascbyte **mswfontptr; - + for (mswfontptr = mswfonts + countof (mswfonts) - 1; mswfontptr >= mswfonts; mswfontptr--) { /* display device */ - inst_list = Fcons (Fcons (list1 (Qmswindows), + inst_list = Fcons (Fcons (list1 (Qmswindows), build_string (*mswfontptr)), inst_list); /* printer device */ - inst_list = Fcons (Fcons (list1 (Qmsprinter), + inst_list = Fcons (Fcons (list1 (Qmsprinter), build_string (*mswfontptr)), inst_list); } /* Use Lucida Console rather than Courier New if it exists -- the line spacing is much less, so many more lines fit with the same size font. (And it's specifically designed for screens.) */ - inst_list = Fcons (Fcons (list1 (Qmswindows), + inst_list = Fcons (Fcons (list1 (Qmswindows), build_string ("Lucida Console:Regular:10::")), inst_list); } 1.41.2.3 +8 -8 XEmacs/xemacs/src/file-coding.c Index: file-coding.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/file-coding.c,v retrieving revision 1.41.2.2 retrieving revision 1.41.2.3 diff -u -p -r1.41.2.2 -r1.41.2.3 --- file-coding.c 2005/07/13 04:46:41 1.41.2.2 +++ file-coding.c 2005/09/20 16:06:07 1.41.2.3 ＠＠ -1080,7 +1080,7 ＠＠ nil or 'undecided Compound Text (the encoding used in X11). You can specify more specific information about the conversion with the PROPS argument. 'big5 - Big5 (the encoding commonly used for Taiwanese). + Big5 (the encoding commonly used for Mandarin Chinese in Taiwan). 'ccl The conversion is performed using a user-written pseudo-code program. CCL (Code Conversion Language) is the name of this ＠＠ -2799,13 +2799,13 ＠＠ no_conversion_detect (struct detection_s /************************************************************************/ /* This is used to handle end-of-line (EOL) differences. It is -character-to-character, and works (when encoding) *BEFORE* sending -data to the main encoding routine -- thus, that routine must handle -different EOL types itself if it does line-oriented type processing. -This is unavoidable because we don't know whether the output of the -main encoding routine is ASCII compatible (Unicode is definitely not, -for example). [[ sjt sez this is bogus. There should be _no_ EOL -processing (or processing of any kind) after conversion to external. ]] +character-to-character, and works (when encoding) *BEFORE* sending data to +the main encoding routine -- thus, that routine must handle different EOL +types itself if it does line-oriented type processing. This is unavoidable +because we don't know whether the output of the main encoding routine is +ASCII compatible (UTF-16 is definitely not, for example). [[ sjt sez this +is bogus. There should be _no_ EOL processing (or processing of any kind) +after conversion to external. ]] There is one parameter: `subtype', either `cr', `lf', `crlf', or nil. */ 1.55.2.1 +1 -1 XEmacs/xemacs/src/frame-msw.c Index: frame-msw.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-msw.c,v retrieving revision 1.55 retrieving revision 1.55.2.1 diff -u -p -r1.55 -r1.55.2.1 --- frame-msw.c 2004/11/04 23:06:30 1.55 +++ frame-msw.c 2005/09/20 16:06:08 1.55.2.1 ＠＠ -353,7 +353,7 ＠＠ mswindows_set_frame_size (struct frame * GetMenu (FRAME_MSWINDOWS_HANDLE (f)) != NULL, qxeGetWindowLong (FRAME_MSWINDOWS_HANDLE (f), GWL_EXSTYLE)); - if (IsIconic (FRAME_MSWINDOWS_HANDLE (f)) || IsZoomed (FRAME_MSWINDOWS_HANDLE (f))) + if (IsIconic (FRAME_MSWINDOWS_HANDLE (f))) ShowWindow (FRAME_MSWINDOWS_HANDLE (f), SW_RESTORE); SetWindowPos (FRAME_MSWINDOWS_HANDLE (f), NULL, 1.15.2.1 +1 -0 XEmacs/xemacs/src/general-slots.h Index: general-slots.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/general-slots.h,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -u -p -r1.15 -r1.15.2.1 --- general-slots.h 2004/04/05 22:49:54 1.15 +++ general-slots.h 2005/09/20 16:06:08 1.15.2.1 ＠＠ -169,6 +169,7 ＠＠ SYMBOL_KEYWORD (Q_vertically_justify); SYMBOL_KEYWORD (Q_horizontally_justify); SYMBOL (Qkey); SYMBOL (Qkey_assoc); +SYMBOL (Qkey_mapping); SYMBOL_KEYWORD (Q_key_sequence); SYMBOL (Qkeyboard); SYMBOL (Qkeymap); 1.18.2.2 +1 -19 XEmacs/xemacs/src/gpmevent.c Index: gpmevent.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/gpmevent.c,v retrieving revision 1.18.2.1 retrieving revision 1.18.2.2 diff -u -p -r1.18.2.1 -r1.18.2.2 --- gpmevent.c 2005/07/13 04:46:47 1.18.2.1 +++ gpmevent.c 2005/09/20 16:06:08 1.18.2.2 ＠＠ -59,10 +59,6 ＠＠ static void (*orig_next_event_cb) (Lisp_ static Lisp_Object gpm_event_queue; static Lisp_Object gpm_event_queue_tail; -#ifdef MC_ALLOC -static Lisp_Object MC_ALLOC_Freceive_gpm_event; -#endif /* MC_ALLOC */ - struct __gpm_state { int gpm_tried; ＠＠ -597,11 +593,7 ＠＠ Toggle accepting of GPM mouse events. { rval = 0; Fprocess_kill_without_query (gpm_process, Qnil); -#ifdef MC_ALLOC - gpm_filter = MC_ALLOC_Freceive_gpm_event; -#else /* not MC_ALLOC */ - gpm_filter = wrap_subr (&SFreceive_gpm_event); -#endif /* not MC_ALLOC */ + gpm_filter = GET_DEFUN_LISP_OBJECT (Freceive_gpm_event); set_process_filter (gpm_process, gpm_filter, 1, 0); /* Keep track of the device for later */ ＠＠ -629,17 +621,7 ＠＠ void vars_of_gpmevent (void) void syms_of_gpmevent (void) { -#ifdef MC_ALLOC -#define DEFSUBR_receive_gpm_event(Fname) \ -do { \ - DEFSUBR_MC_ALLOC (Fname); \ - defsubr (S##Fname); \ - MC_ALLOC_Freceive_gpm_event = wrap_subr (S##Fname); \ -} while (0) - DEFSUBR_receive_gpm_event (Freceive_gpm_event); -#else /* not MC_ALLOC */ DEFSUBR (Freceive_gpm_event); -#endif /* not MC_ALLOC */ DEFSUBR (Fgpm_enable); DEFSUBR (Fgpm_enabled_p); } 1.52.2.5 +20 -15 XEmacs/xemacs/src/keymap.c Index: keymap.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/keymap.c,v retrieving revision 1.52.2.4 retrieving revision 1.52.2.5 diff -u -p -r1.52.2.4 -r1.52.2.5 --- keymap.c 2005/07/13 04:46:48 1.52.2.4 +++ keymap.c 2005/09/20 16:06:08 1.52.2.5 ＠＠ -1586,7 +1586,7 ＠＠ event_matches_key_specifier_p (Lisp_Obje Fcharacter_to_event() will only match 'escape'. */ if (CHAR_OR_CHAR_INTP (key_specifier)) return (XCHAR_OR_CHAR_INT (key_specifier) - == event_to_character (event, 0, 0, 0)); + == event_to_character (event, 0, 0)); /* Otherwise, we cannot call event_to_character() because we may be dealing with non-ASCII keystrokes. In any case, if I ask ＠＠ -1609,8 +1609,8 ＠＠ event_matches_key_specifier_p (Lisp_Obje { int ch1, ch2; - ch1 = event_to_character (event, 0, 0, 0); - ch2 = event_to_character (event2, 0, 0, 0); + ch1 = event_to_character (event, 0, 0); + ch2 = event_to_character (event2, 0, 0); retval = (ch1 >= 0 && ch2 >= 0 && ch1 == ch2); } else if (EQ (XEVENT_KEY_KEYSYM (event), XEVENT_KEY_KEYSYM (event2)) && ＠＠ -1810,10 +1810,10 ＠＠ set of modifiers (such as control and me on the keys on your keyboard. A keysym may be represented by a symbol, or (if and only if it is equivalent -to an ASCII character in the range 32 - 255) by a character or its equivalent -ASCII code. The `A' key may be represented by the symbol `A', the character -`?A', or by the number 65. The `break' key may be represented only by the -symbol `break'. +to a character with a code in the range 32 - 255) by a character or its +equivalent code. The `A' key may be represented by the symbol `A', the +character `?A', or by the number 65. The `break' key may be represented +only by the symbol `break'. A keystroke may be represented by a list: the last element of the list is the key (a symbol, character, or number, as above) and the ＠＠ -2912,6 +2912,8 ＠＠ map_keymap_sort_predicate (Lisp_Object o int bit1, bit2; int sym1_p = 0; int sym2_p = 0; + extern Lisp_Object Qcharacter_of_keysym; + obj1 = XCAR (obj1); obj2 = XCAR (obj2); ＠＠ -2920,12 +2922,12 ＠＠ map_keymap_sort_predicate (Lisp_Object o bit1 = MODIFIER_HASH_KEY_BITS (obj1); bit2 = MODIFIER_HASH_KEY_BITS (obj2); - /* If either is a symbol with a character-set-property, then sort it by + /* If either is a symbol with a Qcharacter_of_keysym property, then sort it by that code instead of alphabetically. */ if (! bit1 && SYMBOLP (obj1)) { - Lisp_Object code = Fget (obj1, Vcharacter_set_property, Qnil); + Lisp_Object code = Fget (obj1, Qcharacter_of_keysym, Qnil); if (CHAR_OR_CHAR_INTP (code)) { obj1 = code; ＠＠ -2935,7 +2937,7 ＠＠ map_keymap_sort_predicate (Lisp_Object o } if (! bit2 && SYMBOLP (obj2)) { - Lisp_Object code = Fget (obj2, Vcharacter_set_property, Qnil); + Lisp_Object code = Fget (obj2, Qcharacter_of_keysym, Qnil); if (CHAR_OR_CHAR_INTP (code)) { obj2 = code; ＠＠ -3397,12 +3399,13 ＠＠ of a character from a buffer rather than if (EVENTP (chr)) { - Lisp_Object ch = Fevent_to_character (chr, Qnil, Qnil, Qt); + Lisp_Object ch = Fevent_to_character (chr, Qnil, Qnil, Qnil); if (NILP (ch)) return signal_continuable_error (Qinvalid_argument, - "character has no ASCII equivalent", Fcopy_event (chr, Qnil)); + "key has no character equivalent (that we know of)", + Fcopy_event (chr, Qnil)); chr = ch; } ＠＠ -4127,6 +4130,7 ＠＠ static int elide_next_two_p (Lisp_Object list) { Lisp_Object s1, s2; + extern Lisp_Object Qcharacter_of_keysym; if (NILP (XCDR (list))) return 0; ＠＠ -4146,7 +4150,7 ＠＠ elide_next_two_p (Lisp_Object list) if (SYMBOLP (s1)) { - Lisp_Object code = Fget (s1, Vcharacter_set_property, Qnil); + Lisp_Object code = Fget (s1, Qcharacter_of_keysym, Qnil); if (CHAR_OR_CHAR_INTP (code)) { s1 = code; ＠＠ -4156,7 +4160,7 ＠＠ elide_next_two_p (Lisp_Object list) } if (SYMBOLP (s2)) { - Lisp_Object code = Fget (s2, Vcharacter_set_property, Qnil); + Lisp_Object code = Fget (s2, Qcharacter_of_keysym, Qnil); if (CHAR_OR_CHAR_INTP (code)) { s2 = code; ＠＠ -4207,6 +4211,7 ＠＠ describe_map (Lisp_Object keymap, Lisp_O ? 256 : 160)); int elided = 0; struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; + extern Lisp_Object Qcharacter_of_keysym; keymap = get_keymap (keymap, 1, 1); describe_map_closure.partial = (partial ? Qsuppress_keymap : Qnil); ＠＠ -4247,7 +4252,7 ＠＠ describe_map (Lisp_Object keymap, Lisp_O buffer_insert_c_string (buf, "Sh-"); if (SYMBOLP (keysym)) { - Lisp_Object code = Fget (keysym, Vcharacter_set_property, Qnil); + Lisp_Object code = Fget (keysym, Qcharacter_of_keysym, Qnil); Ichar c = (CHAR_OR_CHAR_INTP (code) ? XCHAR_OR_CHAR_INT (code) : (Ichar) -1); /* Calling Fsingle_key_description() would cons more */ 1.116.2.5 +6 -0 XEmacs/xemacs/src/lisp.h Index: lisp.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v retrieving revision 1.116.2.4 retrieving revision 1.116.2.5 diff -u -p -r1.116.2.4 -r1.116.2.5 --- lisp.h 2005/07/13 04:46:49 1.116.2.4 +++ lisp.h 2005/09/20 16:06:09 1.116.2.5 ＠＠ -2994,6 +2994,7 ＠＠ Lisp_Object,Lisp_Object,Lisp_Object lname, \ (lisp_fn_t) Fname \ }; \ + static struct Lisp_Subr *S##Fname; \ Lisp_Object Fname (DEFUN_##max_args arglist) #define DEFUN_NORETURN(lname, Fname, min_args, max_args, prompt, arglist) \ ＠＠ -3013,7 +3014,10 ＠＠ Lisp_Object,Lisp_Object,Lisp_Object lname, \ (lisp_fn_t) Fname \ }; \ + static struct Lisp_Subr *S##Fname; \ DOESNT_RETURN_TYPE (Lisp_Object) Fname (DEFUN_##max_args arglist) +#define GET_DEFUN_LISP_OBJECT(Fname) \ + wrap_subr (S##Fname); #else /* not MC_ALLOC */ #define DEFUN(lname, Fname, min_args, max_args, prompt, arglist) \ Lisp_Object Fname (EXFUN_##max_args); \ ＠＠ -3054,6 +3058,8 ＠＠ Lisp_Object,Lisp_Object,Lisp_Object (lisp_fn_t) Fname \ }; \ DOESNT_RETURN_TYPE (Lisp_Object) Fname (DEFUN_##max_args arglist) +#define GET_DEFUN_LISP_OBJECT(Fname) \ + wrap_subr (&S##Fname); #endif /* not MC_ALLOC */ /* Heavy ANSI C preprocessor hackery to get DEFUN to declare a 1.72.2.2 +1 -1 XEmacs/xemacs/src/lread.c Index: lread.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lread.c,v retrieving revision 1.72.2.1 retrieving revision 1.72.2.2 diff -u -p -r1.72.2.1 -r1.72.2.2 --- lread.c 2005/03/15 05:24:29 1.72.2.1 +++ lread.c 2005/09/20 16:06:09 1.72.2.2 ＠＠ -3247,7 +3247,7 ＠＠ would also be safe, but much slower. *Whether `load' should always display loading messages. If this is true, every file loaded will be shown, regardless of the setting of the NOMESSAGE parameter, and even when files are loaded indirectly, e.g. -due to `requre'. +due to `require'. */ ); load_always_display_messages = 0; 1.25.2.2 +32 -13 XEmacs/xemacs/src/mule-ccl.c Index: mule-ccl.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mule-ccl.c,v retrieving revision 1.25.2.1 retrieving revision 1.25.2.2 diff -u -p -r1.25.2.1 -r1.25.2.2 --- mule-ccl.c 2005/07/13 04:46:53 1.25.2.1 +++ mule-ccl.c 2005/09/20 16:06:10 1.25.2.2 ＠＠ -826,6 +826,9 ＠＠ static int stack_idx_of_map_multiple; } \ } while (0) +#define POSSIBLE_LEADING_BYTE_P(leading_byte) \ + ((leading_byte > MIN_LEADING_BYTE) && \ + (leading_byte - MIN_LEADING_BYTE) < NUM_LEADING_BYTES) /* Set C to the character code made from CHARSET and CODE. This is like make_ichar but check the validity of CHARSET and CODE. If they ＠＠ -1295,19 +1298,22 ＠＠ ccl_driver (struct ccl_program *ccl, reg[rrr] = i; reg[RRR] = LEADING_BYTE_ASCII; } - else if (i <= MAX_LEADING_BYTE_OFFICIAL_1) + /* Previously, these next two elses were reversed in order, + which should have worked fine, but is more fragile than + this order. */ + else if (LEADING_BYTE_CONTROL_1 == i) { if (src >= src_end) goto ccl_read_multibyte_character_suspend; reg[RRR] = i; - reg[rrr] = (*src++ & 0x7F); + reg[rrr] = (*src++ - 0xA0); } - else if (LEADING_BYTE_CONTROL_1 == i) + else if (i <= MAX_LEADING_BYTE_OFFICIAL_1) { if (src >= src_end) goto ccl_read_multibyte_character_suspend; reg[RRR] = i; - reg[rrr] = (*src++ - 0xA0); + reg[rrr] = (*src++ & 0x7F); } else if (i <= MAX_LEADING_BYTE_OFFICIAL_2) { ＠＠ -1356,15 +1362,29 ＠＠ ccl_driver (struct ccl_program *ccl, case CCL_WriteMultibyteChar2: i = reg[RRR]; /* charset */ - if (i == LEADING_BYTE_ASCII || i == LEADING_BYTE_CONTROL_1) + if (i == LEADING_BYTE_ASCII) i = reg[rrr] & 0xFF; - else if (XCHARSET_DIMENSION (charset_by_leading_byte (i)) == 1) - i = (((i - FIELD2_TO_OFFICIAL_LEADING_BYTE) << 7) - | (reg[rrr] & 0x7F)); - else if (i < MAX_LEADING_BYTE_OFFICIAL_2) - i = ((i - FIELD1_TO_OFFICIAL_LEADING_BYTE) << 14) | reg[rrr]; - else - i = ((i - FIELD1_TO_PRIVATE_LEADING_BYTE) << 14) | reg[rrr]; + else if (LEADING_BYTE_CONTROL_1 == i) + i = ((reg[rrr] & 0xFF) - 0xA0); + else if (POSSIBLE_LEADING_BYTE_P(i) && + !NILP(charset_by_leading_byte(i))) + { + if (XCHARSET_DIMENSION (charset_by_leading_byte (i)) == 1) + i = (((i - FIELD2_TO_OFFICIAL_LEADING_BYTE) << 7) + | (reg[rrr] & 0x7F)); + else if (i < MAX_LEADING_BYTE_OFFICIAL_2) + i = ((i - FIELD1_TO_OFFICIAL_LEADING_BYTE) << 14) + | reg[rrr]; + else + i = ((i - FIELD1_TO_PRIVATE_LEADING_BYTE) << 14) | reg[rrr]; + } + else + { + /* No charset we know about; use U+3012 GETA MARK */ + i = make_ichar + (charset_by_leading_byte(LEADING_BYTE_JAPANESE_JISX0208), + 34, 46); + } CCL_WRITE_CHAR (i); ＠＠ -1423,7 +1443,6 ＠＠ ccl_driver (struct ccl_program *ccl, for (;i < j;i++) { - size = XVECTOR (Vcode_conversion_map_vector)->size; point = XINT (ccl_prog[ic++]); if (point >= size) continue; 1.32.2.2 +1 -1 XEmacs/xemacs/src/mule-coding.c Index: mule-coding.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mule-coding.c,v retrieving revision 1.32.2.1 retrieving revision 1.32.2.2 diff -u -p -r1.32.2.1 -r1.32.2.2 --- mule-coding.c 2005/03/15 05:24:32 1.32.2.1 +++ mule-coding.c 2005/09/20 16:06:10 1.32.2.2 ＠＠ -324,7 +324,7 ＠＠ shift_jis_detect (struct detection_state /* Big5 methods */ /************************************************************************/ -/* BIG5 (used for Taiwanese). */ +/* BIG5 (used for Mandarin in Taiwan). */ DEFINE_CODING_SYSTEM_TYPE (big5); /* BIG5 is a coding system encoding two character sets: ASCII and 1.18.2.2 +4 -0 XEmacs/xemacs/src/ralloc.c Index: ralloc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ralloc.c,v retrieving revision 1.18.2.1 retrieving revision 1.18.2.2 diff -u -p -r1.18.2.1 -r1.18.2.2 --- ralloc.c 2005/03/15 05:24:38 1.18.2.1 +++ ralloc.c 2005/09/20 16:06:10 1.18.2.2 ＠＠ -61,7 +61,9 ＠＠ typedef unsigned char *POINTER; #include "getpagesize.h" #include <string.h> +#ifndef MC_ALLOC void refill_memory_reserve (void); +#endif /* not MC_ALLOC */ #else /* Not emacs. */ ＠＠ -984,7 +986,9 ＠＠ r_alloc_free (POINTER *ptr) *ptr = 0; #ifdef emacs +#ifndef MC_ALLOC refill_memory_reserve (); +#endif /* not MC_ALLOC */ #endif } 1.12.2.2 +1 -2 XEmacs/xemacs/src/symeval.h Index: symeval.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symeval.h,v retrieving revision 1.12.2.1 retrieving revision 1.12.2.2 diff -u -p -r1.12.2.1 -r1.12.2.2 --- symeval.h 2005/07/13 04:47:02 1.12.2.1 +++ symeval.h 2005/09/20 16:06:11 1.12.2.2 ＠＠ -284,8 +284,7 ＠＠ DECLARE_LRECORD (symbol_value_varalias, #ifdef MC_ALLOC MODULE_API void defsubr (Lisp_Subr *); #define DEFSUBR_MC_ALLOC(Fname) \ - struct Lisp_Subr *S##Fname= (struct Lisp_Subr *) \ - mc_alloc (sizeof (struct Lisp_Subr)); \ + S##Fname= (struct Lisp_Subr *) mc_alloc (sizeof (struct Lisp_Subr)); \ set_lheader_implementation (&S##Fname->lheader, &lrecord_subr); \ \ S##Fname->min_args = MC_ALLOC_S##Fname.min_args; \ 1.77.2.4 +2 -2 XEmacs/xemacs/src/sysdep.c Index: sysdep.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sysdep.c,v retrieving revision 1.77.2.3 retrieving revision 1.77.2.4 diff -u -p -r1.77.2.3 -r1.77.2.4 --- sysdep.c 2005/07/13 04:47:03 1.77.2.3 +++ sysdep.c 2005/09/20 16:06:11 1.77.2.4 ＠＠ -1602,7 +1602,7 ＠＠ tty_init_sys_modes_on_device (struct dev if (CONSOLE_TTY_DATA (con)->controlling_terminal) { tty.main.c_cc[VINTR] = /* C-g (usually) gives SIGINT */ - event_to_character (CONSOLE_QUIT_EVENT (con), 0, 1, 0); + event_to_character (CONSOLE_QUIT_EVENT (con), 0, 1); /* Set up C-g for both SIGQUIT and SIGINT. We don't know which we will get, but we handle both alike so which one it really gives us does not matter. */ ＠＠ -1696,7 +1696,7 ＠＠ tty_init_sys_modes_on_device (struct dev /* Note: if not using CBREAK mode, it makes no difference how we set this */ tty.tchars = new_tchars; - tty.tchars.t_intrc = event_to_character (CONSOLE_QUIT_EVENT (con), 0, 1, 0); + tty.tchars.t_intrc = event_to_character (CONSOLE_QUIT_EVENT (con), 0, 1); if (TTY_FLAGS (con).flow_control) { tty.tchars.t_startc = '\021'; 1.19.2.1 +7 -1 XEmacs/xemacs/src/sysdll.c Index: sysdll.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sysdll.c,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -u -p -r1.19 -r1.19.2.1 --- sysdll.c 2004/05/14 15:34:40 1.19 +++ sysdll.c 2005/09/20 16:06:11 1.19.2.1 ＠＠ -228,9 +228,15 ＠＠ dll_open (Lisp_Object fname) NSModule out; NSObjectFileImageReturnCode ret; + /* + * MacOS X dll support is for bundles, not the current executable, so return + * NULL is this case. However, dll_function() uses a special hack where a + * NULL handle can be used to find executable symbols. This satisfies the + * needs of ui-gtk.c but is not a general solution. + */ if (NILP (fname)) { - soname = NULL; + return NULL; } else { 1.32.2.2 +1 -1 XEmacs/xemacs/src/tooltalk.c Index: tooltalk.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/tooltalk.c,v retrieving revision 1.32.2.1 retrieving revision 1.32.2.2 diff -u -p -r1.32.2.1 -r1.32.2.2 --- tooltalk.c 2005/07/13 04:47:06 1.32.2.1 +++ tooltalk.c 2005/09/20 16:06:12 1.32.2.2 ＠＠ -1289,7 +1289,7 ＠＠ init_tooltalk (void) { /* Don't ask the user for confirmation when exiting Emacs */ Fprocess_kill_without_query (lp, Qnil); - fil = wrap_subr (&SFreceive_tooltalk_message); + fil = GET_DEFUN_LISP_OBJECT (Freceive_tooltalk_message); set_process_filter (lp, fil, 1, 0); } else 1.16.2.2 +10 -10 XEmacs/xemacs/src/unexelf.c Index: unexelf.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unexelf.c,v retrieving revision 1.16.2.1 retrieving revision 1.16.2.2 diff -u -p -r1.16.2.1 -r1.16.2.2 --- unexelf.c 2005/07/13 04:47:07 1.16.2.1 +++ unexelf.c 2005/09/20 16:06:12 1.16.2.2 ＠＠ -413,7 +413,8 ＠＠ Filesz Memsz Flags Alig #define fatal(a, b, c) fprintf (stderr, a, b, c), exit (1) #else #include <config.h> -extern void fatal (const char *, ...); +#include "lisp.h" +extern DOESNT_RETURN fatal (const CIbyte *, ...); #endif #include <sys/types.h> ＠＠ -563,10 +564,8 ＠＠ round_up (ElfW(Addr) x, ElfW(Addr) y) * .data section, and inserting an empty .bss immediately afterwards. * */ -void unexec (char *new_name, char *old_name, unsigned int data_start, - unsigned int bss_start, unsigned int entry_address); -void -unexec (char *new_name, char *old_name, unsigned int UNUSED (data_start), +int +unexec (Extbyte *new_name, Extbyte *old_name, unsigned int UNUSED (data_start), unsigned int UNUSED (bss_start), unsigned int UNUSED (entry_address)) { int new_file, old_file, new_file_size; ＠＠ -637,7 +636,7 ＠＠ unexec (char *new_name, char *old_name, break; } if (old_bss_index == old_file_h->e_shnum) - fatal ("Can't find .bss in %s.\n", old_name, 0); + fatal ("Can't find .bss in %s.\n", old_name); for (old_sbss_index = 1; old_sbss_index < (int) old_file_h->e_shnum; old_sbss_index++) ＠＠ -714,7 +713,7 ＠＠ unexec (char *new_name, char *old_name, #endif if ((unsigned) new_bss_addr < (unsigned) old_bss_addr + old_bss_size) - fatal (".bss shrank when undumping???\n", 0, 0); + fatal (".bss shrank when undumping???\n"); /* Set the output file to the right size and mmap it. Set * pointers to various interesting objects. stat_buf still has ＠＠ -797,7 +796,7 ＠＠ unexec (char *new_name, char *old_name, > (old_sbss_index == -1 ? old_bss_addr : round_up (old_bss_addr, alignment))) - fatal ("Program segment above .bss in %s\n", old_name, 0); + fatal ("Program segment above .bss in %s\n", old_name); if (NEW_PROGRAM_H (n).p_type == PT_LOAD && (round_up ((NEW_PROGRAM_H (n)).p_vaddr ＠＠ -807,7 +806,7 ＠＠ unexec (char *new_name, char *old_name, break; } if (n < 0) - fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0); + fatal ("Couldn't find segment next to .bss in %s\n", old_name); /* Make sure that the size includes any padding before the old .bss section. */ ＠＠ -838,7 +837,7 ＠＠ unexec (char *new_name, char *old_name, ".data")) break; if (old_data_index == old_file_h->e_shnum) - fatal ("Can't find .data in %s.\n", old_name, 0); + fatal ("Can't find .data in %s.\n", old_name); /* Walk through all section headers, insert the new data2 section right before the new bss section. */ ＠＠ -1180,4 +1179,5 ＠＠ unexec (char *new_name, char *old_name, stat_buf.st_mode |= 0111 & ~n; if (chmod (new_name, stat_buf.st_mode) == -1) fatal ("Can't chmod (%s): errno %d\n", new_name, errno); + return 0; } 1.62.2.5 +4 -0 XEmacs/xemacs/tests/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/ChangeLog,v retrieving revision 1.62.2.4 retrieving revision 1.62.2.5 diff -u -p -r1.62.2.4 -r1.62.2.5 --- ChangeLog 2005/07/13 04:47:45 1.62.2.4 +++ ChangeLog 2005/09/20 16:06:27 1.62.2.5 ＠＠ -1,3 +1,7 ＠＠ +2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> + + * XEmacs 21.5.22 "cucumber" is released. + 2005-05-28 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.21 "corn" is released.

1 participants
0 comments

CVS update by viteno xemacs ... 19 years, 3 months

CVS Monitor

User: viteno Date: 05/09/19 23:51:04 Modified: xemacs version.sh Log: Update xemacs_extra_name. Revision Changes Path 1.1288 +1 -1 XEmacs/xemacs/version.sh Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.1287 retrieving revision 1.1288 diff -u -p -r1.1287 -r1.1288 --- version.sh 2005/09/18 21:51:11 1.1287 +++ version.sh 2005/09/19 21:51:04 1.1288 ＠＠ -8,5 +8,5 ＠＠ emacs_kit_version= infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -xemacs_extra_name="(+CVS-20050918)" +xemacs_extra_name="(+CVS-20050919)" xemacs_release_date="2005-02-18"

1 participants
0 comments

CVS update by stephent xemacsweb/Releases ... 19 years, 3 months

CVS Monitor

User: stephent Date: 05/09/19 11:13:09 Modified: xemacsweb/Releases ChangeLog index.content Added: xemacsweb/Releases 21.5.22.content Log: XEmacs 21.5.22 is released. <87wtlkb3xa.fsf(a)tleepslib.sk.tsukuba.ac.jp> Revision Changes Path 1.232 +4 -0 XEmacs/xemacsweb/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/ChangeLog,v retrieving revision 1.231 retrieving revision 1.232 diff -u -p -r1.231 -r1.232 --- ChangeLog 2005/05/28 08:48:02 1.231 +++ ChangeLog 2005/09/19 09:12:56 1.232 ＠＠ -1,3 +1,7 ＠＠ +2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> + + * index.content (Releases): XEmacs 21.5.22 is released. + 2005-05-28 Stephen J. Turnbull <stephen(a)xemacs.org> * index.content (Releases): XEmacs 21.5.21 "corn" is released. 1.148 +1 -1 XEmacs/xemacsweb/index.content Index: index.content =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/index.content,v retrieving revision 1.147 retrieving revision 1.148 diff -u -p -r1.147 -r1.148 --- index.content 2005/07/17 16:37:12 1.147 +++ index.content 2005/09/19 09:12:57 1.148 ＠＠ -75,7 +75,7 ＠＠ Martin Buchholz <dt><strong><a href="">Stable</a> branch:</strong></dt> <dd><a href="Releases/21.4.17.html">21.4.17</a></dd> <dt><strong><a href="">Beta</a> branch:</strong></dt> - <dd><a href="Releases/21.5.21.html">21.5.21</a></dd> + <dd><a href="Releases/21.5.22.html">21.5.22</a></dd> </dl> <ul> 1.119 +6 -0 XEmacs/xemacsweb/Releases/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Releases/ChangeLog,v retrieving revision 1.118 retrieving revision 1.119 diff -u -p -r1.118 -r1.119 --- ChangeLog 2005/06/11 22:07:14 1.118 +++ ChangeLog 2005/09/19 09:13:08 1.119 ＠＠ -1,3 +1,9 ＠＠ +2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> + + * index.content: + * 21.5.22.content: + XEmacs 21.5.22 is released. + 2005-06-11 Adrian Aichner <adrian(a)xemacs.org> * index.content: Remove links to za.xemacs.org. 1.106 +1 -0 XEmacs/xemacsweb/Releases/index.content Index: index.content =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Releases/index.content,v retrieving revision 1.105 retrieving revision 1.106 diff -u -p -r1.105 -r1.106 --- index.content 2005/07/17 16:37:27 1.105 +++ index.content 2005/09/19 09:13:08 1.106 ＠＠ -266,6 +266,7 ＠＠ john s jacobs anderson, Sandra Wambold & </p> <ul> + <li><strong>2005-09-14</strong>: <a href="21.5.22.html">[21.5.22 release notice]</a> <a href="21.5.22.html#changes">[changelogs]</a></li> <li><strong>2005-05-28</strong>: <a href="21.5.21.html">[21.5.21 release notice]</a> <a href="21.5.21.html#changes">[changelogs]</a></li> <li><strong>2005-03-12</strong>: <a href="21.5.20.html">[21.5.20 release notice]</a> <a href="21.5.20.html#changes">[changelogs]</a></li> <li><strong>2005-02-18</strong>: <a href="21.5.19.html">[21.5.19 release notice]</a> <a href="21.5.19.html#changes">[changelogs]</a></li> 1.1 XEmacs/xemacsweb/Releases/21.5.22.content Index: 21.5.22.content =================================================================== %title% XEmacs 21.5.22 "cucumber" is released %author% automatically generated (with release announcement) by xre.py %main% <h1><a name="announcement">XEmacs 21.5.22 "cucumber" is released</a></h1> <p>goto announcement, <a href="#summary">summary</a>, <a href="#changes">changes</a></p> <pre xml:space="preserve"> To: xemacs-beta(a)xemacs.org From: "Stephen J. Turnbull, XEmacs 21.5 Beta Engineer" <stephen(a)xemacs.org> Subject: XEmacs 21.5.22 "cucumber" is released. Organization: The XEmacs Project * XEmacs 21.5.22 "cucumber" is released. "cucumber" is the twenty-third in the VEGETABLE series. The successor to XEmacs 21.5.21 "corn", "cucumber" adds important fixes to the window configuration code from Fabrice Popineau and Michael Sperber. Aidan Kehoe added support for Unnnn-style keysyms on X11. Although we still need better internal support for Unicode, this is an important step. For LISP programmers, Didier Verna added face aliasing support. This has no immediate impact on users but will help us keep up with recent changes in GNU Emacs face naming conventions, which are pervasive. Marcus Crestani has performed a number of cleanups on his new allocator code. There have been a few bug reports recently, but they don't seem to affect very many people. Marcus's new allocator remains the default in this release. If you experience problems in building or running, give configure the `--disable-mc-alloc' option and rebuild. This is the development line. The current series started with XEmacs 21.5.0 (an alias for XEmacs 21.4.0 "Solid Vapor", the first release in the current stable line). 21.5 is the code base for introduction of major new subsystems and fixes to design bugs that experience shows will introduce instability. So far the main effort has been on improved support for Unicode, updates to the build infrastructure, and development of new features in memory allocation. For general information about XEmacs, the developers, and the user community, see our home page, http://www.xemacs.org/ * XEmacs 21.5.22 is "beta" software. The usual "no warranty" disclaimer (see etc/WARRANTY, sections 10 and 11) applies. At this point in time, it is the version that most developers are using for their daily work. However, it is certain that many bugs remain and new ones will be introduced as development proceeds. Be sure to take care to safe your work often and follow a regular backup regime. * Availability Anonymous ftp: ftp://ftp.xemacs.org/pub/xemacs/xemacs-21.5 See http://www.xemacs.org/Install/ for more information about building from source. If you already have a 21.5.21 source tree, a patchkit is available in xemacs-21.5.21-21.5.22.patch.gz. This does not update .elcs or .infos, they will be rebuilt when you make XEmacs. If you have an earlier version, you can repeatedly apply patchkits. Also, if you don't have the packages yet, see http://www.xemacs.org/Documentation/packageGuide.html. Anonymous (pserver) CVS: Anonymous CVS is available. We are very grateful to the staff at our host, SunSITE.dk, for a lot of help and quick reponse to all our requests. Take care that your Root is set correctly to CVSROOT=:pserver:cvs＠cvs.xemacs.org:/pack/xemacscvs On platforms with a Bourne shell and find available, something like for r in `find . -name Root`; do echo $CVSROOT > $r; done will convert your entire tree. To make it straightforward to access certain versions of the code, we have a standard tagging policy. To update to release 21.5.22, use the update flag "-r r21-5-22". To update to the current release without referring to it specifically, use the flag "-r r21-5-current-beta". To update to the latest commits in CVS, use the flag "-A". Then rebuild XEmacs. For more details, see http://www.xemacs.org/Develop/cvsaccess.html . </pre> <h1><a name="summary">Changes</a> in XEmacs 21.5.22 "cucumber"</h1> <p>goto <a href="#announcement">announcement</a>, summary, <a href="#changes">changes</a></p> <ul> <li> Fix: window configuration subsystem. (<em>Michael Sperber, Fabrice Popineau</em>) </li> <li> Fix: add generated dumper files to .cvsignore. (<em>Marcus Crestani</em>) </li> <li> Fix: add generated makefiles to .cvsignore in ./modules. (<em>Craig Lanning</em>) </li> <li> Fix: lispref - compose processing now goes direct to character, not keysym. (<em>Aidan Kehoe</em>) </li> <li> Improve: lispref - Mule explanations. (<em>Aidan Kehoe</em>) </li> <li> Improve: lispref - remove discussion of pure storage, long disabled. (<em>Aidan Kehoe</em>) </li> <li> New: lispref - face aliasing. (<em>Didier Verna</em>) </li> <li> New: face aliasing. (<em>Didier Verna</em>) </li> <li> Fix: DLL implementation for Mac OS X "Tiger". (<em>Atanu Ghosh</em>) </li> <li> Fix: false load path shadows after package update. (<em>Jeff Mincy, Adrian Aichner</em>) </li> <li> Fix: make CCL check for existence before using characters. (<em>Aidan Kehoe</em>) </li> <li> Fix: memory descriptions for gap variables for better 64-bit support. (<em>Darryl Okahata</em>) </li> <li> Fix: various cleanups for MC_ALLOC. (<em>Marcus Crestani</em>) </li> <li> Improve: use characters instead of keysyms in x-compose.el. Remove iso8859 .els from dumped-lisp.el. (<em>Aidan Kehoe</em>) </li> </ul> <h1><a name="changes">ChangeLogs</a> for XEmacs 21.5.22 "cucumber"</h1> <p>goto <a href="#announcement">announcement</a>, <a href="#summary">summary</a>, changes</p> <ul> <li>ChangeLog Entries from <a href="#ChangeLog">ChangeLog</a></li> <li>ChangeLog Entries from <a href="#etc:ChangeLog">etc/ChangeLog</a></li> <li>ChangeLog Entries from <a href="#lib-src:ChangeLog">lib-src/ChangeLog</a></li> <li>ChangeLog Entries from <a href="#lisp:ChangeLog">lisp/ChangeLog</a></li> <li>ChangeLog Entries from <a href="#lwlib:ChangeLog">lwlib/ChangeLog</a></li> <li>ChangeLog Entries from <a href="#man:ChangeLog">man/ChangeLog</a></li> <li>ChangeLog Entries from <a href="#netinstall:ChangeLog">netinstall/ChangeLog</a></li> <li>ChangeLog Entries from <a href="#nt:ChangeLog">nt/ChangeLog</a></li> <li>ChangeLog Entries from <a href="#src:ChangeLog">src/ChangeLog</a></li> <li>ChangeLog Entries from <a href="#tests:ChangeLog">tests/ChangeLog</a></li> </ul> <h2>ChangeLog Entries from <a name="ChangeLog">ChangeLog</a></h2> <p>goto <a href="#announcement">announcement</a>, <a href="#summary">summary</a>, <a href="#changes">changes</a></p> <pre xml:space="preserve"> 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released. 2005-07-20 Didier Verna <didier(a)xemacs.org> * CHANGES-beta: Remove the face aliasing feature announcement. 2005-07-19 Didier Verna <didier(a)xemacs.org> * CHANGES-beta: Announce the face aliasing feature.</pre> <h2>ChangeLog Entries from <a name="etc:ChangeLog">etc/ChangeLog</a></h2> <p>goto <a href="#announcement">announcement</a>, <a href="#summary">summary</a>, <a href="#changes">changes</a></p> <pre xml:space="preserve"> 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released. 2005-07-17 Aidan Kehoe <kehoea(a)parhasard.net> * NEWS: Add information on the last argument to event-to-character being ignored.</pre> <h2>ChangeLog Entries from <a name="lib-src:ChangeLog">lib-src/ChangeLog</a></h2> <p>goto <a href="#announcement">announcement</a>, <a href="#summary">summary</a>, <a href="#changes">changes</a></p> <pre xml:space="preserve"> 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released. 2005-06-28 Marcus Crestani <crestani(a)xemacs.org> * .cvsignore: Add insert-data-in-exec.</pre> <h2>ChangeLog Entries from <a name="lisp:ChangeLog">lisp/ChangeLog</a></h2> <p>goto <a href="#announcement">announcement</a>, <a href="#summary">summary</a>, <a href="#changes">changes</a></p> <pre xml:space="preserve"> 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released. 2005-08-06 Mike Sperber <mike(a)xemacs.org> * window-xemacs.el (really-set-window-configuration): Only set the frame top and left if they've changed. 2005-08-04 Mike Sperber <mike(a)xemacs.org> * window-xemacs.el (window-configuration-equal): Compare frame top and left via `equal' rather than '=', as it can be nil. 2005-07-24 Fabrice Popineau <Fabrice.Popineau(a)supelec.fr> * window-xemacs.el (really-set-window-configuration): * window-xemacs.el (current-window-configuration): * window-xemacs.el (window-configuration-equal): * window-xemacs.el (window-configuration): Add `frame-top' and `frame-left' field to windows configurations, and save and restore them. 2005-06-26 Aidan Kehoe <kehoea(a)parhasard.net> * cmdloop.el (read-quoted-char): * isearch-mode.el (isearch-char-to-string): Remove the fourth argument from event-to-character. * dumped-lisp.el (preloaded-file-list): No longer dump x-iso8859-1.el--we don't need it any more. * x-init.el (x-initialize-keyboard): * keymap.el (events-to-keys): * events.el: Rename the ascii-character keysym property to character-of-keysym. * gtk-compose.el: Don't depend on gtk-iso8859-1.el * x-compose.el: Move to using character literals rather than X11 keysyms as macro expansions. Loses the ability to use another character encoding for the Latin-1 characters in X11 composition with a bit of programming, which no-one uses; also happily reduces dependence on x-iso8859-1.el, which is no longer of use. 2005-06-06 Adrian Aichner <adrian(a)xemacs.org> * package-get.el (package-get-init-package): package-get-init-package buglet (21.4.17) by Jeff Mincy <mincy(a)rcn.com> fixing false temporary load-path shadows reported after package installation and simplifying code.</pre> <h2>ChangeLog Entries from <a name="lwlib:ChangeLog">lwlib/ChangeLog</a></h2> <p>goto <a href="#announcement">announcement</a>, <a href="#summary">summary</a>, <a href="#changes">changes</a></p> <pre xml:space="preserve"> 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released.</pre> <h2>ChangeLog Entries from <a name="man:ChangeLog">man/ChangeLog</a></h2> <p>goto <a href="#announcement">announcement</a>, <a href="#summary">summary</a>, <a href="#changes">changes</a></p> <pre xml:space="preserve"> 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released. 2005-07-20 Didier Verna <didier(a)xemacs.org> * lispref/faces.texi (Basic Face Functions): Rephrase the face aliasing paragraph following a suggestion from Stephen J. Turnbull. 2005-07-19 Didier Verna <didier(a)xemacs.org> * lispref/faces.texi (Basic Face Functions): Document the face aliasing feature. 2005-07-17 Aidan Kehoe <kehoea(a)parhasard.net> * lispref/commands.texi (Converting Events): Give details on the deprecated ALLOW-NON-ASCII argument to event-to-character, and why you shouldn't use it. 2005-06-26 Aidan Kehoe <kehoea(a)parhasard.net> * lispref/commands.texi (Converting Events): * lispref/keymaps.texi (Key Sequences): Stop pretending ASCII is an eight-bit character set, and remove documentation of event-to-character's vanished fourth argument. * internals/internals.texi (Old Future Work -- Improvements in support for non-ASCII (European) keysyms under X): Rename the ascii-character property. 2005-06-19 Aidan Kehoe <kehoea(a)parhasard.net> * lispref/building.texi (Building XEmacs and Object Allocation): Pure storage has been gone for half a decade or more. * lispref/mule.texi (Internationalization Terminology): Phrase stuff a little more clearly, compare Mule with Unicode. * lispref/lispref.texi (Top): Take out info on pure storage.</pre> <h2>ChangeLog Entries from <a name="modules:ChangeLog">modules/ChangeLog</a></h2> <p>goto <a href="#announcement">announcement</a>, <a href="#summary">summary</a>, <a href="#changes">changes</a></p> <pre xml:space="preserve"> 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released. 2005-06-09 Craig Lanning <CraigL(a)sc.rr.com> * ldap/.cvsignore: * sample/external/.cvsignore: * sample/internal/.cvsignore: Added GNUmakefile, Makefile, and Makefile.in</pre> <h2>ChangeLog Entries from <a name="netinstall:ChangeLog">netinstall/ChangeLog</a></h2> <p>goto <a href="#announcement">announcement</a>, <a href="#summary">summary</a>, <a href="#changes">changes</a></p> <pre xml:space="preserve"> 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released.</pre> <h2>ChangeLog Entries from <a name="nt:ChangeLog">nt/ChangeLog</a></h2> <p>goto <a href="#announcement">announcement</a>, <a href="#summary">summary</a>, <a href="#changes">changes</a></p> <pre xml:space="preserve"> 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released.</pre> <h2>ChangeLog Entries from <a name="nt:installer:Wise:ChangeLog">nt/installer/Wise/ChangeLog</a></h2> <p>goto <a href="#announcement">announcement</a>, <a href="#summary">summary</a>, <a href="#changes">changes</a></p> <pre xml:space="preserve"> 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released.</pre> <h2>ChangeLog Entries from <a name="src:ChangeLog">src/ChangeLog</a></h2> <p>goto <a href="#announcement">announcement</a>, <a href="#summary">summary</a>, <a href="#changes">changes</a></p> <pre xml:space="preserve"> 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released. 2005-07-29 Darryl Okahata <darrylo(a)xemacs.org> * extents.c (lispobj_gap_array_description_1): fix the memory descriptions for the "gap", "offset_past_gap", and "els_past_gap" members. Before, they were incorrectly defined as "XD_INT" objects. They've been corrected to use "XD_ELEMCOUNT" and "XD_BYTECOUNT", as that is how they are defined in the actual Gap_Array declaration. This is important on systems where sizeof(int) != sizeof(long), such as some 64-bit systems. 2005-07-24 Fabrice Popineau <Fabrice.Popineau(a)supelec.fr> * frame-msw.c (mswindows_set_frame_size): Don't have a frame size change trigger restoring the frame. 2005-07-20 Didier Verna <didier(a)xemacs.org> Following suggestions from Stephen J. Turnbull: * faces.c (Qcyclic_face_alias): New name for Qcyclic_face_aliasing. * faces.c (Ffind_face): Use it. Rename FACE_ALIASING_MAX_DEPTH to FACE_ALIAS_MAX_DEPTH. * faces.c (syms_of_faces): Ditto. 2005-07-19 Didier Verna <didier(a)xemacs.org> * faces.c (Ffind_face): Implement face aliasing. * faces.c (syms_of_faces): Define Qface_alias symbol, and Qcyclic_face_aliasing error symbol. 2005-07-17 Aidan Kehoe <kehoea(a)parhasard.net> * cmds.c (Fself_insert_command): * editfns.c (Fchar_to_string): * event-stream.c (Fnext_event): * event-stream.c (execute_command_event): * events.c (Fevent_to_character): * keymap.c (Ftext_char_description): * lisp.h: Add back the last argument to event-to-character; document that it's unused. 2005-07-11 Atanu Ghosh <atanu(a)icsi.berkeley.edu> * sysdll.c (dll_open): Under MacOS X return NULL under the filename is NULL. Fixes problems finding local symbols under 10.4 (Tiger) 2005-07-07 Aidan Kehoe <kehoea(a)parhasard.net> * console-msw.c: * console-msw.c (mswindows_perhaps_init_unseen_key_defaults): * console-msw.c (vars_of_console_mswindows): Rename Qseen_characters to Vmswindows_seen_characters, dump it when pdump is in use. * console-tty.c (tty_perhaps_init_unseen_key_defaults): * console-tty.c (vars_of_console_tty): Rename Qseen_characters to Vttyxo_seen_characters, dump it when pdump is in use. 2005-06-29 Marcus Crestani <crestani(a)xemacs.org> Fix C++ build for unexec. * unexelf.c: Adjust fatal and unexec to the declarations in lisp.h. * unexelf.c (unexec): Remove unneeded arguments from fatal calls. 2005-07-03 Aidan Kehoe <kehoea(a)parhasard.net> * event-Xt.c: * event-gtk.c: * events.c (event_to_character): * general-slots.h: Move the Qkey_mapping variable to general-slots.h, now that it's used outside the platform specific keyboard warning code. 2005-06-28 Marcus Crestani <crestani(a)xemacs.org> * console-x.c (x_perhaps_init_unseen_key_defaults): Use build_intstring to avoid type error. * event-Xt.c (x_keysym_to_emacs_keysym): Add cast to avoid type error. 2005-06-28 Marcus Crestani <crestani(a)xemacs.org> * .cvsignore: Add dump-size, xemacs.def, xemacs.def.in. 2005-06-28 Marcus Crestani <crestani(a)xemacs.org> * gpmevent.c: Remove workaround. * gpmevent.c (Fgpm_enable): Use GET_DEFUN_LISP_OBJECT to get Lisp_Object of a built-in function. * gpmevent.c (syms_of_gpmevent): Remove workaround. * lisp.h (GET_DEFUN_LISP_OBJECT): New. Returns Lisp_Object of a DEFUN. * tooltalk.c (init_tooltalk): Use GET_DEFUN_LISP_OBJECT to get Lisp_Object of a built-in function. 2005-06-26 Aidan Kehoe <kehoea(a)parhasard.net> * event-stream.c (command_builder_find_leaf): * mule-ccl.c (POSSIBLE_LEADING_BYTE_P): * mule-ccl.c (ccl_driver): Couple of build fixes. 2005-06-26 Aidan Kehoe <kehoea(a)parhasard.net> * mule-ccl.c (POSSIBLE_LEADING_BYTE_P): Add. * mule-ccl.c: Check that a character set exists before using it to create a character. 2005-06-26 Aidan Kehoe <kehoea(a)parhasard.net> * cmds.c (Fself_insert_command): No 4th arg to event_to_character. * console-impl.h (struct console_methods): Add a new member method, perhaps_init_unseen_key_defaults, which is to allow the console to take appropriate action--often a default binding to self-insert-command--when notified about a character it may not have seen before. * console-gtk.c: Add gtk_perhaps_init_unseen_key_defaults, a new console method, and a hash table it uses. * console-msw.c: Add mswindows_perhaps_init_unseen_key_defaults, a new console method, and a hash table it uses. * console-tty.c: Add tty_perhaps_init_unseen_key_defaults, a new console method, and a hash table used by it. * console-x.c: * console-x.c (x_perhaps_init_unseen_key_defaults): New. Given a key, if it maps to a character and we weren't previously aware that it could be generated on console CON, and if it's unbound in the global map, bind it to self-insert-command. Return Qt if the binding was done; Qnil if not. * device-gtk.c: * device-gtk.c (vars_of_device_gtk): Add a hash table var used by gtk_perhaps_init_unseen_key_defaults. * editfns.c (Fchar_to_string): Call Fevent_to_character with three arguments, not four; don't express a belief that the only XEmacs character encoding is ASCII. * event-Xt.c: * event-Xt.c (maybe_define_x_key_as_self_inserting_character): ascii-character -> character-of-keysym property renaming. * event-Xt.c (x_has_keysym): Make it visible to the console code, make it a little more Mule-safe. * event-Xt.c (index_to_name): Move to Mule declaration conventions. * event-Xt.c (x_reset_modifier_mapping): Move large comment from Jamie before this function. * event-Xt.c (x_keysym_to_emacs_keysym): Move to Mule declaration conventions and coding practices. * event-Xt.c (x_event_to_emacs_event): Add some comments, and the initial steps necessary for Russian C-x support. * event-msw.c (mswindows_wnd_proc): Don't conditionalize Russian C-x support on Mule. (I'm not certain if this is correct on MSW, but it's the approach I'm taking on X11.) * event-stream.c: Add Russian C-x support, a var to enable and disable it, remove composed-character-default-binding in favour of self-insert-command, rename command_builder_find_leaf_no_mule_processing to command_builder_find_leaf_no_jit_binding, change command_builder_find_leaf to tell the console-specific code to perhaps add a binding for keys its never seen before, and then retry the lookup if it would otherwise fail. * event-stream.c (execute_command_event): event-to-character has three arguments now, not four. * event-stream.c (vars_of_event_stream): Formatting clean up for inhibit-input-event-recoding. * event-xlike-inc.c: * event-xlike-inc.c (endif): Move x_keysym_to_character here from event-Xt.c so it can be used by GTK 1.0 as well; greatly expand it, to handle many more characters than previously. * events.c: Rename the ascii-character property, remove character-set-property, remove the now unused fourth argument to event_to_character, ditto for the event-to-character, * events.h (enum alternative_key_chars): * events.h (struct Lisp_Key_Data): Russian C-x processing is no longer Mule specific. (Though I'm not certain why a Russian speaker would be using a non-Mule build.) * keymap.c: * keymap.c (event_matches_key_specifier_p): * keymap.c (map_keymap_sort_predicate): * keymap.c (Ftext_char_description): * keymap.c (elide_next_two_p): * keymap.c (describe_map): Rename ascii-character to character-of-keysym, stop pretending the internal encoding of XEmacs is purely ASCII, * lisp.h: * sysdep.c (tty_init_sys_modes_on_device): One less argument to event-to-character. 2005-06-23 Marcus Crestani <crestani(a)xemacs.org> * dumper.c (pdump_load_finish): Use EMACS_INT for elt_count. 2005-06-19 Aidan Kehoe <kehoea(a)parhasard.net> * file-coding.c: * mule-coding.c: The vernacular in Taiwan, and thus the language for which Big5 is most used, is Mandarin. Taiwanese does exist, but since the Chinese civil war, it's used less and less in Taiwan. 2005-06-06 Marcus Crestani <crestani(a)xemacs.org> * lisp.h (DEFUN): Define S##fname here. * lisp.h (DEFUN_NORETURN): Define S##fname here. * symeval.h (DEFSUBR_MC_ALLOC): Use already defined S##fname. 2005-06-01 Marcus Crestani <crestani(a)xemacs.org> * ralloc.c: * ralloc.c (r_alloc_free): Call refill_memory_reserve only if MC_ALLOC is not defined.</pre> <h2>ChangeLog Entries from <a name="tests:ChangeLog">tests/ChangeLog</a></h2> <p>goto <a href="#announcement">announcement</a>, <a href="#summary">summary</a>, <a href="#changes">changes</a></p> <pre xml:space="preserve"> 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released.</pre> <p>goto <a href="#announcement">announcement</a>, <a href="#summary">summary</a>, <a href="#changes">changes</a></p>

1 participants
0 comments

CVS update by mta xemacs/lib-src ... 19 years, 3 months

CVS Monitor

User: mta Date: 05/09/19 02:36:06 Modified: xemacs/lib-src ChangeLog installexe.sh Log: * configure.ac: Fix the cygwin, non-X build by adding XPM header and library files to XE_CFLAGS. Patch from Rick Rankin. * lib-src/installexe.sh: Don't add an exe extention to a file that already has one. Patch from Rick Rankin. Revision Changes Path 1.459 +5 -0 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.458 retrieving revision 1.459 diff -u -p -r1.458 -r1.459 --- ChangeLog 2005/09/18 13:01:03 1.458 +++ ChangeLog 2005/09/19 00:36:01 1.459 ＠＠ -1,3 +1,8 ＠＠ +2005-09-18 Mike Alexander <mta(a)arbortext.com> + + * configure.ac: Fix the cygwin, non-X build by adding XPM header + and library files to XE_CFLAGS. Patch from Rick Rankin. + 2005-09-17 Malcolm Purvis <malcolmp(a)xemacs.org> * configure.in: Replace with warning to use autoconf 2.59. 1.13 +2 -0 XEmacs/xemacs/configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- configure.ac 2005/09/18 13:01:08 1.12 +++ configure.ac 2005/09/19 00:36:02 1.13 ＠＠ -3755,6 +3755,7 ＠＠ if test "$window_system" != "none"; then xpm_problem="" if test -z "$with_xpm"; then XE_PREPEND("$incpath_xpm", CFLAGS) + XE_PREPEND("$incpath_xpm", XE_CFLAGS) XE_PREPEND("$libpath_xpm", LDFLAGS) AC_MSG_CHECKING(for Xpm - no older than 3.4f) xe_check_libs=-lXpm ＠＠ -3794,6 +3795,7 ＠＠ if test "$window_system" != "none"; then XE_PREPEND("$libpath_xpm", LDFLAGS) XE_PREPEND(-lXpm, libs_x) XE_PREPEND("$incpath_xpm", CFLAGS) + XE_PREPEND("$incpath_xpm", XE_CFLAGS) AC_MSG_CHECKING(for \"FOR_MSW\" xpm) xe_check_libs=-lXpm AC_TRY_LINK(, [XpmCreatePixmapFromData()], 1.195 +5 -0 XEmacs/xemacs/lib-src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v retrieving revision 1.194 retrieving revision 1.195 diff -u -p -r1.194 -r1.195 --- ChangeLog 2005/09/14 05:29:26 1.194 +++ ChangeLog 2005/09/19 00:36:05 1.195 ＠＠ -1,3 +1,8 ＠＠ +2005-09-18 Mike Alexander <mta(a)arbortext.com> + + * installexe.sh: Don't add an exe extention to a file that already + has one. Patch from Rick Rankin. + 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released. 1.5 +8 -3 XEmacs/xemacs/lib-src/installexe.sh Index: installexe.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/installexe.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- installexe.sh 2001/04/12 18:21:02 1.4 +++ installexe.sh 2005/09/19 00:36:05 1.5 ＠＠ -5,11 +5,16 ＠＠ shift tstr="" -while [ $# -gt 0 ] +while [[ $# -gt 0 ]] do - if [ -f $1.exe ] + if [[ -f $1.exe ]] then - tstr="$tstr$1.exe $2.exe" + if [[ "$2" == *.exe ]] + then + tstr="$tstr$1 $2" + else + tstr="$tstr$1.exe $2.exe" + fi shift 2 else tstr="$tstr$1 "

1 participants
0 comments

CVS update by viteno xemacs ... 19 years, 3 months

CVS Monitor

User: viteno Date: 05/09/18 23:51:12 Modified: xemacs version.sh Log: Update xemacs_extra_name. Revision Changes Path 1.1287 +1 -1 XEmacs/xemacs/version.sh Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.1286 retrieving revision 1.1287 diff -u -p -r1.1286 -r1.1287 --- version.sh 2005/09/17 21:51:10 1.1286 +++ version.sh 2005/09/18 21:51:11 1.1287 ＠＠ -8,5 +8,5 ＠＠ emacs_kit_version= infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -xemacs_extra_name="(+CVS-20050917)" +xemacs_extra_name="(+CVS-20050918)" xemacs_release_date="2005-02-18"

1 participants
0 comments

CVS update by malcolmp xemacs/etc ... 19 years, 3 months

CVS Monitor

User: malcolmp Date: 05/09/18 15:01:18 Modified: xemacs/etc ChangeLog Removed: xemacs/etc configure-2.13 Log: Autoconf 2.13 support removed. Final cutover to autoconf 2.59 based configure scripts. Revision Changes Path 1.458 +5 -0 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.457 retrieving revision 1.458 diff -u -p -r1.457 -r1.458 --- ChangeLog 2005/09/14 05:29:06 1.457 +++ ChangeLog 2005/09/18 13:01:03 1.458 ＠＠ -1,3 +1,8 ＠＠ +2005-09-17 Malcolm Purvis <malcolmp(a)xemacs.org> + + * configure.in: Replace with warning to use autoconf 2.59. + * configure.ac: Removed warning about the use of autoconf 2.59. + 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released. 1.253 +620 -330 XEmacs/xemacs/configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.252 retrieving revision 1.253 diff -u -p -r1.252 -r1.253 --- configure 2005/05/28 04:51:22 1.252 +++ configure 2005/09/18 13:01:03 1.253 ＠＠ -1214,7 +1214,7 ＠＠ esac else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd "$ac_popdir" + cd $ac_popdir done fi ＠＠ -4067,7 +4067,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -4125,7 +4126,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -4241,7 +4243,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -4295,7 +4298,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -4340,7 +4344,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -4384,7 +4389,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -5082,7 +5088,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -5140,7 +5147,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -5256,7 +5264,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -5310,7 +5319,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -5355,7 +5365,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -5399,7 +5410,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -5813,7 +5825,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -5871,7 +5884,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -5987,7 +6001,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -6041,7 +6056,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -6086,7 +6102,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -6130,7 +6147,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -6544,7 +6562,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -6602,7 +6621,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -6718,7 +6738,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -6772,7 +6793,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -6817,7 +6839,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -6861,7 +6884,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -7238,7 +7262,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -7632,7 +7657,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -7676,7 +7702,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -8090,7 +8117,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -8352,7 +8380,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -8529,7 +8558,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -8585,7 +8615,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -8877,7 +8908,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9047,7 +9079,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9132,7 +9165,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9286,7 +9320,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9350,7 +9385,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9515,7 +9551,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9584,7 +9621,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9652,7 +9690,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9745,7 +9784,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9820,7 +9860,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9881,7 +9922,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -9946,7 +9988,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10049,7 +10092,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10114,7 +10158,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10179,7 +10224,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10242,7 +10288,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10299,7 +10346,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10345,7 +10393,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10415,7 +10464,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10475,7 +10525,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10540,7 +10591,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10586,7 +10638,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10660,7 +10713,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10769,7 +10823,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10866,7 +10921,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10908,7 +10964,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -10965,7 +11022,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11091,7 +11149,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11153,7 +11212,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11193,7 +11253,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11249,7 +11310,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11289,7 +11351,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11353,7 +11416,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11384,8 +11448,10 ＠＠ See \`config.log' for more details." >&2 esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF ＠＠ -11503,7 +11569,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11565,7 +11632,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11605,7 +11673,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11661,7 +11730,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11701,7 +11771,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11765,7 +11836,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11796,8 +11868,10 ＠＠ See \`config.log' for more details." >&2 esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF ＠＠ -11909,7 +11983,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -11971,7 +12046,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12011,7 +12087,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12067,7 +12144,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12107,7 +12185,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12171,7 +12250,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12202,8 +12282,10 ＠＠ See \`config.log' for more details." >&2 esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF ＠＠ -12315,7 +12397,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12377,7 +12460,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12417,7 +12501,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12473,7 +12558,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12513,7 +12599,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12577,7 +12664,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12608,8 +12696,10 ＠＠ See \`config.log' for more details." >&2 esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF ＠＠ -12721,7 +12811,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12783,7 +12874,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12823,7 +12915,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12879,7 +12972,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12919,7 +13013,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -12983,7 +13078,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13014,8 +13110,10 ＠＠ See \`config.log' for more details." >&2 esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF ＠＠ -13127,7 +13225,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13189,7 +13288,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13229,7 +13329,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13285,7 +13386,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13325,7 +13427,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13389,7 +13492,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13420,8 +13524,10 ＠＠ See \`config.log' for more details." >&2 esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF ＠＠ -13617,7 +13723,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13683,7 +13790,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13744,7 +13852,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13837,7 +13946,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -13942,7 +14052,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -14054,7 +14165,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -14238,7 +14350,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -14305,7 +14418,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -14403,7 +14517,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -14517,7 +14632,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -14664,7 +14780,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -14725,7 +14842,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -14786,7 +14904,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -14870,12 +14989,9 ＠＠ if test "$with_x11" != "no"; then done fi - -if test "x$ac_path_x_has_been_run" != xyes; then echo "$as_me:$LINENO: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 -ac_path_x_has_been_run=yes # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then ＠＠ -14968,7 +15084,7 ＠＠ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for a specified header file. + # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ ＠＠ -15042,7 +15158,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15102,15 +15219,10 ＠＠ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - # It might be that x_includes is empty (headers are found in the - # standard search path. Then output the corresponding message - ac_out_x_includes=$x_includes - test "x$x_includes" = x && ac_out_x_includes="in standard search path" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 + echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi -fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. ＠＠ -15158,7 +15270,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15209,7 +15322,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15285,7 +15399,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15340,7 +15455,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15408,7 +15524,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15516,7 +15633,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15580,7 +15698,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15648,7 +15767,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15752,7 +15872,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15816,7 +15937,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15913,7 +16035,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -15977,7 +16100,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -16074,7 +16198,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -16138,7 +16263,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -16217,7 +16343,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -16295,7 +16422,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -16440,7 +16568,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -16665,7 +16794,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -16819,7 +16949,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -16887,7 +17018,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -16962,7 +17094,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -17030,7 +17163,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -17184,7 +17318,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -17252,7 +17387,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -17437,7 +17573,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -17500,7 +17637,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -17565,7 +17703,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -17640,7 +17779,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -17719,7 +17859,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -17886,7 +18027,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -17979,7 +18121,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -18130,7 +18273,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -18228,7 +18372,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -18362,7 +18507,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -18411,7 +18557,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -18459,7 +18606,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -18527,7 +18675,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -18661,7 +18810,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -18710,7 +18860,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -18774,7 +18925,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -18910,7 +19062,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -19145,7 +19298,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -19272,7 +19426,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -19690,7 +19845,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -19789,7 +19945,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -19950,7 +20107,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -20034,7 +20192,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -20185,7 +20344,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -20322,7 +20482,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -20465,7 +20626,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -20617,7 +20779,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -20684,7 +20847,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -20751,7 +20915,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -20818,7 +20983,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -20885,7 +21051,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21003,7 +21170,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21081,7 +21249,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21232,7 +21401,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21306,7 +21476,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21485,7 +21656,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21547,7 +21719,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21698,7 +21871,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21785,7 +21959,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21852,7 +22027,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21919,7 +22095,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -21984,7 +22161,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -22135,7 +22313,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -22241,7 +22420,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -22301,7 +22481,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -22452,7 +22633,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -22585,7 +22767,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -22736,7 +22919,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -22809,7 +22993,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -22960,7 +23145,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23066,7 +23252,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23132,7 +23319,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23210,7 +23398,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23276,7 +23465,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23347,7 +23537,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23483,7 +23674,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23548,7 +23740,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23603,7 +23796,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23749,7 +23943,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23804,7 +23999,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -23950,7 +24146,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -24004,7 +24201,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -24154,7 +24352,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -24208,7 +24407,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -24359,7 +24559,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -24520,7 +24721,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -24665,7 +24867,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -24985,7 +25188,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -25139,7 +25343,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -25217,7 +25422,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -25287,7 +25493,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -25388,7 +25595,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -25462,7 +25670,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -25605,7 +25814,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -25788,7 +25998,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -25859,7 +26070,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -25933,7 +26145,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -25999,7 +26212,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -26065,7 +26279,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -26131,7 +26346,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -26216,7 +26432,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -26284,7 +26501,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -26430,7 +26648,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -26577,7 +26796,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -26728,7 +26948,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -26797,7 +27018,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -26886,7 +27108,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -27099,7 +27322,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -27218,7 +27442,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -27316,7 +27541,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -27382,7 +27608,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -27453,7 +27680,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -27606,7 +27834,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -27755,7 +27984,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -27904,7 +28134,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -28056,7 +28287,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -28241,7 +28473,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -28307,7 +28540,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -28492,7 +28726,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -28560,7 +28795,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -28719,7 +28955,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -28787,7 +29024,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -28942,7 +29180,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -29004,7 +29243,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -29058,7 +29298,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -29212,7 +29453,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -29271,7 +29513,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -29342,7 +29585,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -29383,7 +29627,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -29447,7 +29692,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -29528,7 +29774,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -29669,7 +29916,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -30059,7 +30307,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -30121,7 +30370,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -30268,7 +30518,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -30329,7 +30580,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -30479,7 +30731,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -30663,7 +30916,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -30718,7 +30972,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -30855,7 +31110,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -30997,7 +31253,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -31052,7 +31309,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -31152,7 +31410,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -31207,7 +31466,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -31344,7 +31604,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -31494,7 +31755,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -31636,7 +31898,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -31786,7 +32049,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -31938,7 +32202,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -32121,7 +32386,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -32197,7 +32463,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -32283,7 +32550,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -32436,7 +32704,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -32539,7 +32808,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -32685,7 +32955,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -32860,7 +33131,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -32963,7 +33235,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -33030,7 +33303,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -33171,7 +33445,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -33320,7 +33595,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -33484,7 +33760,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -33560,7 +33837,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -33626,7 +33904,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -33704,7 +33983,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -33850,7 +34130,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -33940,7 +34221,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -34098,7 +34380,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -34202,7 +34485,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -34268,7 +34552,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -34357,7 +34642,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -34518,7 +34804,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -34585,7 +34872,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -34666,7 +34954,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -34759,7 +35048,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -34838,7 +35128,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -34984,7 +35275,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -35061,7 +35353,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -35207,7 +35500,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -35274,7 +35568,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -35383,7 +35678,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -35484,7 +35780,8 ＠＠ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? ＠＠ -36083,13 +36380,7 ＠＠ fi ( echo " -XEmacs ${emacs_major_version}.${emacs_minor_version}${xemacs_betaname} \"$xemacs_codename\" $xemacs_extra_name configured for \`$ac_cv_build'. -" -echo " WARNING: --------------------------------------------------------------" -echo " WARNING: This was produced from a new autoconf-2.5 based configuration." -echo " WARNING: If this configuration seems buggy then copy etc/configure-2.13" -echo " WARNING: to configure and try again. Also please report the bug." -echo " WARNING: --------------------------------------------------------------" +XEmacs ${emacs_major_version}.${emacs_minor_version}${xemacs_betaname} \"$xemacs_codename\" $xemacs_extra_name configured for \`$ac_cv_build'." echo " Compilation Environment and Installation Defaults:" ＠＠ -37279,6 +37570,11 ＠＠ esac *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ ＠＠ -37317,12 +37613,6 ＠＠ echo "$as_me: error: cannot find input f fi;; esac done` || { (exit 1); exit 1; } - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub 1.12 +1 -7 XEmacs/xemacs/configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- configure.ac 2005/05/28 04:51:28 1.11 +++ configure.ac 2005/09/18 13:01:08 1.12 ＠＠ -5531,13 +5531,7 ＠＠ dnl Start stdout redirection to '| tee - ( echo " -XEmacs ${emacs_major_version}.${emacs_minor_version}${xemacs_betaname} \"$xemacs_codename\" $xemacs_extra_name configured for \`$ac_cv_build'. -" -echo " WARNING: --------------------------------------------------------------" -echo " WARNING: This was produced from a new autoconf-2.5 based configuration." -echo " WARNING: If this configuration seems buggy then copy etc/configure-2.13" -echo " WARNING: to configure and try again. Also please report the bug." -echo " WARNING: --------------------------------------------------------------" +XEmacs ${emacs_major_version}.${emacs_minor_version}${xemacs_betaname} \"$xemacs_codename\" $xemacs_extra_name configured for \`$ac_cv_build'." echo " Compilation Environment and Installation Defaults:" 1.242 +2 -5865 XEmacs/xemacs/configure.in Index: configure.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.in,v retrieving revision 1.241 retrieving revision 1.242 diff -u -p -r1.241 -r1.242 --- configure.in 2005/04/08 23:10:14 1.241 +++ configure.in 2005/09/18 13:01:08 1.242 ＠＠ -1,5867 +1,4 ＠＠ -dnl Define our own header notice with own copyright -define([AC_INIT_NOTICE], -[#### Configuration script for XEmacs. Largely divergent from FSF. -#### Guess values for system-dependent variables and create Makefiles. -#### Generated automatically using autoconf version] AC_ACVERSION [ -#### Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. -#### Copyright (C) 1993-1995 Board of Trustees, University of Illinois. -#### Copyright (C) 1996, 1997 Sun Microsystems, Inc. -#### Copyright (C) 1995, 1996, 2002, 2003, 2004 Ben Wing. -#### Copyright (C) 2000, 2001 Martin Buchholz. -#### Copyright (C) 1998, 1999 J. Kean Johnston. +# XEmacs now uses autoconf 2.59. Please use configure.ac. -### Don't edit this script! -### This script was automatically generated by the `autoconf' program -### from the file `./configure.in'. -### To rebuild it, execute the command -### autoconf -### in the this directory. You must have autoconf version 2.13 or later. -### Note: this script has not yet been ported to autoconf version 2.5x. +AC_PREREQ(2.59) -### This file is part of XEmacs. - -### XEmacs is free software; you can redistribute it and/or modify it -### under the terms of the GNU General Public License as published by -### the Free Software Foundation; either version 2, or (at your -### option) any later version. - -### XEmacs is distributed in the hope that it will be useful, but -### WITHOUT ANY WARRANTY; without even the implied warranty of -### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -### General Public License for more details. - -### You should have received a copy of the GNU General Public License -### along with XEmacs; see the file COPYING. If not, write to the Free -### Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -### 02111-1307, USA. - -### For usage, run `./configure --help' -### For more detailed information on building and installing XEmacs, -### read the file `INSTALL'. -### -### If configure succeeds, it leaves its status in config.status. -### A log of configuration tests can be found in config.log. -### If configure fails after disturbing the status quo, -### config.status is removed. -]) - -dnl Since XEmacs has configuration requirements that autoconf cannot -dnl meet, this file is an unholy marriage of custom-baked -dnl configuration code and autoconf macros. - -dnl We use the m4 quoting characters [ ] (as established by the -dnl autoconf system), so quote them like this: [[foo]] - -AC_PREREQ(2.13)dnl - -dnl #### Doesn't work currently. it would be really nice if we could -dnl get this working, because many autoconfs v2.5 come with support for -dnl v2.1 source files but get snafued by our nasty configure.ac kludge. -dnl -dnl m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), 2.5), -1, -dnl [m4_fatal([Autoconf version 2.5 or higher not supported])]) - -dnl Redefine some standard autoconf macros -dnl here is how XEmacs is different: -dnl - no cache file -dnl - non-standard options -dnl - support for extra-verbosity -dnl - ordinary libs are handled separately from X libs (might be a mistake) -dnl - various random kludges (e.g. -with-dnet=no) - -dnl PRINT_VAR(var var ...) prints values of shell variables -define([PRINT_VAR],[for var in patsubst([$1],[[ -]+],[ ]); do eval "echo \"$var = '\$$var'\""; done]) - -dnl Disable cache files: -dnl This is controversial, but I am convinced this is the right way to go, -dnl at least by default. Otherwise there are too many surprises. -dnl It's been several years, and nobody noticed. -- sjt, 2004-01-28 -define([AC_CACHE_LOAD], )dnl -define([AC_CACHE_SAVE], )dnl -define([AC_CACHE_VAL], [ -$2 -])dnl - -dnl Redefine AC_TRY_RUN_NATIVE to not throw away stderr while running -dnl AC_TRY_RUN_NATIVE(PROGRAM, [ACTION-IF-TRUE [, ACTION-IF-FALSE]]) -define([AC_TRY_RUN_NATIVE], -[cat > conftest.$ac_ext <<EOF -[#]line __oline__ "configure" -#include "confdefs.h" -[$1] -EOF -if AC_TRY_EVAL(ac_link) && test -s conftest && (./conftest; exit $?) 2>&AC_FD_CC -then -dnl Do not remove the temporary files here, so they can be examined. - ifelse([$2], , :, [$2]) -else - conftest_rc="$?" - echo "configure: failed program was:" >&AC_FD_CC - cat conftest.$ac_ext >&AC_FD_CC -ifelse([$3], , , [ rm -fr conftest* - $3 -])dnl -fi -rm -fr conftest*])dnl AC_TRY_RUN_NATIVE - - -dnl Avoid spurious cross-compiling warnings from AC_TRY_RUN -dnl XEmacs is unlikely to ever cross-compile -define([AC_TRY_RUN],[AC_TRY_RUN_NATIVE([$1], [$2], [$3])])dnl - -dnl Redefine AC_DEFINE* to provide more output if extra_verbose -dnl Set VARIABLE to VALUE, verbatim, or 1. -dnl AC_DEFINE(VARIABLE [, VALUE]) -define([AC_DEFINE], -[{ test "$extra_verbose" = "yes" && cat << \EOF - Defining $1[]ifelse($#, 2, [ = $2],) -EOF -cat >> confdefs.h <<\EOF -[#define] $1 ifelse($#, 2, [$2], 1) -EOF -} -])dnl AC_DEFINE - -define([AC_DEFINE_UNQUOTED], -[{ test "$extra_verbose" = "yes" && cat << EOF - Defining $1[]ifelse($#, 2, [ = $2],) -EOF -cat >> confdefs.h <<EOF -[#define] $1 ifelse($#, 2, [$2], 1) -EOF -} -])dnl AC_DEFINE_UNQUOTED - -dnl redefine AC_CHECK_LIB in accordance with our own value of ac_link -dnl Add in extra kludgy check to support with_dnet=no -dnl Add in extra LDFLAGS arg, which PRECEDES libs -dnl Support --with-dnet=no - -dnl AC_CHECK_LIB(LIBRARY, FUNCTION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND -dnl [, OTHER-LIBRARIES] [, LDFLAGS]]]]) -define([AC_CHECK_LIB], -[ifelse([$1],dnet, [if test "$with_dnet" = "no" ; then -ac_cv_lib_dnet_dnet_ntoa=no -ifelse([$4], , , [$4] -)dnl -else -])] -AC_CHECK_LIB_ORIG_HACKED([$1],[$2],[$3],[$4],[$5], [$6]) -[ifelse([$1],dnet,[fi -])]dnl -)dnl AC_CHECK_LIB - -define([AC_CHECK_LIB_ORIG_HACKED], -[ifelse([$5],,AC_MSG_CHECKING([for $2 in -l$1]), -xe_msg_checking="for [$2] in -l[$1]" -test -n "[$5]" && xe_msg_checking="$xe_msg_checking using extra libs [$5]" -AC_MSG_CHECKING("$xe_msg_checking")) -dnl Use a cache variable name containing both the library and function name, -dnl because the test really is for library $1 defining function $2, not -dnl just for library $1. Separate tests with the same $1 and different $2s -dnl may have different results. -ac_lib_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` -AC_CACHE_VAL(ac_cv_lib_$ac_lib_var, -[xe_check_libs="$6 -l$1 $5" -AC_TRY_LINK(dnl -ifelse([$2], [main], , dnl Avoid conflicting decl of main. -[/* Override any gcc2 internal prototype to avoid an error. */ -]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus -extern "C" -#endif -])dnl -[/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $2(); -]), - [$2()], - eval "ac_cv_lib_$ac_lib_var=yes", - eval "ac_cv_lib_$ac_lib_var=no") -xe_check_libs="" -])dnl -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then - AC_MSG_RESULT(yes) - ifelse([$3], , -[changequote(, )dnl - ac_tr_lib=HAVE_LIB`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -changequote([, ])dnl - AC_DEFINE_UNQUOTED($ac_tr_lib) - XE_PREPEND([-l$1], LIBS) -], [$3]) -else - AC_MSG_RESULT(no) -ifelse([$4], , , [$4 -])dnl -fi -])dnl AC_CHECK_LIB_ORIG_HACKED - - -dnl AC_LANG_C() -define([AC_LANG_C], -[define([AC_LANG], [C])dnl -ac_ext=c -dnl CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -dnl ac_cpp='$CPP $CPPFLAGS' -dnl ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&AC_FD_CC' -dnl ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC' -xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' -xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run' -xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard' -ac_cpp='$CPP '"$xe_cppflags" -ac_compile='${CC-cc} -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext 1>&AC_FD_CC' -ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&AC_FD_CC' -cross_compiling=no -]) dnl AC_LANG_C - -dnl The construct foo=`echo $w1 $w2 $w3` fails on some systems if $w1 = -e or -n -dnl So we use the following instead. -dnl XE_SPACE(var, words) -define([XE_SPACE],[ -T="" -for W in $2; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done -$1="$T" -])dnl XE_SPACE - -dnl XE_ADD_OBJS(foo.o ...) -define([XE_ADD_OBJS], -[extra_objs="$extra_objs [$1]" && dnl - if test "$extra_verbose" = "yes"; then - echo " xemacs will be linked with \"[$1]\"" - fi])dnl XE_ADD_OBJS - -dnl XE_APPEND(value, varname) -define([XE_APPEND], -[[$2]="$[$2] [$1]" && dnl - if test "$extra_verbose" = "yes"; then echo " Appending \"[$1]\" to \$[$2]"; fi]) - -dnl XE_PREPEND(value, varname) -define([XE_PREPEND], -[[$2]="[$1] $[$2]" && dnl - if test "$extra_verbose" = "yes"; then echo " Prepending \"[$1]\" to \$[$2]"; fi]) - -dnl XE_DIE(message) -define([XE_DIE], [{ echo "Error:" $1 >&2; exit 1; }]) - -dnl XE_STRIP_4TH_COMPONENT(var) -dnl Changes i986-pc-linux-gnu to i986-pc-linux, as God (not RMS) intended. -define([XE_STRIP_4TH_COMPONENT], -[$1=`echo "$$1" | sed '[s/^$[^-][^-]*-[^-][^-]*-[^-][^-]*$-.*$/\1/]'`]) - -define([USAGE_ERROR], -[(echo "$progname: Usage error:" -echo " " $1 -echo " Use \`$progname --help' to show usage.") >&2 && exit 1]) - -define([AC_INIT_PARSE_ARGS],[ - -dnl Get sane consistent behavior from various shells -dnl Avoid losing with weird user CDPATHs - -if test -n "$ZSH_VERSION"; then - dnl zsh's Bourne shell emulation options - setopt NO_BAD_PATTERN NO_BANG_HIST NO_BG_NICE NO_EQUALS NO_FUNCTION_ARGZERO - setopt GLOB_SUBST NO_HUP INTERACTIVE_COMMENTS KSH_ARRAYS NO_MULTIOS NO_NOMATCH - setopt RM_STAR_SILENT POSIX_BUILTINS SH_FILE_EXPANSION SH_GLOB SH_OPTION_LETTERS - setopt SH_WORD_SPLIT BSD_ECHO IGNORE_BRACES - dnl zsh-3.1-beta drops core on the following - dnl unset CDPATH - if test -n "$CDPATH"; then CDPATH="."; export CDPATH; fi -elif test -n "$BASH_VERSION"; then - dnl Use Posix mode with bash - set -o posix - unset CDPATH -else - if test -n "$CDPATH"; then CDPATH="."; export CDPATH; fi -fi - -dnl Find the source directory. -dnl srcdir is used internally by autoconf macros, -dnl so parse it here. -for xe_parse_arg -do - case $xe_parse_arg in - --srcdir) USAGE_ERROR(["The \`--srcdir' option requires a string value."]) ;; - --srcdir=*) srcdir=`echo $xe_parse_arg | sed -e 's/--srcdir=//'` ;; - *) ;; - esac -done - -dnl Initialize some variables set by options. -dnl The variables have the same names as the options, with -dnl dashes changed to underlines. -exec_prefix=NONE -host=NONE -no_create= -nonopt=NONE -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -target=NONE -verbose= -x_includes=NONE -x_libraries=NONE - -dnl Initialize some other variables. -subdirs= -MFLAGS= -MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -dnl Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 -])dnl AC_INIT_PARSE_ARGS - -AC_INIT(src/lisp.h)dnl -AC_CONFIG_HEADER(src/config.h lwlib/config.h) - -dnl Remove any more than one leading "." element from the path name. -dnl If we do not remove them, then another "./" will be prepended to -dnl the file name each time we use config.status, and the program name -dnl will get larger and larger. This would not be a problem, except -dnl that since progname gets recorded in all the Makefiles this script -dnl produces, move-if-change thinks they're different when they're -dnl not. -dnl -dnl It would be nice if we could put the ./ in a  group and then -dnl apply the * operator to that, so we remove as many leading './././'s -dnl as are present, but some seds (like Ultrix's sed) don't allow you to -dnl apply * to a  group. Bleah. -progname="`echo $0 | sed 's:^\./\./:\./:'`" - -dnl ----------------------------------------------------------------- -dnl Establish some default values -dnl Some switches have idiosyncratic syntax, but in most cases a null -dnl value means to autodetect -dnl ----------------------------------------------------------------- - -XE_APPEND(lib-src, MAKE_SUBDIR) -XE_APPEND(lib-src, INSTALL_ARCH_DEP_SUBDIR) - -prefix='/usr/local' -exec_prefix='${prefix}' -bindir='${exec_prefix}/bin' -dnl FSF 19.29 changes to: -dnl datadir='${prefix}/share' -dnl sharedstatedir='${prefix}/com' -dnl libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/lib' -statedir='${prefix}/lib' -libdir='${exec_prefix}/lib' -mandir='${prefix}/man/man1' -inststaticdir='${PROGNAME}' -instvardir='${PROGNAME}-${version}' -infodir='${datadir}/${instvardir}/info' -infopath='' -install_pp='' -lispdir='${datadir}/${instvardir}/lisp' -moduledir='${libdir}/${instvardir}/${configuration}/modules' -sitelispdir='${datadir}/${inststaticdir}/site-lisp' -sitemoduledir='${libdir}/${inststaticdir}/site-modules' -package_path='' -etcdir='${datadir}/${instvardir}/etc' -archlibdir='${libdir}/${instvardir}/${configuration}' -docdir='${archlibdir}' -with_netinstall="no" -with_prefix='yes' -with_site_lisp='no' -with_site_modules='yes' -need_modules_common='' -with_menubars='' -with_scrollbars='' -with_widgets='' -with_dialogs='' -cpp='' cppflags='' libs='' ldflags='' -extra_includes='' -dynamic='' -with_x11='' -with_msw='' -rel_alloc='default' -with_system_malloc='default' -with_dlmalloc='default' -dnl ESD Considered Harmful (plays nasty games with interrupts) -with_native_sound='' -with_nas_sound='' -with_esd_sound='no' -native_sound_lib='' -dnl These should be set to the empty string when we want gtk / gnome to -dnl be auto-detected instead of manually specified. -with_gtk='no' -with_gnome='no' -dnl use_assertions should be 'yes' by default. Too many people in this -dnl world have core dumps turned off by default or \"cannot find where the -dnl core file went\". At least we should get some useful output ... -use_assertions="yes" -with_toolbars="" -with_tty="" -use_union_type="no" -with_dnet="" -use_number_lib="no" -dnl pdump defaults per opsys, do not default it here -pdump="" -dnl dragndrop is still experimental, except on Windows. When it is stable, -dnl comment out the following line: -with_dragndrop_default="no" -dnl Too annoying, even if mandated by IPv6 (and I'm not even sure of that) -dnl Change this to yes when somebody understands IPv6 and handle bugs. -with_ipv6_cname="no" - -dnl ------------------ -dnl Options Processing -dnl ------------------ - -dnl Record all the arguments, so we can save them in config.status. -arguments="$＠" - -dnl Shell Magic: Quote the quoted arguments in ARGUMENTS. At a later date, -dnl in order to get the arguments back in $＠, we have to do an -dnl 'eval set x "$quoted_arguments"; shift' -dnl # We use sed to turn embedded ' into '"'"'. I truly hate sh quoting. -quoted_sed_magic=s/"'"/"'"'"'"'"'"'"'"/g -quoted_arguments= -for i in "$＠"; do - case "$i" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *) - quoted_i="`echo '' $i | sed -e 's:^ ::' -e $quoted_sed_magic`" - quoted_arguments="$quoted_arguments '$quoted_i'" ;; - esac -done - -dnl Do not use shift -- that destroys the argument list, which autoconf needs -dnl to produce config.status. It turns out that "set - $arguments" does not -dnl work portably. -dnl However, it also turns out that many shells cannot expand ${10} at all. -dnl So using an index variable does not work either. It is possible to use -dnl some shell magic to make 'set x "$arguments"; shift' work portably. -while test $# != 0; do - arg="$1"; shift - case "$arg" in - --no-create|--no-recursion) ;; - --srcdir=*) ;; dnl Ignore here; parsed during AC_INIT. - dnl Anything starting with a hyphen we assume is an option. - -* ) - dnl Separate the switch name from the value it is being given. - case "$arg" in - -*=*) - opt=`echo '' $arg | sed -e 's:^ ::' -e 's:^-*$[[^=]]*$=.*$:\1:'` - val=`echo '' $arg | sed -e 's:^ ::' -e 's:^-*[[^=]]*=$.*$$:\1:'` - valomitted=no - ;; - dnl special case these strings since echo may silently eat them: - dnl --help ) opt=help val=yes valomitted=yes ;; - dnl --version ) opt=version val=yes valomitted=yes ;; - dnl -e ) opt=e val=yes valomitted=yes ;; - dnl -E ) opt=E val=yes valomitted=yes ;; - dnl -n ) opt=n val=yes valomitted=yes ;; - -*) - dnl If FOO is a boolean argument, --FOO is equivalent to - dnl --FOO=yes. Otherwise, the value comes from the next - dnl argument - see below. - opt=`echo '' $arg | sed -e 's:^ ::' -e 's:^-*$.*$$:\1:'` - val="yes" valomitted=yes - ;; - esac - - dnl translate "-" in option string to "_" - optname="$opt" - opt="`echo '' $opt | sed -e 's:^ ::' | tr - _`" - - dnl Support --without-FOO as a synonym for --with-FOO=no - case "${valomitted}-${opt}" in yes-without_* ) - opt=`echo $opt | sed 's/without/with/'` - valomitted="no" val="no" ;; - esac - - dnl Process the option. - case "$opt" in - - dnl Process (many) boolean options - with_site_lisp | \ - with_prefix | \ - with_site_modules | \ - with_x | \ - with_x11 | \ - with_gtk | \ - with_gnome | \ - with_msw | \ - with_gcc | \ - dynamic | \ - with_ncurses | \ - with_dnet | \ - with_socks | \ - with_dragndrop | \ - with_cde | \ - with_offix | \ - with_gpm | \ - with_xpm | \ - with_xface | \ - with_gif | \ - with_jpeg | \ - with_png | \ - with_tiff | \ - with_zlib | \ - with_wmcommand | \ - with_xmu | \ - with_purify | \ - with_quantify | \ - with_toolbars | \ - with_tty | \ - with_xfs | \ - with_mule | \ - with_default_eol_detection | \ - with_canna | \ - with_wnn | \ - with_wnn6 | \ - with_workshop | \ - with_sparcworks | \ - with_tooltalk | \ - with_ldap | \ - with_postgresql | \ - with_pop | \ - with_kerberos | \ - with_hesiod | \ - with_dnet | \ - with_infodock | \ - with_netinstall | \ - with_optimization | \ - with_ipv6_cname | \ - external_widget | \ - use_kkcc | \ - mc_alloc | \ - verbose | \ - extra_verbose | \ - usage_tracking | \ - use_union_type | \ - pdump | \ - dump_in_exec | \ - debug | \ - use_assertions | \ - memory_usage_stats | \ - with_clash_detection | \ - with_modules | \ - quick_build ) - dnl Make sure the value given was either "yes" or "no". - case "$val" in - y | ye | yes ) val=yes ;; - n | no ) val=no ;; - * ) USAGE_ERROR("The \`--$optname' option requires a boolean value: \`yes' or \`no'.") ;; - esac - eval "$opt=\"$val\"" ;; - - - dnl Options that take a user-supplied value, as in --x-includes=/usr/X11R6/include - dnl The cache-file option is ignored (for compatibility with other configures) - compiler | \ - xemacs_compiler | \ - cflags | \ - cflags_warning | \ - cflags_optimization | \ - cflags_debugging | \ - cpp | \ - cppflags | \ - libs | \ - ldflags | \ - cache_file | \ - native_sound_lib| \ - site_lisp | \ - x_includes | \ - x_libraries | \ - site_includes | \ - site_libraries | \ - site_prefixes | \ - site_runtime_libraries ) - dnl If the value was omitted, get it from the next argument. - if test "$valomitted" = "yes" ; then - dnl Get the next argument from the argument list, if there is one. - if test "$#" = 0 ; then - USAGE_ERROR("The \`--$optname' option requires a value."); - fi - val="$1"; shift - fi - eval "$opt=\"$val\"" - ;; - - dnl Options that take "yes", "no", or "default" values - rel_alloc | \ - with_dlmalloc | \ - with_debug_malloc | use_debug_malloc | \ - with_system_malloc | use_system_malloc ) - case "$val" in - y | ye | yes ) val=yes ;; - n | no ) val=no ;; - d | de | def | defa | defau | defaul | default ) val=default ;; - * ) USAGE_ERROR(["The \`--$optname' option requires one of these values: - \`yes', \`no', or \`default'."]) ;; - esac - case "$opt" in use_* ) opt="`echo $opt | sed s/use/with/`" ;; esac - eval "$opt=\"$val\"" - ;; - - dnl Has the user requested database support? - "with_database" ) - with_database_berkdb=no - with_database_dbm=no - with_database_gdbm=no - for x in `echo "$val" | sed -e 's/,/ /g'` ; do - case "$x" in - no ) ;; - b | be | ber | berk | berkd | berkdb ) with_database_berkdb=yes ;; - d | db | dbm ) with_database_dbm=yes ;; - g | gn | gnu | gnud | gnudb | gnudbm | gdbm) with_database_gdbm=yes ;; - * ) USAGE_ERROR(["The \`--$optname' option value - must be either \`no' or a comma-separated list - of one or more of \`berkdb' and either \`dbm' or \`gnudbm'."]) ;; - esac - done - if test "$with_database_dbm" = "yes" -a \ - "$with_database_gdbm" = "yes"; then - USAGE_ERROR("Only one of \`dbm' and \`gnudbm' may be specified - with the \`--$optname' option.") - fi - ;; - - dnl Has the user requested sound support? - "with_sound" ) - dnl values is a subset of all,native,nas,esd - dnl or their negatives: none,nonative,nonas,noesd - for x in `echo "$val" | sed -e 's/,/ /g'` ; do - case "$x" in - dnl all and none are only permitted as the first in the list. - n | no | non | none ) new_sdefault=no ;; - a | al | all | both ) new_sdefault=yes ;; - - native ) with_native_sound=yes ;; - nonative ) with_native_sound=no ;; - - nas ) with_nas_sound=yes ;; - nonas ) with_nas_sound=no ;; - - esd ) with_esd_sound=yes ;; - noesd ) with_esd_sound=no ;; - - * ) bogus_sound=yes ;; - esac - if test "$bogus_sound" -o \ - $ -n "$new_sdefault" -a -n "$sound_notfirst" $ ; then - types="\`all', \`none', \`(no)native', \`no(nas)', \`(no)esd'." - USAGE_ERROR(["Valid types for the \`--$optname' option are: - $types. -Option \`all' or \`none' must be first in the list. -The default is to autodetect native and NAS sound support."]) - elif test -n "$new_sdefault" ; then - with_native_sound=$new_sdefault - with_nas_sound=$new_sdefault - with_esd_sound=$new_sdefault - new_sdefault= # reset this - fi - sound_notfirst=true - done - ;; - - dnl Has the user specified a preferred Athena widget set? - dnl This bit expands any alias names out for us... - "with_athena" ) - case "$val" in - xa | xaw ) val=xaw ;; - 3 | 3d | xaw3d ) val=3d ;; - dnl No `n' for next, someone may try `no' - ne | nex | next | naxtaw) val=next ;; - dnl Have not tested the next two... - 9 | 95 | xaw95 ) val=95 ;; - xp | xpm | xawxpm ) val=xpm ;; - * ) USAGE_ERROR(["The \`--$optname' option must have one of these values: - \`xaw', \`3d', \`next', \`95', or \`xpm'."]) ;; - esac - eval "$opt=\"$val\"" - ;; - - dnl Has the user requested XIM support? - "with_xim" ) - case "$val" in - y | ye | yes ) val=yes ;; - n | no | non | none ) val=no ;; - x | xl | xli | xlib ) val=xlib ;; - m | mo | mot | moti | motif ) val=motif ;; - * ) USAGE_ERROR(["The \`--$optname' option must have one of these values: - \`motif', \`xlib', \`yes', or \`no'."]) ;; - esac - eval "$opt=\"$val\"" - ;; - - dnl Mail locking specification - "mail_locking" ) - case "$val" in - lockf ) val=lockf ;; - flock ) val=flock ;; - file | dot ) val=file ;; - locking ) val=locking ;; - mmdf ) val=mmdf ;; - pop ) val=pop ;; - * ) USAGE_ERROR(["The \`--$optname' option must have one of these values: - \`lockf', \`flock', \`file', \`dot', \`locking', \`mmdf', or \`pop'."]) ;; - esac - eval "$opt=\"$val\"" - ;; - - dnl Enhanced Lisp numbers - "use_number_lib" ) - case "$val" in - gmp ) val=gmp ;; - mp ) val=mp ;; - no|non|none ) val=no ;; - * ) USAGE_ERROR(["The \`--$optname' option must have one of these values: - \`gmp', \`mp', or \`no'."]) ;; - esac - eval "$opt=\"$val\"" - ;; - - dnl Has the user requested error-checking? - "error_checking" ) - dnl value can be all, none, and/or a list of categories to check. - dnl Example: --error-checking=all,noextents,nocharbpos - dnl Example: --error-checking=none,malloc,gc - - for x in `echo "$val" | sed -e 's/,/ /g'` ; do - case "$x" in - dnl all and none are only permitted as the first in the list. - n | no | non | none ) new_default=no ;; - a | al | all ) new_default=yes ;; - - extents ) error_check_extents=yes ;; - noextents ) error_check_extents=no ;; - - types ) error_check_types=yes ;; - notypes ) error_check_types=no ;; - - text ) error_check_text=yes ;; - notext ) error_check_text=no ;; - - gc ) error_check_gc=yes ;; - nogc ) error_check_gc=no ;; - - malloc ) error_check_malloc=yes ;; - nomalloc ) error_check_malloc=no ;; - - byte_code ) error_check_byte_code=yes ;; - nobyte_code ) error_check_byte_code=no ;; - - glyphs ) error_check_glyphs=yes ;; - noglyphs ) error_check_glyphs=no ;; - - display ) error_check_display=yes ;; - nodisplay ) error_check_display=no ;; - - structures ) error_check_structures=yes ;; - nostructures ) error_check_structures=no ;; - - * ) bogus_error_check=yes ;; - esac - if test "$bogus_error_check" -o \ - $ -n "$new_default" -a -n "$echeck_notfirst" $ ; then - if test "$error_check_default" = yes ; then - types="\`all' (default), \`none', \`noextents', \`notypes', \`notext', \`nogc', \`nomalloc', \`noglyphs', \`nobyte-code', \`nodisplay', \`nostructures'." - else - types="\`all', \`none' (default), \`extents', \`types', \`text', \`gc', \`malloc', \`glyphs', \`byte-code', \`display', \`structures'." - fi - USAGE_ERROR(["Valid types for the \`--$optname' option are: - $types."]) - elif test -n "$new_default" ; then - error_check_extents=$new_default - error_check_types=$new_default - error_check_text=$new_default - error_check_gc=$new_default - error_check_malloc=$new_default - error_check_byte_code=$new_default - error_check_glyphs=$new_default - error_check_display=$new_default - error_check_structures=$new_default - new_default= # reset this - fi - echeck_notfirst=true - done - ;; - - dnl Has the user specified one of the path options? - prefix | exec_prefix | bindir | datadir | statedir | libdir | \ - mandir | infodir | infopath | lispdir | etcdir | \ - archlibdir | docdir | package_path | package_prefix | moduledir ) - dnl If the value was omitted, get it from the next argument. - if test "$valomitted" = "yes"; then - if test "$#" = 0; then - USAGE_ERROR("The \`--$optname' option requires a value."); - fi - val="$1"; shift - fi - eval "$opt=\"$val\"" - - dnl You need to synchronize this with the way the - dnl default values are built. - case "$opt" in - dnl prefix is taken care of by --with-prefix - exec_prefix ) AC_DEFINE(EXEC_PREFIX_USER_DEFINED) ;; - lispdir ) AC_DEFINE(LISPDIR_USER_DEFINED) ;; - sitelispdir ) AC_DEFINE(SITELISPDIR_USER_DEFINED) ;; - moduledir ) AC_DEFINE(MODULEDIR_USER_DEFINED) ;; - etcdir ) AC_DEFINE(ETCDIR_USER_DEFINED) ;; - infodir ) AC_DEFINE(INFODIR_USER_DEFINED) ;; - infopath ) AC_DEFINE(INFOPATH_USER_DEFINED) ;; - package_prefix ) AC_DEFINE(PACKAGE_PATH_USER_DEFINED) ;; - package_path ) AC_DEFINE(PACKAGE_PATH_USER_DEFINED) ;; - datadir ) - AC_DEFINE(INFODIR_USER_DEFINED) - AC_DEFINE(LISPDIR_USER_DEFINED) - AC_DEFINE(MODULEDIR_USER_DEFINED) - AC_DEFINE(ETCDIR_USER_DEFINED) - AC_DEFINE(DOCDIR_USER_DEFINED) - AC_DEFINE(ARCHLIBDIR_USER_DEFINED) ;; - docdir ) AC_DEFINE(DOCDIR_USER_DEFINED) ;; - exec_prefix | libdir | archlibdir ) AC_DEFINE(ARCHLIBDIR_USER_DEFINED) ;; - esac - ;; - - dnl --no-create added by autoconf for use by config.status - "no_create" ) ;; - - dnl Has the user asked for some help? - "usage" | "help" ) ${PAGER-more} ${srcdir}/configure.usage; exit 0 ;; - - dnl Has the user specified the toolkit(s) to use for GUI elements? - "with_menubars" | \ - "with_scrollbars" | \ - "with_dialogs" | \ - "with_widgets" ) - case "$val" in - l | lu | luc | luci | lucid ) val=lucid ;; - mo | mot | moti | motif ) val=motif ;; - a | at | ath | athe | athen | athena ) val=athena ;; - n | no | non | none ) val=no ;; - y | ye | yes ) val=yes ;; - dnl Explicit --with-widgets on command line means yes. - "") val=yes ;; - g | gt | gtk ) val=gtk ;; - ms | msw ) val=msw ;; - * ) USAGE_ERROR(["The \`--$optname' option must have one of these values: - \`gtk', \`lucid', \`motif', \`athena', \`yes', or \`no'."]) ;; - esac - eval "$opt=\"$val\"" - ;; - - dnl Obsolete legacy argument? Warn, but otherwise ignore. - "use_minimal_tagbits" | \ - "use_indexed_lrecord_implementation" | \ - "run_in_place" | \ - "const_is_losing" | \ - "with_gnu_make" ) - AC_MSG_WARN([Obsolete option \`--$optname' ignored.]) - ;; - - dnl Unrecognized option? No mercy for user errors. - * ) USAGE_ERROR("Unrecognized option: $arg") ;; - - esac - ;; - - dnl Assume anything with multiple hyphens is a configuration name. - *-*-*) configuration="$arg" ;; - - dnl Unrecognized argument? No mercy for user errors. - *) USAGE_ERROR("Unrecognized argument: $arg") ;; - - esac -done - -dnl ------------------------- -dnl Finish options processing -dnl ------------------------- - -dnl Several options are equivalent to, and override, environment variables. -test -n "$cpp" && CPP="$cpp" -test -n "$cppflags" && CPPFLAGS="$cppflags" -test -n "$libs" && LIBS="$libs" -test -n "$ldflags" && LDFLAGS="$ldflags" - -dnl Get the arguments back. See the diatribe on Shell Magic above. -eval set x "$quoted_arguments"; shift - -dnl --extra-verbose implies --verbose -test "$extra_verbose" = "yes" && verbose=yes - -dnl with_x is an obsolete synonym for with_x11 -test -n "$with_x" && with_x11="$with_x" - -dnl --with-quantify or --with-purify imply --use-system-malloc -if test "$with_purify" = "yes" -o "$with_quantify" = "yes"; then - test "$with_system_malloc" = "default" && with_system_malloc=yes -fi - -dnl XE_CHECK_FEATURE_DEPENDENCY(feature1, feature2) -define([XE_CHECK_FEATURE_DEPENDENCY], -[if test "$with_$1 $with_$2" = "yes no"; then - USAGE_ERROR("--with-$1 requires --with-$2") -elif test "$with_$2" = "no" ; then with_$1=no -elif test "$with_$1" = "yes"; then with_$2=yes -fi -]) - -dnl CDE requires tooltalk -XE_CHECK_FEATURE_DEPENDENCY(cde, tooltalk) - -dnl Done parsing options. -dnl ########################################################################### -if test -z "$configuration"; then - dnl Guess the configuration - configuration=`${CONFIG_SHELL-/bin/sh} $srcdir/config.guess` - if test -z "$configuration"; then - USAGE_ERROR(["XEmacs has not been ported to this host type. -Try explicitly specifying the CONFIGURATION when rerunning configure."]) - fi -fi - -AC_PROG_LN_S - -dnl Make symlinks for etc, lisp, and info directories while the path -dnl is still relative. We do not symlink lock because someone may -dnl have stuck the source on a read-only partition. Instead we -dnl create it as an actual directory later on if it does not already -dnl exist. -for dir in lisp etc man info tests; do - if test ! -d "$dir" ; then - echo Making symbolic link to "$srcdir/$dir" - ${LN_S} "$srcdir/$dir" "$dir" - fi -done - -dnl Do our best to deal with automounter brokenness -dnl CANONICALIZE_PATH(varname) -define([CANONICALIZE_PATH], -[if test -d "/net"; then - if test -d "/tmp_mnt/net"; then tdir="tmp_mnt/net"; else tdir="tmp_mnt"; fi - $1=`echo "[$]$1" | \ - sed -e "s|^${tdir}/|/net/|" -e "s|^/a/|/net/|" -e "s|^/amd/|/net/|"` -fi])dnl - -dnl Calculate canonical name for blddir (i.e. current directory). -dnl PWD may already be the preferable absolute name for ".", -dnl but we can't trust it - it is sometimes inaccurate. -absolute_pwd="`pwd`"; -if test -n "$PWD" -a "`cd $PWD && pwd`" = "$absolute_pwd" -then blddir="$PWD" -else blddir="$absolute_pwd"; CANONICALIZE_PATH(blddir) -fi -AC_SUBST(blddir) - -dnl Make srcdir absolute, if not already. It is important to -dnl avoid running the path through pwd unnecessary, since pwd can -dnl give you automounter prefixes, which can go away. -case "$srcdir" in - /* ) ;; - . ) srcdir="$blddir" ;; - * ) srcdir="`cd $srcdir && pwd`"; CANONICALIZE_PATH(srcdir) ;; -esac - -dnl Check if the source directory already has a configured system in it. -if test `pwd` != `sh -c cd $srcdir && pwd` \ - && test -f "$srcdir/src/config.h"; then - (echo "$progname: WARNING: The directory tree \`$srcdir' is being used" - echo " as a build directory right now; it has been configured in its own" - echo " right. To configure in another directory as well, you MUST" - echo " use GNU make. If you do not have GNU make, then you must" - echo " now do \`make distclean' in $srcdir," - echo " and then run $progname again.") >&2 - extrasub='/^VPATH[[ ]]*=/c\ -vpath %.c $(srcdir)\ -vpath %.h $(srcdir)\ -vpath %.y $(srcdir)\ -vpath %.l $(srcdir)\ -vpath %.s $(srcdir)\ -vpath %.in $(srcdir)' -fi - -dnl ---------------------------------------- -dnl Find out which version of XEmacs this is -dnl ---------------------------------------- -. "$srcdir/version.sh" || exit 1; -dnl Must do the following first to determine verbosity for AC_DEFINE -if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi -: "${extra_verbose=$beta}" -version="${emacs_major_version}.${emacs_minor_version}" -AC_DEFINE_UNQUOTED(EMACS_MAJOR_VERSION, $emacs_major_version) -AC_DEFINE_UNQUOTED(EMACS_MINOR_VERSION, $emacs_minor_version) -if test -n "$emacs_beta_version" ; then - if test "$beta" = "yes"; then - version="${version}-b${emacs_beta_version}" - AC_DEFINE_UNQUOTED(EMACS_BETA_VERSION, $emacs_beta_version) - else - version="${version}.${emacs_beta_version}" - AC_DEFINE_UNQUOTED(EMACS_PATCH_LEVEL, $emacs_beta_version) - fi -fi -AC_DEFINE_UNQUOTED(XEMACS_CODENAME, "$xemacs_codename") -if test "$xemacs_extra_name" != ""; then - AC_DEFINE_UNQUOTED(XEMACS_EXTRA_NAME, "$xemacs_extra_name") -fi -if test "$xemacs_release_date" != ""; then - AC_DEFINE_UNQUOTED(XEMACS_RELEASE_DATE, "$xemacs_release_date") -fi -AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version") - -if test "$with_infodock" = "yes"; then - if test ! -f ../../ID-INSTALL; then - echo "Cannot build InfoDock without InfoDock sources" - with_infodock=no - fi -fi - -if test "$with_infodock" = "yes"; then - dnl InfoDock version numbers. XEmacs will use the same style of numbering - dnl after the release of XEmacs 21.0. - AC_DEFINE_UNQUOTED(INFODOCK_MAJOR_VERSION, $infodock_major_version) - AC_DEFINE_UNQUOTED(INFODOCK_MINOR_VERSION, $infodock_minor_version) - AC_DEFINE_UNQUOTED(INFODOCK_BUILD_VERSION, $infodock_build_version) - version=${infodock_major_version}.${infodock_minor_version}.${infodock_build_version} - PROGNAME=infodock - CPPFLAGS="$CPPFLAGS -DINFODOCK" -else - PROGNAME=xemacs -fi - -AC_DEFINE_UNQUOTED(EMACS_PROGNAME, "$PROGNAME") - -dnl ---------------------------------- -dnl Error checking and debugging flags -dnl ---------------------------------- -dnl Error checking default to "yes" in beta versions, to "no" in releases. -dnl Same goes for --debug and --extra-verbosity. -if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi -test "${error_check_extents=$beta}" = yes && AC_DEFINE(ERROR_CHECK_EXTENTS) -test "${error_check_types=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TYPES) -test "${error_check_text=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TEXT) -test "${error_check_gc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GC) -test "${error_check_malloc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_MALLOC) -test "${error_check_byte_code=$beta}" = yes && AC_DEFINE(ERROR_CHECK_BYTE_CODE) -test "${error_check_glyphs=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GLYPHS) -test "${error_check_display=$beta}" = yes && AC_DEFINE(ERROR_CHECK_DISPLAY) -test "${error_check_structures=$beta}" = yes && AC_DEFINE(ERROR_CHECK_STRUCTURES) -dnl debug=yes must be set when error checking is present. This should be -dnl fixed up. -dnl debug implies other options -if test "${debug:=$beta}" = "yes"; then - use_assertions=yes - memory_usage_stats=yes - AC_DEFINE(DEBUG_XEMACS) -fi -test "$use_assertions" = "yes" && AC_DEFINE(USE_ASSERTIONS) -test "$memory_usage_stats" = "yes" && AC_DEFINE(MEMORY_USAGE_STATS) - -dnl ------------------------------ -dnl Determine the s&m files to use -dnl ------------------------------ -dnl Given the configuration name, set machfile and opsysfile to the -dnl names of the m/*.h and s/*.h files we should use. - -dnl Canonicalize the configuration name. -AC_MSG_CHECKING("host system type") -dnl allow -workshop suffix on configuration name -internal_configuration=`echo $configuration | sed 's/-$workshop$//'` -canonical=`${CONFIG_SHELL-/bin/sh} $srcdir/config.sub "$internal_configuration"` -XE_STRIP_4TH_COMPONENT(configuration) -XE_STRIP_4TH_COMPONENT(canonical) -AC_MSG_RESULT($configuration) - -dnl If you add support for a new configuration, add code to this -dnl switch statement to recognize your configuration name and select -dnl the appropriate operating system and machine description files. - -dnl You would hope that you could choose an m/*.h file pretty much -dnl based on the machine portion of the configuration name, and an s- -dnl file based on the operating system portion. However, it turns out -dnl that each m/*.h file is pretty manufacturer-specific - for -dnl example, apollo.h, hp9000s300.h, mega68k, news.h, and tad68k are -dnl all 68000 machines; mips.h, pmax.h, and news-risc are all MIPS -dnl machines. So we basically have to have a special case for each -dnl configuration name. - -dnl As far as handling version numbers on operating systems is -dnl concerned, make sure things will fail in a fixable way. If -dnl /etc/MACHINES says nothing about version numbers, be -dnl prepared to handle anything reasonably. If version numbers -dnl matter, be sure /etc/MACHINES says something about it. - -dnl Eric Raymond says we should accept strings like "sysvr4" to mean -dnl "System V Release 4"; he writes, "The old convention encouraged" -dnl "confusion between `system' and `release' levels'." - -machine='' opsys='' - -dnl Straightforward machine determination -case "$canonical" in - sparc-*-* ) machine=sparc ;; - alpha*-*-* ) machine=alpha ;; - vax-*-* ) machine=vax ;; - mips-dec-* ) machine=pmax ;; - mips-sgi-irix6* ) machine=iris6d ;; - mips-sgi-* ) machine=iris4d ;; - mips*-linux ) machine=mips ;; - romp-ibm-* ) machine=ibmrt ;; - rs6000-ibm-aix* ) machine=ibmrs6000 ;; - powerpc-ibm-aix* ) machine=ibmrs6000 ;; - powerpc*-* ) machine=powerpc ;; - hppa-*-* ) machine=hp800 ;; - m88k-dg-* ) machine=aviion ;; - m68*-sony-* ) machine=news ;; - mips-sony-* ) machine=news-risc ;; - clipper-* ) machine=clipper ;; - arm* ) machine=arm ;; - ns32k-* ) machine=ns32000 ;; -esac - -dnl Straightforward OS determination -case "$canonical" in - *-*-linux* ) opsys=linux ;; - *-*-netbsd* ) opsys=netbsd ;; - *-*-openbsd* ) opsys=openbsd ;; - *-*-nextstep* ) opsys=nextstep ;; - *-*-vms ) opsys=vms ;; - - dnl DEC OSF - *-dec-osf1.3 | *-dec-osf2* ) opsys=decosf1-3 ;; - *-dec-osf1.2 | *-dec-osf1* ) opsys=decosf1-2 ;; - *-dec-osf3.[[2-9]] ) opsys=decosf3-2 ;; - *-dec-osf3* ) opsys=decosf3-1 ;; - *-dec-osf[[4-9]]* ) opsys=decosf4-0 ;; - - dnl DEC Ultrix - *-*-ultrix[[0-3]].* | *-*-ultrix4.0* ) opsys=bsd4-2 ;; - *-*-ultrix4.[[12]]* ) opsys=bsd4-3 ;; - *-*-ultrix* ) opsys=ultrix4-3 ;; - - dnl AIX - *-*-aix3.1* ) opsys=aix3-1 ;; - *-*-aix3.2.5 ) opsys=aix3-2-5 ;; - *-*-aix3* ) opsys=aix3-2 ;; - *-*-aix4.0* ) opsys=aix4 ;; - *-*-aix4.1* ) opsys=aix4-1 ;; - *-*-aix[[4-9]]* ) opsys=aix4-2 ;; - - dnl Other generic OSes - *-gnu* ) opsys=gnu ;; - *-*-bsd4.[[01]] ) opsys=bsd4-1 ;; - *-*-bsd4.2 ) opsys=bsd4-2 ;; - *-*-bsd4.3 ) opsys=bsd4-3 ;; - *-*-aos4.2 ) opsys=bsd4-2 ;; - *-*-aos* ) opsys=bsd4-3 ;; - *-*-sysv0 | *-*-sysvr0 ) opsys=usg5-0 ;; - *-*-sysv2 | *-*-sysvr2 ) opsys=usg5-2 ;; - *-*-sysv2.2 | *-*-sysvr2.2 ) opsys=usg5-2-2 ;; - *-*-sysv3* | *-*-sysvr3* ) opsys=usg5-3 ;; - *-*-sysv4.1* | *-*-sysvr4.1* )opsys=usg5-4 NON_GNU_CPP=/usr/lib/cpp ;; - *-*-sysv4.[[2-9]]* | *-sysvr4.[[2-9]]* ) - if test -z "$NON_GNU_CPP" ; then - for prog in "/usr/ccs/lib/cpp" "/lib/cpp"; do - if test -f "$prog"; then NON_GNU_CPP="$prog"; break; fi - done - fi - opsys=usg5-4-2 ;; - *-sysv4* | *-sysvr4* ) opsys=usg5-4 ;; - *-*-mach_bsd4.3* ) opsys=mach-bsd4-3 ;; -esac - -case "$canonical" in - - dnl NetBSD ports - *-*-netbsd* ) - case "$canonical" in - i[[3-9]]86-*-netbsd*) machine=intel386 ;; - hp300-*-netbsd* | amiga-*-netbsd* | sun3-*-netbsd* | mac68k-*-netbsd* | da30-*-netbsd* | m68k-*-netbsd* ) - dnl Yes, this is somewhat bogus. - machine=hp9000s300 ;; - pc532-*-netbsd* | ns32k-*-netbsd* ) machine=ns32000 ;; - pmax-*-netbsd* | mips-*-netbsd* ) machine=pmax ;; - esac - ;; - - dnl OpenBSD ports - *-*-openbsd* ) - case "${canonical}" in - i386-*-openbsd*) machine=intel386 ;; - m68k-*-openbsd*) machine=hp9000s300 ;; - mipsel-*-openbsd*) machine=pmax ;; - esac - ;; - - dnl Acorn RISCiX: - arm-acorn-riscix1.1* ) machine=acorn opsys=riscix1-1 ;; - arm-acorn-riscix1.2* | arm-acorn-riscix ) machine=acorn opsys=riscix1-2 ;; - - dnl Alliant machines - fx80-alliant-* ) machine=alliant4 opsys=bsd4-2 ;; - i860-alliant-* ) machine=alliant-2800 opsys=bsd4-3 ;; - - dnl Altos 3068 - m68*-altos-sysv* ) machine=altos opsys=usg5-2 ;; - - dnl Amdahl UTS - 580-amdahl-sysv* ) machine=amdahl opsys=usg5-2-2 ;; - - dnl Apollo, Domain/OS - m68*-apollo-* ) machine=apollo opsys=bsd4-3 ;; - - dnl AT&T 3b2, 3b5, 3b15, 3b20 - we32k-att-sysv* ) machine=att3b opsys=usg5-2-2 ;; - - dnl AT&T 3b1 - The Mighty Unix PC! - m68*-att-sysv* ) machine=7300 opsys=usg5-2-2 ;; - - dnl Bull machines - rs6000-bull-bosx* ) machine=ibmrs6000 opsys=aix3-2 ;; # dpx20 - m68*-bull-sysv3* ) machine=dpx2 opsys=usg5-3 ;; # dpx2 - m68*-bull-sysv2* ) machine=sps7 opsys=usg5-2 ;; # sps7 - - dnl CCI 5/32, 6/32 -- see "Tahoe". - - dnl Celerity - celerity-celerity-bsd* ) machine=celerity opsys=bsd4-2 ;; - - dnl Convex - *-convex-bsd* | *-convex-convexos* ) - machine=convex opsys=bsd4-3 - NON_GNU_CPP="cc -E -P" - ;; - - dnl Cubix QBx/386 - i[[3-9]]86-cubix-sysv* ) machine=intel386 opsys=usg5-3 ;; - - dnl Darwin, a.k.a. MacOS X (based on Mach and Freebsd) - *-*-darwin*) - opsys=darwin - ;; - - dnl Data General AViiON Machines - i586-dg-dgux*R4* | i586-dg-dgux5.4.4* ) machine=aviion opsys=dgux5-4r4 ;; - m88k-dg-dgux5.4R3* | m88k-dg-dgux5.4.3* ) opsys=dgux5-4r3 ;; - m88k-dg-dgux5.4R2* | m88k-dg-dgux5.4.2* ) opsys=dgux5-4r2 ;; - m88k-dg-dgux* ) opsys=dgux ;; - - dnl Motorola Delta machines - m68k-motorola-sysv* | m68000-motorola-sysv* ) machine=delta opsys=usg5-3 ;; - m88k-motorola-sysv4* ) - dnl jbotte(a)bnr.ca says that UNIX_System_V <hostName> 4.0 R40V4.3 m88k mc88110 - dnl needs POSIX_SIGNALS and therefore needs usg5-4-2. - dnl I hope there are not other 4.0 versions for this machine - dnl which really need usg5-4 instead. - machine=delta88k opsys=usg5-4-2 - ;; - m88k-motorola-sysv* | m88k-motorola-m88kbcs* ) machine=delta88k opsys=usg5-3 ;; - - dnl Dual machines - m68*-dual-sysv* ) machine=dual opsys=usg5-2 ;; - m68*-dual-uniplus* ) machine=dual opsys=unipl5-2 ;; - - dnl Encore machines - ns16k-encore-bsd* ) machine=ns16000 opsys=umax ;; - - dnl Gould Power Node and NP1 - pn-gould-bsd4.2* ) machine=gould opsys=bsd4-2 ;; - pn-gould-bsd4.3* ) machine=gould opsys=bsd4-3 ;; - np1-gould-bsd* ) machine=gould-np1 opsys=bsd4-3 ;; - - dnl Harris Night Hawk machines running CX/UX (a 5000 looks just like a 4000 - dnl as far as XEmacs is concerned). - m88k-harris-cxux* ) - dnl Build needs to be different on 7.0 and later releases - case "`uname -r`" in - [[56]].[[0-9]] ) machine=nh4000 opsys=cxux ;; - [[7]].[[0-9]] ) machine=nh4000 opsys=cxux7 ;; - esac - NON_GNU_CPP="/lib/cpp" - ;; - dnl Harris ecx or gcx running CX/UX (Series 1200, Series 3000) - m68k-harris-cxux* ) machine=nh3000 opsys=cxux ;; - dnl Harris power pc NightHawk running Power UNIX (Series 6000) - powerpc-harris-powerunix ) machine=nh6000 opsys=powerunix NON_GNU_CPP="cc -Xo -E -P" ;; - - dnl Honeywell XPS100 - xps*-honeywell-sysv* ) machine=xps100 opsys=usg5-2 ;; - - dnl HP 9000 series 200 or 300 - m68*-hp-bsd* ) machine=hp9000s300 opsys=bsd4-3 ;; - - dnl HP-UX - *-hp-hpux* ) - dnl Figure out machine and opsys orthogonally - case "$canonical" in - m68* ) machine=hp9000s300 ;; - hppa* ) machine=hp800 ;; - esac - - case "$canonical" in - *-hp-hpux7* ) opsys=hpux ;; - *-hp-hpux8* ) opsys=hpux8 ;; - *-hp-hpux9* ) opsys=hpux9 ;; - *-hp-hpux10* ) opsys=hpux10 ;; - *-hp-hpux11* ) opsys=hpux11 ;; - * ) opsys=hpux ;; - esac - - dnl HP has a broken "strcat" - case "$opsys" in hpux9 | hpux10 ) XE_ADD_OBJS(strcat.o) ;; esac - - if test "$opsys" = "hpux10" -o "$opsys" = "hpux11"; then \ - ansi_flag="-Ae"; else ansi_flag="-Aa"; fi - NON_GNU_CC="cc $ansi_flag" NON_GNU_CPP="cc $ansi_flag -E" - - case "$canonical" in *-hp-hpux*shr* ) opsys="${opsys}-shr" ;; esac - ;; - - dnl Orion machines - orion-orion-bsd* ) machine=orion opsys=bsd4-2 ;; - clipper-orion-bsd* ) machine=orion105 opsys=bsd4-2 ;; - - dnl IBM machines - i[[3-9]]86-ibm-aix1.1* ) machine=ibmps2-aix opsys=usg5-2-2 ;; - i[[3-9]]86-ibm-aix1.[[23]]* | i[[3-9]]86-ibm-aix* ) machine=ibmps2-aix opsys=usg5-3 ;; - i370-ibm-aix*) machine=ibm370aix opsys=usg5-3 ;; - romp-ibm-aos* ) opsys=bsd4-3 ;; - romp-ibm-bsd* ) opsys=bsd4-3 ;; - romp-ibm-mach* ) opsys=mach-bsd4-3 ;; - - dnl Integrated Solutions "Optimum V" - m68*-isi-bsd4.2* ) machine=isi-ov opsys=bsd4-2 ;; - m68*-isi-bsd4.3* ) machine=isi-ov opsys=bsd4-3 ;; - - dnl Intel 386 machines where we do care about the manufacturer - i[[3-9]]86-intsys-sysv* ) machine=is386 opsys=usg5-2-2 ;; - - dnl Prime EXL - i[[3-9]]86-prime-sysv* ) machine=i386 opsys=usg5-3 ;; - - dnl Sequent Symmetry running Dynix - i[[3-9]]86-sequent-bsd* ) machine=symmetry opsys=bsd4-3 ;; - - dnl Sequent Symmetry running DYNIX/ptx - i[[3-9]]86-sequent-ptx* ) machine=sequent-ptx opsys=ptx NON_GNU_CPP="/lib/cpp" ;; - - dnl Unspecified sysv on an ncr machine defaults to svr4.2. - dnl (Plain usg5-4 does not turn on POSIX signals, which we need.) - i[[3-9]]86-ncr-sysv* ) machine=ncr386 opsys=usg5-4-2 ;; - - dnl Intel Paragon OSF/1 - i860-intel-osf1* ) machine=paragon opsys=osf1 NON_GNU_CPP=/usr/mach/lib/cpp ;; - - dnl Intel 860 - i860-*-sysv4* ) machine=i860 opsys=usg5-4 NON_GNU_CC="/bin/cc" NON_GNU_CPP="/usr/ccs/lib/cpp" ;; - - dnl Masscomp machines - m68*-masscomp-rtu* ) machine=masscomp opsys=rtu ;; - - dnl Megatest machines - m68*-megatest-bsd* ) machine=mega68 opsys=bsd4-2 ;; - - dnl Workstations sold by MIPS - dnl This is not necessarily all workstations using the MIPS processor - - dnl Irises are produced by SGI, and DECstations by DEC. - mips-mips-usg* ) machine=mips4 ;; - mips-mips-riscos4 ) - machine=mips4 - NON_GNU_CC="cc -systype bsd43" - NON_GNU_CPP="cc -systype bsd43 -E" - case "$canonical" in - mips-mips-riscos4* ) opsys=bsd4-3 ;; - mips-mips-riscos5* ) opsys=riscos5 ;; - esac - ;; - mips-mips-bsd* ) machine=mips opsys=bsd4-3 ;; - mips-mips-* ) machine=mips opsys=usg5-2-2 ;; - - dnl NeXT - m68*-next-* | m68k-*-nextstep* ) machine=m68k opsys=nextstep ;; - - dnl The complete machine from National Semiconductor - ns32k-ns-genix* ) machine=ns32000 opsys=usg5-2 ;; - - dnl NCR machines - m68*-ncr-sysv2* | m68*-ncr-sysvr2* ) machine=tower32 opsys=usg5-2-2 ;; - m68*-ncr-sysv3* | m68*-ncr-sysvr3* ) machine=tower32v3 opsys=usg5-3 ;; - - dnl Nixdorf Targon 31 - m68*-nixdorf-sysv* ) machine=targon31 opsys=usg5-2-2 ;; - - dnl Nu (TI or LMI) - m68*-nu-sysv* ) machine=nu opsys=usg5-2 ;; - - dnl Plexus - m68*-plexus-sysv* ) machine=plexus opsys=usg5-2 ;; - - dnl Pyramid machines - pyramid-pyramid-bsd* ) machine=pyramid opsys=bsd4-2 ;; - - dnl Sequent Balance - ns32k-sequent-bsd4.2* ) machine=sequent opsys=bsd4-2 ;; - ns32k-sequent-bsd4.3* ) machine=sequent opsys=bsd4-3 ;; - - dnl Siemens Nixdorf - mips-siemens-sysv* | mips-sni-sysv*) - machine=mips-siemens opsys=usg5-4 - NON_GNU_CC=/usr/ccs/bin/cc - NON_GNU_CPP=/usr/ccs/lib/cpp - ;; - - dnl NEC - mips-nec-sysv*) - machine=mips-nec - NON_GNU_CC=/usr/ccs/bin/cc - NON_GNU_CPP=/usr/ccs/lib/cpp - ;; - - dnl Silicon Graphics machines - dnl Iris 2500 and Iris 2500 Turbo (aka the Iris 3030) - m68*-sgi-iris3.5* ) machine=irist opsys=iris3-5 ;; - m68*-sgi-iris3.6* | m68*-sgi-iris*) machine=irist opsys=iris3-6 ;; - dnl Iris 4D - mips-sgi-irix3.* ) opsys=irix3-3 ;; - mips-sgi-irix4.* ) opsys=irix4-0 ;; - mips-sgi-irix6* ) opsys=irix6-0 ;; - mips-sgi-irix5.1* ) opsys=irix5-1 ;; - mips-sgi-irix5.2* ) opsys=irix5-2 ;; - mips-sgi-irix5.* ) opsys=irix5-3 ;; - mips-sgi-irix* ) opsys=irix5-0 ;; - - dnl SONY machines - *-sony-newsos[[34]]* | *-sony-news[[34]]* ) opsys=bsd4-3 ;; - *-sony-news* ) opsys=newsos5 ;; - - dnl Stride - m68*-stride-sysv* ) machine=stride opsys=usg5-2 ;; - - dnl Suns - *-*-solaris* | *-*-sunos* | *-sun-mach* | *-sun-bsd* ) - dnl Hardware type - case "$canonical" in - m68*-sunos1* ) machine=sun1 ;; - m68*-sunos2* ) machine=sun2 ;; - m68* ) machine=sun3 ;; - i*86*-sun-sunos[[34]]* ) machine=sun386 ;; - i*86-*-* ) machine=intel386 ;; - rs6000* ) machine=rs6000 ;; - esac - - dnl Make $canonical even more so. - case "$canonical" in *-sunos5*) - canonical=`echo $canonical | sed -e s/sunos5/solaris2/`;; - esac - - dnl On SunOS 4, use /usr/lib/cpp, sans dynodump, /bin/ranlib - dnl On SunOS 5, use cc -E, need dynodump, RANLIB not needed - dnl But, SunOS 5.6 no longer needs dynodump because it has a similar - dnl function integrated. - case "$canonical" in - *-sunos4* ) - #test -f /usr/lib/cpp && NON_GNU_CPP=/usr/lib/cpp ;; - : ;; - *-solaris2* ) - #test -f /usr/ccs/lib/cpp && NON_GNU_CPP=/usr/ccs/lib/cpp - RANLIB=':' ;; - esac - - case "$canonical" in - *-solaris* ) - opsys=sol2 - os_release_major=`uname -r | sed -e 's/^$[[0-9]]\{1,\}$\.$[[0-9]]\{1,\}$.*/\1/'` - os_release_minor=`uname -r | sed -e 's/^$[[0-9]]\{1,\}$\.$[[0-9]]\{1,\}$.*/\2/'` - case "$os_release_minor" in [[0-9]]) - os_release_minor="0${os_release_minor}";; - esac - os_release="${os_release_major}${os_release_minor}" - AC_DEFINE_UNQUOTED(OS_RELEASE, $os_release) ;; - - dnl The last Sun386 ran 4.0. - i*86-*-sunos4* ) opsys=sunos4-0 ;; - *-sunos4.0* ) opsys=sunos4-0 ;; - *-sunos4.1.2* ) opsys=sunos4-1-2 ;; - *-sunos4.1.3* ) opsys=sunos4-1-3 ;; - *-sunos4.1.[[4-9]]* ) opsys=sunos4-1-4 ;; - *-sunos4* | *-sunos ) opsys=sunos4-1 ;; - *-mach* ) opsys=mach-bsd4-3 ;; - * ) opsys=bsd4-2 ;; - esac - - case "$canonical" in *-sunos4*shr* ) opsys="${opsys}-shr" ;; esac - - dnl Watch out for a compiler guaranteed not to work. - test "$opsys $CC" = "sol2 /usr/ucb/cc" && CC="" - ;; - - dnl Tadpole 68k - m68*-tadpole-sysv* ) machine=tad68k opsys=usg5-3 ;; - - dnl Tahoe machines - tahoe-tahoe-bsd4.2* ) machine=tahoe opsys=bsd4-2 ;; - tahoe-tahoe-bsd4.3* ) machine=tahoe opsys=bsd4-3 ;; - - dnl Tandem Integrity S2 - mips-tandem-sysv* ) machine=tandem-s2 opsys=usg5-3 ;; - - dnl Tektronix XD88 - m88k-tektronix-sysv3* ) machine=tekxd88 opsys=usg5-3 ;; - - dnl Tektronix 16000 box (6130?) - ns16k-tektronix-bsd* ) machine=ns16000 opsys=bsd4-2 ;; - dnl Tektronix 4300 - dnl src/m/tek4300.h hints that this is a m68k machine. - m68*-tektronix-bsd* ) machine=tek4300 opsys=bsd4-3 ;; - - dnl Titan P2 or P3 - titan-titan-sysv* ) machine=titan opsys=usg5-3 ;; - - dnl Ustation E30 (SS5E) - m68*-unisys-uniplus* ) machine=ustation opsystem=unipl5-2 ;; - - dnl Vaxen. - vax-dec-* ) - case "$canonical" in - *-sysv[[01]]* | *-sysvr[[01]]* ) opsys=usg5-0 ;; - *-sysv2* | *-sysvr2* ) opsys=usg5-2 ;; - *-mach* ) opsys=mach-bsd4-3 ;; - esac - ;; - - dnl Whitechapel MG1 - ns16k-whitechapel-* ) machine=mg1 ;; - - dnl Wicat - m68*-wicat-sysv* ) machine=wicat opsys=usg5-2 ;; - - dnl Intel 386 machines where we do not care about the manufacturer - i[[3-9]]86-*-* ) - machine=intel386 - case "$canonical" in - *-isc1.* | *-isc2.[[01]]* ) opsys=386-ix ;; - *-isc2.2* ) opsys=isc2-2 ;; - *-isc4.0* ) opsys=isc4-0 ;; - *-isc4.* ) opsys=isc4-1 - GCC_TEST_OPTIONS=-posix - NON_GCC_TEST_OPTIONS=-Xp - ;; - *-isc* ) opsys=isc3-0 ;; - *-esix5* ) opsys=esix5r4 NON_GNU_CPP=/usr/lib/cpp ;; - *-esix* ) opsys=esix ;; - *-mach* ) opsys=mach-bsd4-3 ;; - *-xenix* ) opsys=xenix ;; - *-sco3.2v4* ) opsys=sco4 NON_GNU_CPP=/lib/cpp ;; - *-bsd386* | *-bsdi1* ) opsys=bsd386 ;; - *-bsdi4* ) opsys=bsdos4 ;; - *-bsdi3* ) opsys=bsdos3 ;; - *-bsdi2.1* ) opsys=bsdos2-1 ;; - *-bsdi2* ) opsys=bsdos2 ;; - *-sco3.2v5* ) opsys=sco5 ;; - *-sysv5* ) opsys=sco7 ;; - *-386bsd* ) opsys=386bsd ;; - *-freebsd* ) opsys=freebsd ;; - *-nextstep* ) opsys=nextstep ;; - *-pc-cygwin* ) opsys=cygwin32 ;; - *-pc-mingw* ) opsys=mingw32 ; - test -z "$with_tty" && with_tty="no";; - dnl Otherwise, we fall through to the generic opsys code at the bottom. - esac - ;; - - dnl Linux/68k - m68k-*-linux* ) machine=m68k opsys=linux ;; - -esac - -dnl Initialize machine from $canonical if not in our database above. -test -z "$machine" && machine=`echo $canonical | sed 's/-.*$//'` - -dnl Initialize opsys from `uname -s` if not in our database above. -test -z "$opsys" && opsys=`uname -s | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` - -dnl Use configure-time autodetection if s&m not available -if test -r "${srcdir}/src/m/${machine}.h"; then - machfile="m/${machine}.h" - AC_DEFINE_UNQUOTED(config_machfile, "$machfile") -else - echo "XEmacs has no builtin knowledge of \`$machine' machines." - echo "Using configure-time autodetection only." -fi - -if test -r "${srcdir}/src/s/${opsys}.h"; then - opsysfile="s/${opsys}.h" - AC_DEFINE_UNQUOTED(config_opsysfile, "$opsysfile") -else - echo "XEmacs has no builtin knowledge of \`$opsys' operating systems." - echo "Using configure-time autodetection only." -fi - -dnl -------------------------------------------------------------- -dnl $opsys detection complete; defaults depending on $opsys follow -dnl -------------------------------------------------------------- - -if test -z "$pdump"; then - case "$opsys" in - linux* ) pdump=yes ;; dnl glibc 2.3.1 seems to hose unexec - darwin ) pdump=yes ;; dnl No "native" working dumper available - cygwin* ) pdump=yes ;; dnl unexec is broken - * ) pdump=no ;; - esac -fi - -dnl Dump into executable -if test -z "$dump_in_exec"; then - if test "$pdump" = "yes"; then - if test "$mc_alloc" = "yes"; then - dump_in_exec=no - else - dump_in_exec=yes - fi - fi -fi - -if test -z "$dynamic"; then - case "$opsys" in - hpux* | sunos4* ) dynamic=no ;; - *) dynamic=yes ;; - esac -fi -if test "$dynamic" = "yes"; then - case "$opsys" in - hpux* | sunos4* | sco5 ) opsys="${opsys}-shr" ;; - decosf* ) ld_call_shared="-call_shared" ;; - darwin ) AC_DEFINE(DLSYM_NEEDS_UNDERSCORE) ;; - esac -else dnl "$dynamic" = "no" - case "$opsys" in - sol2 ) - echo "Static linking is not supported on Solaris 2." - echo "Rerun configure without specifying --dynamic=no." - exit 1 ;; - linux ) ld_call_shared="-Bstatic" ;; - decosf* ) ld_call_shared="-non_shared" ;; - esac -fi - -dnl Tools configuration -case "$opsys" in - aix* ) NON_GNU_CC=xlc ;; dnl Use xlc by default on AIX - darwin ) RANLIB="ranlib -c" ;; dnl Avoid link error in lwlib-config.c -esac - -stack_trace_eye_catcher=`echo ${PROGNAME}_${version}_${canonical} | sed 'y/.-/__/'` -AC_DEFINE_UNQUOTED(STACK_TRACE_EYE_CATCHER, $stack_trace_eye_catcher) - -dnl -------------------------------------------------- -dnl Determine the compiler, set up for feature testing -dnl -------------------------------------------------- - -dnl Sun Development environment support -test "$with_sparcworks" = "yes" && with_workshop=yes # compatibility alias -XE_CHECK_FEATURE_DEPENDENCY(workshop, tooltalk) -if test "$with_workshop" = "yes"; then - AC_DEFINE(SUNPRO) -fi - -if test "$with_clash_detection" != "no"; then - AC_DEFINE(CLASH_DETECTION) -fi - -dnl Choose a compiler from (in order) -dnl --compiler, env var CC, with_gcc=no && ${NON_GNU_CC:-cc}, AC_PROG_CC -test -n "$compiler" && CC="$compiler" -if test "$with_gcc" = "no"; then dnl Try to find a non-gcc compiler - case "$CC" in "" | *gcc* ) CC="${NON_GNU_CC-cc}" ;; esac -fi - -dnl If we don't set CFLAGS here, AC_PROG_CC will set it. -dnl But we know better what's good for us, so we do our own -dnl computation of real CFLAGS later. -dnl --cflags overrides environment variable CFLAGS -test "${cflags-unset}" != unset && CFLAGS="$cflags" -if test "${CFLAGS-unset}" != unset - then cflags_specified=yes; - else cflags_specified=no; -fi - -if test "${cflags_warning-unset}" != unset - then cflags_warning_specified=yes; - else cflags_warning_specified=no; -fi - -if test "${cflags_optimization-unset}" != unset - then cflags_optimization_specified=yes; - else cflags_optimization_specified=no; -fi - -if test "${cflags_debugging-unset}" != unset - then cflags_debugging_specified=yes; - else cflags_debugging_specified=no; -fi - -xe_save_CFLAGS="$CFLAGS" - -AC_PROG_CC dnl Autoconf has its own magic for compiler autodetection - -dnl Retry using random guesswork if AC_PROG_CC got it wrong... -if test "$with_gcc" = "no" -a "$GCC" = "yes"; then - CC=${NON_GNU_CC-cc} - AC_PROG_CC -elif test "$with_gcc" = "yes" -a "$GCC" != "yes" ; then - CC=gcc - AC_PROG_CC -fi -CFLAGS="$xe_save_CFLAGS" - -dnl Determine GCC version. -if test "$GCC" = "yes"; then -AC_TRY_RUN([int main () { -#if __GNUC__ >= 3 -return 11; -#else -return 0; -#endif -}], [], -[case "$conftest_rc" in - 11) echo "You appear to be using GCC version 3 or above."; __GCC3=yes ;; -esac]) -fi - -dnl Support for using a different compiler for xemacs itself. -dnl Useful for building XEmacs with a C++ compiler. -dnl For example, `configure --compiler=gcc --xemacs-compiler=g++ - -dnl The compiler used to build xemacs, as opposed to the compiler -dnl used by configure and lib-src, is determined from the following -dnl sources, in order of priority: -dnl o --xemacs-compiler configure flag -dnl o XEMACS_CC environment variable -dnl o same as the regular compiler, (determined previously) - -dnl We don't do AC_PROG_CC for XEMACS_CC; if we can't trust these people.... -test -n "$xemacs_compiler" && XEMACS_CC="$xemacs_compiler" -: ${XEMACS_CC:="$CC"} - -dnl Figure out what C preprocessor to use. - -dnl On Sun systems, people sometimes set up the variable CPP -dnl with a value that is a directory, not an executable at all. -dnl Detect that case, and ignore that value. -test -n "$CPP" -a -d "$CPP" && CPP= - -test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP" - -AC_PROG_CPP - -dnl -------------------------------------------------------------------- -dnl Compiler feature macros -dnl -------------------------------------------------------------------- - -AC_AIX dnl Defines _ALL_SOURCE on AIX. - -dnl We want feature macros defined here *and* in config.h.in, so that -dnl the compilation environment at configure time and compile time agree. - -AC_MSG_CHECKING(for GNU libc) -AC_TRY_COMPILE([#include <features.h>],[ -#if ! (defined __GLIBC__ || defined __GNU_LIBRARY__) -#error Not a GNU libc system :-( -******* ======= ******** &&&&&&&& -#endif -], have_glibc=yes, have_glibc=no) -AC_MSG_RESULT($have_glibc) -dnl I'm tired of pop being broken with GLIBC -slb -dnl Well. then why not fix fucking pop? -test "$have_glibc" = "yes" && AC_DEFINE(_GNU_SOURCE) - -dnl We'd like to use vendor extensions, where available. -dnl We'd like to use functions from the latest Unix98 standards. -dnl See http://www.opengroup.org/onlinepubs/007908799/xsh/compilation.html -case "$opsys" in - sol2) - AC_DEFINE(__EXTENSIONS__) - dnl Solaris 2 before 2.5 had some bugs with feature test macro interaction. - if test "$os_release" -ge 505; then - AC_DEFINE(_XOPEN_SOURCE,500) - AC_DEFINE(_XOPEN_SOURCE_EXTENDED) - fi ;; - linux) - AC_DEFINE(_POSIX_C_SOURCE,199506L) - dnl #### should this be 600? - AC_DEFINE(_XOPEN_SOURCE,500) - AC_DEFINE(_XOPEN_SOURCE_EXTENDED) - ;; - freebsd4*) - AC_DEFINE(_POSIX_C_SOURCE,199506L) - dnl #### Do we want these too? Apparently yes for _XOPEN_SOURCE=500. - AC_DEFINE(_XOPEN_SOURCE,500) - dnl AC_DEFINE(_XOPEN_SOURCE_EXTENDED) - ;; -esac - -dnl Identify compilers to enable compiler-specific hacks. -dnl Add support for other compilers HERE! -dnl GCC is already identified elsewhere. -AC_TRY_RUN([int main () { -#if defined __SUNPRO_C -return 11; -#elif defined __DECC -return 12; -#elif defined __USLC__ && defined __SCO_VERSION__ -return 13; -#elif defined __INTEL_COMPILER -return 14; -#else -return 0; -#endif -}], [], -[case "$conftest_rc" in - 11) echo "You appear to be using the SunPro C compiler." ; __SUNPRO_C=yes ;; - 12) echo "You appear to be using the DEC C compiler." ; __DECC=yes ;; - 13) echo "You appear to be using the SCO C compiler." ; __USLC__=yes ;; - 14) echo "You appear to be using the Intel C++ compiler."; __ICC=yes - dnl Newer versions of icc claim to be GCC - GCC=no ;; -esac]) - - -dnl case "$canonical" in -dnl *-sun-sunos* ) test "$CPP" = "acc -E" && CPP="acc -E -Xs" ;; -dnl esac - -dnl -------------------------------------------------------------------- -dnl Extract some information from the operating system and machine files -dnl -------------------------------------------------------------------- - -echo "Extracting information from the machine- and system-dependent headers..." - -dnl It is not important that this name contain the PID; you cannot run -dnl two configures in the same directory and have anything work -dnl anyway. -tempcname="conftest.c" - -dnl CPP_to_sh(CPP_SYMBOL, SH_VAR, DEFAULT_VALUE) -define([CPP_to_sh], -[[#]ifndef [$1] -[#]define [$1]ifelse([$3],,, [ "$3"]) -[#]endif -configure___ [$2]=[$1] -])dnl CPP_to_sh - -dnl CPP_boolean_to_sh(CPP_SYMBOL, SH_VAR) -define([CPP_boolean_to_sh], -[[#]ifdef [$1] -configure___ [$2]=yes -[#]else -configure___ [$2]=no -[#]endif -])dnl CPP_boolean_to_sh - -cat > $tempcname < confdefs.h -cat >> $tempcname <<EOF -#define NOT_C_CODE -#define C_SWITCH_SITE -#define C_SWITCH_X_SITE -#define LD_SWITCH_SITE -#define LD_SWITCH_X_SITE -#define LD_SWITCH_X_SITE_AUX -#define OS_RELEASE $os_release - -#ifdef config_opsysfile -#include "$srcdir/src/$opsysfile" -#endif - -#ifdef config_machfile -#include "$srcdir/src/$machfile" -#endif - -CPP_to_sh(LIBS_MACHINE, libs_machine) -CPP_to_sh(LIBS_SYSTEM, libs_system) -CPP_to_sh(LIBS_TERMCAP, libs_termcap) -CPP_to_sh(LIB_STANDARD, libs_standard) - -CPP_to_sh(OBJECTS_MACHINE, objects_machine) -CPP_to_sh(OBJECTS_SYSTEM, objects_system) - -CPP_to_sh(C_SWITCH_MACHINE, c_switch_machine) -CPP_to_sh(C_SWITCH_SYSTEM, c_switch_system) - -CPP_to_sh(LD_SWITCH_MACHINE, ld_switch_machine) -CPP_to_sh(LD_SWITCH_SYSTEM, ld_switch_system) - -CPP_to_sh(UNEXEC, unexec) - -CPP_to_sh(SYSTEM_TYPE, system_type) - -CPP_to_sh(LD_SWITCH_SHARED, ld_switch_shared, -c) - -#define ORDINARY_LD "\$(CC) \$(CFLAGS)" -configure___ ordinary_ld=ORDINARY_LD - -#ifdef ORDINARY_LINK -#define LD ORDINARY_LD -#else /* no ORDINARY LINK */ -#ifdef COFF_ENCAPSULATE -#define LD "\$(CC) -nostdlib" -#else /* not COFF_ENCAPSULATE */ -#ifdef LINKER -#define LD LINKER -#else /* ! defined (LINKER) */ -#define LD "ld" -#endif /* ! defined (LINKER) */ -#endif /* ! defined (COFF_ENCAPSULATE) */ -#endif /* not ORDINARY_LINK */ -configure___ ld=LD - -CPP_to_sh(LIB_GCC, lib_gcc) -CPP_to_sh(LD_TEXT_START_ADDR, ld_text_start_addr) - -#if ! defined (ORDINARY_LINK) && !defined (START_FILES) -#ifdef NO_REMAP -#ifdef COFF_ENCAPSULATE -#define START_FILES "pre-crt0.o /usr/local/lib/gcc-crt0.o" -#else /* ! defined (COFF_ENCAPSULATE) */ -#define START_FILES "pre-crt0.o /lib/crt0.o" -#endif /* ! defined (COFF_ENCAPSULATE) */ -#else /* ! defined (NO_REMAP) */ -#define START_FILES "ecrt0.o" -#endif /* ! defined (NO_REMAP) */ -#endif /* no ORDINARY_LINK */ -#ifndef START_FILES -#define START_FILES -#endif -configure___ start_files=START_FILES - -CPP_boolean_to_sh(ORDINARY_LINK, ordinary_link) -CPP_boolean_to_sh(SYSTEM_MALLOC, system_malloc) -CPP_boolean_to_sh(TERMINFO, have_terminfo) -dnl The MAIL_USE_xxx variables come from the s&m headers -CPP_boolean_to_sh(MAIL_USE_FLOCK, mail_use_flock) -CPP_boolean_to_sh(MAIL_USE_LOCKF, mail_use_lockf) -CPP_boolean_to_sh(MAIL_USE_LOCKING, mail_use_locking) -CPP_boolean_to_sh(HAVE_WIN32_PROCESSES, win32_processes) -EOF - -dnl The value of CPP is a quoted variable reference, so we need to do this -dnl to get its actual value... -CPP=`eval "echo $CPP $CPPFLAGS"` -define(TAB, [ ])dnl -changequote(, )dnl -eval `$CPP -Isrc $tempcname \ - | sed -n -e "s/[ TAB]*=[ TAB\"]*/='/" -e "s/[ TAB\"]*\$/'/" -e "s/^configure___//p"` -changequote([, ])dnl - -rm $tempcname - -dnl s&m files shouldn't be required to define anything, or even to exist. -dnl So we default SYSTEM_TYPE to the obvious documented standard, `uname -s`, -dnl appropriately emacsulated. -test -z "$system_type" && \ - AC_DEFINE_UNQUOTED(SYSTEM_TYPE,"`uname -s | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`") - -dnl If the s&m files don't define a system-specific dumper, simply use pdump. -dnl Sometime in the future, we'll remove all definitions of UNEXEC -dnl from all the s&m files. -test -z "$unexec" && pdump=yes - -if test "$pdump" = "yes"; then - ordinary_link="yes" - ld="${ordinary_ld}" - start_files= - libs_standard= - unexec= - lib_gcc= -fi - -dnl For debugging... -test "$extra_verbose" = "yes" && \ - PRINT_VAR(libs_machine libs_system libs_termcap libs_standard - objects_machine objects_system c_switch_machine c_switch_system - ld_switch_machine ld_switch_system unexec ld_switch_shared - ld lib_gcc ld_text_start_addr start_files ordinary_link - have_terminfo mail_use_flock mail_use_lockf mail_using_locking) && echo "" - -dnl Pick up mingw include path -dnl We only cope with headers in mingw, not mingw32: no previous version of -dnl XEmacs supported mingw and cygnus have made this incompatible change -dnl so we just go with the flow. -case "$opsys" in mingw* | cygwin*) - cygwin_include=`eval "gcc -print-file-name=libc.a"` ; - cygwin_include=`eval "dirname $cygwin_include"` ; - cygwin_include="-I$cygwin_include/../include" ; - extra_includes="$cygwin_include/mingw $cygwin_include" ; - case "$opsys" in mingw*) - XE_APPEND($extra_includes, c_switch_system) ;; - esac - ;; -esac - -dnl Non-ordinary link usually requires -lc -test "$ordinary_link" = "no" -a -z "$libs_standard" && libs_standard="-lc" - -dnl ----------------------- -dnl Compiler-specific hacks -dnl ----------------------- - -dnl DEC C `-std1' means ANSI C mode -test "$__DECC" = "yes" && XE_APPEND(-std1, c_switch_site) - -dnl Some versions of SCO native compiler need -Kalloca -if test "$__USLC__" = yes; then - AC_MSG_CHECKING(for whether the -Kalloca compiler flag is needed) - need_kalloca=no - AC_TRY_LINK([], [void *x = alloca(4);], [:], [ - xe_save_c_switch_system="$c_switch_system" - c_switch_system="$c_switch_system -Kalloca" - AC_TRY_LINK([], [void *x = alloca(4);], [ need_kalloca=yes ]) - c_switch_system="$xe_save_c_switch_system"]) - AC_MSG_RESULT($need_kalloca) - test "$need_kalloca" = "yes" && XE_APPEND(-Kalloca,c_switch_system) -fi - -dnl If we're specifying XEMACS_CC, it'd better be in the same family -dnl as CC or the following flag calculations are bogus. -dnl #### We may want to actually error and abort here, but I am not sure. -if test "$CC" != "$XEMACS_CC"; then - if test "$XEMACS_CC" = "g++" -a "$GCC" != "yes"; then - AC_MSG_WARN([CC and g++ are mismatched; XE_CFLAGS may be wrong]) - xemacs_cc_cc_mismatch=yes - elif test -n "$GCC" -a "$XEMACS_CC" != "g++"; then - AC_MSG_WARN([gcc and XEMACS_CC are mismatched; XE_CFLAGS may be wrong]) - xemacs_cc_cc_mismatch=yes - dnl #### Add other detectable mismatches here. - else - xemacs_cc_cc_mismatch=no - fi -fi - -dnl Calculate optimization flags. These will be off by default in beta -dnl versions and on in release versions. - -if test -z "$with_optimization" ; then - if test -n "$emacs_is_beta" ; then - with_optimization=no - else - with_optimization=yes - fi -fi - -dnl #### We should be checking C_OPTIMIZE_SWITCH in m/*, s/*. - -AC_MSG_CHECKING([for preferred optimization flags]) -if test "$with_optimization" = "yes" ; then - if test "$cflags_optimization_specified" = "no"; then - dnl Following values of cflags_optimization are known to work well. - dnl Should we take debugging options into consideration? - if test "$GCC" = "yes"; then - cflags_optimization="-O3" - elif test "$__SUNPRO_C" = "yes"; then - case "$opsys" in - sol2 ) cflags_optimization="-xO4" ;; - sunos4* ) cflags_optimization="-xO2" ;; - esac - elif test "$__DECC" = "yes"; then - cflags_optimization="-O3" - elif test "$CC" = "xlc"; then - dnl see http://www.nersc.gov/vendor_docs/ibm/vac/sc094959.pdf - cflags_optimization="-O3 -qstrict -qnoansialias -qlibansi -qmaxmem=20000" - elif test "$__ICC" = "yes"; then - cflags_optimization="-O3 -Ob2" - dnl ### Add optimal cflags_optimization support for other compilers HERE! - else - cflags_optimization="-O" ;dnl The only POSIX-approved flag - fi - fi -else - cflags_optimization= -fi - -AC_MSG_RESULT([${cflags_optimization}]) - -dnl #### We should be checking C_DEBUG_SWITCH in m/*, s/*. - -AC_MSG_CHECKING([for preferred debugging flags]) -if test "$cflags_debugging_specified" = "no"; then - dnl ### Add optimal debugging support for other compilers HERE! - cflags_debugging="-g" - - debugging_ok_with_optimization=no - if test "$GCC" = "yes" -o "$CC" = "xlc" -o "$__ICC" = "yes"; then - debugging_ok_with_optimization=yes - fi - - if test "$with_optimization" = "yes" -a "$debugging_ok_with_optimization" = "no"; then - cflags_debugging= - fi -fi -AC_MSG_RESULT([${cflags_debugging}]) - -dnl Calculate warning flags. We separate the flags for warnings from -dnl the other flags because we want to force the warnings to be seen -dnl by everyone who doesn't specifically override them. - -AC_MSG_CHECKING([for preferred warning flags for XEMACS_CC]) - -dnl If this stays nil, it will be set to cflags_warning before use. -xe_cflags_warning="" - -if test "$cflags_warning_specified" = "no"; then - dnl Following warning flags are known to work well. - if test "$__SUNPRO_C" = "yes"; then - case "$opsys" in - sol2 ) cflags_warning="-v" ;; - esac - elif test "$CC" = "xlc"; then - cflags_warning="-qinfo" - elif test "$GCC" = "yes"; then - cflags_warning="-Wall -Wno-switch -Wundef" - dnl This is not very useful, as it issues warnings that may appear - dnl or disappear rather randomly, cannot easily be fixed, and are - dnl not a big deal. If you want it, add it yourself. - dnl cflags_warning="$cflags_warning -Winline" - - dnl Yuck, bad compares have been worth at least 3 crashes! - dnl Warnings about char subscripts are pretty pointless, though, - dnl and we use them in various places. - cflags_warning="$cflags_warning -Wsign-compare -Wno-char-subscripts" - test "$__GCC3" = "yes" && cflags_warning="$cflags_warning -Wpacked" - dnl glibc is intentionally not `-Wpointer-arith'-clean. - dnl Ulrich Drepper has rejected patches to fix the glibc header files. - test "$have_glibc" != "yes" && \ - cflags_warning="$cflags_warning -Wpointer-arith" - dnl Warning flags that may differ for gcc and g++ (xemacs_compiler) - dnl With g++, -Wshadow produces five zillion utterly random warnings -- - dnl a local var named `buffer' conflicts with `struct buffer' for - dnl example. Even with gcc, -Wshadow is questionable because of its - dnl complaints about parameters with the same names as global functions. - dnl There is no -Wmissing-declarations under g++. - dnl But gcc warns about -Weffc++ in C compiles. - dnl With g++, there is no effective way to use -Wunused-parameter without - dnl some very ugly code changes. - if test "$xemacs_compiler" = "g++"; then - xe_cflags_warning="$cflags_warning -Weffc++" - elif test "$__GCC3" = "yes"; then - xe_cflags_warning="$cflags_warning -Wunused-parameter" - fi - cflags_warning="$cflags_warning -Wshadow -Wmissing-declarations" - cflags_warning="$cflags_warning -Wmissing-prototypes -Wstrict-prototypes" - dnl **** If more gcc/g++ flags are added, from here on must handle - dnl **** cflags_warning and xe_cflags_warning in parallel - elif test "$__ICC" = "yes"; then - cflags_warning="-Wall -w1 -we147" - dnl ### Add optimal cflags_warning support for other compilers HERE! - fi -fi -test -z "$xe_cflags_warning" && xe_cflags_warning="$cflags_warning" -AC_MSG_RESULT([${xe_cflags_warning}]) - -AC_MSG_CHECKING([for preferred warning flags for CC]) -AC_MSG_RESULT([${cflags_warning}]) - -dnl Calculate remaining cflags. -dnl Use either command line flag, environment var, or autodetection - -AC_MSG_CHECKING([for remaining CFLAGS]) - -if test "$cflags_specified" = "no"; then - dnl Following values of CFLAGS are known to work well. - if test "$CC" = "xlc"; then - CFLAGS="-qro" - dnl ### Add optimal CFLAGS support for other compilers HERE! - fi -fi -AC_MSG_RESULT([${CFLAGS}]) - -dnl Now combine all C flags. Put the warning and optimization flags first -dnl so that user-specified flags will override. -dnl Do XE_CFLAGS before adding flags to CFLAGS. -dnl Flags for XEMACS_CC: - -XE_CFLAGS="$xe_cflags_warning $cflags_debugging $cflags_optimization $CFLAGS" -dnl Flags for CC: -CFLAGS="$cflags_warning $cflags_debugging $cflags_optimization $CFLAGS" - -AC_MSG_CHECKING([total value of XE_CFLAGS]) -AC_MSG_RESULT([${XE_CFLAGS}]) -AC_MSG_CHECKING([total value of CFLAGS]) -AC_MSG_RESULT([${CFLAGS}]) - -dnl Search for GCC specific build problems we know about -if test "$GCC" = "yes"; then -AC_MSG_CHECKING(for buggy gcc versions) -GCC_VERSION=`$CC --version` -case `uname -s`:`uname -m`:$GCC_VERSION in - dnl egcs 2.90.21 (egcs-1.00 release) - dnl egcs 2.90.29 (egcs-1.0.3 release) - *:sun4*:2.8.1|*:sun4*:egcs-2.90.*) - dnl Don't use -O2 with gcc 2.8.1 and egcs 1.0 under SPARC architectures - dnl without also using `-fno-schedule-insns'. - case "$CFLAGS" in - *-O2*|*-O3*) - case "$CFLAGS" in - *-fno-schedule-insns*) ;; - *) - AC_MSG_RESULT(yes) - AC_MSG_WARN([Don't use -O2 with gcc 2.8.1 and egcs 1.0 under SPARC architectures]) - AC_MSG_WARN([without also using -fno-schedule-insns.]) - AC_MSG_ERROR([Aborting due to known problem]) - ;; - esac - ;; - esac - ;; - dnl egcs-2.91.57 (egcs-1.1 release) - dnl egcs-2.91.66 (egcs-1.1.2 release) - Linux:alpha:egcs-2.91.*) - AC_MSG_RESULT(yes) - AC_MSG_WARN([There have been reports of egcs-1.1 not compiling XEmacs correctly on]) - AC_MSG_WARN([Alpha Linux. There have also been reports that egcs-1.0.3a is O.K.]) - AC_MSG_ERROR([Aborting due to known problem]) - ;; - *:i*86*:2.7.2*) - case "$CFLAGS" in - *-O2*|*-O3*) - case "$GCC_VERSION" in - 2.7.2) - case "$CFLAGS" in - *-fno-strength-reduce*) ;; - *) - AC_MSG_RESULT(yes) - AC_MSG_WARN([Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using]) - AC_MSG_WARN([-fno-strength-reduce.]) - AC_MSG_ERROR([Aborting due to known problem]) - ;; - esac - ;; - esac - case "$CFLAGS" in - *-fno-caller-saves*) ;; - *) - AC_MSG_RESULT(yes) - AC_MSG_WARN([Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using]) - AC_MSG_WARN([-fno-caller-saves.]) - AC_MSG_ERROR([Aborting due to known problem]) - ;; - esac - ;; - esac - ;; -esac -AC_MSG_RESULT(no) -fi - -dnl GNU ld now defaults to combreloc, which screws up unexec, but not pdump. -dnl Note that it's OK if the GNU style long option causes non-GNU ld to barf -dnl a usage message, that's often good enough. Please report it, though. -dnl #### Should make this Solaris-friendly. -dnl Link with -z nocombreloc for now. -if test "$pdump" != "yes"; then - AC_MSG_CHECKING(for \"-z nocombreloc\" linker flag) - case "`ld --help 2>&1`" in - *-z\ nocombreloc* ) AC_MSG_RESULT(yes) - XE_PREPEND(-z nocombreloc, ld_switch_site) ;; - *) AC_MSG_RESULT(no) ;; - esac -fi - - -dnl Inform compiler that certain flags are meant for the linker -dnl XE_PROTECT_LINKER_FLAGS(shell_var) -define([XE_PROTECT_LINKER_FLAGS], [ -if test "$GCC" = "yes"; then - set x $[$1]; shift; [$1]="" - while test -n "[$]1"; do - case [$]1 in - -L | -l | -u ) [$1]="$[$1] [$]1 [$]2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) [$1]="$[$1] [$]1" ;; - -Xlinker* ) ;; - * ) [$1]="$[$1] -Xlinker [$]1" ;; - esac - shift - done -fi])dnl -XE_PROTECT_LINKER_FLAGS(ld_switch_system) -XE_PROTECT_LINKER_FLAGS(ld_switch_machine) -XE_PROTECT_LINKER_FLAGS(ld_switch_site) -XE_PROTECT_LINKER_FLAGS(LDFLAGS) -XE_PROTECT_LINKER_FLAGS(ld_call_shared) - -dnl Add s&m-determined objects (including unexec) to link line -test -n "$objects_machine" && XE_ADD_OBJS($objects_machine) -test -n "$objects_system" && XE_ADD_OBJS($objects_system) -test -n "$unexec" && test ! "$pdump" = "yes" && XE_ADD_OBJS($unexec) -test "$pdump" = "yes" && XE_ADD_OBJS(dumper.o) - -dnl Dynodump (Solaris 2.x, x<6) -AC_MSG_CHECKING(for dynodump) -if test "$unexec" != "unexsol2.o"; then - AC_MSG_RESULT(no) -else - AC_MSG_RESULT(yes) - AC_DEFINE(DYNODUMP) - XE_APPEND(dynodump, MAKE_SUBDIR) - XE_APPEND(dynodump, SRC_SUBDIR_DEPS) - case "$machine" in - sparc ) dynodump_arch=sparc ;; - *86* ) dynodump_arch=i386 ;; - powerpc ) dynodump_arch=ppc ;; - esac - dnl Dynodump requires the system linker - test "$GCC" = "yes" && XE_APPEND(-fno-gnu-linker, ld_switch_site) -fi - -dnl Feed s&m crud to src/Makefile - -dnl Linux/powerpc needs the following magic for some reason -dnl [Not needed with YellowDog 2.3 and causes link problems with YellowDog 3.0, -dnl the two most popular PowerPC distributions.] -dnl test "$machine$opsys" = "powerpclinux" && start_flags="-T $srcdir/src/ppc.ldscript" - -if test "$unexec" = "unexaix.o"; then -dnl AIX needs various hacks to make static linking work. - if test "$dynamic" = "no"; then - start_flags="-Wl,-bnso,-bnodelcsect" - test "$GCC" = "yes" && start_flags="-B/bin/ ${start_flags}" - for f in "/lib/syscalls.exp" "/lib/threads.exp"; do - if test -r "$f"; then start_flags="${start_flags},-bI:${f}"; fi - done - for f in "/usr/lpp/X11/bin/smt.exp" "/usr/bin/X11/smt.exp"; do - if test -r "$f"; then start_flags="${start_flags},-bI:${f}"; break; fi - done - AC_CHECK_LIB(C, terminateAndUnload, XE_APPEND(-lC, libs_system)) - fi -elif test -n "$ld_text_start_addr"; then - start_flags="-T $ld_text_start_addr -e __start" -fi -AC_SUBST(start_flags) - -AC_SUBST(ld_switch_shared) -AC_SUBST(start_files) -if test "$ordinary_link" = "no" -a "$GCC" = "yes"; then - test -z "$linker" && linker='$(CC) -nostdlib' - test -z "$lib_gcc" && lib_gcc='`$(CC) -print-libgcc-file-name`' -fi -test "$GCC" != "yes" && lib_gcc= -AC_SUBST(ld) -AC_SUBST(lib_gcc) - -dnl --------------------------------------------------------------- -dnl Get version information for: -dnl C compiler, libc -dnl #### should do CC compiler, too, if different from XEMACS_CC -dnl --------------------------------------------------------------- - -compiler_version="" -gcc_compiler_specs="" -libc_version="" - -AC_MSG_CHECKING(for compiler version information) - -dnl First try portable compilers, then crack system secrets -dnl #### Is this code correct if $XEMACS_CC != $CC? XEMACS_CC hasn't been -dnl run through the AC_PROG_CC mill. -dnl Would anybody really build libsrc with GCC and XEmacs with non-GCC? -if test "$GCC" = "yes"; then - compiler_version=`$XEMACS_CC --version | head -1` - gcc_compiler_specs=`$XEMACS_CC -v 2>&1 | sed 's/.* $[[^ ]]$/\1/' | head -1` -else case "$XEMACS_CC" in - dnl The Intel cc compiler - ic*) - compiler_version=`icc -V 2>&1 | head -1` - ;; - dnl non-gcc machine-specific magic - contributions welcome - *) case "$canonical" in - *-*-aix* ) - dnl Yes, it's this ugly for AIX... - realcc=`which $XEMACS_CC` - dnl Might be a symlink created by replaceCset command - if test -L $realcc ; then - ccdir=`dirname $realcc` - ccprog=`/bin/ls -l $realcc | sed 's/.* $[[^ ]]$/\1/'` - dnl This doesn't handle ../../xlc type stuff, but I've not seen one... - case $ccprog in - */*) realcc=$ccprog;; - *) realcc=$ccdir/$ccprog;; - esac - fi - lpp=`lslpp -wqc $realcc | cut -f2 -d:` - if test ! -z "$lpp" ; then - lppstr=`lslpp -Lqc $lpp` - lpplev=`echo "$lppstr" | cut -f3 -d:` - lppdesc=`echo "$lppstr" | cut -f8 -d:` - fi - if test ! -z "$lpplev" ; then - compiler_version="$lpp $lpplev - $lppdesc" - fi - ;; - - *-*-solaris*) - compiler_version=`$XEMACS_CC -V 2>&1 | head -1` - ;; - - alpha*-dec-osf*) - compiler_version=`$XEMACS_CC -V | tr '\n' ' '` - ;; - - mips-sgi-irix*) - compiler_version=`$XEMACS_CC -version` - ;; - esac - esac -fi - -dnl Awww, shucks. -if test -z "$compiler_version"; then - compiler_version="detection failed (please report this)" -fi - -AC_MSG_CHECKING(for standard C library version information) - -case "$canonical" in - *-*-linux*) - dnl #### who would ever _not_ be running the distro's libc? - dnl Maybe it would be better to get/augment this info with ldd? - if test -f /etc/redhat-release ; then - libc_version=`rpm -q glibc` - elif test -f /etc/debian_version ; then - libc_version=`dpkg-query --showformat='${version}' --show libc6` - libc_version="GNU libc $libc_version (Debian)" - dnl need SuSE et al checks here... - fi - dnl #### Tested on Debian, does this actually work elsewhere? ;-) - if test -z "$libc_version"; then - libc_version=`ls /lib/libc-*.so | sed -e 's,/lib/libc-$.*$\.so,\1,'` - fi - ;; - - *-*-aix*) - libc_version="bos.rte.libc `lslpp -Lqc bos.rte.libc | cut -f3 -d:`" - ;; - - *-*-solaris*) - libc=`pkginfo -l SUNWcsl | grep VERSION: | awk '{print $2}'` - libc_version="SUNWcsl $libc" - - ;; - - mips-sgi-irix*) - libc_version="IRIX libc `uname -sRm`" - ;; - - alpha*-dec-osf*) - dnl Another ugly case - (cd /usr/.smdb.; - libc_version=` grep -h libc.so *.inv | awk '$9 == "f" {print $12}' | tr '\n' ','` - ) - ;; -esac - -dnl Awww, shucks. -if test -z "libc_version"; then - libc_version="detection failed (please report this)" -fi - -dnl --------------------------------------------------------------- -dnl Add site and system specific flags to compile and link commands -dnl --------------------------------------------------------------- - -dnl Allow use of either ":" or spaces for lists of directories -define(COLON_TO_SPACE, - [case "$[$1]" in *:* [)] [$1]="`echo '' $[$1] | sed -e 's/^ //' -e 's/:/ /g'`";; esac])dnl - -dnl --site-libraries (multiple dirs) -COLON_TO_SPACE(site_libraries) -if test -n "$site_libraries"; then - for arg in $site_libraries; do - case "$arg" in - -* ) ;; - * ) test -d "$arg" || \ - XE_DIE("Invalid site library \`$arg': no such directory") - arg="-L${arg}" ;; - esac - XE_APPEND($arg, ld_switch_site) - done -fi - -dnl --site-includes (multiple dirs) -COLON_TO_SPACE(site_includes) -if test -n "$site_includes"; then - for arg in $site_includes; do - case "$arg" in - -* ) ;; - * ) test -d "$arg" || \ - XE_DIE("Invalid site include \`$arg': no such directory") - arg="-I${arg}" ;; - esac - XE_APPEND($arg, c_switch_site) - done -fi - -dnl --site-prefixes (multiple dirs) -dnl --site-prefixes=dir1:dir2 is a convenient shorthand for -dnl --site-libraries=dir1/lib:dir2/lib --site-includes=dir1/include:dir2/include -dnl Site prefixes take precedence over the standard places, but not over -dnl site-includes and site-libraries. -COLON_TO_SPACE(site_prefixes) -if test -n "$site_prefixes"; then - for dir in $site_prefixes; do - lib_dir="${dir}/lib" - inc_dir="${dir}/include" - if test ! -d "$dir"; then - XE_DIE("Invalid site prefix \`$dir': no such directory") - elif test ! -d "$lib_dir"; then - XE_DIE("Invalid site prefix \`$dir': no such directory \`$lib_dir'") - else - if test -d "$inc_dir"; then - XE_APPEND("-I$inc_dir", c_switch_site) - fi - XE_APPEND("-L$lib_dir", ld_switch_site) - fi - done -fi - -dnl GNU software installs by default into /usr/local/{include,lib} -dnl if test -d "/usr/local/include" -a -d "/usr/local/lib"; then -dnl XE_APPEND("-L/usr/local/lib", ld_switch_site) -dnl XE_APPEND("-I/usr/local/include", c_switch_site) -dnl fi - -dnl Extra system-specific library directories - please add to list -for dir in "/usr/ccs/lib"; do - test -d "$dir" && XE_APPEND(-L${dir}, ld_switch_system) -done - -dnl --site-runtime-libraries (multiple dirs) -COLON_TO_SPACE(site_runtime_libraries) -if test -n "$site_runtime_libraries"; then - LD_RUN_PATH="`echo $site_runtime_libraries | sed -e 's/ */:/g'`" - export LD_RUN_PATH -fi - -dnl Linux systems have dynamic runtime library directories listed in -dnl /etc/ld.so.conf. Since those are used at run time, it seems pretty -dnl safe to use them at link time, and less controversial than forcing -dnl the run-time to use the link-time libraries. This also helps avoid -dnl mismatches between the link-time and run-time libraries. - -dnl #### Unfortunately, there are horrible libc4 and libc5 libraries -dnl listed in /etc/ld.so.conf on some systems, and including them on -dnl the link path leads to linking in utterly broken libc's. -dnl There are many clever ways of approaching this problem, -dnl but finding one that actually works... - -dnl if test -z "$LD_RUN_PATH" -a -r "/etc/ld.so.conf"; then -dnl for dir in `cat /etc/ld.so.conf`; do -dnl test -d "$dir" && XE_APPEND(-L${dir}, ld_switch_system) -dnl done -dnl add_runtime_path=no -dnl fi - -dnl ------------------------------------- -dnl Compute runtime library path -dnl ------------------------------------- - -if test -n "$add_runtime_path"; then :; -elif test "$dynamic" = "no"; then add_runtime_path=no -elif test -n "$LD_RUN_PATH"; then add_runtime_path=yes -else case "$opsys" in - sol2 | irix* | *bsd* | decosf* ) add_runtime_path=yes ;; - * ) add_runtime_path=no ;; - esac -fi - -if test "$add_runtime_path" = "yes"; then - dnl Try to autodetect runtime library flag (usually -R), - dnl and whether it works (or at least does no harm) - AC_MSG_CHECKING("for runtime libraries flag") - case "$opsys" in - sol2 ) dash_r="-R" ;; - decosf* | linux* | irix*) dash_r="-rpath " ;; - *) - dash_r="" - for try_dash_r in "-R" "-R " "-rpath "; do - xe_check_libs="${try_dash_r}/no/such/file-or-directory" - XE_PROTECT_LINKER_FLAGS(xe_check_libs) - AC_TRY_LINK(, , dash_r="$try_dash_r") - xe_check_libs="" - test -n "$dash_r" && break - done ;; - esac - if test -n "$dash_r"; - then AC_MSG_RESULT("\"${dash_r}\"") - else AC_MSG_RESULT(NONE) - fi -fi - -xe_add_unique_runpath_dir=' - xe_add_p=yes - for xe_dir in $runpath_dirs; do dnl Uniquify - test "$xe_dir" = "$xe_runpath_dir" && xe_add_p=no - done - if test "$xe_add_p" = "yes"; then - test -n "$runpath" && runpath="${runpath}:" - runpath="${runpath}${xe_runpath_dir}" - runpath_dirs="$runpath_dirs $xe_runpath_dir" - fi' - - -dnl XE_ADD_RUNPATH_DIR(directory) -define([XE_ADD_RUNPATH_DIR],[{ -xe_runpath_dir=$1 -dnl PRINT_VAR(ld_switch_site ld_switch_x_site runpath xe_runpath_dir LD_RUN_PATH xe_ldflags) - test "$xe_runpath_dir" != "/lib" -a \ - "$xe_runpath_dir" != "/usr/lib" -a \ - -n "`ls ${xe_runpath_dir}/*.s[[ol]] 2>/dev/null`" && \ - eval "$xe_add_unique_runpath_dir" -}])dnl - -dnl XE_COMPUTE_RUNPATH() -define([XE_COMPUTE_RUNPATH],[ -if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then - dnl Remove runtime paths from current ld switches - ld_switch_site=`echo '' $ld_switch_site | sed -e 's:^ ::' -e "s/$dash_r[[^ ]]*//g"` - ld_switch_x_site=`echo '' $ld_switch_x_site | sed -e 's:^ ::' -e "s/$dash_r[[^ ]]*//g"` - dnl PRINT_VAR(ld_switch_site ld_switch_x_site) - - dnl Fix up Runtime path - dnl If LD_RUN_PATH is set in environment, use that. - dnl In this case, assume user has set the right value. - runpath="" runpath_dirs="" - if test -n "$LD_RUN_PATH"; then - runpath="$LD_RUN_PATH" - elif test "$GCC" = "yes"; then - dnl Compute runpath from gcc's -v output - ld_switch_run_save="$ld_switch_run"; ld_switch_run="" - echo "int main(int argc, char *argv[[]]) {return 0;}" > conftest.c - xe_runpath_link='${CC-cc} -o conftest -v $CFLAGS '"$xe_ldflags"' conftest.$ac_ext 2>&1 1>/dev/null' - for arg in `eval "$xe_runpath_link" | grep ' -L'`; do - case "$arg" in P,* | -L* | -R* ) - for dir in `echo '' "$arg" | sed -e 's:^ ::' -e 's/^..//' -e 'y/:/ /'`; do - XE_ADD_RUNPATH_DIR("$dir") - done ;; - esac - done - ld_switch_run="$ld_switch_run_save" - rm -f conftest* - else - dnl Add all directories with .so files to runpath - for arg in $ld_switch_site $ld_switch_x_site; do - case "$arg" in -L*) XE_ADD_RUNPATH_DIR(`echo '' "$arg" | sed -e 's:^ ::' -e 's/^-L//'`);; esac - done - dnl Sometimes /opt/SUNWdt/lib is the only installed Motif available - if test "$opsys $need_motif" = "sol2 yes"; then - xe_runpath_dir="/opt/SUNWdt/lib"; - eval "$xe_add_unique_runpath_dir"; - fi - fi dnl Compute $runpath - - if test -n "$runpath"; then - ld_switch_run="${dash_r}${runpath}" - XE_PROTECT_LINKER_FLAGS(ld_switch_run) - test "$extra_verbose" = "yes" && echo "Setting runpath to $runpath" - fi -fi -])dnl -XE_COMPUTE_RUNPATH() - -dnl ----------------------------------- -dnl Do some misc autoconf-special tests -dnl ----------------------------------- - -dnl Do the opsystem or machine files prohibit the use of the GNU malloc? -dnl Assume not, until told otherwise. -GNU_MALLOC=yes -if test "$with_dlmalloc" != "no"; then - doug_lea_malloc=yes -else - doug_lea_malloc=no -fi -after_morecore_hook_exists=yes -AC_CHECK_FUNC(malloc_set_state, ,doug_lea_malloc=no) -AC_MSG_CHECKING(whether __after_morecore_hook exists) -AC_TRY_LINK([extern void (* __after_morecore_hook)();],[__after_morecore_hook = 0], - [AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no) - after_morecore_hook_exists=no]) -if test "$system_malloc" = "yes" ; then - GNU_MALLOC=no - GNU_MALLOC_reason=" - - The GNU allocators don't work with this system configuration." -elif test "$with_system_malloc" = "yes" ; then - GNU_MALLOC=no - GNU_MALLOC_reason=" - - User chose not to use GNU allocators." -elif test "$with_debug_malloc" = "yes" ; then - GNU_MALLOC=no - GNU_MALLOC_reason=" - - User chose to use Debugging Malloc." -fi - -if test "$doug_lea_malloc" = "yes" -a "$GNU_MALLOC" = "yes" ; then - GNU_MALLOC_reason=" - - Using Doug Lea's new malloc from the GNU C Library." - AC_DEFINE(DOUG_LEA_MALLOC) - if test "$after_morecore_hook_exists" = "no" ; then - GNU_MALLOC_reason=" - - Using Doug Lea's new malloc from the Linux C Library." - AC_DEFINE(_NO_MALLOC_WARNING_) - fi -fi - -dnl #### mcheck is broken in all versions of Linux libc and glibc. -dnl Try this again when 2.1 hits the streets. -dnl Avoid using free-hook.c if support exists for malloc debugging in libc -dnl have_libmcheck=no -dnl if test "$error_check_malloc" = "yes" -a \ -dnl "$have_glibc" = "yes" -a \ -dnl "$doug_lea_malloc" = "yes"; then -dnl AC_CHECK_HEADERS(mcheck.h) -dnl AC_CHECK_LIB(mcheck, mcheck, have_libmcheck=yes, have_libmcheck=no) -dnl fi - -dnl if test "$have_libmcheck" = "yes"; then -dnl AC_DEFINE(HAVE_LIBMCHECK) -dnl libmcheck=-lmcheck -dnl AC_SUBST(libmcheck) -dnl fi - -dnl Some other nice autoconf tests. If you add a test here which -dnl should make an entry in src/config.h, do not forget to add an -dnl #undef clause to src/config.h.in for autoconf to modify. - -AC_PROG_RANLIB -AC_PROG_INSTALL -AC_PROG_YACC - -dnl checks for header files -AC_CHECK_HEADERS(dnl - a.out.h dnl - elf.h dnl - cygwin/version.h dnl - fcntl.h dnl - inttypes.h dnl - libgen.h dnl - locale.h dnl - wchar.h dnl - mach/mach.h dnl - sys/param.h dnl - sys/pstat.h dnl - sys/resource.h dnl - sys/time.h dnl - sys/timeb.h dnl - sys/times.h dnl - sys/un.h dnl - sys/vlimit.h dnl - ulimit.h dnl - unistd.h dnl -) -AC_HEADER_SYS_WAIT -AC_HEADER_STDC -AC_HEADER_TIME -AC_DECL_SYS_SIGLIST - - -dnl ---------------------------------------------------------------- -dnl Checking for utime() or utimes(). -dnl We prefer utime, since it is more standard. -dnl Some systems have utime.h but do not declare the struct anyplace, -dnl so we use a more sophisticated test for utime than AC_CHECK_FUNCS. -dnl ---------------------------------------------------------------- -AC_MSG_CHECKING(for utime) -AC_TRY_COMPILE([#include <sys/types.h> -#include <utime.h>], -[struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x);], - [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_UTIME)], - [AC_MSG_RESULT(no) - dnl We don't have utime(); how about utimes()? - AC_CHECK_FUNCS(utimes)]) - - -dnl checks for typedefs -AC_TYPE_SIGNAL -AC_TYPE_SIZE_T -AC_TYPE_PID_T -AC_TYPE_UID_T -AC_TYPE_MODE_T -AC_TYPE_OFF_T -AC_CHECK_TYPE(ssize_t, int) - -dnl not AC_CHECK_TYPE; lisp.h does hairy conditional typedef -if test "$ac_cv_header_inttypes_h" != "yes"; then -AC_MSG_CHECKING(for intptr_t in sys/types.h) -AC_TRY_COMPILE([#include <sys/types.h> -intptr_t x; -],[],[AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_INTPTR_T_IN_SYS_TYPES_H,1)], - [AC_MSG_RESULT(no)]) -fi - -dnl check for Unix98 socklen_t -AC_MSG_CHECKING(for socklen_t) -AC_TRY_COMPILE([#include <sys/types.h> -#include <sys/socket.h> -socklen_t x; -],[],[AC_MSG_RESULT(yes)],[ -AC_TRY_COMPILE([#include <sys/types.h> -#include <sys/socket.h> -int accept (int, struct sockaddr *, size_t *); -],[],[ -AC_MSG_RESULT(size_t) -AC_DEFINE(socklen_t,size_t)], [ -AC_MSG_RESULT(int) -AC_DEFINE(socklen_t,int)])]) - -AC_MSG_CHECKING(for struct timeval) -AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME -#include <sys/time.h> -#include <time.h> -#else -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#else -#include <time.h> -#endif -#endif], [static struct timeval x; x.tv_sec = x.tv_usec;], - [AC_MSG_RESULT(yes) - HAVE_TIMEVAL=yes - AC_DEFINE(HAVE_TIMEVAL)], - [AC_MSG_RESULT(no) - HAVE_TIMEVAL=no]) - -dnl checks for structure members -AC_STRUCT_TM -AC_STRUCT_TIMEZONE - -dnl checks for compiler characteristics -AC_C_CONST - -dnl check for Make feature -AC_PROG_MAKE_SET - -dnl check byte order -AC_C_BIGENDIAN - -dnl define SIZEOF_TYPE -AC_CHECK_SIZEOF(short) -if test "$ac_cv_sizeof_short" = 0; then - echo "" - echo "*** PANIC *** Configure tests are not working - compiler is broken." - echo "*** PANIC *** Please examine config.log for compilation errors." - exit 1 -fi -AC_CHECK_SIZEOF(int) -AC_CHECK_SIZEOF(long) -AC_CHECK_SIZEOF(long long) -AC_CHECK_SIZEOF(void *) -AC_CHECK_SIZEOF(double) - -dnl check for long file names -AC_SYS_LONG_FILE_NAMES - -dnl -lm is required for floating point support, among other things -AC_CHECK_FUNC(sin, ,AC_CHECK_LIB(m, sin)) - -AC_TRY_LINK([#include <math.h>], - [return atanh(1.0) + asinh(1.0) + acosh(1.0); ], - AC_DEFINE(HAVE_INVERSE_HYPERBOLIC)) - -dnl See if mkstemp is available -AC_CHECK_FUNCS(mkstemp) - -dnl Determine type of mail locking from configure args and s&m headers -AC_CHECKING(type of mail spool file locking) -AC_CHECK_FUNCS(lockf flock) -dnl The mail_use_xxx variables are set according to the s&m headers. -test -z "$mail_locking" -a "$mail_use_flock" = "yes" && mail_locking=flock -test -z "$mail_locking" -a "$mail_use_lockf" = "yes" && mail_locking=lockf -test -z "$mail_locking" -a "$mail_use_locking" = "yes" && mail_locking=locking -if test -z "$mail_locking"; then - case "$opsys" in cygwin* | mingw*) - mail_locking=pop ;; - esac -fi - -if test "$mail_locking" = "lockf"; then AC_DEFINE(MAIL_LOCK_LOCKF) -elif test "$mail_locking" = "flock"; then AC_DEFINE(MAIL_LOCK_FLOCK) -elif test "$mail_locking" = "locking"; then AC_DEFINE(MAIL_LOCK_LOCKING) -elif test "$mail_locking" = "pop"; then - with_pop=yes - mail_locking= -elif test "$mail_locking" = "mmdf"; then AC_DEFINE(MAIL_LOCK_MMDF) -else mail_locking="file"; AC_DEFINE(MAIL_LOCK_DOT) -fi -test "$mail_locking" = "lockf" -a "$ac_cv_func_lockf" != "yes" && \ - XE_DIE("lockf mail locking requested but not available.") -test "$mail_locking" = "flock" -a "$ac_cv_func_flock" != "yes" && \ - XE_DIE("flock mail locking requested but not available.") -test "$mail_locking" = "locking" -a "$ac_cv_func_locking" != "yes" && \ - XE_DIE("locking mail locking requested but not available.") - -case "$opsys" in decosf*) - AC_CHECK_LIB(pthreads, cma_open) - test "$ac_cv_lib_pthreads_cma_open" = "yes" && \ - c_switch_site="$c_switch_site -threads" ;; -esac - -dnl ---------------------------------------------------------------- -dnl Miscellaneous flags -dnl ---------------------------------------------------------------- - -AC_MSG_CHECKING(whether the -xildoff compiler flag is required) -if ${CC-cc} '-###' -xildon no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then - if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; - then AC_MSG_RESULT(no); - else AC_MSG_RESULT(yes); XE_APPEND(-xildoff, ld_switch_site) - fi - else AC_MSG_RESULT(no) -fi - -dnl Link with "-z ignore" on Solaris if supported -if test "$opsys" = "sol2"; then - if test "$os_release" -ge 506; then - AC_MSG_CHECKING(for \"-z ignore\" linker flag) - case "`ld -h 2>&1`" in - *-z\ ignore\|record* ) AC_MSG_RESULT(yes) - XE_PREPEND(-z ignore, ld_switch_site) ;; - *) AC_MSG_RESULT(no) ;; - esac - fi -fi - -dnl ---------------------- -dnl Choose a window system -dnl ---------------------- - -AC_CHECKING("for specified window system") - -dnl Autodetection of Gdk libraries and includes -dnl ------------------------------------------- -dnl On some systems (FreeBSD springs to mind), they use -dnl versions on the utility routines, so instead of gtk-config -dnl you must use gtk12-config, etc, etc. - -GNOME_CONFIG=no -GTK_CONFIG=no - -if test "$with_gnome" != "no"; then - AC_MSG_CHECKING(for GNOME configuration script) - for possible in gnome-config - do - possible_version=`${possible} --version 2> /dev/null` - if test "x${possible_version}" != "x"; then - GNOME_CONFIG="${possible}" - with_gnome=yes - with_gtk=yes - break - fi - done - AC_MSG_RESULT([${GNOME_CONFIG}]) -fi - -if test "${GNOME_CONFIG}" != "no"; then - GNOME_LIBS=`${GNOME_CONFIG} --libs gnomeui` - GNOME_CFLAGS=`${GNOME_CONFIG} --cflags gnomeui` - AC_DEFINE(HAVE_GNOME) - XE_APPEND(${GNOME_LIBS}, libs_gtk) - XE_APPEND(${GNOME_CFLAGS}, c_switch_gtk) -fi - -if test "$with_gtk" != "no";then - AC_MSG_CHECKING(for GTK configuration script) - for possible in gtk12-config gtk14-config gtk-config - do - possible_version=`${possible} --version 2> /dev/null` - if test "x${possible_version}" != "x"; then - GTK_CONFIG="${possible}" - case "${possible_version}" in - 1.0.*) AC_MSG_WARN([GTK 1.2 is required, please upgrade your version of GTK.]); with_gtk=no;; - 1.3.*) AC_MSG_WARN([GTK 1.3 is not supported right now]); with_gtk=no;; - 1.2.*) - with_gtk=yes - break - ;; - *) AC_MSG_WARN([Found unsupported version of GTK: $possible_version]);; - esac - fi - done - AC_MSG_RESULT([${GTK_CONFIG}]) -fi - -if test "${GTK_CONFIG}" != "no"; then - AC_MSG_CHECKING(gtk version) - GTK_VERSION=`${GTK_CONFIG} --version` - AC_MSG_RESULT(${GTK_VERSION}) - - AC_MSG_CHECKING(gtk libs) - GTK_LIBS=`${GTK_CONFIG} --libs` - XE_APPEND(${GTK_LIBS}, libs_gtk) - AC_MSG_RESULT(${GTK_LIBS}) - - AC_MSG_CHECKING(gtk cflags) - GTK_CFLAGS=`${GTK_CONFIG} --cflags` - if test "$GCC" = "yes"; then - GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow" - fi - XE_APPEND(${GTK_CFLAGS}, c_switch_gtk) - AC_MSG_RESULT(${GTK_CFLAGS}) - - AC_CHECK_LIB(gdk_imlib, main, XE_PREPEND(-lgdk_imlib, libs_gtk)) - AC_CHECK_LIB(Imlib, Imlib_init, XE_APPEND(-lImlib, libs_gtk)) - AC_CHECK_FUNCS(gdk_imlib_init) - - AC_DEFINE(HAVE_XPM) - AC_DEFINE(HAVE_GTK) - AC_SUBST(GTK_CONFIG) - - window_system=gtk - with_gtk=yes - if test "$with_x11" != "no"; then - AC_MSG_WARN([Configuring GTK, forcing with_x11 to no]) - with_x11=no - fi - - for feature in scrollbars toolbars menubars dialogs widgets - do - eval "feature_value=\${with_${feature}}" - case "${feature_value}" in - yes|no|gtk|"" ) - ;; - * ) - feature_conflict_with_gtk=yes - AC_MSG_WARN([--with-${feature}=${feature_value} is incompatible with --with-gtk]) ;; - esac - done - if test "${feature_conflict_with_gtk}" = "yes"; then - XE_DIE(["One or more GUI toolkit features conflict with GTK"]) - fi - - test "${with_scrollbars}" != "no" && with_scrollbars=gtk - test "${with_toolbars}" != "no" && with_toolbars=gtk - test "${with_menubars}" != "no" && with_menubars=gtk - test "${with_dialogs}" != "no" && with_dialogs=gtk - test "${with_widgets}" != "no" && with_widgets=gtk - - dnl Check for libglade support (it rocks) - OLD_CFLAGS="${CFLAGS}" - OLD_CPPFLAGS="${CPPFLAGS}" - OLD_LDFLAGS="${LDFLAGS}" - CFLAGS="${GTK_CFLAGS} ${CFLAGS}" - CPPFLAGS="${GTK_CFLAGS} ${CFLAGS}" - LDFLAGS="${LDFLAGS} ${GTK_LIBS}" - AC_CHECK_HEADERS(glade/glade.h glade.h) - AC_CHECK_LIB(xml, main, XE_PREPEND(-lxml, libs_gtk)) - AC_CHECK_LIB(glade, main, XE_PREPEND(-lglade, libs_gtk)) - AC_CHECK_LIB(glade-gnome, main, XE_PREPEND(-lglade-gnome, libs_gtk)) - AC_EGREP_HEADER([char \*txtdomain;], [glade/glade-xml.h], - [AC_MSG_RESULT(yes) - AC_DEFINE(LIBGLADE_XML_TXTDOMAIN,1)], - [AC_MSG_RESULT(no)]) - CFLAGS="${OLD_CFLAGS}" - CPPFLAGS="${OLD_CPPFLAGS}" - LDFLAGS="${OLD_LDFLAGS}" -fi - -dnl We may eventually prefer gtk/gdk over vanilla X11... - -if test "$with_x11" != "no"; then - dnl User-specified --x-includes or --x-libraries implies --with-x11. - test "$x_includes $x_libraries" != "NONE NONE" && \ - window_system=x11 with_x11=yes - - dnl Autodetection of X11 libraries and includes - dnl ------------------------------------------- - dnl AC_PATH_XTRA thinks it can find our X headers and includes, but - dnl it often gets it wrong, so we only use it as a last resort. - - dnl $OPENWINHOME implies --x-includes and --x-libraries - dnl Not (yet) handled by autoconf2 - if test "$x_includes $x_libraries" = "NONE NONE" \ - -a -n "$OPENWINHOME" \ - -a "$OPENWINHOME" != "/usr/openwin" \ - -a -d "$OPENWINHOME"; then - test -d "$OPENWINHOME/lib" && x_libraries="$OPENWINHOME/lib" - test -d "$OPENWINHOME/include" && x_includes="$OPENWINHOME/include" - test -d "$OPENWINHOME/share/include" && x_includes="$OPENWINHOME/share/include" - fi - - if test "$x_includes" = "NONE"; then - dnl AC_PATH_XTRA often guesses /usr/include, when some other - dnl include directory is a MUCH better guess (Linux, HP-UX 10.20). - dnl This is a workaround for idiot (esp. HP) system vendors, who - dnl provide a /usr/include/X11, but DON'T FULLY POPULATE IT. - for dir in "/usr/X11" "/usr/X11R6"; do - if test -d "$dir/include/X11"; then x_includes="$dir/include"; break; fi - done - fi - - if test "$x_libraries" = "NONE"; then - for dir in "/usr/X11/lib" "/usr/X11R6/lib" "/usr/lib/X11R6"; do - if test -r "$dir/libX11.a"; then x_libraries="$dir"; break; fi - done - fi - - AC_PATH_XTRA # Autoconf claims to find X library and include dirs for us. - if test "$no_x" = "yes" - then with_x11=no window_system=none HAVE_X_WINDOWS=no - else with_x11=yes window_system=x11 HAVE_X_WINDOWS=yes - fi -fi - -dnl #### wmperry:: !x11 != NONE -dnl case "$with_x11" in -dnl yes ) window_system=x11 HAVE_X_WINDOWS=yes ;; -dnl no ) window_system=none HAVE_X_WINDOWS=no ;; -dnl esac - -if test "$with_x11" = "yes"; then - AC_DEFINE(HAVE_X_WINDOWS) - XE_APPEND(lwlib, MAKE_SUBDIR) - XE_APPEND(lwlib, SRC_SUBDIR_DEPS) - - - dnl Look for Motif, but only if not found in $x_includes and $x_libraries - AC_CHECK_HEADER(Xm/Xm.h, [AC_CHECK_LIB(Xm, XmStringFree, got_motif=yes)]) - - if test "$got_motif" != "yes"; then - dnl Try to find Motif/CDE/Tooltalk dirs - dnl These take precedence over other X libs/includes, so PRE-pend - for lib_dir in "/usr/dt/lib" "/usr/lib/Motif2.1" \ - "/usr/lib/Motif1.2" "/usr/lib/Motif1.1"; do - inc_dir=`echo $lib_dir | sed -e 's/lib/include/'` - if test -d "$lib_dir" -a -d "$inc_dir"; then - case "$x_libraries" in *"$lib_dir"* ) ;; *) - x_libraries="$lib_dir $x_libraries" - XE_PREPEND(-L${lib_dir}, X_LIBS) ;; - esac - case "$x_includes" in "$inc_dir"* ) ;; *) - x_includes="$inc_dir $x_includes" - XE_PREPEND(-I${inc_dir}, X_CFLAGS) ;; - esac - break; dnl only need ONE Motif implementation! - fi - done - fi - - dnl Contrib X libs/includes do NOT take precedence, so AP-pend - for rel in "X11R6" "X11R5" "X11R4"; do - lib_dir="/usr/contrib/$rel/lib" inc_dir="/usr/contrib/$rel/include" - if test -d "$lib_dir" -a -d "$inc_dir"; then - case "$x_libraries" in *"$lib_dir"* ) ;; *) - x_libraries="$x_libraries $lib_dir" - XE_APPEND(-L${lib_dir}, X_LIBS) - esac - case "$x_includes" in "$inc_dir"* ) ;; *) - x_includes="$x_includes $inc_dir" - XE_APPEND(-I${inc_dir}, X_CFLAGS) - esac - break; dnl Only need ONE X11 implementation ! - fi - done - - dnl Avoid version mismatch for shared library libXm.so on osf4 - case "$opsys" in - decosf*) if test "$GCC" = yes -a -d /usr/shlib; then XE_APPEND(-L/usr/shlib, X_LIBS); fi ;; - esac - - ld_switch_x_site="$X_LIBS" - - XE_COMPUTE_RUNPATH() - - if test "$extra_verbose" = "yes"; then - echo; echo "X11 compilation variables:" - PRINT_VAR(x_libraries x_includes X_CFLAGS X_LIBS X_PRE_LIBS X_EXTRA_LIBS) - echo - fi - - dnl Set up bitmaps search path. - dnl The original suggestion was to unconditionally to append X11/bitmaps - dnl to each element of $x_includes, I'm pretty sure this is the wrong - dnl thing to do. We test for bitmaps and X11/bitmaps directories on each - dnl element and add them to BITMAPDIR if they exist. - bitmapdirs= - if test "$x_includes" != NONE; then - for i in $x_includes; do - if test -d "$i/bitmaps"; then - bitmapdirs="$i/bitmaps:$bitmapdirs" - fi - if test -d "$i/X11/bitmaps"; then - bitmapdirs="$i/X11/bitmaps:$bitmapdirs" - fi - done - bitmapdirs=`echo "$bitmapdirs" | sed s/.$//` - fi - test ! -z "$bitmapdirs" && AC_DEFINE_UNQUOTED(BITMAPDIR, "$bitmapdirs") - - dnl Autodetect defines extracted from X config by xmkmf, e.g. NARROWPROTO - AC_CHECKING(for X defines extracted by xmkmf) - rm -fr conftestdir - if mkdir conftestdir; then - cd conftestdir - cat > Imakefile <<'EOF' -xetest: - ＠echo ${PROTO_DEFINES} ${STD_DEFINES} -EOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - xmkmf_defines=`${MAKE-make} xetest 2>/dev/null | grep -v make` - fi - cd .. - rm -fr conftestdir - for word in $xmkmf_defines; do - case "$word" in - -D__STDC__*) ;; - -D* ) - sym=`echo '' $word | sed -e 's:^ *-D::' -e 's:=.*::'` - case "$word" in - -D*=* ) val=`echo '' $word | sed -e 's:^.*=::'` ;; - * ) val=1 ;; - esac -dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above. - if grep "^#define $sym " confdefs.h >/dev/null; then :; else - if test "$val" = "1" - then AC_DEFINE_UNQUOTED($sym) - else AC_DEFINE_UNQUOTED($sym,$val) - fi - fi ;; - esac - done - fi - - dnl make sure we can find Intrinsic.h - AC_CHECK_HEADER(X11/Intrinsic.h, , - [AC_MSG_ERROR([Unable to find X11 header files.])]) - - dnl -lXt and -lX11 are required - dnl Some broken systems require the magic "-b i486-linuxaout" flag - AC_CHECK_LIB(X11, XOpenDisplay, have_lib_x11=yes) - if test "$have_lib_x11" != "yes"; then - AC_CHECK_LIB(X11, XGetFontProperty, - ld_switch_x_site="-b i486-linuxaout $ld_switch_x_site", - [AC_MSG_ERROR([Unable to find X11 libraries.])], - -b i486-linuxaout) - fi - libs_x="-lX11" - test "$extra_verbose" = "yes" && echo " Setting libs_x to \"-lX11\"" - - dnl Autodetect -lXext - AC_CHECK_LIB(Xext, XShapeSelectInput, XE_PREPEND(-lXext, libs_x)) - - dnl Require -lXt - AC_CHECK_LIB(Xt, XtOpenDisplay, XE_PREPEND(-lXt, libs_x), - AC_MSG_ERROR([Unable to find X11 libraries.])) - - AC_MSG_CHECKING(the version of X11 being used) - AC_TRY_RUN([#include <X11/Intrinsic.h> - int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }], - [./conftest foobar; x11_release=$?],[x11_release=4],[x11_release=4]) - AC_MSG_RESULT(R${x11_release}) - AC_DEFINE_UNQUOTED(THIS_IS_X11R${x11_release}) - - if test "${x11_release}" = "4"; then - case "$with_widgets" in - "" | "no") with_widgets=no ;; - *) XE_DIE("Widget support requires X11R5 or greater") ;; - esac - fi - - AC_CHECK_FUNCS(XConvertCase XtRegisterDrawable) - - AC_CHECK_HEADERS(X11/Xlocale.h) - - dnl XFree86 has a non-standard prototype for this X11R6 function - AC_CHECK_FUNCS(XRegisterIMInstantiateCallback) - AC_MSG_CHECKING(for standard XRegisterIMInstantiateCallback prototype) - AC_TRY_COMPILE([ -#define NeedFunctionPrototypes 1 -#include <X11/Xlib.h> -extern Bool XRegisterIMInstantiateCallback( - Display*, struct _XrmHashBucketRec*, char*, char*, XIMProc, XPointer*); -], [], - [AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no) - AC_DEFINE(XREGISTERIMINSTANTIATECALLBACK_NONSTANDARD_PROTOTYPE)]) - - dnl autodetect -lXmu - test -z "$with_xmu" && { AC_CHECK_LIB(Xmu, XmuReadBitmapDataFromFile, - with_xmu=yes, with_xmu=no) } - if test "$with_xmu" = "no"; then - XE_ADD_OBJS(xmu.o) - else - XE_PREPEND(-lXmu, libs_x) - AC_DEFINE(HAVE_XMU) - fi - - dnl Autodetect -lXbsd - dnl #### Someone, please add a better function than main - AC_CHECK_LIB(Xbsd, main, XE_PREPEND(-lXbsd, libs_x)) - - dnl Problem with the MIT distribution of X on AIX - if test "$unexec" = "unexaix.o" -a "$x11_release" = "6"; then - dnl X11R6 requires thread-safe code on AIX for some reason - if test "$GCC" = "yes"; then - XE_PREPEND(-mthreads, X_CFLAGS) - XE_PREPEND(-mthreads, libs_x) - else - case "$CC" in - "xlc" ) CC="xlc_r" ;; - "xlC" ) CC="xlC_r" ;; - "cc" ) CC="cc_r" ;; - esac - fi - fi - -fi dnl $with_x11 = yes - -if test "$with_msw" != "no"; then - AC_CHECKING(for MS-Windows) - AC_CHECK_LIB(gdi32,main,with_msw=yes) - if test "$with_msw" = "yes"; then - AC_DEFINE(HAVE_MS_WINDOWS) - - dnl The net installer only works with MS-Windows currently - if test "$with_netinstall" = "yes"; then - XE_APPEND(netinstall, MAKE_SUBDIR) - XE_APPEND(netinstall, SRC_SUBDIR_DEPS) - XE_APPEND(netinstall, INSTALL_ARCH_DEP_SUBDIR) - fi - - install_pp="$srcdir/lib-src/installexe.sh" - XE_APPEND(-limm32 -lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lole32 -luuid -lwinspool -lmpr, libs_system) - if test "$with_dragndrop" != no; then - XE_APPEND(msw, dragndrop_proto) - with_dragndrop=yes - fi - if test "$window_system" != x11; then - window_system=msw - test "$with_scrollbars" != "no" && with_scrollbars=msw - test "$with_menubars" != "no" && with_menubars=msw - test "$with_toolbars" != "no" && with_toolbars=msw - test "$with_dialogs" != "no" && with_dialogs=msw - test "$with_widgets" != "no" && with_widgets=msw - fi - dnl check for our special version of select - AC_TRY_RUN([#include <fcntl.h> - int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }], - [AC_DEFINE(HAVE_MSG_SELECT)]) - fi -fi - -AC_SUBST(install_pp) - -test -z "$with_dragndrop" && with_dragndrop="$with_dragndrop_default" -test -z "$window_system" && window_system="none" - -dnl Test for features that require a window system - ANY window system -if test "$window_system" = "none"; then - for feature in menubars scrollbars toolbars dialogs dragndrop xface - do - if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then - AC_MSG_WARN([--with-$feature ignored: Not valid without window system support]) - fi - eval "with_${feature}=no" - done -else - test -z "$with_toolbars" && with_toolbars=yes -fi - -dnl ### Test for features that require mswindows support - currently none -dnl ### MS-Windows folks: add code here..... (martin) -if test "$with_msw" != "yes"; then - for feature in MARTIN_IS_CLUELESS_ABOUT_MSW_FEATURES - do - if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then - AC_MSG_WARN([--with-$feature ignored: Not valid without MS-Windows support]) - fi - eval "with_${feature}=no" - done -else - : -fi - -dnl Test for features that require X11 support -if test "$with_x11" != "yes"; then - dnl It ought to be reasonable to have no output device at all, and only use - dnl XEmacs in --batch mode. - dnl if test "$with_tty" = "no" ; then - dnl AC_MSG_ERROR([No window system support and no TTY support - Unable to proceed.]) - dnl fi - for feature in tooltalk cde offix wmcommand xim xmu nas_sound - do - if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then - AC_MSG_WARN([--with-$feature ignored: Not valid without X support]) - fi - eval "with_${feature}=no" - done -fi - -dnl Balloon Help requires the Shape extension, not available everywhere, -dnl for example not on AIX 4.3. -if test "$with_x11" = "yes"; then - AC_CHECK_HEADER(X11/extensions/shape.h, [ - AC_DEFINE(HAVE_BALLOON_HELP) - ]) -fi - -dnl FSF 19.29 has some bitmapdir stuff here. -bitmapdir= - -case "$window_system" in - x11 ) HAVE_X_WINDOWS=yes; echo " Using X11." ;; - msw ) HAVE_X_WINDOWS=no ; echo " Using MS-Windows." ;; - gtk ) - HAVE_X_WINDOWS=no - test "$with_gnome" = "yes" && echo " Using GNOME." - test "$with_gnome" = "no" && echo " Using GTK." - ;; - none ) HAVE_X_WINDOWS=no ; echo " Using no window system." ;; -esac - -case "$x_libraries" in *X11R4* ) - test "$opsys" = "hpux9" && opsysfile="s/hpux9-x11r4.h" - test "$opsys" = "hpux9-shr" && opsysfile="s/hpux9shxr4.h" -esac - -dnl Enable or disable proper handling of WM_COMMAND -AC_CHECKING(for WM_COMMAND option); -dnl if test "$with_wmcommand" = "yes"; then -if test "$with_wmcommand" != "no"; then - AC_DEFINE(HAVE_WMCOMMAND) -fi - -dnl Autodetect Xauth -dnl -lXau is only used by gnuclient, so use a special variable for Xauth X libs -test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no -test -z "$with_xauth" && { AC_CHECK_HEADER(X11/Xauth.h, ,with_xauth=no) } -test -z "$with_xauth" && { AC_CHECK_LIB(Xau, XauGetAuthByAddr,[:],with_xauth=no) } -test -z "$with_xauth" && with_xauth=yes -if test "$with_xauth" = "yes"; then - AC_DEFINE(HAVE_XAUTH) - XE_SPACE(libs_xauth, $GTK_LIBS $X_EXTRA_LIBS -lXau $libs_x $X_PRE_LIBS) -fi -AC_SUBST(libs_xauth) - -dnl This one is for the static initializeds variables in -dnl offix.c, so that the thing is dumped after lastfile.o -AC_SUBST(dnd_objs) - -dnl Autodetect dll support - -dnl If g++ is used, we have to explicitly link modules with -lstdc++ on Cygwin -dnl to avoid undefined symbol errors. This will never hurt, so just do it on -dnl all platforms in case others have the same brain damage. -if test "$xemacs_compiler" = "g++"; then - LIBSTDCPP=-lstdc++ -else - LIBSTDCPP= -fi -AC_SUBST(LIBSTDCPP) - -dnl This must come before the detection code for anything that is in a module -if test "$with_modules" != "no"; then - AC_CHECKING(for module support) - - case "$opsys" in - mingw* | cygwin* ) have_dl=yes ;; - darwin ) have_dl=yes - AC_DEFINE(HAVE_DYLD) - ;; - * ) - dnl Check for the ELFish dlopen() - AC_CHECK_HEADER(dlfcn.h, [ - AC_MSG_CHECKING([for dlopen in -lc]) - AC_TRY_LINK([#include <dlfcn.h>],dnl - [dlopen ("", 0);], [ have_dl=yes ], [ - AC_MSG_CHECKING([for dlopen in -ldl]) - ac_save_LIBS="$LIBS" - LIBS="$LIBS -ldl" - AC_TRY_LINK([#include <dlfcn.h>],dnl - [dlopen ("", 0);], [ have_dl=yes ], [ - AC_MSG_CHECKING([for dlopen in -lsvld]) - LIBS="$ac_save_LIBS -lsvld" - AC_TRY_LINK([#include <dlfcn.h>],dnl - [dlopen ("", 0);], [ have_dl=yes ], [LIBS="$ac_save_LIBS"])])])]) - if test "$have_dl" = "yes"; then - AC_DEFINE(HAVE_DLOPEN) - else - dnl Check for HP/UX shl_load - AC_CHECK_HEADER(dl.h, [ - AC_MSG_CHECKING([for shl_load in -lc]) - AC_TRY_LINK([#include <dl.h>],dnl - [shl_load ("", 0, 0);], [have_dl=yes], [ - AC_MSG_CHECKING([for shl_load in -ldl]) - ac_save_LIBS="$LIBS" - LIBS="$LIBS -ldld" - AC_TRY_LINK([#include <dl.h>],dnl - [shl_load ("", 0, 0);], [have_dl=yes], [LIBS="$ac_save_LIBS"])])]) - if test "$have_dl" = "yes"; then - AC_DEFINE(HAVE_SHL_LOAD) - else - dnl Check for libtool's libltdl - AC_CHECK_HEADER(ltdl.h, [ - AC_MSG_CHECKING([for lt_dlinit in -lltdl]) - ac_save_LIBS="$LIBS" - LIBS="$LIBS -lltdl" - AC_TRY_LINK([#include <ltdl.h>],dnl - [lt_dlinit ();], [have_dl=yes], [LIBS="$ac_save_LIBS"])]) - if test "$have_dl" = "yes"; then - AC_DEFINE(HAVE_LTDL) - fi - dnl end !HP/UX - fi - dnl end !dlopen - fi - ac_save_LIBS= - dnl end !darwin - esac - - if test -n "$have_dl"; then - dnl XE_SHLIB_STUFF (in aclocal.m4) defines $can_build_shared - XE_SHLIB_STUFF - fi - - if test "$can_build_shared" = "yes"; then - AC_DEFINE(HAVE_SHLIB) - dnl src must be built before modules on MacOSX and Windows platforms, since - dnl the binary must be available to properly link the modules - dnl For no-module builds, this is added *after* the module directories - XE_APPEND(src, MAKE_SUBDIR) - XE_APPEND(src, INSTALL_ARCH_DEP_SUBDIR) - test -n "$libdl" && XE_PREPEND(-l${libdl}, LIBS) - AC_CHECK_FUNCS(dlerror _dlerror) - with_modules=yes - MOD_CC="../../lib-src/ellcc" - MODCFLAGS="\$(CFLAGS) --mode=compile --mod-output=\$＠ -I../../src -I\$(srcdir)/../../src" - INSTALLPATH="\$(moduledir)" - MOD_INSTALL_PROGRAM=${INSTALL_PROGRAM} - OBJECT_TO_BUILD="\$(MODNAME).ell" - else - if test "$with_modules" = "yes"; then - XE_DIE("Required module support cannot be provided.") - else - echo " No module support." - fi - with_modules=no - fi -fi -if test "$with_modules" != "yes"; then - MOD_CC="$XEMACS_CC" - MODCFLAGS="\$(XE_CFLAGS) -I../../src -I\$(srcdir)/../../src" - INSTALLPATH="" - MOD_INSTALL_PROGRAM="true" - OBJECT_TO_BUILD="\$(MODNAME).o" -fi -MODARCHDIR= -MAKE_DOCFILE="../../lib-src/make-docfile" -AC_SUBST(with_modules) -AC_SUBST(MOD_CC) -AC_SUBST(MODARCHDIR) -AC_SUBST(MAKE_DOCFILE) -AC_SUBST(MODCFLAGS) -AC_SUBST(INSTALLPATH) -AC_SUBST(MOD_INSTALL_PROGRAM) -AC_SUBST(OBJECT_TO_BUILD) - -dnl Autodetect tooltalk -if test "$with_tooltalk" != "no" ; then - dnl autodetect the location of tt_c.h - dnl tt_c.h might be in Tt or desktop include directories - for dir in "" "Tt/" "desktop/" ; do - AC_CHECK_HEADER(${dir}tt_c.h, tt_c_h_file="${dir}tt_c.h"; break) - done - if test -z "$tt_c_h_file"; then - if test "$with_tooltalk" = "yes"; then - USAGE_ERROR("Unable to find required tooltalk header files.") - fi - with_tooltalk=no - fi -fi -if test "$with_tooltalk" != "no" ; then - for extra_libs in "" "-lI18N -lce" "-lcxx"; do - AC_CHECK_LIB(tt, tt_message_create, - tt_libs="-ltt $extra_libs"; break, [:],$extra_libs) - done - if test -z "$tt_libs"; then - if test "$with_tooltalk" = "yes"; then - USAGE_ERROR("Unable to find required tooltalk libraries.") - fi - with_tooltalk=no - fi -fi -test -z "$with_tooltalk" && with_tooltalk=yes -if test "$with_tooltalk" = "yes"; then - AC_DEFINE(TOOLTALK) - AC_DEFINE_UNQUOTED(TT_C_H_FILE, "$tt_c_h_file") - XE_PREPEND($tt_libs, libs_x) -fi - -dnl Autodetect CDE -test -z "$with_cde" && { AC_CHECK_HEADER(Dt/Dt.h, , with_cde=no) } -test -z "$with_cde" && { AC_CHECK_LIB(DtSvc, DtDndDragStart, [:], with_cde=no) } -if test "$with_dragndrop" = "no" ; then - if test "$with_cde" = "yes" ; then - AC_MSG_WARN([--with-cde forced to \`no'; no generic Drag'n'Drop support]) - fi - with_cde=no -fi -test -z "$with_cde" && with_cde=yes -if test "$with_cde" = "yes" ; then - AC_DEFINE(HAVE_CDE) - XE_PREPEND(-lDtSvc, libs_x) - XE_APPEND(CDE, dragndrop_proto) - with_tooltalk=yes # CDE requires Tooltalk - need_motif=yes # CDE requires Motif -fi - -dnl Always compile OffiX unless --without-offix is given, no -dnl X11 support is compiled in, no standard Xmu is available, -dnl or dragndrop support is disabled -dnl Because OffiX support currently loses when more than one display -dnl is in use, we now disable it by default -slb 07/10/1998. -test "$window_system" != "x11" && with_offix=no -if test "$with_xmu" != yes -a "$with_x11" = yes; then - if test "$with_offix" = "yes" ; then - AC_MSG_WARN([--with-offix forced to \`no'; no real Xmu support]) - fi - with_offix=no -fi -if test "$with_dragndrop" = no; then - if test "$with_offix" = "yes" ; then - AC_MSG_WARN([--with-offix forced to \`no'; no generic Drag'n'Drop support]) - fi - with_offix=no -fi -if test "$with_cde" = yes; then - if test "$with_offix" = "yes" ; then - AC_MSG_WARN([--with-offix forced to \`no'; CDE already found]) - fi - with_offix=no -fi -test -z "$with_offix" && with_offix=no -if test "$with_offix" = "yes"; then - AC_DEFINE(HAVE_OFFIX_DND) - XE_APPEND(offix.o, dnd_objs) - XE_APPEND(OffiX, dragndrop_proto) -fi -if test "$with_gtk" = "yes"; then - XE_APPEND(GTK, dragndrop_proto) -fi - -dnl Autodetect Drag'n'Drop support -dnl always included if CDE, Offix, or MSWindows are defined -if test "$with_dragndrop" != "no" ; then - AC_MSG_CHECKING(if drag and drop API is needed) - if test -n "$dragndrop_proto" ; then - with_dragndrop=yes - AC_MSG_RESULT([yes (${dragndrop_proto} )]) - AC_DEFINE(HAVE_DRAGNDROP) - XE_APPEND(dragdrop.o, extra_objs) - else - with_dragndrop=no - AC_MSG_RESULT(no) - fi -fi - -dnl Autodetect LDAP -AC_CHECKING(for LDAP) -ldap_libs= -test -z "$with_ldap" && { AC_CHECK_HEADER(ldap.h, ,with_ldap=no) } -test -z "$with_ldap" && { AC_CHECK_HEADER(lber.h, ,with_ldap=no) } -if test "$with_ldap" != "no"; then - AC_CHECK_LIB(ldap, ldap_search, with_ldap=yes) - dnl Check for other libraries we need to link with to get the main routines. - test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes], , -llber) } - test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes], , -llber -lkrb) } - test "$with_ldap" != "yes" && { AC_CHECK_LIB(ldap, ldap_open, [with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes with_ldap_des=yes], , -llber -lkrb -ldes) } - dnl Recently, we need -lber even though the main routines are elsewhere, - dnl because otherwise be get link errors w.r.t. ber_pvt_opt_on. So just - dnl check for that (it's a variable not a fun but that doesn't seem to - dnl matter in these checks) and stick in -lber if so. Can't hurt (even to - dnl stick it in always shouldn't hurt, I don't think) ... #### Someone who - dnl #### understands LDAP needs to fix this properly. - test "$with_ldap_lber" != "yes" && { AC_CHECK_LIB(lber, ber_pvt_opt_on, with_ldap_lber=yes) } -fi -if test "$with_ldap" = "yes"; then - AC_DEFINE(HAVE_LDAP) - if test "$with_ldap_des" = "yes" ; then - XE_PREPEND(-ldes, ldap_libs) - fi - if test "$with_ldap_krb" = "yes" ; then - XE_PREPEND(-lkrb, ldap_libs) - fi - if test "$with_ldap_lber" = "yes" ; then - XE_PREPEND(-llber, ldap_libs) - fi - XE_PREPEND(-lldap, ldap_libs) - save_LIBS="$LIBS" LIBS="$LIBS $ldap_libs" - AC_CHECK_FUNCS(ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result) - LIBS="$save_LIBS" - XE_APPEND(modules/ldap, MAKE_SUBDIR) - need_modules_common=yes - if test "$with_modules" = "yes"; then - XE_APPEND(modules/ldap, INSTALL_ARCH_DEP_SUBDIR) - fi -fi -AC_SUBST(ldap_libs) - -dnl Autodetect PostgreSQL -dnl On many Linux systems, PostgreSQL is packaged to be installed in /usr; -dnl in this case, configure will easily detect it there. -dnl -dnl If PostgreSQL is installed into a different prefix, -dnl (such as the default /usr/local/pgsql when building from source), -dnl that prefix must be specified using the --site-prefixes flag. -postgresql_libs= -if test "$with_postgresql" != "no"; then - AC_CHECKING(for PostgreSQL) - -dnl Look for these standard header file locations, known to be used on Linux - for header_dir in "" "pgsql/" "postgresql/"; do - AC_CHECK_HEADER(${header_dir}libpq-fe.h, - libpq_fe_h_file=${header_dir}libpq-fe.h; break) - done - - test -n "$libpq_fe_h_file" && { AC_CHECK_LIB(pq,PQconnectdb,have_libpq=yes) } - - if test -n "$libpq_fe_h_file" -a "$have_libpq" = "yes"; then - with_postgresql=yes - AC_DEFINE(HAVE_POSTGRESQL) - AC_CHECK_LIB(pq,PQconnectStart, [ - with_postgresqlv7=yes; - AC_DEFINE(HAVE_POSTGRESQLV7)]) - AC_DEFINE_UNQUOTED(LIBPQ_FE_H_FILE, "$libpq_fe_h_file") - XE_PREPEND(-lpq, postgresql_libs) - XE_APPEND(modules/postgresql, MAKE_SUBDIR) - need_modules_common=yes - if test "$with_modules" = "yes"; then - XE_APPEND(modules/postgresql, INSTALL_ARCH_DEP_SUBDIR) - fi - elif test "$with_postgresql" = "yes"; then - XE_DIE("Required PostgreSQL support cannot be provided. Check --site-prefixes.") - fi -fi -AC_SUBST(postgresql_libs) - -dnl ---------------------- -dnl Graphics libraries -dnl ---------------------- - -if test "$window_system" != "none"; then - AC_CHECKING(for graphics libraries) - - dnl add special code to handle xpm-nox on Cygwin (csw) - dnl -- should only happen if CYGWIN && WITH_XPM && WITH_MSW && !WITH_X - libpath_xpm= - incpath_xpm= - case "$opsys" in - cygwin*) - cygwin_top=`eval "gcc -print-file-name=libc.a"` ; - cygwin_top=`eval "dirname ${cygwin_top}"`; - cygwin_top="${cygwin_top}/.."; - case "$window_system" in - dnl use "standard" search pattern - x11) ;; - dnl hardcode "standard" non-X11 xpm lib/inc dirs - msw) libpath_xpm="-L${cygwin_top}/lib/noX" - incpath_xpm="-I${cygwin_top}/include/noX" - ;; - dnl not supported on cygwin (yet?) - gtk) ;; - dnl probably not reached... - none) ;; - dnl ditto - *) ;; - esac - ;; - dnl use "standard" search pattern for all other OS's - *) ;; - esac - dnl Autodetect Xpm - xpm_problem="" - if test -z "$with_xpm"; then - XE_PREPEND("$incpath_xpm", CFLAGS) - XE_PREPEND("$libpath_xpm", LDFLAGS) - AC_MSG_CHECKING(for Xpm - no older than 3.4f) - xe_check_libs=-lXpm - AC_TRY_RUN([#define XPM_NUMBERS -#include <X11/xpm.h> - int main(int c, char **v) { - return c == 1 ? 0 : - XpmIncludeVersion != XpmLibraryVersion() ? 1 : - XpmIncludeVersion < 30406 ? 2 : 0 ;}], - [./conftest dummy_arg; xpm_status=$?; - if test "$xpm_status" = "0"; then - with_xpm=yes; - else - with_xpm=no; - if test "$xpm_status" = "1"; then - xpm_problem="Xpm library version and header file version don't match!" - elif test "$xpm_status" = "2"; then - xpm_problem="Xpm library version is too old!" - else - xpm_problem="Internal xpm detection logic error!" - fi - echo " -*** WARNING *** $xpm_problem - I'm not touching that with a 10-foot pole! - If you really want to use the installed version of Xpm, rerun - configure and add '--with-xpm=yes', but don't blame me if XEmacs crashes!" - fi], - [with_xpm=no]) - xe_check_libs= - AC_MSG_RESULT($with_xpm) - fi - if test "$with_xpm" = "yes"; then - dnl #### This code assumes that if AC_CHECK_LIB fails, - dnl #### then it will succeed if FOR_MSW is defined, - dnl #### but doesn't actually verify this assumption. - AC_DEFINE(HAVE_XPM) - XE_PREPEND("$libpath_xpm", LDFLAGS) - XE_PREPEND(-lXpm, libs_x) - XE_PREPEND("$incpath_xpm", CFLAGS) - AC_MSG_CHECKING(for \"FOR_MSW\" xpm) - xe_check_libs=-lXpm - AC_TRY_LINK(, [XpmCreatePixmapFromData()], - [xpm_for_msw=no], - [xpm_for_msw=yes]) - xe_check_libs= - AC_MSG_RESULT($xpm_for_msw) - if test "$xpm_for_msw" = "yes"; then - AC_DEFINE(FOR_MSW) - fi - fi - - dnl Autodetect XFACE - test -z "$with_xface" && { AC_CHECK_HEADER(compface.h, ,with_xface=no) } - test -z "$with_xface" && { AC_CHECK_LIB(compface, UnGenFace,[:] ,with_xface=no) } - test -z "$with_xface" && with_xface=yes - if test "$with_xface" = "yes"; then - AC_DEFINE(HAVE_XFACE) - XE_PREPEND(-lcompface, libs_x) - fi - - dnl For a brief period we had the GIF code split out into a separate library, - dnl but patent problems, etc. sort of squashed that idea. - dnl We default to building with builtin GIF decoding - if test "$with_gif" != "no"; then - with_gif="yes" - AC_DEFINE(HAVE_GIF) - fi - - dnl Too many stupid linkers can't detect cascaded lib dependencies until runtime - dnl So we always search for libz compression support. - if test "$with_png $with_tiff" != "no no"; then - AC_CHECK_LIB(c, inflate, [:], [ - AC_CHECK_LIB(z, inflate, [XE_PREPEND(-lz, libs_x)],[ - AC_CHECK_LIB(gz, inflate, [XE_PREPEND(-lgz, libs_x)])])]) - fi - - dnl autodetect JPEG - test -z "$with_jpeg" && { AC_CHECK_HEADER(jpeglib.h, ,with_jpeg=no) } - test -z "$with_jpeg" && { AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,[:],with_jpeg=no) } - test -z "$with_jpeg" && with_jpeg=yes - if test "$with_jpeg" = "yes"; then - AC_DEFINE(HAVE_JPEG) - XE_PREPEND(-ljpeg, libs_x) - fi - - dnl autodetect PNG - png_problem="" - test -z "$with_png" && { AC_CHECK_FUNC(pow, ,with_png=no) } - test -z "$with_png" && { AC_CHECK_HEADER(png.h, ,with_png=no) } - test -z "$with_png" && { AC_CHECK_LIB(png, png_read_image,[:],with_png=no) } - if test -z "$with_png"; then - AC_MSG_CHECKING(for workable png version information) - xe_check_libs="-lpng -lz" - AC_TRY_RUN([#include <png.h> - int main(int c, char **v) { - if (c == 1) return 0; - if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1; - return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}], - [./conftest dummy_arg; png_status=$?; - if test "$png_status" = "0"; then - with_png=yes; - else - with_png=no; - if test "$png_status" = "1"; then - png_problem="PNG library version and header file don't match!" - elif test "$png_status" = "2"; then - png_problem="PNG library version too old (pre 1.0.2)!" - fi - echo " -*** WARNING *** $png_problem - I'm not touching that with a 10-foot pole! - If you really want to use the installed version of libPNG, rerun - configure and add '--with-png=yes', but don't blame me if XEmacs crashes!" - fi], - [with_png=no]) - xe_check_libs= - AC_MSG_RESULT($with_png) - fi - if test "$with_png" = "yes"; then - AC_DEFINE(HAVE_PNG) - XE_PREPEND(-lpng, libs_x) - fi - - dnl autodetect TIFF - test -z "$with_tiff" && { AC_CHECK_HEADER(tiffio.h, ,with_tiff=no) } - test -z "$with_tiff" && { AC_CHECK_LIB(tiff, TIFFClientOpen,[:],with_tiff=no) } - test -z "$with_tiff" && with_tiff=yes - if test "$with_tiff" = "yes"; then - AC_DEFINE(HAVE_TIFF) - XE_PREPEND(-ltiff, libs_x) - fi -fi - -dnl ---------------------- -dnl GTK-Specific Graphics libraries -dnl ---------------------- - -if test "$with_gtk" = "yes"; then - dnl Autodetect XFACE - test -z "$with_xface" && { AC_CHECK_HEADER(compface.h, ,with_xface=no) } - test -z "$with_xface" && { AC_CHECK_LIB(compface, UnGenFace,[:] ,with_xface=no) } - test -z "$with_xface" && with_xface=yes - if test "$with_xface" = "yes"; then - AC_DEFINE(HAVE_XFACE) - XE_PREPEND(-lcompface, libs_gtk) - fi -fi - - -dnl ---------------------- -dnl X-Specific Graphics libraries -dnl ---------------------- - -if test "$with_x11" = "yes"; then - AC_CHECKING(for X11 graphics libraries) -fi - -dnl We don't automatically trigger widgets if athena is present -dnl because of stability concerns. -dnl But if the user wants widgets, still offer him autodetections -case "$with_widgets" in - "yes" | "athena") detect_athena=yes ;; - *) detect_athena=no ;; -esac - -if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then - AC_CHECKING(for the Athena widgets) - - dnl What in heck did the user actually want? - case "$with_athena" in - dnl This is the default, old fashioned flat Athena. - "xaw" | "") athena_variant=Xaw athena_3d=no ;; - "3d") athena_variant=Xaw3d athena_3d=yes ;; - "next") athena_variant=neXtaw athena_3d=yes ;; - "95") athena_variant=Xaw95 athena_3d=yes ;; - "xpm") athena_variant=XawXpm athena_3d=yes ;; - *) XE_DIE("Unknown Athena widget set \`$with_athena'. This should not happen.") ;; - esac - - dnl Search for the Athena library... - if test "$athena_3d" = "no"; then - AC_CHECK_LIB($athena_variant, XawScrollbarSetThumb, - [ - dnl Must not be a 3d library... - AC_CHECK_LIB($athena_variant, threeDClassRec, - AC_MSG_WARN([Could not find a non-3d Athena widget library.]), - athena_lib=$athena_variant) - ], - AC_MSG_WARN([Could not find an Athena widget library.])) - else - dnl The real configuration, need 3d library - AC_CHECK_LIB($athena_variant, threeDClassRec, athena_lib=$athena_variant, - dnl OK, couldn't find it with a proper name, try the standard Athena lib - dnl If that is 3d, presume the user asked for what they have installed. - AC_CHECK_LIB(Xaw, threeDClassRec, - [ - athena_lib=Xaw; - AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]); - ], - AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.]))) - fi - - dnl Now we locate the Athena headers that we need. - if test "$athena_3d" = "no"; then - AC_CHECK_HEADER(X11/Xaw/ThreeD.h, - AC_MSG_WARN([Could not find a non-3d Athena header set.]), - AC_CHECK_HEADER(X11/Xaw/XawInit.h, - athena_h_path=X11/Xaw, - AC_MSG_WARN([Could not find a non-3d Athena header set.]))) - else - dnl The three-d Athena headers are so much more slippery. - dnl Curse this `Lets replace standard libraries' thing that they did. :/ - AC_CHECK_HEADER(X11/$athena_variant/XawInit.h, - AC_CHECK_HEADER(X11/$athena_variant/ThreeD.h, - athena_h_path=X11/$athena_variant,)) - - dnl Is the variant specific header directory directly under include? - if test -z "$athena_h_path"; then - AC_CHECK_HEADER($athena_variant/XawInit.h, - AC_CHECK_HEADER($athena_variant/ThreeD.h, - athena_h_path=$athena_variant,)) - fi - - dnl If we couldn't find the specific variant, try the generic Athena 3d headers - if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then - AC_CHECK_HEADER(X11/Xaw3d/XawInit.h, - AC_CHECK_HEADER(X11/Xaw3d/ThreeD.h, - [ - AC_MSG_WARN([Assuming that X11/Xaw3d headers are suitable for $athena_variant.]) - athena_h_path=X11/Xaw3d - ],)) - fi - - dnl Also generic 3d headers directly under include dir - if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then - AC_CHECK_HEADER(Xaw3d/XawInit.h, - AC_CHECK_HEADER(Xaw3d/ThreeD.h, - [ - AC_MSG_WARN([Assuming that Xaw3d headers are suitable for $athena_variant.]) - athena_h_path=Xaw3d - ],)) - fi - - dnl If nothing yet found, see if Xaw is a 3d header set... - dnl We AC_MSG_WARN if we fail because I am all out of ideas... - if test -z "$athena_h_path"; then - AC_CHECK_HEADER(X11/Xaw/ThreeD.h, - [ - AC_MSG_WARN([Assuming that X11/Xaw headers are suitable for $athena_variant.]) - athena_h_path=X11/Xaw - ], - AC_MSG_WARN([Could not find a suitable 3d Athena header set.])) - fi - fi - - dnl Do we actually have a usable Athena widget set? Please? - if test -n "$athena_lib" -a -n "$athena_h_path"; then - have_xaw=yes - else - have_xaw=no - fi - -else - have_xaw=no -fi dnl "$with_x11" = "yes" -a "detect_athena" = "yes" - -if test "$with_x11" = "yes"; then - dnl autodetect Motif - but only add to libs_x later (if necessary) - AC_CHECK_HEADER(Xm/Xm.h, - [AC_CHECK_LIB(Xm, XmStringFree, have_motif=yes, have_motif=no)], - have_motif=no) - - if test "$have_motif" = "yes"; then - dnl autodetect lesstif - AC_MSG_CHECKING(for Lesstif) - AC_EGREP_CPP(yes, -[#include <Xm/Xm.h> -#ifdef LESSTIF_VERSION -yes -#endif -], have_lesstif=yes, have_lesstif=no) - AC_MSG_RESULT($have_lesstif) - fi - -fi dnl "$with_x11" = "yes" - -dnl Finish ensuring that we have values for the various toolkit items. -dnl Not all toolkits support all widgets -dnl if Motif is available we use it for the dialog boxes. - -case "$with_menubars" in "" | "yes" | "athena" ) - with_menubars="lucid" ;; -esac -case "$with_dialogs" in "" | "yes" | "lucid" ) - if test "$have_motif" = "yes"; then with_dialogs="motif" - elif test "$have_xaw" = "yes"; then with_dialogs="athena" - elif test "$with_msw" = "yes"; then with_dialogs="msw" - else with_dialogs=no - fi ;; -esac -case "$with_scrollbars" in "" | "yes" ) - with_scrollbars="lucid" ;; -esac -case "$with_widgets" in "" | "yes" | "lucid") - if test "$have_motif" = "yes"; then with_widgets="motif" - elif test "$have_xaw" = "yes"; then with_widgets="athena" - elif test "$with_msw" = "yes"; then with_widgets="msw" - else with_widgets=no - fi ;; -esac - -all_widgets="$with_menubars $with_scrollbars $with_dialogs $with_toolbars $with_widgets" - -case "$all_widgets" in - *athena* ) - if test "$have_xaw" != "yes"; then - XE_DIE("Could not find a suitable Athena library to build with.") - fi - - dnl Add the Lucid widget Athena code - XE_APPEND(lwlib-Xaw.o, lwlib_objs) - - dnl Add the Athena widget library we located earlier - XE_PREPEND(-l$athena_lib, libs_x) - - dnl Tell lwlib where to find the Athena header files. - dnl Many people have tried to create a `smart' way of doing this, - dnl but all have failed. Before changing the following ugly definitions, - dnl consult the veterans of many a battle. - AC_DEFINE_UNQUOTED(ATHENA_Scrollbar_h_,"$athena_h_path/Scrollbar.h") - AC_DEFINE_UNQUOTED(ATHENA_Dialog_h_,"$athena_h_path/Dialog.h") - AC_DEFINE_UNQUOTED(ATHENA_Form_h_,"$athena_h_path/Form.h") - AC_DEFINE_UNQUOTED(ATHENA_Command_h_,"$athena_h_path/Command.h") - AC_DEFINE_UNQUOTED(ATHENA_Label_h_,"$athena_h_path/Label.h") - AC_DEFINE_UNQUOTED(ATHENA_LabelP_h_,"$athena_h_path/LabelP.h") - AC_DEFINE_UNQUOTED(ATHENA_Toggle_h_,"$athena_h_path/Toggle.h") - AC_DEFINE_UNQUOTED(ATHENA_ToggleP_h_,"$athena_h_path/ToggleP.h") - AC_DEFINE_UNQUOTED(ATHENA_AsciiText_h_,"$athena_h_path/AsciiText.h") - AC_DEFINE_UNQUOTED(ATHENA_XawInit_h_,"$athena_h_path/XawInit.h") - - AC_DEFINE(LWLIB_USES_ATHENA) - AC_DEFINE(NEED_ATHENA) - need_athena="yes" - - if test "$athena_3d" = "yes"; then - AC_DEFINE(HAVE_ATHENA_3D) - fi - ;; -esac - -case "$all_widgets" in *motif* ) - AC_DEFINE(LWLIB_USES_MOTIF) - AC_DEFINE(NEED_MOTIF) - XE_APPEND(lwlib-Xm.o, lwlib_objs) - need_motif=yes ;; -esac - -test "$with_menubars" = "lucid" && XE_APPEND(xlwmenu.o, lwlib_objs) -test "$with_menubars" = "motif" && XE_APPEND(xlwmenu.o, lwlib_objs) -test "$with_scrollbars" = "lucid" && XE_APPEND(xlwscrollbar.o, lwlib_objs) -test "$with_widgets" != "no" && test "$with_widgets" != "msw" && \ - XE_APPEND(xlwtabs.o xlwgcs.o, lwlib_objs) -case "$with_widgets" in athena* ) - XE_APPEND(xlwradio.o xlwcheckbox.o xlwgauge.o, lwlib_objs);; -esac -case "$all_widgets" in *lucid* ) - AC_DEFINE(NEED_LUCID) - XE_APPEND(lwlib-Xlw.o, lwlib_objs) ;; -esac - -AC_SUBST(lwlib_objs) - -test "$with_scrollbars" = "athena" && AC_DEFINE(LWLIB_SCROLLBARS_ATHENA) -test "$with_dialogs" = "athena" && AC_DEFINE(LWLIB_DIALOGS_ATHENA) - -if test "$athena_3d" = "yes"; then - test "$with_scrollbars" = "athena" && AC_DEFINE(LWLIB_SCROLLBARS_ATHENA3D) - test "$with_dialogs" = "athena" && AC_DEFINE(LWLIB_DIALOGS_ATHENA3D) -fi - -case "$with_widgets" in athena* ) AC_DEFINE(LWLIB_WIDGETS_ATHENA);; esac -test "$with_widgets" != "no" && test "$with_widgets" != "msw" && \ - AC_DEFINE(LWLIB_TABS_LUCID) - -test "$with_menubars" != "no" && AC_DEFINE(HAVE_MENUBARS) -test "$with_scrollbars" != "no" && AC_DEFINE(HAVE_SCROLLBARS) -test "$with_dialogs" != "no" && AC_DEFINE(HAVE_DIALOGS) -test "$with_toolbars" != "no" && AC_DEFINE(HAVE_TOOLBARS) -test "$with_widgets" != "no" && AC_DEFINE(HAVE_WIDGETS) - -test "$with_menubars" = "lucid" && AC_DEFINE(LWLIB_MENUBARS_LUCID) -test "$with_scrollbars" = "lucid" && AC_DEFINE(LWLIB_SCROLLBARS_LUCID) - -test "$with_menubars" = "motif" && AC_DEFINE(LWLIB_MENUBARS_MOTIF) -test "$with_scrollbars" = "motif" && AC_DEFINE(LWLIB_SCROLLBARS_MOTIF) -test "$with_dialogs" = "motif" && AC_DEFINE(LWLIB_DIALOGS_MOTIF) -test "$with_widgets" = "motif" && AC_DEFINE(LWLIB_WIDGETS_MOTIF) - -dnl ---------------------- -dnl Mule-dependent options -dnl ---------------------- - -test -z "$with_mule" && with_mule=no - -dnl if test "$with_mule" = "yes" && test ! -d "$srcdir/lisp/mule"; then -dnl echo "Attempt to Build with Mule without Mule/Lisp" -dnl echo "Please install the XEmacs/Mule tarball or" -dnl echo "rerun configure with --with-mule=no" -dnl exit 1 -dnl fi - -if test "$with_default_eol_detection" = "yes"; then - AC_DEFINE(HAVE_DEFAULT_EOL_DETECTION) -fi - -if test "$with_mule" = "yes" ; then - AC_CHECKING(for Mule-related features) - AC_DEFINE(MULE) - - dnl Use -lintl to get internationalized strerror for Mule - AC_CHECK_HEADERS(libintl.h) - AC_CHECK_LIB(intl, strerror) - - AC_CHECKING(for Mule input methods) - dnl Do we have the XmIm* routines? And if so, do we want to use them? - dnl XIM seems to be flaky except on Solaris... - dnl test -z "$with_xim" -a "$opsys" != "sol2" && with_xim=no - case "$with_xim" in "" | "yes" ) - AC_CHECKING(for XIM) - AC_CHECK_LIB(X11, XOpenIM, with_xim=xlib, with_xim=no) - dnl XIM + Lesstif is not (yet?) usable - if test "$have_motif $have_lesstif" = "yes no"; then - AC_CHECK_LIB(Xm, XmImMbLookupString, with_xim=motif) - fi ;; - esac - if test "$with_xim" != "no"; then - AC_DEFINE(HAVE_XIM) - if test "$with_xim" = "xlib"; then - AC_DEFINE(XIM_XLIB) - XE_ADD_OBJS(input-method-xlib.o) - fi - if test "$with_xim" = "motif"; then - AC_DEFINE(XIM_MOTIF) - need_motif=yes - XE_ADD_OBJS(input-method-motif.o) - fi - if test "$with_xim" = "motif"; then - with_xfs=no - fi - fi - - dnl "with_xfs" = "yes" - if test "$with_xfs" = "yes" ; then - AC_CHECKING(for XFontSet) - AC_CHECK_LIB(X11, XmbDrawString, [:], with_xfs=no) - if test "$with_xfs" = "yes" && test "$with_menubars" = "lucid"; then - AC_DEFINE(USE_XFONTSET) - if test "$with_xim" = "no" ; then - XE_ADD_OBJS(input-method-xlib.o) - fi - fi - fi dnl with_xfs - - dnl Autodetect WNN - test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support - test -z "$with_wnn" && { AC_CHECK_HEADER(wnn/jllib.h, ,with_wnn=no) } - dnl gcc 2.97 fixincludes breaks inclusion of wnn/commonhd.h - test -z "$with_wnn" && { AC_CHECK_HEADER(wnn/commonhd.h, ,with_wnn=no) } - dnl Detour to find crypt - if test "$with_wnn" != "no"; then - AC_CHECK_FUNCS(crypt) - test "$ac_cv_func_crypt" != "yes" && { AC_CHECK_LIB(crypt, crypt) } - fi - dnl Back to our regularly scheduled wnn hunting - if test -z "$with_wnn" -o "$with_wnn" = "yes"; then - AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn, - AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4, - AC_CHECK_LIB(wnn6,jl_dic_list_e,libwnn=wnn6, - AC_CHECK_LIB(wnn6_fromsrc,dic_list_e,libwnn=wnn6_fromsrc,with_wnn=no)))) - fi - test -z "$with_wnn" && with_wnn=yes - if test "$with_wnn" = "yes"; then - AC_DEFINE(HAVE_WNN) - XE_PREPEND(-l$libwnn, libs_x) - if test "$with_wnn6" != "no"; then - AC_CHECK_LIB($libwnn, jl_fi_dic_list, with_wnn6=yes) - test "$with_wnn6" = "yes" && AC_DEFINE(WNN6) - fi - fi - - dnl Autodetect canna - canna_includes_found=no - if test "$with_canna" != "no"; then - AC_CHECK_HEADER(canna/jrkanji.h,canna_includes_found=yes) - fi - if test "$canna_includes_found" = "no" -a "$with_canna" != "no" -a \ - -d "/usr/local/canna/include"; then - save_c_switch_site="$c_switch_site" - c_switch_site="$c_switch_site -I/usr/local/canna/include" - AC_CHECK_HEADER(canna/jrkanji.h,canna_includes_found=yes) - if test "$canna_includes_found" != "yes"; then - c_switch_site="$save_c_switch_site" - with_canna="no" - fi - fi - - test -z "$with_canna" && { AC_CHECK_HEADER(canna/RK.h, , with_canna=no) } - test -z "$with_canna" && { AC_CHECK_LIB(RKC, RkBgnBun, [:],with_canna=no) } - test -z "$with_canna" && { AC_CHECK_LIB(canna,jrKanjiControl,[:],with_canna=no) } - test -z "$with_canna" && with_canna=yes - if test "$with_canna" = "yes"; then - AC_DEFINE(HAVE_CANNA) - XE_PREPEND(-lcanna -lRKC, libs_x) - fi - -else dnl "$with_mule" = "no" - for feature in xim canna wnn; do - if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then - AC_MSG_WARN([--with-${feature} ignored: Not valid without Mule support]) - fi - eval "with_${feature}=no" - done -fi dnl with_mule - - -dnl At this point, we know whether we need the motif lib or not. -if test "$need_motif" = "yes" ; then - XE_PREPEND(-lXm, libs_x) - dnl AIX needs the following library for use with Motif - AC_CHECK_LIB(i18n, layout_object_getvalue, [XE_PREPEND(-li18n, libs_x)]) - XE_COMPUTE_RUNPATH() -fi - -dnl ---------------------------------------------------------------- -dnl Check for POSIX functions -dnl ---------------------------------------------------------------- - -AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen) - -dnl getaddrinfo() is borked under hpux11 -if test "$ac_cv_func_getaddrinfo" != "no" ; then - case "$opsys" in - hpux11 ) - AC_MSG_WARN([Use of getaddrinfo is disabled for HP-UX 11.XX.]) - ac_cv_func_getaddrinfo=no - ;; - esac -fi - -dnl ---------------------------------------------------------------- -dnl Check for Unixoid pty/process support. -dnl ---------------------------------------------------------------- - -dnl There is no "standard" pty allocation method. Every system is different. -dnl getpt() is the preferred pty allocation method on glibc systems. -dnl _getpty() is the preferred pty allocation method on SGI systems. -dnl grantpt(), unlockpt(), ptsname() are defined by Unix98. -AC_CHECK_FUNCS(getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp) - -dnl openpty() is the preferred pty allocation method on BSD and Tru64 systems. -dnl openpty() might be declared in: -dnl - pty.h (Tru64 or Linux) -dnl - libutil.h (FreeBSD) -dnl - util.h (NetBSD) -AC_CHECK_FUNC(openpty, have_openpty=yes, [ - AC_CHECK_LIB(util, openpty, have_openpty=yes need_libutil=yes)]) -if test "$have_openpty" = "yes"; then - AC_DEFINE(HAVE_OPENPTY) - AC_CHECK_HEADERS(libutil.h util.h, break) - test "$need_libutil" = "yes" && XE_APPEND(-lutil, libs_system) -fi - -dnl Check for system-specific pty header files -dnl Often the TIOCSIG* symbols are hiding there. -case "$opsys" in - dnl HPUX pty.h #defines TRUE and FALSE, so just use ptyio.h there. - hpux*) AC_CHECK_HEADERS(sys/ptyio.h) ;; - *) AC_CHECK_HEADERS(pty.h) - test "$ac_cv_header_pty_h" = "no" && AC_CHECK_HEADERS(sys/pty.h) - ;; -esac - -dnl Check for STREAM support functions. -dnl Confusingly, "str" means both "string" and "SysV Streams". -AC_CHECK_HEADERS(stropts.h) -if test "$ac_cv_header_stropts_h" = "yes"; then - AC_CHECK_FUNCS(isastream) - AC_CHECK_HEADERS(strtio.h) dnl TIOCSIGNAL -fi - -dnl Check whether the system provides getloadavg(). -AC_CHECK_FUNCS(getloadavg) - -if test "$ac_cv_func_getloadavg" = "yes"; then - dnl Solaris 8 declares getloadavg() in <sys/loadavg.h>. - dnl glibc 2.2 declares getloadavg() in <stdlib.h>... - dnl ...if we #define _GNU_SOURCE, which we do. - AC_CHECK_HEADERS(sys/loadavg.h) -else - dnl We define our own getloadavg() using lower level functions. - XE_ADD_OBJS(getloadavg.o) - - dnl Used by getloadavg() - does not require root priveleges - AC_CHECK_LIB(kstat, kstat_open) - AC_CHECK_HEADERS(kstat.h) - - dnl Another way to get the load average - AC_CHECK_LIB(kvm, kvm_read) -fi - -dnl If netdb.h does not declare h_errno, we must declare it by hand. -AC_MSG_CHECKING(whether netdb declares h_errno) -AC_TRY_LINK([#include <netdb.h>], - [return h_errno;], - [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_H_ERRNO)], - [AC_MSG_RESULT(no)]) - -AC_MSG_CHECKING(for sigsetjmp) -AC_TRY_COMPILE([#include <setjmp.h>], - [sigjmp_buf bar; sigsetjmp (bar, 0);], - [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SIGSETJMP)], - [AC_MSG_RESULT(no)]) - -AC_MSG_CHECKING(whether localtime caches TZ) -AC_CACHE_VAL(emacs_cv_localtime_cache, -[if test "$ac_cv_func_tzset" = "yes"; then -AC_TRY_RUN([#include <time.h> -#if STDC_HEADERS -# include <stdlib.h> -#endif -extern char **environ; -unset_TZ () -{ - char **from, **to; - for (to = from = environ; (*to = *from); from++) - if (! (to[0][0] == 'T' && to[0][1] == 'Z' && to[0][2] == '=')) - to++; -} -char TZ_GMT0[] = "TZ=GMT0"; -char TZ_PST8[] = "TZ=PST8"; -main() -{ - time_t now = time ((time_t *) 0); - int hour_GMT0, hour_unset; - if (putenv (TZ_GMT0) != 0) - exit (1); - hour_GMT0 = localtime (&now)->tm_hour; - unset_TZ (); - hour_unset = localtime (&now)->tm_hour; - if (putenv (TZ_PST8) != 0) - exit (1); - if (localtime (&now)->tm_hour == hour_GMT0) - exit (1); - unset_TZ (); - if (localtime (&now)->tm_hour != hour_unset) - exit (1); - exit (0); -}], emacs_cv_localtime_cache=no, emacs_cv_localtime_cache=yes, -[# If we have tzset, assume the worst when cross-compiling. -emacs_cv_localtime_cache=yes]) -else - # If we lack tzset, report that localtime does not cache TZ, - # since we can't invalidate the cache if we don't have tzset. - emacs_cv_localtime_cache=no -fi],[:])dnl -AC_MSG_RESULT($emacs_cv_localtime_cache) -if test $emacs_cv_localtime_cache = yes; then - AC_DEFINE(LOCALTIME_CACHE) -fi - -if test "$HAVE_TIMEVAL" = "yes"; then -AC_MSG_CHECKING(whether gettimeofday accepts one or two arguments) -AC_TRY_LINK([ -#ifdef TIME_WITH_SYS_TIME -#include <sys/time.h> -#include <time.h> -#else -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#else -#include <time.h> -#endif -#endif - ], - [ - struct timeval time; - gettimeofday (&time, 0); -], - [AC_MSG_RESULT(two)], - [AC_MSG_RESULT(one) - AC_DEFINE(GETTIMEOFDAY_ONE_ARGUMENT)]) -fi - - -AC_C_INLINE -test "$ac_cv_c_inline" != "no" -a "$GCC" = "yes" && XE_ADD_OBJS(inline.o) - -dnl check for the typeof extension -AC_MSG_CHECKING(for typeof) -AC_TRY_COMPILE(, [int i; __typeof__(i) j;], typeofname="__typeof__", - [AC_TRY_COMPILE(, [int i; typeof(i) j;], typeofname="typeof", - typeofname=no)]) -AC_MSG_RESULT($typeofname) -if test "$typeofname" != "no"; then - AC_DEFINE_UNQUOTED(TYPEOF, $typeofname) -fi - -dnl HP-UX has a working alloca in libPW. -dnl case "${GCC}${opsys}" in hpux* ) -dnl AC_CHECK_FUNC(alloca, [:], [AC_CHECK_LIB(PW, alloca)]) -dnl esac - -dnl AC_FUNC_ALLOCA doesn't know about DEC C's #pragma intrinsic(alloca) -if test "$__DECC" != "yes"; then - AC_FUNC_ALLOCA - test -n "$ALLOCA" && XE_ADD_OBJS($ALLOCA) -fi - -AC_MSG_CHECKING(for working alloca in function calls) -AC_TRY_RUN([ -#if defined (__CYGWIN__) -#include <alloca.h> -#elif defined (__GNUC__) -#define alloca __builtin_alloca -#elif defined (__DECC) -#include <alloca.h> -#pragma intrinsic(alloca) -#elif defined (HAVE_ALLOCA_H) -#include <alloca.h> -#elif defined (_AIX) -#pragma alloca -#elif ! defined (alloca) -#ifdef C_ALLOCA -#define alloca xemacs_c_alloca -#else -void *alloca (); -#endif /* C_ALLOCA */ -#endif /* !defined (alloca) */ - -void -f1 (double a, void *ptr, int b) -{ - unsigned char *ptr2 = (unsigned char *) ptr; - if (ptr2[0] != 0xBF || ptr2[1] != 0xBF || ptr2[3000] != 0xBF) - exit (1); - if (a != 3.1415 || b != -5490) - exit (1); -} - -int -f2 (short c, void *ptr, long e) -{ - unsigned char *ptr2 = (unsigned char *) ptr; - if (ptr2[0] != 0xFB || ptr2[1] != 0xFB || ptr2[1000] != 0xFB) - exit (1); - if (c != 665 || e != 776776776) - exit (1); - f1 (3.1415, memset (alloca (3001), 0xBF, 3001), -5490); - return 42; -} - -int -main (int argc, char *argv[]) -{ - if (f2 (665, memset (alloca (1001), 0xFB, 1001), 776776776) != 42) - return 1; - return 0; -} -], working_alloca_in_function_calls=yes, working_alloca_in_function_calls=no) -AC_MSG_RESULT($working_alloca_in_function_calls) -test "$working_alloca_in_function_calls" != "yes" && \ - AC_DEFINE(BROKEN_ALLOCA_IN_FUNCTION_CALLS) - -AC_MSG_CHECKING(for working scanf) -AC_TRY_RUN([ -int -main (int argc, char **argv) -{ - int ret, cp1, cp2, endcount; - char *p = "0x7d 0x000E "; - ret = sscanf (p, "%i %i%n", &cp1, &cp2, &endcount); - /* endcount should be 13 but it's 11 in Cygwin newlib after 6/04; - this breaks unicode.c */ - return endcount != 13; -} -], working_scanf=yes, working_scanf=no) -AC_MSG_RESULT($working_scanf) -test "$working_scanf" != "yes" && \ - AC_DEFINE(CYGWIN_SCANF_BUG) - -dnl Check whether strcoll exists and works correctly. (This does more -dnl than just check for its existence.) If so, it defines HAVE_STRCOLL. -AC_FUNC_STRCOLL - -dnl If `getpgrp' takes no argument (the POSIX.1 version), define -dnl `GETPGRP_VOID'. Otherwise, it is the BSD version, which takes a -dnl process ID as an argument. -AC_CHECK_FUNCS(getpgrp) -AC_FUNC_GETPGRP - -dnl We used to call AC_FUNC_MMAP here -dnl Instead we now use following, suggested by Neal Becker -AC_MSG_CHECKING(for working mmap) -case "$opsys" in ultrix* ) have_mmap=no ;; *) -AC_TRY_RUN([#include <stdio.h> -#include <unistd.h> -#include <fcntl.h> -#include <sys/mman.h> - -#ifndef MAP_VARIABLE -#define MAP_VARIABLE 0 -#endif - -#ifndef MAP_FAILED -#define MAP_FAILED -1 -#endif - -int main (int argc, char *argv[]) -{ - int fd = -1; - caddr_t p; -#ifndef MAP_ANONYMOUS - fd = open ("/dev/zero", O_RDWR); - if (fd < 0) - return 1; -#define MAP_ANONYMOUS 0 -#endif - if (mmap(0, 1024, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_VARIABLE | MAP_ANONYMOUS, - fd, 0) != (void *) MAP_FAILED) - return 0; - perror ("conftest: mmap failed"); - return 1; -}], have_mmap=yes, have_mmap=no) ;; -esac -AC_MSG_RESULT($have_mmap) -test "$have_mmap" = "yes" && AC_DEFINE(HAVE_MMAP) - -dnl By default we switch off rel-alloc on cygwin as it generally causes us grief -case "$opsys" in cygwin*) - test "$rel_alloc" = "default" && rel_alloc=no ;; -esac -dnl rel_alloc requires either GNU malloc or system malloc with mmap -dnl We only turn rel_alloc on by default if mmap is available. -test "$GNU_MALLOC" != "yes" -a "$have_mmap" != "yes" && rel_alloc=no -if test "$rel_alloc $have_mmap" = "default yes"; then - if test "$doug_lea_malloc" = "yes"; then - dnl Check if malloc() calls mmap(), making rel_alloc pointless. - AC_MSG_CHECKING(for M_MMAP_THRESHOLD) - AC_TRY_COMPILE([#include <malloc.h>],[ -#ifndef M_MMAP_THRESHOLD -#error No M_MMAP_THRESHOLD :-( -!＠+$%^&*_)(_ - unlikely to compile... -#endif -], [rel_alloc=no; AC_MSG_RESULT(yes);], [rel_alloc=yes; AC_MSG_RESULT(no);]) - else - rel_alloc=yes - fi -fi -test "$rel_alloc" = "yes" && AC_DEFINE(REL_ALLOC) - -dnl Check for terminal I/O variants -dnl TERMIOS systems may have termio.h, but not vice-versa, I think. -AC_CHECK_HEADER(termios.h, - AC_DEFINE(HAVE_TERMIOS) - AC_DEFINE(SIGNALS_VIA_CHARACTERS) - AC_DEFINE(NO_TERMIO), - [AC_CHECK_HEADER(termio.h, [AC_DEFINE(HAVE_TERMIO)])]) - - -dnl Check for Internet sockets. -AC_CHECK_FUNC(socket, - [AC_CHECK_HEADER(netinet/in.h, - [AC_CHECK_HEADER(arpa/inet.h, [ - AC_DEFINE(HAVE_SOCKETS) - AC_MSG_CHECKING("for sun_len member in struct sockaddr_un") - AC_TRY_LINK([ -#include <sys/types.h> -#include <sys/socket.h> -#include <sys/un.h> - ], - [static struct sockaddr_un x; x.sun_len = 1;], - [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SOCKADDR_SUN_LEN)], - [AC_MSG_RESULT(no)]) - AC_MSG_CHECKING("for ip_mreq struct in netinet/in.h") - AC_TRY_LINK([ -#include <sys/types.h> -#include <netinet/in.h> - ], - [static struct ip_mreq x;], - [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_MULTICAST)], - [AC_MSG_RESULT(no)])])])]) - -dnl Check for SYS V IPC. (Inferior to sockets.) -AC_CHECK_FUNC(msgget, - [AC_CHECK_HEADER(sys/ipc.h, - [AC_CHECK_HEADER(sys/msg.h, - [AC_DEFINE(HAVE_SYSVIPC)])])]) - -dnl Check for directory variants -AC_CHECK_HEADER(dirent.h, [AC_DEFINE(SYSV_SYSTEM_DIR)], - [AC_CHECK_HEADER(sys/dir.h, , [AC_DEFINE(NONSYSTEM_DIR_LIBRARY)])]) - -dnl Check for nlist.h -AC_CHECK_HEADER(nlist.h, AC_DEFINE(NLIST_STRUCT), ) - -dnl Check for sound of various sorts. - -dnl Autodetect native sound -AC_CHECKING("for sound support") -test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes - -if test "$with_native_sound" != "no"; then - dnl Maybe sound is already on include path... - if test -n "$native_sound_lib"; then - AC_CHECK_HEADER(multimedia/audio_device.h, - [sound_found=yes sound_cflags="" - XE_ADD_OBJS(sunplay.o)]) - fi - - dnl Autodetect Sun native sound from SUNWaudmo package - if test -z "$sound_found" -a -d "/usr/demo/SOUND"; then - if test -d "/usr/demo/SOUND/include/multimedia"; then - sun_sound_cflags="-I/usr/demo/SOUND/include" - elif test -d "/usr/demo/SOUND/multimedia"; then - sun_sound_cflags="-I/usr/demo/SOUND" - fi - - if test -n "$native_sound_lib"; then - sun_sound_lib="$native_sound_lib" - elif test -r "/usr/demo/SOUND/lib/libaudio.a"; then - sun_sound_lib="/usr/demo/SOUND/lib/libaudio.a" - elif test -r "/usr/demo/SOUND/libaudio.a"; then - sun_sound_lib="/usr/demo/SOUND/libaudio.a" - fi - - if test -n "$sun_sound_cflags" -a -n "$sun_sound_lib"; then - native_sound_lib="$sun_sound_lib" - sound_cflags="$sun_sound_cflags" - sound_found=yes - XE_ADD_OBJS(sunplay.o) - fi - fi - - dnl Check for SGI and HP native sound libs - if test -z "$sound_found"; then - case "$canonical" in - *-sgi-* ) - if test -z "$native_sound_lib"; then - AC_CHECK_LIB(audio, ALopenport, native_sound_lib="-laudio") - fi - if test -n "$native_sound_lib"; then - sound_found=yes sound_cflags="" - XE_ADD_OBJS(sgiplay.o) - fi ;; - hppa*-hp-hpux* ) - if test -z "$native_sound_lib"; then - AC_CHECK_LIB(Alib, AOpenAudio, native_sound_lib="-lAlib") - fi - if test -n "$native_sound_lib"; then - sound_found=yes - XE_ADD_OBJS(hpplay.o) - if test "$GCC" = "yes" # Kludge city - then sound_cflags="-Dconst= -Dvolatile= -I/usr/audio/examples" - else sound_cflags="+e -I/usr/audio/examples" - fi - fi ;; - esac - fi - - dnl Win32 Native uses native sound - if test -z "$sound_found"; then - if test "$with_msw" = "yes"; then - sound_found=yes - native_sound_lib= - XE_ADD_OBJS(ntplay.o) - fi - fi - - dnl Check for Linux/BSD native sound (also on recent Cygwins) - if test -z "$sound_found"; then - for dir in "machine" "sys" "linux"; do - AC_CHECK_HEADER(${dir}/soundcard.h, - sound_found=yes - need_miscplay=yes - XE_ADD_OBJS(linuxplay.o) - [AC_DEFINE_UNQUOTED(SOUNDCARD_H_FILE, "${dir}/soundcard.h")] - break) - done - fi - - if test "$sound_found" = "yes"; then - with_native_sound=yes - - dnl NetBSD can use Linux's sound API, but it needs an extra library at - dnl link time to do so. (OpenBSD apparently needs the same; not written - dnl or tested.) - if test "$opsys" = "netbsd" ; then - AC_CHECK_LIB(ossaudio, _oss_ioctl, native_sound_lib="-lossaudio") - fi - fi -fi - -if test "$with_native_sound" = "yes"; then - AC_DEFINE(HAVE_NATIVE_SOUND) - test -n "$native_sound_lib" && XE_PREPEND($native_sound_lib, LIBS) -fi - -dnl NAS Sound support -if test "$with_nas_sound" != "no"; then - AC_CHECK_HEADER(audio/audiolib.h, [ - AC_CHECK_LIB(audio, AuOpenServer, have_nas_sound=yes)]) - if test "$have_nas_sound" = "yes"; then - with_nas_sound=yes - AC_DEFINE(HAVE_NAS_SOUND) - XE_ADD_OBJS(nas.o) - XE_PREPEND(-laudio, libs_x) - dnl If the nas library does not contain the error jump point, - dnl then we force safer behavior. - AC_EGREP_HEADER(AuXtErrorJump,audio/Xtutil.h,,[old_nas=yes; AC_DEFINE(NAS_NO_ERROR_JUMP)]) - else - test "$with_nas_sound" = "yes" && \ - XE_DIE("Required NAS sound support cannot be provided.") - with_nas_sound=no - fi -fi - -dnl ESD Sound support -if test "$with_esd_sound" != "no"; then - AC_CHECK_PROG(have_esd_config, esd-config, yes, no) - if test "$have_esd_config" = "yes"; then - save_c_switch_site="$c_switch_site" save_LIBS="$LIBS" - XE_APPEND(`esd-config --cflags`, c_switch_site) - XE_PREPEND(`esd-config --libs`, LIBS) - AC_CHECK_FUNC(esd_play_stream, - have_esd_sound=yes, - c_switch_site="$save_c_switch_site" LIBS="$save_LIBS") - fi - - if test "$have_esd_sound" = "yes"; then - with_esd_sound=yes - need_miscplay=yes - XE_ADD_OBJS(esd.o) - AC_DEFINE(HAVE_ESD_SOUND) - else - test "$with_esd_sound" = "yes" && \ - XE_DIE("Required ESD sound support cannot be provided.") - with_esd_sound=no - fi -fi - -test "$need_miscplay" = "yes" && XE_ADD_OBJS(miscplay.o) - -dnl --------------------- -dnl TTY-dependent options -dnl --------------------- - -test -z "$with_tty" && with_tty=yes - -if test "$with_tty" = "yes" ; then - AC_CHECKING(for TTY-related features) - AC_DEFINE(HAVE_TTY) - - dnl Autodetect ncurses. - if test -z "$with_ncurses"; then - AC_CHECK_LIB(ncurses, tgetent, with_ncurses=yes, with_ncurses=no) - fi - if test "$with_ncurses" = "yes"; then - AC_DEFINE(HAVE_NCURSES) - AC_CHECK_HEADER(ncurses/curses.h, curses_h_file=ncurses/curses.h) - AC_CHECK_HEADER(ncurses/term.h, term_h_file=ncurses/term.h) - XE_ADD_OBJS(terminfo.o) - XE_PREPEND(-lncurses, LIBS) - - if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then - dnl Try again, and check for the bogus ncurses/ include bug. - dnl (i.e. ncurses/curses.h bogusly includes <unctrl.h> instead of - dnl <ncurses/unctrl.h>) - save_c_switch_site="$c_switch_site" - c_switch_site="$c_switch_site -I/usr/include/ncurses" - AC_CHECK_HEADER(ncurses/curses.h, curses_h_file=ncurses/curses.h) - if test "$ac_cv_header_ncurses_curses_h" = "yes" - then AC_MSG_WARN([Your system has the bogus ncurses include bug.]) - else c_switch_site="$save_c_switch_site" - fi - fi - else dnl "$with_ncurses" = "no" - dnl Autodetect terminfo/-lcurses/-ltermlib/-ltermcap - if test "$have_terminfo" = "yes"; then - XE_ADD_OBJS(terminfo.o) - if test -n "$libs_termcap"; then - XE_PREPEND($libs_termcap, LIBS) - else - for lib in curses termlib termcap; do - AC_CHECK_LIB($lib, tgetent, XE_PREPEND(-l${lib}, LIBS); break) - done - fi - else dnl "$have_terminfo" = "no" && "with_ncurses" = "no" - XE_ADD_OBJS(tparam.o) - dnl The HP-UX curses library seems to have a badly broken version of select(2) - dnl that makes "poll: interrupted system call" messages to appear and - dnl Emacs subprocesses to hang (e.g. TeX compilation w/ AUCTeX) */ - case "$opsys" in *-hp-hpux* ) libs_termcap="-ltermcap" ;; esac - if test -n "$libs_termcap"; then - XE_PREPEND($libs_termcap, LIBS) - else - AC_CHECK_LIB(curses, tgetent, XE_PREPEND(-lcurses, LIBS), - AC_CHECK_LIB(termcap, tgetent, XE_PREPEND(-ltermcap, LIBS), - XE_ADD_OBJS(termcap.o))) - fi - fi - fi - AC_DEFINE_UNQUOTED(CURSES_H_FILE, "${curses_h_file-curses.h}") - AC_DEFINE_UNQUOTED(TERM_H_FILE, "${term_h_file-term.h}") - - dnl General Purpose Mouse (libgpm) support - if test "$with_gpm" != "no"; then - AC_CHECK_HEADER(gpm.h, [ - AC_CHECK_LIB(gpm, Gpm_Open, have_gpm=yes)]) - if test "$have_gpm" = "yes"; then - with_gpm=yes - AC_DEFINE(HAVE_GPM) - XE_PREPEND(-lgpm, LIBS) - elif test "$with_gpm" = "yes"; then - XE_DIE(["GPM requested, but gpm.h or libgpm seems to be missing."]) - else - with_gpm=no - fi - fi - -else dnl "$with_tty" = "no" - for feature in ncurses gpm; do - if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then - AC_MSG_WARN([--with-${feature} ignored: Not valid without TTY support]) - fi - eval "with_${feature}=no" - done -fi dnl with_tty - -dnl Database support -dnl We do not necessarily have to have libdb/lib(g)dbm for DB/(G)DBM support. -dnl On FreeBSD, both DB and DBM are part of libc. -dnl By default, we check for DBM support in libgdbm, then libc, then libdbm. - -test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \ - != "no no no" && AC_CHECKING(for database support) - -dnl Check for ndbm.h, required for either kind of DBM support. -if test "$with_database_gdbm $with_database_dbm" != "no no"; then - AC_CHECK_HEADER(ndbm.h, [:], [ - test "$with_database_gdbm" = "yes" -o \ - "$with_database_dbm" = "yes" && \ - XE_DIE("Required DBM support cannot be provided.") - with_database_gdbm=no with_database_dbm=no]) -fi - -dnl Check for DBM support in libgdbm. -if test "$with_database_gdbm" != "no"; then - AC_CHECK_LIB(gdbm, dbm_open, [ - with_database_gdbm=yes with_database_dbm=no libdbm=-lgdbm], [ - if test "$with_database_gdbm" = "yes"; then - XE_DIE("Required GNU DBM support cannot be provided.") - fi - with_database_gdbm=no]) -fi - -dnl Check for DBM support in libc and libdbm. -if test "$with_database_dbm" != "no"; then - AC_CHECK_FUNC(dbm_open, [with_database_dbm=yes libdbm=], [ - AC_CHECK_LIB(dbm, dbm_open, [with_database_dbm=yes libdbm=-ldbm], [ - test "$with_database_dbm" = "yes" && \ - XE_DIE("Required DBM support cannot be provided.") - with_database_dbm=no])]) -fi - -dnl Tell make about the DBM support we detected. -test -n "$libdbm" && XE_PREPEND("$libdbm", LIBS) -test "$with_database_gdbm" = "yes" -o \ - "$with_database_dbm" = "yes" && \ - AC_DEFINE(HAVE_DBM) - -dnl Check for Berkeley DB. -if test "$with_database_berkdb" != "no"; then - AC_MSG_CHECKING(for Berkeley db.h) - for header in "db/db.h" "db.h"; do - AC_TRY_COMPILE([ -#include <stdlib.h> -#if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) -#ifdef HAVE_INTTYPES_H -#define __BIT_TYPES_DEFINED__ -#include <inttypes.h> -typedef uint8_t u_int8_t; -typedef uint16_t u_int16_t; -typedef uint32_t u_int32_t; -#ifdef WE_DONT_NEED_QUADS -typedef uint64_t u_int64_t; -#endif -#endif -#endif -#include <$header> -],[], db_h_file="$header"; break) - done - if test -z "$db_h_file" - then AC_MSG_RESULT(no); with_database_berkdb=no - else AC_MSG_RESULT($db_h_file) - fi - - if test "$with_database_berkdb" != "no"; then - AC_MSG_CHECKING(for Berkeley DB version) - AC_EGREP_CPP(yes, -[#include <$db_h_file> -#if DB_VERSION_MAJOR > 1 -yes -#endif -], [AC_EGREP_CPP(yes, -[#include <$db_h_file> -#if DB_VERSION_MAJOR > 2 -yes -#endif -], [AC_EGREP_CPP(yes, -[#include <$db_h_file> -#if DB_VERSION_MAJOR > 3 -yes -#endif -], [AC_MSG_RESULT(4); dbfunc=db_create; dbver=4],[ - AC_MSG_RESULT(3); dbfunc=db_create; dbver=3])],[ - AC_MSG_RESULT(2); dbfunc=db_open; dbver=2])],[ - AC_MSG_RESULT(1); dbfunc=dbopen; dbver=1]) - AC_CHECK_FUNC($dbfunc, with_database_berkdb=yes need_libdb=no, [ - AC_CHECK_LIB(db, $dbfunc, with_database_berkdb=yes need_libdb=yes)]) - fi - - dnl Berk db 4.1 decorates public functions with version information - if test "$with_database_berkdb" != "yes" -a "$dbver" = "4"; then - rm -f $tempcname - echo "#include <$db_h_file>" > $tempcname - echo "configure___ dbfunc=db_create" >> $tempcname - define(TAB, [ ])dnl - changequote(, )dnl - eval `$CPP -Isrc $tempcname \ - | sed -n -e "s/[ TAB]*=[ TAB\"]*/='/" -e "s/[ TAB\"]*\$/'/" -e "s/^configure___//p"` - changequote([, ])dnl - rm -f $tempcname - AC_MSG_WARN("db_create is really $dbfunc") - AC_CHECK_LIB(db, $dbfunc, with_database_berkdb=yes need_libdb=yes) - fi - - if test "$with_database_berkdb" = "yes"; then - AC_DEFINE_UNQUOTED(DB_H_FILE, "$db_h_file") - AC_DEFINE(HAVE_BERKELEY_DB) - test "$need_libdb" = "yes" && XE_PREPEND(-ldb, LIBS) - else with_database_berkdb=no - fi -fi - -if test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \ - != "no no no"; then - AC_DEFINE(HAVE_DATABASE) -fi - -dnl Socks support -if test "$with_socks" = "yes"; then - AC_CHECK_LIB(socks, SOCKSinit) - test -n "$ac_cv_lib_socks_SOCKSinit" && AC_DEFINE(HAVE_SOCKS) -fi - -dnl Usage tracking (undocumented and likely unused option) -if test "$usage_tracking" = "yes"; then - AC_DEFINE(USAGE_TRACKING) - XE_PREPEND(-Bstatic -lut -Bdynamic, LIBS) -fi - -dnl Enhanced number support -if test "$use_number_lib" = "gmp"; then - AC_CHECK_HEADER(gmp.h, [ - AC_CHECK_LIB(gmp, __gmpz_init, have_mpz_init=yes)]) - if test "$have_mpz_init" = "yes"; then - AC_DEFINE(WITH_NUMBER_TYPES) - AC_DEFINE(WITH_GMP) - XE_PREPEND(-lgmp, LIBS) - else - XE_DIE("Required GMP numeric support cannot be provided.") - fi -elif test "$use_number_lib" = "mp"; then - for library in "" "-lcrypto"; do - AC_CHECK_HEADER(mp.h, [ - AC_CHECK_LIB(mp, mp_mfree, have_mp_mfree=yes; break, [ - AC_CHECK_LIB(mp, mfree, have_mfree=yes; break, , $library)], - $library)]) - done - if test "$have_mp_mfree" = "yes"; then - AC_DEFINE(MP_PREFIX) - XE_APPEND(-lmp, LIBS) - if test "$library" != ""; then - XE_APPEND($library, LIBS) - fi - AC_CHECK_FUNC(mp_move, [AC_DEFINE(HAVE_MP_MOVE)]) - elif test "$have_mfree" = "yes"; then - XE_APPEND(-lmp, LIBS) - if test "$library" != ""; then - XE_APPEND($library, LIBS) - fi - AC_CHECK_FUNC(move, [AC_DEFINE(HAVE_MP_MOVE)]) - else - XE_DIE("Required MP numeric support cannot be provided.") - fi - AC_DEFINE(WITH_NUMBER_TYPES) - AC_DEFINE(WITH_MP) -fi - -dnl Unfortunately, just because we can link doesn't mean we can run. -dnl One of the above link tests may have succeeded but caused resulting -dnl executables to fail to run. Also any tests using AC_TRY_RUN will -dnl have reported incorrect results. -AC_TRY_RUN([int main(int c,char *v[]){return 0;}],[:],[ - echo "" - echo "*** PANIC *** The C compiler can no longer build working executables." - echo "*** PANIC *** Please examine the tail of config.log for runtime errors." - echo "*** PANIC *** The most likely reason for this problem is that configure" - echo "*** PANIC *** links with shared libraries, but those libraries cannot be" - echo "*** PANIC *** found at run time." - echo "*** PANIC ***" - echo "*** PANIC *** On a Linux system, edit /etc/ld.so.conf and re-run ldconfig." - echo "*** PANIC *** On other systems, try telling configure where to find the" - echo "*** PANIC *** shared libraries using the --site-runtime-libraries option" - echo "*** PANIC ***" - echo "*** PANIC *** Another way to shoot yourself in the foot is to specify" - echo "*** PANIC *** --with-FEATURE when FEATURE is not actually installed" - echo "*** PANIC *** on your system. Don't do that." - exit 1]) - -dnl Process support -if test "$win32_processes" != "yes"; then - AC_DEFINE(HAVE_UNIX_PROCESSES) -fi - -dnl -------------------------------- -dnl Compute SUBST-itutable variables -dnl -------------------------------- - -dnl We ignore (C|LD)_SWITCH_X_(MACHINE|SYSTEM) -dnl Use XE_SPACE instead of plain assignment statements to remove extraneous blanks -if test "$with_modules" = "yes"; then - ld_libs_module= -else - XE_SPACE(ld_libs_module, $ldap_libs $postgresql_libs) -fi - -XE_SPACE(CFLAGS, $CFLAGS) -XE_SPACE(extra_objs, $extra_objs) -XE_SPACE(c_switch_general, -DHAVE_CONFIG_H $c_switch_site $c_switch_machine $c_switch_system) -XE_SPACE(c_switch_window_system, $c_switch_x_site $c_switch_gtk $X_CFLAGS) -XE_SPACE(c_switch_all, $c_switch_general $c_switch_window_system) -XE_SPACE(ld_switch_general, $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_run) -XE_SPACE(ld_switch_window_system, $ld_switch_x_site) -XE_SPACE(ld_switch_all, $ld_switch_general $ld_switch_window_system) -XE_SPACE(ld_libs_general, $LIBS $libs_machine $libs_system $libs_standard) -XE_SPACE(ld_libs_window_system, $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS) -XE_SPACE(ld_libs_all, $ld_libs_window_system $ld_libs_general $ld_libs_module) - -dnl For no-module builds, make the src dir last -if test "$with_modules" = "no"; then - XE_APPEND(src, MAKE_SUBDIR) -fi - -dnl Compute lists of Makefiles and subdirs -AC_SUBST(SRC_SUBDIR_DEPS) -internal_makefile_list="Makefile.in" -SUBDIR_MAKEFILES='' -test -d lock || mkdir lock -for dir in $MAKE_SUBDIR; do - case "$dir" in */* ) dnl Implement mkdir -p - ( for d in `echo $dir | sed 's:/: :g'` ; do - test -d "$d" || mkdir "$d"; cd "$d" - done ) ;; - * ) test -d "$dir" || mkdir "$dir" ;; - esac - XE_SPACE(SUBDIR_MAKEFILES, $SUBDIR_MAKEFILES $dir/Makefile $dir/GNUmakefile) - XE_SPACE(internal_makefile_list, $internal_makefile_list $dir/Makefile.in) -done -AC_SUBST(INSTALL_ARCH_DEP_SUBDIR) -AC_SUBST(MAKE_SUBDIR) -AC_SUBST(SUBDIR_MAKEFILES) - -dnl Make s&m symlinks in the src directory, for config.h. -for dir in src/s src/m; do - if test ! -d "$dir" ; then - echo Making symbolic link to "$srcdir/$dir" - ${LN_S} "$srcdir/$dir" "$dir" - fi -done - -dnl Also make modules/common link if needed for the module Makefiles. -if test "$need_modules_common" = "yes"; then - for dir in modules/common; do - if test ! -d "$dir" ; then - echo Making symbolic link to "$srcdir/$dir" - ${LN_S} "$srcdir/$dir" "$dir" - fi - done -fi - -if test "$extra_verbose" = "yes"; then - echo "" - PRINT_VAR(extra_objs - c_switch_general c_switch_window_system c_switch_all - ld_switch_general ld_switch_window_system ld_switch_all - ld_libs_general ld_libs_window_system ld_libs_all) - echo "" -fi - -dnl ---------------------------------------------- -dnl Create some auxiliary files for developers. -dnl ---------------------------------------------- - -dnl Create a .gdbinit useful for debugging XEmacs -if test -f "$srcdir/src/.gdbinit" -a ! -f "src/.gdbinit"; then - test "$extra_verbose" = "yes" && echo "creating src/.gdbinit" - echo "source $srcdir/src/.gdbinit" > "src/.gdbinit" -fi - -dnl Create a .dbxrc useful for debugging XEmacs -if test -f "$srcdir/src/.dbxrc" -a ! -f "src/.dbxrc"; then - test "$extra_verbose" = "yes" && echo "creating src/.dbxrc" - echo ". $srcdir/src/.dbxrc" > "src/.dbxrc" -fi - -dnl Create a useful TAGS file -if test -f "$srcdir/TAGS" -a ! -f "TAGS"; then - test "$extra_verbose" = "yes" && echo "creating TAGS" - echo " -$srcdir/TAGS,include" > "TAGS" -fi - -dnl Create top level .sbinit for Sun compilers -if test "$__SUNPRO_C" = "yes"; then - test "$extra_verbose" = "yes" && echo "creating .sbinit" - ( echo "# For use with Sun WorkShop's Source browser." - echo "# See sbquery(1) and sbinit(4) for more information" - for dir in $MAKE_SUBDIR; do echo "import $dir"; done - ) > .sbinit -fi - -dnl There are no more compile tests; remove the core they created. -rm -f core - -dnl ---------------------------------------------- -dnl Substitute into Makefile, config.h and paths.h -dnl ---------------------------------------------- - -dnl what sort of things to edit into Makefile, config.h and paths.h -dnl configuration here uncanonicalized to avoid exceeding size limits. - -AC_SUBST(PROGNAME) -AC_SUBST(version) -AC_SUBST(configuration) -AC_SUBST(canonical) -AC_SUBST(inststaticdir) -AC_SUBST(instvardir) -AC_SUBST(srcdir) -AC_SUBST(bindir) -AC_SUBST(datadir) -AC_SUBST(statedir) -AC_SUBST(libdir) -AC_SUBST(mandir) -AC_SUBST(extra_includes) - -AC_SUBST(prefix) -AC_SUBST(PREFIX_USER_DEFINED) -dnl Yo, Stephen Bourne! I want to marry you! -PREFIX=$prefix -while true; do - case "$PREFIX" in - *\$* ) eval "PREFIX=$PREFIX" ;; - *) break ;; - esac -done -AC_SUBST(PREFIX) - -AC_SUBST(exec_prefix) -AC_SUBST(EXEC_PREFIX_USER_DEFINED) -EXEC_PREFIX=$exec_prefix -while true; do - case "$EXEC_PREFIX" in - *\$* ) eval "EXEC_PREFIX=$EXEC_PREFIX" ;; - *) break ;; - esac -done -AC_SUBST(EXEC_PREFIX) - -AC_SUBST(infodir) -AC_SUBST(INFODIR_USER_DEFINED) -INFODIR=$infodir -while true; do - case "$INFODIR" in - *\$* ) eval "INFODIR=$INFODIR" ;; - *) break ;; - esac -done -AC_SUBST(INFODIR) - -AC_SUBST(infopath) -AC_SUBST(INFOPATH_USER_DEFINED) -INFOPATH=$infopath -while true; do - case "$INFOPATH" in - *\$* ) eval "INFOPATH=$INFOPATH" ;; - *) break ;; - esac -done -AC_SUBST(INFOPATH) - -if test -z "$package_path" && test -n "$package_prefix" ; then - if test "$with_mule" = "yes" ; then - package_path="~/.xemacs::${package_prefix}/site-packages:${package_prefix}/xemacs-packages:${package_prefix}/mule-packages" - else - package_path="~/.xemacs::${package_prefix}/site-packages:${package_prefix}/xemacs-packages" - fi -fi - -AC_SUBST(package_path) -AC_SUBST(PACKAGE_PATH_USER_DEFINED) -PACKAGE_PATH=$package_path -while true; do - case "$PACKAGE_PATH" in - *\$* ) eval "PACKAGE_PATH=$PACKAGE_PATH" ;; - *) break ;; - esac -done -AC_SUBST(PACKAGE_PATH) - -AC_SUBST(lispdir) -AC_SUBST(LISPDIR_USER_DEFINED) -LISPDIR=$lispdir -while true; do - case "$LISPDIR" in - *\$* ) eval "LISPDIR=$LISPDIR" ;; - *) break ;; - esac -done -AC_SUBST(LISPDIR) - -AC_SUBST(moduledir) -AC_SUBST(MODULEDIR_USER_DEFINED) -MODULEDIR=$moduledir -while true; do - case "$MODULEDIR" in - *\$* ) eval "MODULEDIR=$MODULEDIR" ;; - *) break ;; - esac -done -AC_SUBST(MODULEDIR) - -AC_SUBST(sitelispdir) -AC_SUBST(SITELISPDIR_USER_DEFINED) -SITELISPDIR=$sitelispdir -while true; do - case "$SITELISPDIR" in - *\$* ) eval "SITELISPDIR=$SITELISPDIR" ;; - *) break ;; - esac -done -AC_SUBST(SITELISPDIR) - -AC_SUBST(sitemoduledir) -AC_SUBST(SITEMODULEDIR_USER_DEFINED) -SITEMODULEDIR=$sitemoduledir -while true; do - case "$SITEMODULEDIR" in - *\$* ) eval "SITEMODULEDIR=$SITEMODULEDIR" ;; - *) break ;; - esac -done -AC_SUBST(SITEMODULEDIR) - -AC_SUBST(etcdir) -AC_SUBST(ETCDIR_USER_DEFINED) -ETCDIR=$etcdir -while true; do - case "$ETCDIR" in - *\$* ) eval "ETCDIR=$ETCDIR" ;; - *) break ;; - esac -done -AC_SUBST(ETCDIR) - -AC_SUBST(docdir) -AC_SUBST(DOCDIR_USER_DEFINED) -DOCDIR=$docdir -while true; do - case "$DOCDIR" in - *\$* ) eval "DOCDIR=$DOCDIR" ;; - *) break ;; - esac -done -AC_SUBST(DOCDIR) - -AC_SUBST(archlibdir) -AC_SUBST(ARCHLIBDIR_USER_DEFINED) -ARCHLIBDIR=$archlibdir -while true; do - case "$ARCHLIBDIR" in - *\$* ) eval "ARCHLIBDIR=$ARCHLIBDIR" ;; - *) break ;; - esac -done -AC_SUBST(ARCHLIBDIR) - -AC_SUBST(docdir) -AC_SUBST(bitmapdir) -AC_SUBST(extra_objs) - -dnl The following flags combine all the information from: -dnl - command line options (user always gets priority) -dnl - user environment variables -dnl - determined by configure -dnl - the s&m header files (required for ellcc) -AC_SUBST(machfile) -AC_SUBST(opsysfile) -AC_SUBST(c_switch_general) -AC_SUBST(c_switch_window_system) -AC_SUBST(c_switch_all) -AC_SUBST(ld_switch_general) -AC_SUBST(ld_switch_window_system) -AC_SUBST(ld_switch_all) -AC_SUBST(ld_libs_general) -AC_SUBST(ld_libs_window_system) -AC_SUBST(ld_libs_all) -AC_SUBST(CFLAGS) -AC_SUBST(CPPFLAGS) -AC_SUBST(LDFLAGS) -RECURSIVE_MAKE_ARGS="\$(MFLAGS) CC='\$(CC)' CFLAGS='\$(CFLAGS)' LDFLAGS='\$(LDFLAGS)' CPPFLAGS='\$(CPPFLAGS)'" -AC_SUBST(RECURSIVE_MAKE_ARGS) - -AC_SUBST(native_sound_lib) -AC_SUBST(sound_cflags) -AC_SUBST(RANLIB) -AC_SUBST(dynodump_arch) - -AC_SUBST(XEMACS_CC) -AC_SUBST(XE_CFLAGS) - -dnl The default is yes -if test "$with_prefix" = "yes"; then - AC_DEFINE(PREFIX_USER_DEFINED) -fi - -dnl The default is no -if test "$with_site_lisp" = "no"; then - AC_DEFINE(INHIBIT_SITE_LISP) -fi -dnl The default is yes -if test "$with_site_modules" = "no"; then - AC_DEFINE(INHIBIT_SITE_MODULES) -fi - -XE_SPACE(ac_configure_args, $ac_configure_args) -AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "$configuration") -AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "$ac_configure_args") - -dnl Following are deprecated - -null_string="" -AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, $null_string) -AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE_AUX, $null_string) -AC_DEFINE_UNQUOTED(C_SWITCH_X_SITE, $null_string) -AC_DEFINE_UNQUOTED(LD_SWITCH_SITE, $null_string) -AC_DEFINE_UNQUOTED(C_SWITCH_SITE, $null_string) - -dnl Note: as a general rule, *only* define things here that are not -dnl autodetected. For things that are autodetected, define them -dnl at the point where the autodetection occurs or would occur, -dnl so that the user gets immediate feedback on the results of the -dnl autodetection. - -if test "$GNU_MALLOC" = "yes"; then AC_DEFINE(GNU_MALLOC) -elif test "$with_system_malloc" = "yes"; then AC_DEFINE(USE_SYSTEM_MALLOC) -elif test "$with_debug_malloc" = "yes"; then AC_DEFINE(USE_DEBUG_MALLOC) - AC_DEFINE(USE_SYSTEM_MALLOC) -fi -test "$GCC" = "yes" && AC_DEFINE(USE_GCC) -test "$external_widget" = "yes" && AC_DEFINE(EXTERNAL_WIDGET) -test "$use_kkcc" = "yes" && AC_DEFINE(USE_KKCC) -test "$mc_alloc" = "yes" && AC_DEFINE(MC_ALLOC) -test "$quick_build" = "yes" && AC_DEFINE(QUICK_BUILD) -test "$with_purify" = "yes" && AC_DEFINE(PURIFY) -test "$with_quantify" = "yes" && AC_DEFINE(QUANTIFY) -test "$with_pop" = "yes" && AC_DEFINE(MAIL_USE_POP) -test "$with_kerberos" = "yes" && AC_DEFINE(KERBEROS) -test "$with_hesiod" = "yes" && AC_DEFINE(HESIOD) -test "$use_union_type" = "yes" && AC_DEFINE(USE_UNION_TYPE) -test "$pdump" = "yes" && AC_DEFINE(PDUMP) -test "$dump_in_exec" = "yes" && AC_DEFINE(DUMP_IN_EXEC) -test "$with_ipv6_cname" = "yes" && AC_DEFINE(IPV6_CANONICALIZE) - -dnl ------------------------------- -dnl Report on what we decided to do -dnl ------------------------------- - -dnl #### We should tag this as the _build_ environment. -dnl Before doing that, though, must check if tools care about line 1. - -( -dnl /etc/osversion is on SONY NEWS-OS -if test -f /etc/osversion; then dnl SONY NEWS-OS - echo "osversion: `cat /etc/osversion`" -else - echo "uname -a: `uname -a`" -fi -echo "" -echo "$0 $quoted_arguments" -) > Installation - -if test ! -z ${emacs_beta_version} ; then - if test -z "${emacs_is_beta}" ; then - xemacs_betaname=".${emacs_beta_version}" - else - xemacs_betaname="-b${emacs_beta_version}" - fi -else - xemacs_betaname="" -fi - -dnl Start stdout redirection to '| tee -a Installation' -( -echo " - -XEmacs ${emacs_major_version}.${emacs_minor_version}${xemacs_betaname} \"$xemacs_codename\" $xemacs_extra_name configured for \`$canonical'. -" -echo " -Compilation Environment and Installation Defaults:" -echo " Source code location: $srcdir" -echo " Installation prefix: $prefix" -if test -n "$site_includes"; then - echo " Additional header files: $site_includes" -fi -if test -n "$site_libraries"; then - echo " Additional libraries: $site_libraries" -fi -if test -n "$site_prefixes"; then - echo " Additional prefixes: $site_prefixes" -fi -if test -n "$runpath"; then - echo " Runtime library search path: $runpath" -fi - -if test -n "$opsysfile" -then echo " Operating system description file: \`$opsysfile'" -else echo " Not using any operating system description file" -fi -if test -n "$machfile" -then echo " Machine description file: \`$machfile'" -else echo " Not using any machine description file" -fi - -echo " Compiler version: $compiler_version" -if test -n "$gcc_compiler_specs"; then - echo " - GCC specs file: $gcc_compiler_specs" -fi -echo " - Compiler command: $XEMACS_CC $XE_CFLAGS" -if test "$CC" != "$XEMACS_CC"; then - echo " Compiler version for lib-src: (detection code unimplemented)" - echo " - Compiler command for lib-src: $CC $CFLAGS" - if test "$xemacs_cc_cc_mismatch" = "yes"; then - echo " WARNING: CC and XEMACS_CC mismatched; check CFLAGS carefully." - fi -fi -echo " libc version: $libc_version" -echo " Relocating allocator for buffers: $rel_alloc" -echo " GNU version of malloc: ${GNU_MALLOC}${GNU_MALLOC_reason}" -case "$ld_switch_site" in - *nocombreloc*) echo " Linking with \`-z nocombreloc'. - - Consider configuring with --pdump." ;; -esac - -echo " -Window System:" -if test "$with_msw" = "yes"; then - echo " Compiling in support for the Microsoft window system." -fi -if test "$with_x11" = "yes"; then - echo " Compiling in support for the X window system:" - echo " - X Windows headers location: $x_includes" - echo " - X Windows libraries location: $x_libraries" - if test "$with_xauth" != yes; then - echo " - Xau (X authority) not available." - fi - if test "$with_xmu" != yes; then - echo " - Xmu library not available; substituting equivalent routines." - fi - if test "$with_wmcommand" != no; then - echo " - Handling WM_COMMAND properly." - fi -fi -if test "$need_athena" = "yes"; then - echo " Compiling in support for the Athena widget set:" - echo " - Athena headers location: $athena_h_path" - echo " - Athena library to link: $athena_lib" -fi -case "$with_menubars" in - gtk ) echo " Using GTK menubars." ;; - lucid ) echo " Using Lucid menubars." ;; - motif ) echo " Using Motif menubars." - echo " *WARNING* The Motif menubar implementation is currently buggy." - echo " We recommend using the Lucid menubar instead." - echo " Re-run configure with --with-menubars='lucid'." ;; - msw ) echo " Using MS-Windows menubars." ;; -esac -case "$with_scrollbars" in - gtk ) echo " Using GTK scrollbars." ;; - lucid ) echo " Using Lucid scrollbars." ;; - motif ) echo " Using Motif scrollbars." ;; - athena ) echo " Using Athena scrollbars." ;; - msw ) echo " Using MS-Windows scrollbars." ;; -esac -case "$with_dialogs" in - gtk ) echo " Using GTK dialog boxes." ;; - motif ) echo " Using Motif dialog boxes." - if test "$unexec" = "unexaix.o"; then if test "`uname -v`" = 4 -a "`uname -r`" -ge 3; then - echo " *WARNING* The Motif dialog boxes cause problems on AIX 4.3 and higher." - echo " We recommend using the Athena dialog boxes instead." - echo " Install libXaw and re-run configure with --with-dialogs='athena'." - echo " Read the PROBLEMS file for more information." - fi; fi ;; - athena ) echo " Using Athena dialog boxes." ;; - msw ) echo " Using MS-Windows dialog boxes." ;; -esac -case "$with_widgets" in - gtk ) echo " Using GTK native widgets." ;; - motif ) echo " Using Motif native widgets." ;; - athena ) echo " Using Athena native widgets." ;; - msw ) echo " Using MS-Windows native widgets." ;; -esac -if test "$with_dragndrop" = yes; then - echo " Compiling in support for Drag'n'Drop (EXPERIMENTAL)." - echo " - Drag'n'Drop prototype: $dragndrop_proto." -fi - -echo " -TTY:" -test "$with_ncurses" = yes && echo " Compiling in support for ncurses." -test "$with_gpm" = yes && echo " Compiling in support for GPM (General Purpose Mouse)." - -echo " -Images:" -test "$with_gif" = yes && echo " Compiling in support for GIF images (builtin)." -if test "$with_xpm" = yes; then - echo " Compiling in support for XPM images." -elif test "$with_x11" = yes; then - echo " WARNING: -----------------------------------------------------------" - echo " WARNING: Compiling without XPM image support." - if test "$xpm_problem" != ""; then - echo " Reason: $xpm_problem" - fi - echo " WARNING: You should strongly consider installing XPM." - echo " WARNING: Otherwise toolbars and other graphics will look suboptimal." - echo " WARNING: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux)" - echo " WARNING: -----------------------------------------------------------" -fi -if test "$with_png" = yes; then - echo " Compiling in support for PNG images." -elif test "$window_system" != "none"; then - echo " WARNING: -----------------------------------------------------------" - echo " WARNING: Compiling without PNG image support." - if test "$png_problem" != ""; then - echo " Reason: $png_problem" - fi - echo " WARNING: You should strongly consider installing the PNG libraries." - echo " WARNING: Otherwise certain images and glyphs may not display." - echo " WARNING: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux)" - echo " WARNING: -----------------------------------------------------------" -fi -test "$with_jpeg" = yes && echo " Compiling in support for JPEG images." -test "$with_tiff" = yes && echo " Compiling in support for TIFF images." -test "$with_xface" = yes && echo " Compiling in support for X-Face message headers." - -echo " -Sound:" -test "$with_native_sound" = yes && echo " Compiling in support for sound (native)." -test "$with_nas_sound" = yes && echo " Compiling in support for NAS (network audio system)." -test "$old_nas" = yes && echo " - NAS library lacks error trapping; will play synchronously." -test "$with_esd_sound" = yes && echo " Compiling in support for ESD (Enlightened Sound Daemon)." - -echo " -Databases:" -test "$with_database_berkdb" = yes && echo " Compiling in support for Berkeley database." -test "$with_database_dbm" = yes && echo " Compiling in support for DBM." -test "$with_database_gdbm" = yes && echo " Compiling in support for GNU DBM." -test "$with_ldap" = yes && echo " Compiling in support for LDAP." -if test "$with_postgresql" = yes; then - echo " Compiling in support for PostgreSQL." - echo " - Using PostgreSQL header file: $libpq_fe_h_file" - test "$with_postgresqlv7" = yes && echo " - Using PostgreSQL V7 bindings." -fi - -echo " -Internationalization:" -test "$with_mule" = yes && echo " Compiling in support for Mule (multi-lingual Emacs)." -test "$with_xim" != no && echo " Compiling in support for XIM (X11R5+ I18N input method)." -test "$with_xim" = motif && echo " - Using Motif to provide XIM support." -test "$with_xim" = xlib && echo " - Using raw Xlib to provide XIM support." -test "$with_xfs" = yes && echo " - Using XFontSet to provide bilingual menubar." -test "$with_canna" = yes && echo " Compiling in support for Canna on Mule." -if test "$with_wnn" = yes; then - echo " Compiling in support for the WNN input method on Mule." - test "$with_wnn6" = yes && echo " - Using WNN version 6." -fi - -echo " -Mail:" -test "$with_pop" = yes && echo " Compiling in support for POP mail retrieval." -test "$with_kerberos" = yes && echo " Compiling in support for Kerberos POP authentication." -test "$with_hesiod" = yes && echo " Compiling in support for Hesiod POP server access." -test -n "$mail_locking" && echo " Compiling in support for \"$mail_locking\" mail spool file locking method." - -echo " -Other Features:" -test "$with_ipv6_cname" = no && echo " Inhibiting IPv6 canonicalization at startup." -test "$with_tooltalk" = yes && echo " Compiling in support for ToolTalk." -test "$with_workshop" = yes && echo " Compiling in support for Sun WorkShop." -test "$with_socks" = yes && echo " Compiling in support for SOCKS." -test "$with_dnet" = yes && echo " Compiling in support for DNET." -test "$with_modules" = "yes" && echo " Compiling in support for dynamic shared object modules." -test "$use_number_lib" = "gmp" && echo " Compiling in support for more number types using the GNU MP library." -test "$use_number_lib" = "mp" && echo " Compiling in support for more number types using the BSD MP library." -if test "$use_union_type" = yes ; then - echo " Using the union type for Lisp_Objects." - echo " WARNING: ---------------------------------------------------------" - echo " WARNING: This tends to trigger compiler bugs, especially when" - echo " WARNING: combined with MULE and ERROR_CHECKING. Crashes have" - echo " WARNING: been seen with various versions of GCC (up to about 2.95)," - echo " WARNING: and recently with Visual C++ as well (mid-2003)." - echo " WARNING: More recent versions may be safer, or not." - echo " WARNING: ---------------------------------------------------------" -fi -test "$use_kkcc" = yes && echo " Using the new GC algorithms." -test "$mc_alloc" = yes && echo " Using the new allocator." -test "$pdump" = yes && echo " Using the new portable dumper." -test "$dump_in_exec" = yes && echo " Dumping into executable." -test "$debug" = yes && echo " Compiling in support for extra debugging code." -test "$usage_tracking" = yes && echo " Compiling in support for active usage tracking (Sun internal)." -if test "$error_check_extents $error_check_types $error_check_text $error_check_gc $error_check_malloc $error_check_glyphs $error_check_byte_code $error_check_display $error_check_structures" \ - != "no no no no no no no no no"; then - echo " Compiling in support for runtime error checking." - echo " WARNING: ---------------------------------------------------------" - echo " WARNING: XEmacs will run noticeably more slowly as a result." - echo " WARNING: Error checking is on by default for XEmacs beta releases." - echo " WARNING: ---------------------------------------------------------" -fi -echo "" -) | tee -a Installation -dnl echo "The above configure report is appended to \"Installation\" file." -echo "" - -dnl ----------------------------------- -dnl Now generate config.h and Makefiles -dnl ----------------------------------- -dnl This has to be called in order for this variable to get into config.status -AC_SUBST(internal_makefile_list) -# Remove any trailing slashes in these variables. -test -n "$prefix" && - prefix=`echo '' "$prefix" | sed -e 's:^ ::' -e 's,$[[^/]]$/*$,\1,'` -test -n "$exec_prefix" && - exec_prefix=`echo '' "$exec_prefix" | sed -e 's:^ ::' -e 's,$[[^/]]$/*$,\1,'` - -dnl Build Makefile.in's from Makefile.in.in's -dnl except ./Makefile from $srcdir/Makefile.in -dnl src/Makefile.in will have src/depend appended to it; -dnl module Makefiles will have the common text in -dnl modules/common/Makefile.common appended. - -for file in $internal_makefile_list; do - case $file in - src/Makefile.in ) file="src/Makefile.in:src/Makefile.in.in:src/depend" ;; - modules/* ) file="${file}:${file}.in:modules/common/Makefile.common" ;; - esac - XE_APPEND($file, ac_output_files) -done -ac_output_files="$ac_output_files src/paths.h src/xemacs.def.in lib-src/config.values" -test "$with_modules" = "yes" && XE_APPEND(lib-src/ellcc.h, ac_output_files) - -AC_OUTPUT($ac_output_files, -[for dir in . $MAKE_SUBDIR; do - ( - cd $dir - -dnl Normally []'s are used for quoting but this will cause problems -dnl since we use brackets in sed. When not inside of a macro definition, -dnl two brackets become one, but inside of a macro definition you need -dnl more, or something -- I don't understand, but Martin probably does. -dnl We put the brackets back later. -dnl [ben] -changequote(<<,>>)dnl - -dnl MAKE_JUNK_C(filename): -dnl Copy a .in file to junk.c in preparation for passing through the -dnl C preprocessor. Delete comment lines, pass lines that will be -dnl interpreted by cpp through directly, and put quotes around remaining -dnl lines, to avoid problems from overly helpful preprocessors that -dnl "helpfully" put extra quotes in various places for later use by the -dnl compiler. Later, the quotes will be removed. - -define(<<MAKE_JUNK_C>>, - rm -f junk.c - < <<$1>> \ - sed -e '/^# Generated/d' \ - -e 's%/\*\*/#.*%%' \ - -e 's/^ *# */#/' \ -dnl Delete Makefile.in.in comment lines - -e '/^##/d' \ -dnl Pass through CPP directives unchanged - -e '/^#/ { -p -d -}' \ -dnl Quote other lines to protect from CPP substitution - -e '/./ { -s/$[\"]$/\\\1/g -s/^/"/ -s/$/"/ -}' > junk.c; -)dnl MAKE_JUNK_C - -dnl CPP_MAKEFILE(CPPFLAGS,filename): -dnl Pass junk.c through the preprocessor and put the result in FILENAME. - -define(<<CPP_MAKEFILE>>, -echo creating $dir/<<$2>> -$CPP -I. -I${top_srcdir}/src <<$1>> junk.c \ -dnl Delete line directives inserted by $CPP - | sed -e 's/^\#.*//' \ -dnl Delete spurious blanks inserted by $CPP - -e 's/^[ TAB][ TAB]*$//'\ - -e 's/^ /TAB/' \ -dnl Delete blank lines - -e '/^[ ]*$/d' \ -dnl Restore lines quoted above to original contents. - -e '/^\"/ { - s/\\$[\"]$/\1/g - s/^[ TAB]*\"// - s/\"[ TAB]*$// -}' > Makefile.new - chmod 444 Makefile.new - mv -f Makefile.new <<$2>> -)dnl CPP_MAKEFILE - -dnl Create a GNUmakefile and Makefile from Makefile.in. -dnl Create xemacs.def from xemacs.def.in in the same fashion, -dnl if it exists (i.e. in the src/ directory). - MAKE_JUNK_C(Makefile.in) - CPP_MAKEFILE(,Makefile) - CPP_MAKEFILE(-DUSE_GNU_MAKE,GNUmakefile) - if test -r "xemacs.def.in"; then -dnl #### We should be using MAKE_JUNK_C instead of the next two lines. -dnl #### But the comments in xemacs.def.in need to be converted from C-style -dnl #### to lines beginning with ##. - rm -f junk.c - cp xemacs.def.in junk.c - CPP_MAKEFILE(,xemacs.def) - fi -changequote([,])dnl - rm -f junk.c - ) -done - -dnl Append AC_DEFINE information to lib-src/config.values -dnl (AC_SUBST information is already there (see config.values.sh). -sed < config.status >> lib-src/config.values \ - -e '/{ac_dA}.*{ac_dB}.*{ac_dC}.*{ac_dD}$/!d' \ - -e 's/\${ac_dA}$.*$\${ac_dB}.*\${ac_dC}$.*$\${ac_dD}/\1 \2/' \ - -e 's/^$[[^ ]]*$ $/\1 ""/' \ - -e 's/ 1$/ t/' - -], -[CPP="$CPP" - top_srcdir="$srcdir" - MAKE_SUBDIR="$MAKE_SUBDIR" -])dnl 1.62 +4 -0 XEmacs/xemacs/etc/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/ChangeLog,v retrieving revision 1.61 retrieving revision 1.62 diff -u -p -r1.61 -r1.62 --- ChangeLog 2005/09/14 05:29:17 1.61 +++ ChangeLog 2005/09/18 13:01:17 1.62 ＠＠ -1,3 +1,7 ＠＠ +2005-09-17 Malcolm Purvis <malcolmp(a)xemacs.org> + + * configure-2.13: Remove. autoconf 2.59 support is stable. + 2005-09-14 Stephen J. Turnbull <stephen(a)xemacs.org> * XEmacs 21.5.22 "cucumber" is released.

1 participants
0 comments

CVS update by viteno xemacs ... 19 years, 3 months

CVS Monitor

User: viteno Date: 05/09/17 23:51:11 Modified: xemacs version.sh Log: Update xemacs_extra_name. Revision Changes Path 1.1286 +1 -1 XEmacs/xemacs/version.sh Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.1285 retrieving revision 1.1286 diff -u -p -r1.1285 -r1.1286 --- version.sh 2005/09/16 21:51:28 1.1285 +++ version.sh 2005/09/17 21:51:10 1.1286 ＠＠ -8,5 +8,5 ＠＠ emacs_kit_version= infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -xemacs_extra_name="(+CVS-20050916)" +xemacs_extra_name="(+CVS-20050917)" xemacs_release_date="2005-02-18"

1 participants
0 comments

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

xemacs-cvs September 2005