CVS update: MODIFIED: xemacs ...
19 years, 11 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/01/28 23:51:35
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1049 +1 -1 XEmacs/xemacs/version.sh
(In the diff below, changes in quantity of whitespace are not shown.)
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1048
retrieving revision 1.1049
diff -u -b -r1.1048 -r1.1049
--- version.sh 2005/01/27 22:51:11 1.1048
+++ version.sh 2005/01/28 22:51:33 1.1049
＠＠ -8,4 +8,4 ＠＠
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20050127)"
+xemacs_extra_name="(+CVS-20050128)"
- 1 participants
- 0 comments
CVS update: MODIFIED: src, objects-msw.c ...
19 years, 11 months
CVS Monitor
CVS Monitor
User: ben
Date: 05/01/28 03:58:56
Modified: xemacs/src ChangeLog console-impl.h objects-gtk.c
objects-msw.c objects-tty.c objects-x.c objects.c
Log:
Abstract font-list/color-list
font-menu.el, font.el, frame.el, gtk-font-menu.el, minibuf.el, msw-faces.el, msw-font-menu.el, obsolete.el, x-faces.el, x-font-menu.el: list-fonts->font-list. Create color-list. Abstract out
x/msw-specific versions and obsolete the x/msw-specific Lisp
functions.
console-impl.h, objects-gtk.c, objects-msw.c, objects-tty.c, objects-x.c, objects.c: list-fonts->font-list. Create color-list. Abstract out
x/msw-specific versions and obsolete the x/msw-specific Lisp
functions.
Revision Changes Path
1.619 +25 -0 XEmacs/xemacs/lisp/ChangeLog
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.618
retrieving revision 1.619
diff -u -b -r1.618 -r1.619
--- ChangeLog 2005/01/28 02:05:03 1.618
+++ ChangeLog 2005/01/28 02:58:38 1.619
＠＠ -1,5 +1,30 ＠＠
2005-01-27 Ben Wing <ben(a)xemacs.org>
+ * font-menu.el:
+ * font.el:
+ * font.el (internal-facep):
+ * font.el (x-font-build-cache):
+ * font.el (font-lookup-rgb-components):
+ * frame.el (set-frame-font):
+ * gtk-font-menu.el (gtk-reset-device-font-menus):
+ * minibuf.el (read-color-completion-table):
+ * minibuf.el (x-library-search-path): Removed.
+ * minibuf.el (x-read-color-completion-table)): Removed.
+ * msw-faces.el (mswindows-available-font-sizes):
+ * msw-font-menu.el (mswindows-reset-device-font-menus):
+ * obsolete.el:
+ * x-faces.el:
+ * x-faces.el (x-available-font-sizes):
+ * x-faces.el (x-library-search-path): New.
+ * x-faces.el (x-color-list-internal-cache)): New.
+ * x-faces.el (x-color-list-internal): New.
+ * x-font-menu.el (x-reset-device-font-menus):
+ list-fonts->font-list. Create color-list. Abstract out
+ x/msw-specific versions and obsolete the x/msw-specific Lisp
+ functions.
+
+2005-01-27 Ben Wing <ben(a)xemacs.org>
+
* subr.el:
* subr.el (macro-declaration-function): New.
Some synching with FSF 21.2.
1.8 +1 -1 XEmacs/xemacs/lisp/font-menu.el
(In the diff below, changes in quantity of whitespace are not shown.)
Index: font-menu.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/font-menu.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- font-menu.el 2004/09/22 02:05:50 1.7
+++ font-menu.el 2005/01/28 02:58:39 1.8
＠＠ -113,7 +113,7 ＠＠
;;; ==>
;;; "-morisawa-ryumin light kl-light-r-normal--10-100-72-72-m-50-jisx0201.1976-0"
;;;
-;;; (list-fonts "-dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*")
+;;; (font-list "-dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*")
;;; ==>
;;; ("-dt-interface user-medium-r-normal-s sans-12-120-72-72-m-70-iso8859-1"
;;; "-dt-interface user-medium-r-normal-s-14-120-75-75-m-120-jisx0208.1983-0"
1.16 +5 -12 XEmacs/xemacs/lisp/font.el
(In the diff below, changes in quantity of whitespace are not shown.)
Index: font.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/font.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- font.el 2003/03/09 02:27:33 1.15
+++ font.el 2005/01/28 02:58:40 1.16
＠＠ -2,7 +2,7 ＠＠
;; Copyright (c) 1995, 1996 by William M. Perry (wmperry(a)cs.indiana.edu)
;; Copyright (c) 1996, 1997 Free Software Foundation, Inc.
-;; Copyright (C) 2002 Ben Wing.
+;; Copyright (C) 2002, 2004 Ben Wing.
;; Author: wmperry
;; Maintainer: XEmacs Development Team
＠＠ -32,8 +32,7 ＠＠
;;; Code:
(globally-declare-fboundp
- '(x-list-fonts
- mswindows-list-fonts ns-list-fonts internal-facep fontsetp get-font-info
+ '(internal-facep fontsetp get-font-info
get-fontset-info mswindows-define-rgb-color cancel-function-timers
mswindows-font-regexp mswindows-canonicalize-font-name
mswindows-parse-font-style mswindows-construct-font-style
＠＠ -60,13 +59,7 ＠＠
(defmacro defcustom (var value doc &rest args)
`(defvar ,var ,value ,doc))))
-(if (not (fboundp 'try-font-name))
- (defun try-font-name (fontname &rest args)
- (case window-system
- ((x pm) (car-safe (x-list-fonts fontname)))
- (mswindows (car-safe (mswindows-list-fonts fontname)))
- (ns (car-safe (ns-list-fonts fontname)))
- (otherwise nil))))
+; delete alternate defn of try-font-name
(if (not (fboundp 'facep))
(defun facep (face)
＠＠ -932,7 +925,7 ＠＠
(defun x-font-build-cache (&optional device)
(let ((hash-table (make-hash-table :test 'equal :size 15))
(fonts (mapcar 'x-font-create-object
- (x-list-fonts "-*-*-*-*-*-*-*-*-*-*-*-*-*-*")))
+ (font-list "-*-*-*-*-*-*-*-*-*-*-*-*-*-*")))
(plist nil)
(cur nil))
(while fonts
＠＠ -1064,7 +1057,7 ＠＠
(defun font-lookup-rgb-components (color)
"Lookup COLOR (a color name) in rgb.txt and return a list of RGB values.
The list (R G B) is returned, or an error is signaled if the lookup fails."
- (let ((lib-list (if (boundp 'x-library-search-path)
+ (let ((lib-list (if-boundp 'x-library-search-path
x-library-search-path
;; This default is from XEmacs 19.13 - hope it covers
;; everyone.
1.24 +1 -1 XEmacs/xemacs/lisp/frame.el
(In the diff below, changes in quantity of whitespace are not shown.)
Index: frame.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/frame.el,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- frame.el 2005/01/26 09:53:32 1.23
+++ frame.el 2005/01/28 02:58:40 1.24
＠＠ -994,7 +994,7 ＠＠
(completion-ignore-case t)
(font (completing-read "Font name: "
(mapcar #'list
- (list-fonts "*" frame))
+ (font-list "*" frame))
nil nil nil nil
(face-font-name 'default frame))))
(list font current-prefix-arg)))
1.6 +2 -2 XEmacs/xemacs/lisp/gtk-font-menu.el
(In the diff below, changes in quantity of whitespace are not shown.)
Index: gtk-font-menu.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/gtk-font-menu.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gtk-font-menu.el 2004/09/22 02:05:50 1.5
+++ gtk-font-menu.el 2005/01/28 02:58:40 1.6
＠＠ -90,7 +90,7 ＠＠
or if you change your font path, you can call this to re-initialize the menus."
;; by Stig(a)hackvan.com
;; #### - this should implement a `menus-only' option, which would
- ;; recalculate the menus from the cache w/o having to do list-fonts again.
+ ;; recalculate the menus from the cache w/o having to do font-list again.
(unless gtk-font-regexp-ascii
(setq gtk-font-regexp-ascii (if (featurep 'mule)
(declare-fboundp
＠＠ -102,7 +102,7 ＠＠
family size weight entry monospaced-p
dev-cache cache families sizes weights)
(dolist (name (cond ((null debug) ; debugging kludge
- (list-fonts "*-*-*-*-*-*-*-*-*-*-*-*-*-*" device))
+ (font-list "*-*-*-*-*-*-*-*-*-*-*-*-*-*" device))
((stringp debug) (split-string debug "\n"))
(t debug)))
(when (and (string-match gtk-font-regexp-ascii name)
1.27 +1 -68 XEmacs/xemacs/lisp/minibuf.el
(In the diff below, changes in quantity of whitespace are not shown.)
Index: minibuf.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/minibuf.el,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- minibuf.el 2004/04/17 09:59:24 1.26
+++ minibuf.el 2005/01/28 02:58:40 1.27
＠＠ -2181,75 +2181,8 ＠＠
"Read the name of a face from the minibuffer and return it as a symbol."
(intern (completing-read prompt obarray 'find-face must-match)))
-;; #### - wrong place for this variable? Exactly. We probably want
-;; `color-list' to be a console method, so `tty-color-list' becomes
-;; obsolete, and `read-color-completion-table' conses (mapcar #'list
-;; (color-list)), optionally caching the results.
-
-;; Ben wanted all of the possibilities from the `configure' script used
-;; here, but I think this is way too many. I already trimmed the R4 variants
-;; and a few obvious losers from the list. --Stig
-(defvar x-library-search-path '("/usr/X11R6/lib/X11/"
- "/usr/X11R5/lib/X11/"
- "/usr/lib/X11R6/X11/"
- "/usr/lib/X11R5/X11/"
- "/usr/local/X11R6/lib/X11/"
- "/usr/local/X11R5/lib/X11/"
- "/usr/local/lib/X11R6/X11/"
- "/usr/local/lib/X11R5/X11/"
- "/usr/X11/lib/X11/"
- "/usr/lib/X11/"
- "/usr/local/lib/X11/"
- "/usr/X386/lib/X11/"
- "/usr/x386/lib/X11/"
- "/usr/XFree86/lib/X11/"
- "/usr/unsupported/lib/X11/"
- "/usr/athena/lib/X11/"
- "/usr/local/x11r5/lib/X11/"
- "/usr/lpp/Xamples/lib/X11/"
- "/usr/openwin/lib/X11/"
- "/usr/openwin/share/lib/X11/")
- "Search path used by `read-color' to find rgb.txt.")
-
-(defvar x-read-color-completion-table)
-
(defun read-color-completion-table ()
- (case (device-type)
- ;; #### Evil device-type dependency
- ((x gtk)
- (if (boundp 'x-read-color-completion-table)
- x-read-color-completion-table
- (let ((rgb-file (locate-file "rgb.txt" x-library-search-path))
- clist color p)
- (if (not rgb-file)
- ;; prevents multiple searches for rgb.txt if we can't find it
- (setq x-read-color-completion-table nil)
- (with-current-buffer (get-buffer-create " *colors*")
- (reset-buffer (current-buffer))
- (insert-file-contents rgb-file)
- (while (not (eobp))
- ;; skip over comments
- (while (looking-at "^!")
- (end-of-line)
- (forward-char 1))
- (skip-chars-forward "0-9 \t")
- (setq p (point))
- (end-of-line)
- (setq color (buffer-substring p (point))
- clist (cons (list color) clist))
- ;; Ugh. If we want to be able to complete the lowercase form
- ;; of the color name, we need to add it twice! Yuck.
- (let ((dcase (downcase color)))
- (or (string= dcase color)
- (push (list dcase) clist)))
- (forward-char 1))
- (kill-buffer (current-buffer))))
- (setq x-read-color-completion-table clist)
- x-read-color-completion-table)))
- (mswindows
- (mapcar #'list (declare-fboundp (mswindows-color-list))))
- (tty
- (mapcar #'list (declare-fboundp (tty-color-list))))))
+ (mapcar #'list (color-list)))
(defun read-color (prompt &optional must-match initial-contents)
"Read the name of a color from the minibuffer.
1.18 +1 -1 XEmacs/xemacs/lisp/msw-faces.el
(In the diff below, changes in quantity of whitespace are not shown.)
Index: msw-faces.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/msw-faces.el,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- msw-faces.el 2003/03/09 02:27:33 1.17
+++ msw-faces.el 2005/01/28 02:58:40 1.18
＠＠ -271,7 +271,7 ＠＠
(and (string-match mswindows-font-regexp name)
(string-to-int (substring name (match-beginning 3)
(match-end 3)))))
- (list-fonts font device)))
+ (font-list font device)))
#'<))
(defun mswindows-frob-font-size (font up-p device)
1.8 +1 -1 XEmacs/xemacs/lisp/msw-font-menu.el
(In the diff below, changes in quantity of whitespace are not shown.)
Index: msw-font-menu.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/msw-font-menu.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- msw-font-menu.el 2002/06/20 21:18:04 1.7
+++ msw-font-menu.el 2005/01/28 02:58:40 1.8
＠＠ -74,7 +74,7 ＠＠
family size weight entry
dev-cache cache families sizes weights)
(dolist (name (cond ((null debug) ; debugging kludge
- (list-fonts "::::" device))
+ (font-list "::::" device))
((stringp debug) (split-string debug "\n"))
(t debug)))
(when (and (string-match mswindows-font-regexp-ascii name)
1.18 +5 -1 XEmacs/xemacs/lisp/obsolete.el
(In the diff below, changes in quantity of whitespace are not shown.)
Index: obsolete.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/obsolete.el,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- obsolete.el 2003/03/20 13:19:59 1.17
+++ obsolete.el 2005/01/28 02:58:41 1.18
＠＠ -3,7 +3,7 ＠＠
;; Copyright (C) 1985-1994, 1997 Free Software Foundation, Inc.
;; Copyright (C) 1994, 1995 Amdahl Corporation.
;; Copyright (C) 1995 Sun Microsystems.
-;; Copyright (C) 2002 Ben Wing.
+;; Copyright (C) 2002, 2004 Ben Wing.
;; Maintainer: XEmacs Development Team
;; Keywords: internal, dumped
＠＠ -371,6 +371,10 ＠＠
If FRAME is omitted or nil, use the selected frame."
(color-instance-rgb-components (make-color-instance color)))
(make-compatible 'x-color-values 'color-instance-rgb-components)
+
+(make-obsolete 'mswindows-color-list 'color-list)
+(make-obsolete 'tty-color-list 'color-list)
+(make-compatible 'list-fonts 'font-list)
;; Two loser functions which shouldn't be used.
(make-obsolete 'following-char 'char-after)
1.20 +67 -2 XEmacs/xemacs/lisp/x-faces.el
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x-faces.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/x-faces.el,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- x-faces.el 2002/06/20 21:18:04 1.19
+++ x-faces.el 2005/01/28 02:58:41 1.20
＠＠ -1,7 +1,7 ＠＠
;;; x-faces.el --- X-specific face frobnication, aka black magic.
;; Copyright (C) 1992-4, 1997 Free Software Foundation, Inc.
-;; Copyright (C) 1995, 1996, 2002 Ben Wing.
+;; Copyright (C) 1995, 1996, 2002, 2004 Ben Wing.
;; Author: Jamie Zawinski <jwz(a)jwz.org>
;; Maintainer: XEmacs Development Team
＠＠ -284,7 +284,7 ＠＠
(string-to-int (substring name (match-beginning 6)
(match-end 6)))
name))))
- (list-fonts font device)))
+ (font-list font device)))
(function (lambda (x y) (if (= (nth 1 x) (nth 1 y))
(< (nth 0 x) (nth 0 y))
(< (nth 1 x) (nth 1 y)))))))
＠＠ -374,6 +374,71 ＠＠
(make-obsolete 'x-make-face-bold-italic 'make-face-bold-italic)
(make-obsolete 'x-make-face-unbold 'make-face-unbold)
(make-obsolete 'x-make-face-unitalic 'make-face-unitalic)
+
+
+
+;; #### - wrong place for this variable? Exactly. We probably want
+;; `color-list' to be a console method, so `tty-color-list' becomes
+;; obsolete, and `read-color-completion-table' conses (mapcar #'list
+;; (color-list)), optionally caching the results.
+
+;; Ben wanted all of the possibilities from the `configure' script used
+;; here, but I think this is way too many. I already trimmed the R4 variants
+;; and a few obvious losers from the list. --Stig
+(defvar x-library-search-path '("/usr/X11R6/lib/X11/"
+ "/usr/X11R5/lib/X11/"
+ "/usr/lib/X11R6/X11/"
+ "/usr/lib/X11R5/X11/"
+ "/usr/local/X11R6/lib/X11/"
+ "/usr/local/X11R5/lib/X11/"
+ "/usr/local/lib/X11R6/X11/"
+ "/usr/local/lib/X11R5/X11/"
+ "/usr/X11/lib/X11/"
+ "/usr/lib/X11/"
+ "/usr/local/lib/X11/"
+ "/usr/X386/lib/X11/"
+ "/usr/x386/lib/X11/"
+ "/usr/XFree86/lib/X11/"
+ "/usr/unsupported/lib/X11/"
+ "/usr/athena/lib/X11/"
+ "/usr/local/x11r5/lib/X11/"
+ "/usr/lpp/Xamples/lib/X11/"
+ "/usr/openwin/lib/X11/"
+ "/usr/openwin/share/lib/X11/")
+ "Search path used by `x-color-list-internal' to find rgb.txt.")
+
+(defvar x-color-list-internal-cache)
+
+(defun x-color-list-internal ()
+ (if (boundp 'x-color-list-internal-cache)
+ x-color-list-internal-cache
+ (let ((rgb-file (locate-file "rgb.txt" x-library-search-path))
+ clist color p)
+ (if (not rgb-file)
+ ;; prevents multiple searches for rgb.txt if we can't find it
+ (setq x-color-list-internal-cache nil)
+ (with-current-buffer (get-buffer-create " *colors*")
+ (reset-buffer (current-buffer))
+ (insert-file-contents rgb-file)
+ (while (not (eobp))
+ ;; skip over comments
+ (while (looking-at "^!")
+ (end-of-line)
+ (forward-char 1))
+ (skip-chars-forward "0-9 \t")
+ (setq p (point))
+ (end-of-line)
+ (setq color (buffer-substring p (point))
+ clist (cons (list color) clist))
+ ;; Ugh. If we want to be able to complete the lowercase form
+ ;; of the color name, we need to add it twice! Yuck.
+ (let ((dcase (downcase color)))
+ (or (string= dcase color)
+ (push (list dcase) clist)))
+ (forward-char 1))
+ (kill-buffer (current-buffer))))
+ (setq x-color-list-internal-cache clist)
+ x-color-list-internal-cache)))
;;; internal routines
1.13 +2 -2 XEmacs/xemacs/lisp/x-font-menu.el
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x-font-menu.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/x-font-menu.el,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- x-font-menu.el 2004/09/22 02:05:51 1.12
+++ x-font-menu.el 2005/01/28 02:58:41 1.13
＠＠ -90,7 +90,7 ＠＠
or if you change your font path, you can call this to re-initialize the menus."
;; by Stig(a)hackvan.com
;; #### - this should implement a `menus-only' option, which would
- ;; recalculate the menus from the cache w/o having to do list-fonts again.
+ ;; recalculate the menus from the cache w/o having to do font-list again.
(unless x-font-regexp-ascii
(setq x-font-regexp-ascii (if (featurep 'mule)
(charset-registry 'ascii)
＠＠ -101,7 +101,7 ＠＠
family size weight entry monospaced-p
dev-cache cache families sizes weights)
(dolist (name (cond ((null debug) ; debugging kludge
- (list-fonts "*-*-*-*-*-*-*-*-*-*-*-*-*-*" device
+ (font-list "*-*-*-*-*-*-*-*-*-*-*-*-*-*" device
font-menu-max-number))
((stringp debug) (split-string debug "\n"))
(t debug)))
1.779 +30 -0 XEmacs/xemacs/src/ChangeLog
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.778
retrieving revision 1.779
diff -u -b -r1.778 -r1.779
--- ChangeLog 2005/01/28 02:36:22 1.778
+++ ChangeLog 2005/01/28 02:58:49 1.779
＠＠ -1,5 +1,35 ＠＠
2005-01-27 Ben Wing <ben(a)xemacs.org>
+ * console-impl.h (struct console_methods):
+ * objects-gtk.c:
+ * objects-gtk.c (gtk_color_list):
+ * objects-gtk.c (gtk_font_list):
+ * objects-gtk.c (console_type_create_objects_gtk):
+ * objects-gtk.c (__gtk_font_list_internal):
+ * objects-msw.c:
+ * objects-msw.c (mswindows_font_list):
+ * objects-msw.c (mswindows_find_charset_font):
+ * objects-msw.c (mswindows_color_list):
+ * objects-msw.c (syms_of_objects_mswindows):
+ * objects-msw.c (console_type_create_objects_mswindows):
+ * objects-tty.c (tty_color_list):
+ * objects-tty.c (tty_font_list):
+ * objects-tty.c (syms_of_objects_tty):
+ * objects-tty.c (console_type_create_objects_tty):
+ * objects-x.c:
+ * objects-x.c (x_color_list):
+ * objects-x.c (x_font_list):
+ * objects-x.c (console_type_create_objects_x):
+ * objects.c:
+ * objects.c (Fcolor_list):
+ * objects.c (Ffont_list):
+ * objects.c (syms_of_objects):
+ list-fonts->font-list. Create color-list. Abstract out
+ x/msw-specific versions and obsolete the x/msw-specific Lisp
+ functions.
+
+2005-01-27 Ben Wing <ben(a)xemacs.org>
+
* nt.c:
* fileio.c:
Fix sync comments.
1.8 +2 -1 XEmacs/xemacs/src/console-impl.h
(In the diff below, changes in quantity of whitespace are not shown.)
Index: console-impl.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-impl.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- console-impl.h 2004/11/04 23:06:18 1.7
+++ console-impl.h 2005/01/28 02:58:51 1.8
＠＠ -192,6 +192,7 ＠＠
int depth);
Lisp_Object (*color_instance_rgb_components_method) (Lisp_Color_Instance *);
int (*valid_color_name_p_method) (struct device *, Lisp_Object color);
+ Lisp_Object (*color_list_method) (void);
/* font methods */
int (*initialize_font_instance_method) (Lisp_Font_Instance *,
＠＠ -206,7 +207,7 ＠＠
Lisp_Object (*font_instance_truename_method) (Lisp_Font_Instance *,
Error_Behavior errb);
Lisp_Object (*font_instance_properties_method) (Lisp_Font_Instance *);
- Lisp_Object (*list_fonts_method) (Lisp_Object pattern,
+ Lisp_Object (*font_list_method) (Lisp_Object pattern,
Lisp_Object device,
Lisp_Object maxnumber);
Lisp_Object (*find_charset_font_method) (Lisp_Object device,
1.16 +14 -5 XEmacs/xemacs/src/objects-gtk.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: objects-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-gtk.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- objects-gtk.c 2005/01/26 10:22:27 1.15
+++ objects-gtk.c 2005/01/28 02:58:51 1.16
＠＠ -206,6 +206,14 ＠＠
return (1);
}
+static Lisp_Object
+gtk_color_list (void)
+{
+ /* #### BILL!!!
+ Is this correct? */
+ return call0 (intern ("x-color-list-internal"));
+}
+
/************************************************************************/
/* font instances */
＠＠ -330,7 +338,7 ＠＠
/* Forward declarations for X specific functions at the end of the file */
Lisp_Object __get_gtk_font_truename (GdkFont *gdk_font, int expandp);
-static Lisp_Object __gtk_list_fonts_internal (const char *pattern);
+static Lisp_Object __gtk_font_list_internal (const char *pattern);
static Lisp_Object
gtk_font_instance_truename (struct Lisp_Font_Instance *f,
＠＠ -361,14 +369,14 ＠＠
}
static Lisp_Object
-gtk_list_fonts (Lisp_Object pattern, Lisp_Object UNUSED (device),
+gtk_font_list (Lisp_Object pattern, Lisp_Object UNUSED (device),
Lisp_Object UNUSED (maxnumber))
{
const char *patternext;
TO_EXTERNAL_FORMAT (LISP_STRING, pattern, C_STRING_ALLOCA, patternext, Qbinary);
- return (__gtk_list_fonts_internal (patternext));
+ return (__gtk_font_list_internal (patternext));
}
#ifdef MULE
＠＠ -454,13 +462,14 ＠＠
CONSOLE_HAS_METHOD (gtk, color_instance_hash);
CONSOLE_HAS_METHOD (gtk, color_instance_rgb_components);
CONSOLE_HAS_METHOD (gtk, valid_color_name_p);
+ CONSOLE_HAS_METHOD (gtk, color_list);
CONSOLE_HAS_METHOD (gtk, initialize_font_instance);
CONSOLE_HAS_METHOD (gtk, print_font_instance);
CONSOLE_HAS_METHOD (gtk, finalize_font_instance);
CONSOLE_HAS_METHOD (gtk, font_instance_truename);
CONSOLE_HAS_METHOD (gtk, font_instance_properties);
- CONSOLE_HAS_METHOD (gtk, list_fonts);
+ CONSOLE_HAS_METHOD (gtk, font_list);
#ifdef MULE
CONSOLE_HAS_METHOD (gtk, find_charset_font);
CONSOLE_HAS_METHOD (gtk, font_spec_matches_charset);
＠＠ -587,7 +596,7 ＠＠
return (font_name);
}
-static Lisp_Object __gtk_list_fonts_internal (const char *pattern)
+static Lisp_Object __gtk_font_list_internal (const char *pattern)
{
char **names;
int count = 0;
1.47 +9 -11 XEmacs/xemacs/src/objects-msw.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: objects-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-msw.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- objects-msw.c 2005/01/26 10:22:27 1.46
+++ objects-msw.c 2005/01/28 02:58:51 1.47
＠＠ -2,7 +2,7 ＠＠
Copyright (C) 1993, 1994 Free Software Foundation, Inc.
Copyright (C) 1995 Board of Trustees, University of Illinois.
Copyright (C) 1995 Tinker Systems.
- Copyright (C) 1995, 1996, 2000, 2001, 2002 Ben Wing.
+ Copyright (C) 1995, 1996, 2000, 2001, 2002, 2004 Ben Wing.
Copyright (C) 1995 Sun Microsystems, Inc.
Copyright (C) 1997 Jonathan Harris.
＠＠ -1926,7 +1926,7 ＠＠
}
static Lisp_Object
-mswindows_list_fonts (Lisp_Object pattern, Lisp_Object device,
+mswindows_font_list (Lisp_Object pattern, Lisp_Object device,
Lisp_Object UNUSED (maxnumber))
{
struct device *d = XDEVICE (device);
＠＠ -2188,7 +2188,7 ＠＠
/* If FONT specifies a particular charset, this will only list fonts with
that charset; otherwise, it will list fonts with all charsets. */
- fontlist = mswindows_list_fonts (font, device, Qnil);
+ fontlist = mswindows_font_list (font, device, Qnil);
if (!stage)
{
＠＠ -2219,10 +2219,8 ＠＠
/* non-methods */
/************************************************************************/
-DEFUN ("mswindows-color-list", Fmswindows_color_list, 0, 0, 0, /*
-Return a list of the colors available on mswindows devices.
-*/
- ())
+static Lisp_Object
+mswindows_color_list (void)
{
Lisp_Object result = Qnil;
int i;
＠＠ -2234,7 +2232,6 ＠＠
}
-
/************************************************************************/
/* initialization */
/************************************************************************/
＠＠ -2242,7 +2239,6 ＠＠
void
syms_of_objects_mswindows (void)
{
- DEFSUBR (Fmswindows_color_list);
}
void
＠＠ -2257,13 +2253,14 ＠＠
CONSOLE_HAS_METHOD (mswindows, color_instance_hash);
CONSOLE_HAS_METHOD (mswindows, color_instance_rgb_components);
CONSOLE_HAS_METHOD (mswindows, valid_color_name_p);
+ CONSOLE_HAS_METHOD (mswindows, color_list);
CONSOLE_HAS_METHOD (mswindows, initialize_font_instance);
/* CONSOLE_HAS_METHOD (mswindows, mark_font_instance); */
CONSOLE_HAS_METHOD (mswindows, print_font_instance);
CONSOLE_HAS_METHOD (mswindows, finalize_font_instance);
CONSOLE_HAS_METHOD (mswindows, font_instance_truename);
- CONSOLE_HAS_METHOD (mswindows, list_fonts);
+ CONSOLE_HAS_METHOD (mswindows, font_list);
#ifdef MULE
CONSOLE_HAS_METHOD (mswindows, font_spec_matches_charset);
CONSOLE_HAS_METHOD (mswindows, find_charset_font);
＠＠ -2280,13 +2277,14 ＠＠
CONSOLE_INHERITS_METHOD (msprinter, mswindows, color_instance_hash);
CONSOLE_INHERITS_METHOD (msprinter, mswindows, color_instance_rgb_components);
CONSOLE_INHERITS_METHOD (msprinter, mswindows, valid_color_name_p);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, color_list);
CONSOLE_HAS_METHOD (msprinter, initialize_font_instance);
/* CONSOLE_INHERITS_METHOD (msprinter, mswindows, mark_font_instance); */
CONSOLE_INHERITS_METHOD (msprinter, mswindows, print_font_instance);
CONSOLE_INHERITS_METHOD (msprinter, mswindows, finalize_font_instance);
CONSOLE_INHERITS_METHOD (msprinter, mswindows, font_instance_truename);
- CONSOLE_INHERITS_METHOD (msprinter, mswindows, list_fonts);
+ CONSOLE_INHERITS_METHOD (msprinter, mswindows, font_list);
#ifdef MULE
CONSOLE_INHERITS_METHOD (msprinter, mswindows, font_spec_matches_charset);
CONSOLE_INHERITS_METHOD (msprinter, mswindows, find_charset_font);
1.16 +5 -7 XEmacs/xemacs/src/objects-tty.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: objects-tty.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-tty.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- objects-tty.c 2005/01/26 10:22:27 1.15
+++ objects-tty.c 2005/01/28 02:58:51 1.16
＠＠ -106,10 +106,8 ＠＠
return Qnil;
}
-DEFUN ("tty-color-list", Ftty_color_list, 0, 0, 0, /*
-Return a list of the registered TTY colors.
-*/
- ())
+static Lisp_Object
+tty_color_list (void)
{
Lisp_Object result = Qnil;
Lisp_Object rest;
＠＠ -293,7 +291,7 ＠＠
}
static Lisp_Object
-tty_list_fonts (Lisp_Object UNUSED (pattern), Lisp_Object UNUSED (device),
+tty_font_list (Lisp_Object UNUSED (pattern), Lisp_Object UNUSED (device),
Lisp_Object UNUSED (maxnumber))
{
return list1 (build_string ("normal"));
＠＠ -368,7 +366,6 ＠＠
DEFSUBR (Fregister_tty_color);
DEFSUBR (Funregister_tty_color);
DEFSUBR (Ffind_tty_color);
- DEFSUBR (Ftty_color_list);
#if 0
DEFSUBR (Fset_tty_dynamic_color_specs);
DEFSUBR (Ftty_dynamic_color_specs);
＠＠ -386,12 +383,13 ＠＠
CONSOLE_HAS_METHOD (tty, color_instance_equal);
CONSOLE_HAS_METHOD (tty, color_instance_hash);
CONSOLE_HAS_METHOD (tty, valid_color_name_p);
+ CONSOLE_HAS_METHOD (tty, color_list);
CONSOLE_HAS_METHOD (tty, initialize_font_instance);
CONSOLE_HAS_METHOD (tty, mark_font_instance);
CONSOLE_HAS_METHOD (tty, print_font_instance);
CONSOLE_HAS_METHOD (tty, finalize_font_instance);
- CONSOLE_HAS_METHOD (tty, list_fonts);
+ CONSOLE_HAS_METHOD (tty, font_list);
#ifdef MULE
CONSOLE_HAS_METHOD (tty, font_spec_matches_charset);
CONSOLE_HAS_METHOD (tty, find_charset_font);
1.28 +9 -2 XEmacs/xemacs/src/objects-x.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: objects-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- objects-x.c 2005/01/26 10:22:27 1.27
+++ objects-x.c 2005/01/28 02:58:52 1.28
＠＠ -355,6 +355,12 ＠＠
return XParseColor (dpy, cmap, extname, &c);
}
+static Lisp_Object
+x_color_list (void)
+{
+ return call0 (intern ("x-color-list-internal"));
+}
+
/************************************************************************/
/* font instances */
＠＠ -853,7 +859,7 ＠＠
}
static Lisp_Object
-x_list_fonts (Lisp_Object pattern, Lisp_Object device, Lisp_Object maxnumber)
+x_font_list (Lisp_Object pattern, Lisp_Object device, Lisp_Object maxnumber)
{
Extbyte **names;
int count = 0;
＠＠ -1005,13 +1011,14 ＠＠
CONSOLE_HAS_METHOD (x, color_instance_hash);
CONSOLE_HAS_METHOD (x, color_instance_rgb_components);
CONSOLE_HAS_METHOD (x, valid_color_name_p);
+ CONSOLE_HAS_METHOD (x, color_list);
CONSOLE_HAS_METHOD (x, initialize_font_instance);
CONSOLE_HAS_METHOD (x, print_font_instance);
CONSOLE_HAS_METHOD (x, finalize_font_instance);
CONSOLE_HAS_METHOD (x, font_instance_truename);
CONSOLE_HAS_METHOD (x, font_instance_properties);
- CONSOLE_HAS_METHOD (x, list_fonts);
+ CONSOLE_HAS_METHOD (x, font_list);
#ifdef MULE
CONSOLE_HAS_METHOD (x, find_charset_font);
CONSOLE_HAS_METHOD (x, font_spec_matches_charset);
1.26 +17 -4 XEmacs/xemacs/src/objects.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: objects.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- objects.c 2005/01/26 10:22:27 1.25
+++ objects.c 2005/01/28 02:58:52 1.26
＠＠ -1,7 +1,7 ＠＠
/* Generic Objects and Functions.
Copyright (C) 1995 Free Software Foundation, Inc.
Copyright (C) 1995 Board of Trustees, University of Illinois.
- Copyright (C) 1995, 1996, 2002 Ben Wing.
+ Copyright (C) 1995, 1996, 2002, 2004 Ben Wing.
This file is part of XEmacs.
＠＠ -248,6 +248,18 ＠＠
return MAYBE_INT_DEVMETH (d, valid_color_name_p, (d, color)) ? Qt : Qnil;
}
+DEFUN ("color-list", Fcolor_list, 0, 1, 0, /*
+Return a list of color names.
+DEVICE specifies which device to return names for, and defaults to the
+currently selected device.
+*/
+ (device))
+{
+ device = wrap_device (decode_device (device));
+
+ return MAYBE_LISP_DEVMETH (XDEVICE (device), color_list, ());
+}
+
/***************************************************************************
* Font-Instance Object *
＠＠ -506,7 +518,7 ＠＠
font_instance_properties, (f));
}
-DEFUN ("list-fonts", Flist_fonts, 1, 3, 0, /*
+DEFUN ("font-list", Ffont_list, 1, 3, 0, /*
Return a list of font names matching the given pattern.
DEVICE specifies which device to search for names, and defaults to the
currently selected device.
＠＠ -516,7 +528,7 ＠＠
CHECK_STRING (pattern);
device = wrap_device (decode_device (device));
- return MAYBE_LISP_DEVMETH (XDEVICE (device), list_fonts, (pattern, device,
+ return MAYBE_LISP_DEVMETH (XDEVICE (device), font_list, (pattern, device,
maxnumber));
}
＠＠ -1121,6 +1133,7 ＠＠
DEFSUBR (Fcolor_instance_name);
DEFSUBR (Fcolor_instance_rgb_components);
DEFSUBR (Fvalid_color_name_p);
+ DEFSUBR (Fcolor_list);
DEFSYMBOL_MULTIWORD_PREDICATE (Qfont_instancep);
DEFSUBR (Fmake_font_instance);
＠＠ -1132,7 +1145,7 ＠＠
DEFSUBR (Ffont_instance_proportional_p);
DEFSUBR (Ffont_instance_truename);
DEFSUBR (Ffont_instance_properties);
- DEFSUBR (Flist_fonts);
+ DEFSUBR (Ffont_list);
/* Qcolor, Qfont defined in general.c */
DEFSYMBOL (Qface_boolean);
- 1 participants
- 0 comments
CVS update: MODIFIED: src, fileio.c, realpath.c, sysfile.h ...
19 years, 11 months
CVS Monitor
CVS Monitor
User: ben
Date: 05/01/28 03:36:34
Modified: xemacs/src ChangeLog dired-msw.c emacs.c event-msw.c
fileio.c glyphs.c lisp.h nt.c ntplay.c process-nt.c
realpath.c sound.c sound.h symsinit.h sysdep.c
sysfile.h syswindows.h text.h win32.c
Log:
Support symlinks under Windows
nt.c, fileio.c: Fix sync comments.
config.h.in, dired-msw.c, emacs.c, event-msw.c, fileio.c, glyphs.c, lisp.h, nt.c, process-nt.c, realpath.c, sound.c, symsinit.h, sysdep.c, sysfile.h, syswindows.h, win32.c: Add support for treating shortcuts under Windows as symbolic links.
Enabled with mswindows-shortcuts-are-links (t by default). Rewrite
lots of places to use PATHNAME_CONVERT_OUT, which is moved to
sysfile.h. Add PATHNAME_RESOLVE_LINKS, which only does things
under Windows.
Add profiling section for expand_file_name calls.
nt.c, sysdep.c: Unicode-ize.
realpath.c: Renamed from readlink_and_correct_case. Fix some problems with
Windows implementation due to incorrect understanding of workings
of the function.
sound.c, ntplay.c, sound.h: Rename play_sound_file to nt_play_sound_file and pass
internally-formatted data to it to avoid converting out and back
again.
text.h: is_c -> is_ascii.
Revision Changes Path
1.237 +914 -852 XEmacs/xemacs/configure
(In the diff below, changes in quantity of whitespace are not shown.)
Index: configure
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -b -r1.236 -r1.237
--- configure 2005/01/24 23:33:30 1.236
+++ configure 2005/01/28 02:36:11 1.237
＠＠ -366,6 +366,7 ＠＠
with_dnet | \
with_infodock | \
with_netinstall | \
+ with_optimization | \
with_ipv6_cname | \
external_widget | \
use_kkcc | \
＠＠ -394,6 +395,8 ＠＠
xemacs_compiler | \
cflags | \
cflags_warning | \
+ cflags_optimization | \
+ cflags_debugging | \
cpp | \
cppflags | \
libs | \
＠＠ -859,7 +862,7 ＠＠
fi
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:863: checking whether ln -s works" >&5
+echo "configure:866: checking whether ln -s works" >&5
rm -f conftestdata
if ln -s X conftestdata 2>/dev/null
＠＠ -1145,7 +1148,7 ＠＠
echo $ac_n "checking "host system type"""... $ac_c" 1>&6
-echo "configure:1149: checking "host system type"" >&5
+echo "configure:1152: checking "host system type"" >&5
internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'`
canonical=`${CONFIG_SHELL-/bin/sh} $srcdir/config.sub "$internal_configuration"`
configuration=`echo "$configuration" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'`
＠＠ -1678,12 +1681,22 ＠＠
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"
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1687: checking for $ac_word" >&5
+echo "configure:1700: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -1710,7 +1723,7 ＠＠
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1714: checking for $ac_word" >&5
+echo "configure:1727: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -1758,7 +1771,7 ＠＠
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1762: checking for $ac_word" >&5
+echo "configure:1775: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -1787,7 +1800,7 ＠＠
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1791: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1804: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
＠＠ -1800,12 +1813,12 ＠＠
cat > conftest.$ac_ext << EOF
-#line 1804 "configure"
+#line 1817 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
＠＠ -1833,19 +1846,19 ＠＠
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1837: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1850: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1842: checking whether we are using GNU C" >&5
+echo "configure:1855: checking whether we are using GNU C" >&5
cat > conftest.c <<EOF
#ifdef __GNUC__
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
＠＠ -1863,7 +1876,7 ＠＠
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1867: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1880: checking whether ${CC-cc} accepts -g" >&5
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
＠＠ -1896,7 +1909,7 ＠＠
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1900: checking for $ac_word" >&5
+echo "configure:1913: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -1923,7 +1936,7 ＠＠
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1927: checking for $ac_word" >&5
+echo "configure:1940: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -1971,7 +1984,7 ＠＠
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1975: checking for $ac_word" >&5
+echo "configure:1988: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -2000,7 +2013,7 ＠＠
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2004: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2017: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
＠＠ -2013,12 +2026,12 ＠＠
cat > conftest.$ac_ext << EOF
-#line 2017 "configure"
+#line 2030 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:2022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
＠＠ -2046,19 +2059,19 ＠＠
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2050: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2063: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2055: checking whether we are using GNU C" >&5
+echo "configure:2068: checking whether we are using GNU C" >&5
cat > conftest.c <<EOF
#ifdef __GNUC__
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
＠＠ -2076,7 +2089,7 ＠＠
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2080: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2093: checking whether ${CC-cc} accepts -g" >&5
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
＠＠ -2109,7 +2122,7 ＠＠
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2113: checking for $ac_word" >&5
+echo "configure:2126: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -2136,7 +2149,7 ＠＠
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2140: checking for $ac_word" >&5
+echo "configure:2153: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -2184,7 +2197,7 ＠＠
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2188: checking for $ac_word" >&5
+echo "configure:2201: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -2213,7 +2226,7 ＠＠
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2217: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2230: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
＠＠ -2226,12 +2239,12 ＠＠
cat > conftest.$ac_ext << EOF
-#line 2230 "configure"
+#line 2243 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:2235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
＠＠ -2259,19 +2272,19 ＠＠
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2263: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2276: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2268: checking whether we are using GNU C" >&5
+echo "configure:2281: checking whether we are using GNU C" >&5
cat > conftest.c <<EOF
#ifdef __GNUC__
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
＠＠ -2289,7 +2302,7 ＠＠
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2293: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2306: checking whether ${CC-cc} accepts -g" >&5
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
＠＠ -2322,7 +2335,7 ＠＠
if test "$GCC" = "yes"; then
cat > conftest.$ac_ext <<EOF
-#line 2326 "configure"
+#line 2339 "configure"
#include "confdefs.h"
int main () {
#if __GNUC__ >= 3
＠＠ -2332,7 +2345,7 ＠＠
#endif
}
EOF
-if { (eval echo configure:2336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
:
else
＠＠ -2358,7 +2371,7 ＠＠
test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP"
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2362: checking how to run the C preprocessor" >&5
+echo "configure:2375: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
＠＠ -2371,13 +2384,13 ＠＠
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 2375 "configure"
+#line 2388 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
＠＠ -2388,13 +2401,13 ＠＠
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 2392 "configure"
+#line 2405 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
＠＠ -2405,13 +2418,13 ＠＠
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 2409 "configure"
+#line 2422 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
＠＠ -2437,9 +2450,9 ＠＠
echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:2441: checking for AIX" >&5
+echo "configure:2454: checking for AIX" >&5
cat > conftest.$ac_ext <<EOF
-#line 2443 "configure"
+#line 2456 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
＠＠ -2466,9 +2479,9 ＠＠
echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:2470: checking for GNU libc" >&5
+echo "configure:2483: checking for GNU libc" >&5
cat > conftest.$ac_ext <<EOF
-#line 2472 "configure"
+#line 2485 "configure"
#include "confdefs.h"
#include <features.h>
int main() {
＠＠ -2480,7 +2493,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:2484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
have_glibc=yes
else
＠＠ -2575,7 +2588,7 ＠＠
esac
cat > conftest.$ac_ext <<EOF
-#line 2579 "configure"
+#line 2592 "configure"
#include "confdefs.h"
int main () {
#if defined __SUNPRO_C
＠＠ -2591,7 +2604,7 ＠＠
#endif
}
EOF
-if { (eval echo configure:2595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
:
else
＠＠ -2845,17 +2858,17 ＠＠
if test "$__USLC__" = yes; then
echo $ac_n "checking for whether the -Kalloca compiler flag is needed""... $ac_c" 1>&6
-echo "configure:2849: checking for whether the -Kalloca compiler flag is needed" >&5
+echo "configure:2862: checking for whether the -Kalloca compiler flag is needed" >&5
need_kalloca=no
cat > conftest.$ac_ext <<EOF
-#line 2852 "configure"
+#line 2865 "configure"
#include "confdefs.h"
int main() {
void *x = alloca(4);
; return 0; }
EOF
-if { (eval echo configure:2859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
:
else
＠＠ -2866,14 +2879,14 ＠＠
xe_save_c_switch_system="$c_switch_system"
c_switch_system="$c_switch_system -Kalloca"
cat > conftest.$ac_ext <<EOF
-#line 2870 "configure"
+#line 2883 "configure"
#include "confdefs.h"
int main() {
void *x = alloca(4);
; return 0; }
EOF
-if { (eval echo configure:2877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
need_kalloca=yes
else
＠＠ -2901,31 +2914,61 ＠＠
fi
-echo $ac_n "checking for preferred CFLAGS""... $ac_c" 1>&6
-echo "configure:2906: checking for preferred CFLAGS" >&5
+if test -z "$with_optimization" ; then
+ if test -n "$emacs_is_beta" ; then
+ with_optimization=no
+ else
+ with_optimization=yes
+ fi
+fi
-if test "$cflags_specified" = "no"; then
+
+echo $ac_n "checking for preferred optimization flags""... $ac_c" 1>&6
+echo "configure:2928: checking for preferred optimization flags" >&5
+if test "$with_optimization" = "yes" ; then
+ if test "$cflags_optimization_specified" = "no"; then
if test "$GCC" = "yes"; then
- CFLAGS="-g -O3"
+ cflags_optimization="-O3"
elif test "$__SUNPRO_C" = "yes"; then
case "$opsys" in
- sol2 ) CFLAGS="-xO4" ;;
- sunos4* ) CFLAGS="-xO2" ;;
+ sol2 ) cflags_optimization="-xO4" ;;
+ sunos4* ) cflags_optimization="-xO2" ;;
esac
elif test "$__DECC" = "yes"; then
- CFLAGS="-O3"
+ cflags_optimization="-O3"
elif test "$CC" = "xlc"; then
- CFLAGS="-g -O3 -qstrict -qnoansialias -qlibansi -qro -qmaxmem=20000"
+ cflags_optimization="-O3 -qstrict -qnoansialias -qlibansi -qmaxmem=20000"
elif test "$__ICC" = "yes"; then
- CFLAGS="-g -O3 -Ob2"
+ cflags_optimization="-O3 -Ob2"
else
- CFLAGS="-O" ; fi
+ cflags_optimization="-O" ; fi
+ fi
+else
+ cflags_optimization=
fi
-echo "$ac_t""${CFLAGS}" 1>&6
+
+echo "$ac_t""${cflags_optimization}" 1>&6
+echo $ac_n "checking for preferred debugging flags""... $ac_c" 1>&6
+echo "configure:2955: checking for preferred debugging flags" >&5
+if test "$cflags_debugging_specified" = "no"; then
+ 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
+echo "$ac_t""${cflags_debugging}" 1>&6
+
+
echo $ac_n "checking for preferred warning flags for XEMACS_CC""... $ac_c" 1>&6
-echo "configure:2929: checking for preferred warning flags for XEMACS_CC" >&5
+echo "configure:2972: checking for preferred warning flags for XEMACS_CC" >&5
xe_cflags_warning=""
＠＠ -2958,15 +3001,34 ＠＠
echo "$ac_t""${xe_cflags_warning}" 1>&6
echo $ac_n "checking for preferred warning flags for CC""... $ac_c" 1>&6
-echo "configure:2962: checking for preferred warning flags for CC" >&5
+echo "configure:3005: checking for preferred warning flags for CC" >&5
echo "$ac_t""${cflags_warning}" 1>&6
+
+
+echo $ac_n "checking for remaining CFLAGS""... $ac_c" 1>&6
+echo "configure:3010: checking for remaining CFLAGS" >&5
+
+if test "$cflags_specified" = "no"; then
+ if test "$CC" = "xlc"; then
+ CFLAGS="-qro"
+ fi
+fi
+echo "$ac_t""${CFLAGS}" 1>&6
+
-XE_CFLAGS="$xe_cflags_warning $CFLAGS"
-CFLAGS="$cflags_warning $CFLAGS"
+XE_CFLAGS="$xe_cflags_warning $cflags_debugging $cflags_optimization $CFLAGS"
+CFLAGS="$cflags_warning $cflags_debugging $cflags_optimization $CFLAGS"
+
+echo $ac_n "checking total value of XE_CFLAGS""... $ac_c" 1>&6
+echo "configure:3024: checking total value of XE_CFLAGS" >&5
+echo "$ac_t""${XE_CFLAGS}" 1>&6
+echo $ac_n "checking total value of CFLAGS""... $ac_c" 1>&6
+echo "configure:3027: checking total value of CFLAGS" >&5
+echo "$ac_t""${CFLAGS}" 1>&6
if test "$GCC" = "yes"; then
echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6
-echo "configure:2970: checking for buggy gcc versions" >&5
+echo "configure:3032: checking for buggy gcc versions" >&5
GCC_VERSION=`$CC --version`
case `uname -s`:`uname -m`:$GCC_VERSION in
*:sun4*:2.8.1|*:sun4*:egcs-2.90.*)
＠＠ -3024,7 +3086,7 ＠＠
if test "$pdump" != "yes"; then
echo $ac_n "checking for \"-z nocombreloc\" linker flag""... $ac_c" 1>&6
-echo "configure:3028: checking for \"-z nocombreloc\" linker flag" >&5
+echo "configure:3090: checking for \"-z nocombreloc\" linker flag" >&5
case "`ld --help 2>&1`" in
*-z\ nocombreloc* ) echo "$ac_t""yes" 1>&6
ld_switch_site="-z nocombreloc $ld_switch_site" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-z nocombreloc\" to \$ld_switch_site"; fi ;;
＠＠ -3113,7 +3175,7 ＠＠
fi
echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:3117: checking for dynodump" >&5
+echo "configure:3179: checking for dynodump" >&5
if test "$unexec" != "unexsol2.o"; then
echo "$ac_t""no" 1>&6
else
＠＠ -3150,12 +3212,12 ＠＠
done
echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6
-echo "configure:3154: checking for terminateAndUnload in -lC" >&5
+echo "configure:3216: checking for terminateAndUnload in -lC" >&5
ac_lib_var=`echo C'_'terminateAndUnload | sed 'y%./+-%__p_%'`
xe_check_libs=" -lC "
cat > conftest.$ac_ext <<EOF
-#line 3159 "configure"
+#line 3221 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -3166,7 +3228,7 ＠＠
terminateAndUnload()
; return 0; }
EOF
-if { (eval echo configure:3170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -3208,7 +3270,7 ＠＠
libc_version=""
echo $ac_n "checking for compiler version information""... $ac_c" 1>&6
-echo "configure:3212: checking for compiler version information" >&5
+echo "configure:3274: checking for compiler version information" >&5
if test "$GCC" = "yes"; then
compiler_version=`$XEMACS_CC --version | head -1`
＠＠ -3259,7 +3321,7 ＠＠
fi
echo $ac_n "checking for standard C library version information""... $ac_c" 1>&6
-echo "configure:3263: checking for standard C library version information" >&5
+echo "configure:3325: checking for standard C library version information" >&5
case "$canonical" in
*-*-linux*)
＠＠ -3371,7 +3433,7 ＠＠
if test "$add_runtime_path" = "yes"; then
echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:3375: checking "for runtime libraries flag"" >&5
+echo "configure:3437: checking "for runtime libraries flag"" >&5
case "$opsys" in
sol2 ) dash_r="-R" ;;
decosf* | linux* | irix*) dash_r="-rpath " ;;
＠＠ -3393,14 +3455,14 ＠＠
done
fi
cat > conftest.$ac_ext <<EOF
-#line 3397 "configure"
+#line 3459 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
dash_r="$try_dash_r"
else
＠＠ -3501,10 +3563,10 ＠＠
fi
after_morecore_hook_exists=yes
echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:3505: checking for malloc_set_state" >&5
+echo "configure:3567: checking for malloc_set_state" >&5
cat > conftest.$ac_ext <<EOF
-#line 3508 "configure"
+#line 3570 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char malloc_set_state(); below. */
＠＠ -3527,7 +3589,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:3531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_malloc_set_state=yes"
else
＠＠ -3547,16 +3609,16 ＠＠
fi
echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:3551: checking whether __after_morecore_hook exists" >&5
+echo "configure:3613: checking whether __after_morecore_hook exists" >&5
cat > conftest.$ac_ext <<EOF
-#line 3553 "configure"
+#line 3615 "configure"
#include "confdefs.h"
extern void (* __after_morecore_hook)();
int main() {
__after_morecore_hook = 0
; return 0; }
EOF
-if { (eval echo configure:3560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
＠＠ -3612,7 +3674,7 ＠＠
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3616: checking for $ac_word" >&5
+echo "configure:3678: checking for $ac_word" >&5
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
＠＠ -3667,7 +3729,7 ＠＠
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:3671: checking for a BSD compatible install" >&5
+echo "configure:3733: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
＠＠ -3721,7 +3783,7 ＠＠
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3725: checking for $ac_word" >&5
+echo "configure:3787: checking for $ac_word" >&5
if test -n "$YACC"; then
ac_cv_prog_YACC="$YACC" # Let the user override the test.
＠＠ -3753,15 +3815,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3757: checking for $ac_hdr" >&5
+echo "configure:3819: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 3760 "configure"
+#line 3822 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -3791,10 +3853,10 ＠＠
done
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3795: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3857: checking for sys/wait.h that is POSIX.1 compatible" >&5
cat > conftest.$ac_ext <<EOF
-#line 3798 "configure"
+#line 3860 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
＠＠ -3810,7 +3872,7 ＠＠
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:3814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
＠＠ -3834,10 +3896,10 ＠＠
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3838: checking for ANSI C header files" >&5
+echo "configure:3900: checking for ANSI C header files" >&5
cat > conftest.$ac_ext <<EOF
-#line 3841 "configure"
+#line 3903 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
＠＠ -3845,7 +3907,7 ＠＠
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -3862,7 +3924,7 ＠＠
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 3866 "configure"
+#line 3928 "configure"
#include "confdefs.h"
#include <string.h>
EOF
＠＠ -3880,7 +3942,7 ＠＠
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 3884 "configure"
+#line 3946 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
＠＠ -3898,7 +3960,7 ＠＠
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
cat > conftest.$ac_ext <<EOF
-#line 3902 "configure"
+#line 3964 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
＠＠ -3909,7 +3971,7 ＠＠
exit (0); }
EOF
-if { (eval echo configure:3913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
:
else
＠＠ -3935,10 +3997,10 ＠＠
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3939: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:4001: checking whether time.h and sys/time.h may both be included" >&5
cat > conftest.$ac_ext <<EOF
-#line 3942 "configure"
+#line 4004 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
＠＠ -3947,7 +4009,7 ＠＠
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:3951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
＠＠ -3971,10 +4033,10 ＠＠
fi
echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:3975: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:4037: checking for sys_siglist declaration in signal.h or unistd.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 3978 "configure"
+#line 4040 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
＠＠ -3986,7 +4048,7 ＠＠
char *msg = *(sys_siglist + 1);
; return 0; }
EOF
-if { (eval echo configure:3990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_decl_sys_siglist=yes
else
＠＠ -4012,9 +4074,9 ＠＠
echo $ac_n "checking for utime""... $ac_c" 1>&6
-echo "configure:4016: checking for utime" >&5
+echo "configure:4078: checking for utime" >&5
cat > conftest.$ac_ext <<EOF
-#line 4018 "configure"
+#line 4080 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <utime.h>
＠＠ -4022,7 +4084,7 ＠＠
struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x);
; return 0; }
EOF
-if { (eval echo configure:4026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
{ test "$extra_verbose" = "yes" && cat << \EOF
＠＠ -4041,10 +4103,10 ＠＠
for ac_func in utimes
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4045: checking for $ac_func" >&5
+echo "configure:4107: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4048 "configure"
+#line 4110 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -4067,7 +4129,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:4071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -4099,10 +4161,10 ＠＠
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:4103: checking return type of signal handlers" >&5
+echo "configure:4165: checking return type of signal handlers" >&5
cat > conftest.$ac_ext <<EOF
-#line 4106 "configure"
+#line 4168 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
＠＠ -4119,7 +4181,7 ＠＠
int i;
; return 0; }
EOF
-if { (eval echo configure:4123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
＠＠ -4141,10 +4203,10 ＠＠
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:4145: checking for size_t" >&5
+echo "configure:4207: checking for size_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4148 "configure"
+#line 4210 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
＠＠ -4175,10 +4237,10 ＠＠
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:4179: checking for pid_t" >&5
+echo "configure:4241: checking for pid_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4182 "configure"
+#line 4244 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
＠＠ -4209,10 +4271,10 ＠＠
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:4213: checking for uid_t in sys/types.h" >&5
+echo "configure:4275: checking for uid_t in sys/types.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 4216 "configure"
+#line 4278 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
＠＠ -4248,10 +4310,10 ＠＠
fi
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:4252: checking for mode_t" >&5
+echo "configure:4314: checking for mode_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4255 "configure"
+#line 4317 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
＠＠ -4282,10 +4344,10 ＠＠
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:4286: checking for off_t" >&5
+echo "configure:4348: checking for off_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4289 "configure"
+#line 4351 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
＠＠ -4316,10 +4378,10 ＠＠
fi
echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:4320: checking for ssize_t" >&5
+echo "configure:4382: checking for ssize_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4323 "configure"
+#line 4385 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
＠＠ -4352,9 +4414,9 ＠＠
if test "$ac_cv_header_inttypes_h" != "yes"; then
echo $ac_n "checking for intptr_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:4356: checking for intptr_t in sys/types.h" >&5
+echo "configure:4418: checking for intptr_t in sys/types.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 4358 "configure"
+#line 4420 "configure"
#include "confdefs.h"
#include <sys/types.h>
intptr_t x;
＠＠ -4363,7 +4425,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:4367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
{ test "$extra_verbose" = "yes" && cat << \EOF
＠＠ -4384,9 +4446,9 ＠＠
fi
echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:4388: checking for socklen_t" >&5
+echo "configure:4450: checking for socklen_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4390 "configure"
+#line 4452 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/socket.h>
＠＠ -4396,7 +4458,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:4400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
＠＠ -4405,7 +4467,7 ＠＠
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 4409 "configure"
+#line 4471 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/socket.h>
＠＠ -4415,7 +4477,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:4419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""size_t" 1>&6
＠＠ -4447,9 +4509,9 ＠＠
rm -f conftest*
echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:4451: checking for struct timeval" >&5
+echo "configure:4513: checking for struct timeval" >&5
cat > conftest.$ac_ext <<EOF
-#line 4453 "configure"
+#line 4515 "configure"
#include "confdefs.h"
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
＠＠ -4465,7 +4527,7 ＠＠
static struct timeval x; x.tv_sec = x.tv_usec;
; return 0; }
EOF
-if { (eval echo configure:4469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
HAVE_TIMEVAL=yes
＠＠ -4487,10 +4549,10 ＠＠
rm -f conftest*
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:4491: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:4553: checking whether struct tm is in sys/time.h or time.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 4494 "configure"
+#line 4556 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
＠＠ -4498,7 +4560,7 ＠＠
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
-if { (eval echo configure:4502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
＠＠ -4522,10 +4584,10 ＠＠
fi
echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:4526: checking for tm_zone in struct tm" >&5
+echo "configure:4588: checking for tm_zone in struct tm" >&5
cat > conftest.$ac_ext <<EOF
-#line 4529 "configure"
+#line 4591 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_cv_struct_tm>
＠＠ -4533,7 +4595,7 ＠＠
struct tm tm; tm.tm_zone;
; return 0; }
EOF
-if { (eval echo configure:4537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm_zone=yes
else
＠＠ -4556,10 +4618,10 ＠＠
else
echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:4560: checking for tzname" >&5
+echo "configure:4622: checking for tzname" >&5
cat > conftest.$ac_ext <<EOF
-#line 4563 "configure"
+#line 4625 "configure"
#include "confdefs.h"
#include <time.h>
#ifndef tzname /* For SGI. */
＠＠ -4569,7 +4631,7 ＠＠
atoi(*tzname);
; return 0; }
EOF
-if { (eval echo configure:4573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_var_tzname=yes
else
＠＠ -4595,10 +4657,10 ＠＠
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4599: checking for working const" >&5
+echo "configure:4661: checking for working const" >&5
cat > conftest.$ac_ext <<EOF
-#line 4602 "configure"
+#line 4664 "configure"
#include "confdefs.h"
int main() {
＠＠ -4647,7 +4709,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:4651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
＠＠ -4672,7 +4734,7 ＠＠
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:4676: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:4738: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
cat > conftestmake <<\EOF
＠＠ -4697,12 +4759,12 ＠＠
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:4701: checking whether byte ordering is bigendian" >&5
+echo "configure:4763: checking whether byte ordering is bigendian" >&5
ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
-#line 4706 "configure"
+#line 4768 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
＠＠ -4713,11 +4775,11 ＠＠
#endif
; return 0; }
EOF
-if { (eval echo configure:4717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
-#line 4721 "configure"
+#line 4783 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
＠＠ -4728,7 +4790,7 ＠＠
#endif
; return 0; }
EOF
-if { (eval echo configure:4732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
＠＠ -4745,7 +4807,7 ＠＠
rm -f conftest*
if test $ac_cv_c_bigendian = unknown; then
cat > conftest.$ac_ext <<EOF
-#line 4749 "configure"
+#line 4811 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
＠＠ -4758,7 +4820,7 ＠＠
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:4762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_c_bigendian=no
else
＠＠ -4785,10 +4847,10 ＠＠
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:4789: checking size of short" >&5
+echo "configure:4851: checking size of short" >&5
cat > conftest.$ac_ext <<EOF
-#line 4792 "configure"
+#line 4854 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
＠＠ -4799,7 +4861,7 ＠＠
exit(0);
}
EOF
-if { (eval echo configure:4803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_short=`cat conftestval`
else
＠＠ -4827,10 +4889,10 ＠＠
exit 1
fi
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4831: checking size of int" >&5
+echo "configure:4893: checking size of int" >&5
cat > conftest.$ac_ext <<EOF
-#line 4834 "configure"
+#line 4896 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
＠＠ -4841,7 +4903,7 ＠＠
exit(0);
}
EOF
-if { (eval echo configure:4845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_int=`cat conftestval`
else
＠＠ -4863,10 +4925,10 ＠＠
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4867: checking size of long" >&5
+echo "configure:4929: checking size of long" >&5
cat > conftest.$ac_ext <<EOF
-#line 4870 "configure"
+#line 4932 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
＠＠ -4877,7 +4939,7 ＠＠
exit(0);
}
EOF
-if { (eval echo configure:4881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_long=`cat conftestval`
else
＠＠ -4899,10 +4961,10 ＠＠
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4903: checking size of long long" >&5
+echo "configure:4965: checking size of long long" >&5
cat > conftest.$ac_ext <<EOF
-#line 4906 "configure"
+#line 4968 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
＠＠ -4913,7 +4975,7 ＠＠
exit(0);
}
EOF
-if { (eval echo configure:4917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_long_long=`cat conftestval`
else
＠＠ -4935,10 +4997,10 ＠＠
echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4939: checking size of void *" >&5
+echo "configure:5001: checking size of void *" >&5
cat > conftest.$ac_ext <<EOF
-#line 4942 "configure"
+#line 5004 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
＠＠ -4949,7 +5011,7 ＠＠
exit(0);
}
EOF
-if { (eval echo configure:4953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:5015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_void_p=`cat conftestval`
else
＠＠ -4971,10 +5033,10 ＠＠
echo $ac_n "checking size of double""... $ac_c" 1>&6
-echo "configure:4975: checking size of double" >&5
+echo "configure:5037: checking size of double" >&5
cat > conftest.$ac_ext <<EOF
-#line 4978 "configure"
+#line 5040 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
＠＠ -4985,7 +5047,7 ＠＠
exit(0);
}
EOF
-if { (eval echo configure:4989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:5051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_double=`cat conftestval`
else
＠＠ -5008,7 +5070,7 ＠＠
echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:5012: checking for long file names" >&5
+echo "configure:5074: checking for long file names" >&5
ac_cv_sys_long_file_names=yes
# Test for long file names in all the places we know might matter:
＠＠ -5054,10 +5116,10 ＠＠
echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:5058: checking for sin" >&5
+echo "configure:5120: checking for sin" >&5
cat > conftest.$ac_ext <<EOF
-#line 5061 "configure"
+#line 5123 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char sin(); below. */
＠＠ -5080,7 +5142,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:5084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_sin=yes"
else
＠＠ -5098,12 +5160,12 ＠＠
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:5102: checking for sin in -lm" >&5
+echo "configure:5164: checking for sin in -lm" >&5
ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
xe_check_libs=" -lm "
cat > conftest.$ac_ext <<EOF
-#line 5107 "configure"
+#line 5169 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -5114,7 +5176,7 ＠＠
sin()
; return 0; }
EOF
-if { (eval echo configure:5118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5149,14 +5211,14 ＠＠
cat > conftest.$ac_ext <<EOF
-#line 5153 "configure"
+#line 5215 "configure"
#include "confdefs.h"
#include <math.h>
int main() {
return atanh(1.0) + asinh(1.0) + acosh(1.0);
; return 0; }
EOF
-if { (eval echo configure:5160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_INVERSE_HYPERBOLIC
＠＠ -5175,10 +5237,10 ＠＠
for ac_func in mkstemp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5179: checking for $ac_func" >&5
+echo "configure:5241: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 5182 "configure"
+#line 5244 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -5201,7 +5263,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:5205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -5230,14 +5292,14 ＠＠
echo "checking type of mail spool file locking" 1>&6
-echo "configure:5234: checking type of mail spool file locking" >&5
+echo "configure:5296: checking type of mail spool file locking" >&5
for ac_func in lockf flock
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5238: checking for $ac_func" >&5
+echo "configure:5300: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 5241 "configure"
+#line 5303 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -5260,7 +5322,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:5264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -5350,12 +5412,12 ＠＠
case "$opsys" in decosf*)
echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:5354: checking for cma_open in -lpthreads" >&5
+echo "configure:5416: checking for cma_open in -lpthreads" >&5
ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lpthreads "
cat > conftest.$ac_ext <<EOF
-#line 5359 "configure"
+#line 5421 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -5366,7 +5428,7 ＠＠
cma_open()
; return 0; }
EOF
-if { (eval echo configure:5370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5403,7 +5465,7 ＠＠
echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:5407: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:5469: checking whether the -xildoff compiler flag is required" >&5
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 echo "$ac_t""no" 1>&6;
＠＠ -5415,7 +5477,7 ＠＠
if test "$opsys" = "sol2"; then
if test "$os_release" -ge 506; then
echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:5419: checking for \"-z ignore\" linker flag" >&5
+echo "configure:5481: checking for \"-z ignore\" linker flag" >&5
case "`ld -h 2>&1`" in
*-z\ ignore\|record* ) echo "$ac_t""yes" 1>&6
ld_switch_site="-z ignore $ld_switch_site" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-z ignore\" to \$ld_switch_site"; fi ;;
＠＠ -5426,7 +5488,7 ＠＠
echo "checking "for specified window system"" 1>&6
-echo "configure:5430: checking "for specified window system"" >&5
+echo "configure:5492: checking "for specified window system"" >&5
GNOME_CONFIG=no
＠＠ -5434,7 +5496,7 ＠＠
if test "$with_gnome" != "no"; then
echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6
-echo "configure:5438: checking for GNOME configuration script" >&5
+echo "configure:5500: checking for GNOME configuration script" >&5
for possible in gnome-config
do
possible_version=`${possible} --version 2> /dev/null`
＠＠ -5465,7 +5527,7 ＠＠
if test "$with_gtk" != "no";then
echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6
-echo "configure:5469: checking for GTK configuration script" >&5
+echo "configure:5531: checking for GTK configuration script" >&5
for possible in gtk12-config gtk14-config gtk-config
do
possible_version=`${possible} --version 2> /dev/null`
＠＠ -5487,18 +5549,18 ＠＠
if test "${GTK_CONFIG}" != "no"; then
echo $ac_n "checking gtk version""... $ac_c" 1>&6
-echo "configure:5491: checking gtk version" >&5
+echo "configure:5553: checking gtk version" >&5
GTK_VERSION=`${GTK_CONFIG} --version`
echo "$ac_t""${GTK_VERSION}" 1>&6
echo $ac_n "checking gtk libs""... $ac_c" 1>&6
-echo "configure:5496: checking gtk libs" >&5
+echo "configure:5558: checking gtk libs" >&5
GTK_LIBS=`${GTK_CONFIG} --libs`
libs_gtk="$libs_gtk ${GTK_LIBS}" && if test "$extra_verbose" = "yes"; then echo " Appending \"${GTK_LIBS}\" to \$libs_gtk"; fi
echo "$ac_t""${GTK_LIBS}" 1>&6
echo $ac_n "checking gtk cflags""... $ac_c" 1>&6
-echo "configure:5502: checking gtk cflags" >&5
+echo "configure:5564: checking gtk cflags" >&5
GTK_CFLAGS=`${GTK_CONFIG} --cflags`
if test "$GCC" = "yes"; then
GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow"
＠＠ -5508,19 +5570,19 ＠＠
echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6
-echo "configure:5512: checking for main in -lgdk_imlib" >&5
+echo "configure:5574: checking for main in -lgdk_imlib" >&5
ac_lib_var=`echo gdk_imlib'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgdk_imlib "
cat > conftest.$ac_ext <<EOF
-#line 5517 "configure"
+#line 5579 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5542,12 +5604,12 ＠＠
echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
-echo "configure:5546: checking for Imlib_init in -lImlib" >&5
+echo "configure:5608: checking for Imlib_init in -lImlib" >&5
ac_lib_var=`echo Imlib'_'Imlib_init | sed 'y%./+-%__p_%'`
xe_check_libs=" -lImlib "
cat > conftest.$ac_ext <<EOF
-#line 5551 "configure"
+#line 5613 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -5558,7 +5620,7 ＠＠
Imlib_init()
; return 0; }
EOF
-if { (eval echo configure:5562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5581,10 +5643,10 ＠＠
for ac_func in gdk_imlib_init
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5585: checking for $ac_func" >&5
+echo "configure:5647: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 5588 "configure"
+#line 5650 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -5607,7 +5669,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:5611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -5691,15 +5753,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5695: checking for $ac_hdr" >&5
+echo "configure:5757: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 5698 "configure"
+#line 5760 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5703: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -5730,19 +5792,19 ＠＠
echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6
-echo "configure:5734: checking for main in -lxml" >&5
+echo "configure:5796: checking for main in -lxml" >&5
ac_lib_var=`echo xml'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lxml "
cat > conftest.$ac_ext <<EOF
-#line 5739 "configure"
+#line 5801 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5764,19 +5826,19 ＠＠
echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6
-echo "configure:5768: checking for main in -lglade" >&5
+echo "configure:5830: checking for main in -lglade" >&5
ac_lib_var=`echo glade'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lglade "
cat > conftest.$ac_ext <<EOF
-#line 5773 "configure"
+#line 5835 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5798,19 +5860,19 ＠＠
echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6
-echo "configure:5802: checking for main in -lglade-gnome" >&5
+echo "configure:5864: checking for main in -lglade-gnome" >&5
ac_lib_var=`echo glade-gnome'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lglade-gnome "
cat > conftest.$ac_ext <<EOF
-#line 5807 "configure"
+#line 5869 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5831,7 +5893,7 ＠＠
cat > conftest.$ac_ext <<EOF
-#line 5835 "configure"
+#line 5897 "configure"
#include "confdefs.h"
#include <glade/glade-xml.h>
EOF
＠＠ -5890,7 +5952,7 ＠＠
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:5894: checking for X" >&5
+echo "configure:5956: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
＠＠ -5950,12 +6012,12 ＠＠
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 5954 "configure"
+#line 6016 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -6024,14 +6086,14 ＠＠
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6028 "configure"
+#line 6090 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:6035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
＠＠ -6140,17 +6202,17 ＠＠
case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*)
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:6144: checking whether -R must be followed by a space" >&5
+echo "configure:6206: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 6147 "configure"
+#line 6209 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:6154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
＠＠ -6166,14 +6228,14 ＠＠
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 6170 "configure"
+#line 6232 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:6177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
＠＠ -6209,12 +6271,12 ＠＠
else
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:6213: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:6275: checking for dnet_ntoa in -ldnet" >&5
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldnet "
cat > conftest.$ac_ext <<EOF
-#line 6218 "configure"
+#line 6280 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6225,7 +6287,7 ＠＠
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:6229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6249,12 +6311,12 ＠＠
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:6253: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:6315: checking for dnet_ntoa in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldnet_stub "
cat > conftest.$ac_ext <<EOF
-#line 6258 "configure"
+#line 6320 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6265,7 +6327,7 ＠＠
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:6269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6294,10 +6356,10 ＠＠
# The nsl library prevents programs from opening the X display
# on Irix 5.2, according to dickey(a)clark.net.
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:6298: checking for gethostbyname" >&5
+echo "configure:6360: checking for gethostbyname" >&5
cat > conftest.$ac_ext <<EOF
-#line 6301 "configure"
+#line 6363 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
＠＠ -6320,7 +6382,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:6324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
＠＠ -6341,12 +6403,12 ＠＠
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:6345: checking for gethostbyname in -lnsl" >&5
+echo "configure:6407: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
xe_check_libs=" -lnsl "
cat > conftest.$ac_ext <<EOF
-#line 6350 "configure"
+#line 6412 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6357,7 +6419,7 ＠＠
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:6361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6387,10 +6449,10 ＠＠
# -lsocket must be given before -lnsl if both are needed.
# We assume that if connect needs -lnsl, so does gethostbyname.
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:6391: checking for connect" >&5
+echo "configure:6453: checking for connect" >&5
cat > conftest.$ac_ext <<EOF
-#line 6394 "configure"
+#line 6456 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
＠＠ -6413,7 +6475,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:6417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
＠＠ -6436,12 +6498,12 ＠＠
xe_msg_checking="for connect in -lsocket"
test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6440: checking "$xe_msg_checking"" >&5
+echo "configure:6502: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
xe_check_libs=" -lsocket $X_EXTRA_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6445 "configure"
+#line 6507 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6452,7 +6514,7 ＠＠
connect()
; return 0; }
EOF
-if { (eval echo configure:6456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6476,10 +6538,10 ＠＠
# gomez(a)mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:6480: checking for remove" >&5
+echo "configure:6542: checking for remove" >&5
cat > conftest.$ac_ext <<EOF
-#line 6483 "configure"
+#line 6545 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
＠＠ -6502,7 +6564,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:6506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_remove=yes"
else
＠＠ -6523,12 +6585,12 ＠＠
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:6527: checking for remove in -lposix" >&5
+echo "configure:6589: checking for remove in -lposix" >&5
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
xe_check_libs=" -lposix "
cat > conftest.$ac_ext <<EOF
-#line 6532 "configure"
+#line 6594 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6539,7 +6601,7 ＠＠
remove()
; return 0; }
EOF
-if { (eval echo configure:6543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6563,10 +6625,10 ＠＠
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:6567: checking for shmat" >&5
+echo "configure:6629: checking for shmat" >&5
cat > conftest.$ac_ext <<EOF
-#line 6570 "configure"
+#line 6632 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
＠＠ -6589,7 +6651,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:6593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shmat=yes"
else
＠＠ -6610,12 +6672,12 ＠＠
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:6614: checking for shmat in -lipc" >&5
+echo "configure:6676: checking for shmat in -lipc" >&5
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
xe_check_libs=" -lipc "
cat > conftest.$ac_ext <<EOF
-#line 6619 "configure"
+#line 6681 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6626,7 +6688,7 ＠＠
shmat()
; return 0; }
EOF
-if { (eval echo configure:6630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6662,12 +6724,12 ＠＠
xe_msg_checking="for IceConnectionNumber in -lICE"
test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6666: checking "$xe_msg_checking"" >&5
+echo "configure:6728: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
xe_check_libs=" -lICE $X_EXTRA_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6671 "configure"
+#line 6733 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6678,7 +6740,7 ＠＠
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:6682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6724,15 +6786,15 ＠＠
ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:6728: checking for Xm/Xm.h" >&5
+echo "configure:6790: checking for Xm/Xm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 6731 "configure"
+#line 6793 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6798: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -6749,12 +6811,12 ＠＠
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:6753: checking for XmStringFree in -lXm" >&5
+echo "configure:6815: checking for XmStringFree in -lXm" >&5
ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXm "
cat > conftest.$ac_ext <<EOF
-#line 6758 "configure"
+#line 6820 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6765,7 +6827,7 ＠＠
XmStringFree()
; return 0; }
EOF
-if { (eval echo configure:6769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6917,7 +6979,7 ＠＠
echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:6921: checking for X defines extracted by xmkmf" >&5
+echo "configure:6983: checking for X defines extracted by xmkmf" >&5
rm -fr conftestdir
if mkdir conftestdir; then
cd conftestdir
＠＠ -6966,15 +7028,15 ＠＠
ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:6970: checking for X11/Intrinsic.h" >&5
+echo "configure:7032: checking for X11/Intrinsic.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 6973 "configure"
+#line 7035 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -6998,12 +7060,12 ＠＠
echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:7002: checking for XOpenDisplay in -lX11" >&5
+echo "configure:7064: checking for XOpenDisplay in -lX11" >&5
ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
xe_check_libs=" -lX11 "
cat > conftest.$ac_ext <<EOF
-#line 7007 "configure"
+#line 7069 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -7014,7 +7076,7 ＠＠
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:7018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7039,12 +7101,12 ＠＠
xe_msg_checking="for XGetFontProperty in -lX11"
test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7043: checking "$xe_msg_checking"" >&5
+echo "configure:7105: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'`
xe_check_libs=" -lX11 -b i486-linuxaout"
cat > conftest.$ac_ext <<EOF
-#line 7048 "configure"
+#line 7110 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -7055,7 +7117,7 ＠＠
XGetFontProperty()
; return 0; }
EOF
-if { (eval echo configure:7059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7082,12 +7144,12 ＠＠
echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:7086: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:7148: checking for XShapeSelectInput in -lXext" >&5
ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXext "
cat > conftest.$ac_ext <<EOF
-#line 7091 "configure"
+#line 7153 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -7098,7 +7160,7 ＠＠
XShapeSelectInput()
; return 0; }
EOF
-if { (eval echo configure:7102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7121,12 +7183,12 ＠＠
echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:7125: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:7187: checking for XtOpenDisplay in -lXt" >&5
ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXt "
cat > conftest.$ac_ext <<EOF
-#line 7130 "configure"
+#line 7192 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -7137,7 +7199,7 ＠＠
XtOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:7141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7160,14 +7222,14 ＠＠
echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:7164: checking the version of X11 being used" >&5
+echo "configure:7226: checking the version of X11 being used" >&5
cat > conftest.$ac_ext <<EOF
-#line 7166 "configure"
+#line 7228 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
EOF
-if { (eval echo configure:7171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
./conftest foobar; x11_release=$?
else
＠＠ -7198,10 +7260,10 ＠＠
for ac_func in XConvertCase
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7202: checking for $ac_func" >&5
+echo "configure:7264: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 7205 "configure"
+#line 7267 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -7224,7 +7286,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:7228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -7256,15 +7318,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7260: checking for $ac_hdr" >&5
+echo "configure:7322: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7263 "configure"
+#line 7325 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -7297,10 +7359,10 ＠＠
for ac_func in XRegisterIMInstantiateCallback
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7301: checking for $ac_func" >&5
+echo "configure:7363: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 7304 "configure"
+#line 7366 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -7323,7 +7385,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:7327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -7351,9 +7413,9 ＠＠
done
echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6
-echo "configure:7355: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+echo "configure:7417: checking for standard XRegisterIMInstantiateCallback prototype" >&5
cat > conftest.$ac_ext <<EOF
-#line 7357 "configure"
+#line 7419 "configure"
#include "confdefs.h"
#define NeedFunctionPrototypes 1
＠＠ -7365,7 +7427,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:7369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
＠＠ -7386,12 +7448,12 ＠＠
test -z "$with_xmu" && {
echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:7390: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:7452: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXmu "
cat > conftest.$ac_ext <<EOF
-#line 7395 "configure"
+#line 7457 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -7402,7 +7464,7 ＠＠
XmuReadBitmapDataFromFile()
; return 0; }
EOF
-if { (eval echo configure:7406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7441,19 +7503,19 ＠＠
echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:7445: checking for main in -lXbsd" >&5
+echo "configure:7507: checking for main in -lXbsd" >&5
ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXbsd "
cat > conftest.$ac_ext <<EOF
-#line 7450 "configure"
+#line 7512 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:7457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7490,22 +7552,22 ＠＠
fi
if test "$with_msw" != "no"; then
echo "checking for MS-Windows" 1>&6
-echo "configure:7494: checking for MS-Windows" >&5
+echo "configure:7556: checking for MS-Windows" >&5
echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:7497: checking for main in -lgdi32" >&5
+echo "configure:7559: checking for main in -lgdi32" >&5
ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgdi32 "
cat > conftest.$ac_ext <<EOF
-#line 7502 "configure"
+#line 7564 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:7509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7556,12 +7618,12 ＠＠
test "$with_widgets" != "no" && with_widgets=msw
fi
cat > conftest.$ac_ext <<EOF
-#line 7560 "configure"
+#line 7622 "configure"
#include "confdefs.h"
#include <fcntl.h>
int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
EOF
-if { (eval echo configure:7565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_MSG_SELECT
＠＠ -7622,15 +7684,15 ＠＠
if test "$with_x11" = "yes"; then
ac_safe=`echo "X11/extensions/shape.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6
-echo "configure:7626: checking for X11/extensions/shape.h" >&5
+echo "configure:7688: checking for X11/extensions/shape.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7629 "configure"
+#line 7691 "configure"
#include "confdefs.h"
#include <X11/extensions/shape.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -7680,7 +7742,7 ＠＠
esac
echo "checking for WM_COMMAND option" 1>&6
-echo "configure:7684: checking for WM_COMMAND option" >&5;
+echo "configure:7746: checking for WM_COMMAND option" >&5;
if test "$with_wmcommand" != "no"; then
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_WMCOMMAND
＠＠ -7695,15 +7757,15 ＠＠
test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6
-echo "configure:7699: checking for X11/Xauth.h" >&5
+echo "configure:7761: checking for X11/Xauth.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7702 "configure"
+#line 7764 "configure"
#include "confdefs.h"
#include <X11/Xauth.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7707: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7769: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -7726,12 +7788,12 ＠＠
}
test -z "$with_xauth" && {
echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:7730: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:7792: checking for XauGetAuthByAddr in -lXau" >&5
ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXau "
cat > conftest.$ac_ext <<EOF
-#line 7735 "configure"
+#line 7797 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -7742,7 +7804,7 ＠＠
XauGetAuthByAddr()
; return 0; }
EOF
-if { (eval echo configure:7746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7793,7 +7855,7 ＠＠
if test "$with_modules" != "no"; then
echo "checking for module support" 1>&6
-echo "configure:7797: checking for module support" >&5
+echo "configure:7859: checking for module support" >&5
case "$opsys" in
mingw* | cygwin* ) have_dl=yes ;;
＠＠ -7810,15 +7872,15 ＠＠
* )
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:7814: checking for dlfcn.h" >&5
+echo "configure:7876: checking for dlfcn.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7817 "configure"
+#line 7879 "configure"
#include "confdefs.h"
#include <dlfcn.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -7835,16 +7897,16 ＠＠
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:7839: checking for dlopen in -lc" >&5
+echo "configure:7901: checking for dlopen in -lc" >&5
cat > conftest.$ac_ext <<EOF
-#line 7841 "configure"
+#line 7903 "configure"
#include "confdefs.h"
#include <dlfcn.h>
int main() {
dlopen ("", 0);
; return 0; }
EOF
-if { (eval echo configure:7848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
＠＠ -7853,18 +7915,18 ＠＠
rm -rf conftest*
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:7857: checking for dlopen in -ldl" >&5
+echo "configure:7919: checking for dlopen in -ldl" >&5
ac_save_LIBS="$LIBS"
LIBS="$LIBS -ldl"
cat > conftest.$ac_ext <<EOF
-#line 7861 "configure"
+#line 7923 "configure"
#include "confdefs.h"
#include <dlfcn.h>
int main() {
dlopen ("", 0);
; return 0; }
EOF
-if { (eval echo configure:7868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
＠＠ -7873,17 +7935,17 ＠＠
rm -rf conftest*
echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-echo "configure:7877: checking for dlopen in -lsvld" >&5
+echo "configure:7939: checking for dlopen in -lsvld" >&5
LIBS="$ac_save_LIBS -lsvld"
cat > conftest.$ac_ext <<EOF
-#line 7880 "configure"
+#line 7942 "configure"
#include "confdefs.h"
#include <dlfcn.h>
int main() {
dlopen ("", 0);
; return 0; }
EOF
-if { (eval echo configure:7887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
＠＠ -7913,15 +7975,15 ＠＠
else
ac_safe=`echo "dl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dl.h""... $ac_c" 1>&6
-echo "configure:7917: checking for dl.h" >&5
+echo "configure:7979: checking for dl.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7920 "configure"
+#line 7982 "configure"
#include "confdefs.h"
#include <dl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -7938,16 +8000,16 ＠＠
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for shl_load in -lc""... $ac_c" 1>&6
-echo "configure:7942: checking for shl_load in -lc" >&5
+echo "configure:8004: checking for shl_load in -lc" >&5
cat > conftest.$ac_ext <<EOF
-#line 7944 "configure"
+#line 8006 "configure"
#include "confdefs.h"
#include <dl.h>
int main() {
shl_load ("", 0, 0);
; return 0; }
EOF
-if { (eval echo configure:7951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
＠＠ -7956,18 +8018,18 ＠＠
rm -rf conftest*
echo $ac_n "checking for shl_load in -ldl""... $ac_c" 1>&6
-echo "configure:7960: checking for shl_load in -ldl" >&5
+echo "configure:8022: checking for shl_load in -ldl" >&5
ac_save_LIBS="$LIBS"
LIBS="$LIBS -ldld"
cat > conftest.$ac_ext <<EOF
-#line 7964 "configure"
+#line 8026 "configure"
#include "confdefs.h"
#include <dl.h>
int main() {
shl_load ("", 0, 0);
; return 0; }
EOF
-if { (eval echo configure:7971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
＠＠ -7995,15 +8057,15 ＠＠
else
ac_safe=`echo "ltdl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ltdl.h""... $ac_c" 1>&6
-echo "configure:7999: checking for ltdl.h" >&5
+echo "configure:8061: checking for ltdl.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8002 "configure"
+#line 8064 "configure"
#include "confdefs.h"
#include <ltdl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -8020,18 +8082,18 ＠＠
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for lt_dlinit in -lltdl""... $ac_c" 1>&6
-echo "configure:8024: checking for lt_dlinit in -lltdl" >&5
+echo "configure:8086: checking for lt_dlinit in -lltdl" >&5
ac_save_LIBS="$LIBS"
LIBS="$LIBS -lltdl"
cat > conftest.$ac_ext <<EOF
-#line 8028 "configure"
+#line 8090 "configure"
#include "confdefs.h"
#include <ltdl.h>
int main() {
lt_dlinit ();
; return 0; }
EOF
-if { (eval echo configure:8035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
＠＠ -8072,7 +8134,7 ＠＠
xealias=$internal_configuration
echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:8076: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:8138: checking how to build dynamic libraries for ${xehost}" >&5
# Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
case "$xehost" in
*-*-linux-gnu*) ;;
＠＠ -8100,9 +8162,9 ＠＠
XEGCC=yes
else
echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:8104: checking checking whether we are using GNU C" >&5
+echo "configure:8166: checking checking whether we are using GNU C" >&5
cat > conftest.$ac_ext <<EOF
-#line 8106 "configure"
+#line 8168 "configure"
#include "confdefs.h"
#ifdef __GNUC__
＠＠ -8124,7 +8186,7 ＠＠
fi
echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:8128: checking how to produce PIC code" >&5
+echo "configure:8190: checking how to produce PIC code" >&5
wl=
can_build_shared=yes
＠＠ -8228,18 +8290,18 ＠＠
# Check to make sure the dll_cflags actually works.
echo $ac_n "checking if PIC flag ${dll_cflags} really works""... $ac_c" 1>&6
-echo "configure:8232: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:8294: checking if PIC flag ${dll_cflags} really works" >&5
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $dll_cflags -DPIC"
cat > conftest.$ac_ext <<EOF
-#line 8236 "configure"
+#line 8298 "configure"
#include "confdefs.h"
int main() {
int x=0;
; return 0; }
EOF
-if { (eval echo configure:8243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also
＠＠ -8270,7 +8332,7 ＠＠
xldf=
xcldf=
echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:8274: checking if C compiler can produce shared libraries" >&5
+echo "configure:8336: checking if C compiler can produce shared libraries" >&5
if test "$XEGCC" = yes -o "$__ICC" = yes; then
case "$xehost_os" in
*darwin*)
＠＠ -8329,14 +8391,14 ＠＠
xe_libs=
ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
cat > conftest.$ac_ext <<EOF
-#line 8333 "configure"
+#line 8395 "configure"
#include "confdefs.h"
int main() {
int x=0;
; return 0; }
EOF
-if { (eval echo configure:8340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cc_produces_so=yes
else
＠＠ -8361,7 +8423,7 ＠＠
if test "$XEGCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:8365: checking for ld used by GCC" >&5
+echo "configure:8427: checking for ld used by GCC" >&5
ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in
# Accept absolute paths.
＠＠ -8387,7 +8449,7 ＠＠
esac
else
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:8391: checking for GNU ld" >&5
+echo "configure:8453: checking for GNU ld" >&5
fi
if test -z "$LTLD"; then
＠＠ -8425,7 +8487,7 ＠＠
# Check to see if it really is or isn't GNU ld.
echo $ac_n "checking if the linker is GNU ld""... $ac_c" 1>&6
-echo "configure:8429: checking if the linker is GNU ld" >&5
+echo "configure:8491: checking if the linker is GNU ld" >&5
# I'd rather use --version here, but apparently some GNU ld's only accept -v.
if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
xe_gnu_ld=yes
＠＠ -8460,7 +8522,7 ＠＠
# OK - only NOW do we futz about with ld.
# See if the linker supports building shared libraries.
echo $ac_n "checking whether the linker supports shared libraries""... $ac_c" 1>&6
-echo "configure:8464: checking whether the linker supports shared libraries" >&5
+echo "configure:8526: checking whether the linker supports shared libraries" >&5
dll_ld=$CC
dll_ldflags=$LDFLAGS
ld_shlibs=yes
＠＠ -8673,10 +8735,10 ＠＠
for ac_func in dlerror _dlerror
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8677: checking for $ac_func" >&5
+echo "configure:8739: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 8680 "configure"
+#line 8742 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -8699,7 +8761,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:8703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -8763,15 +8825,15 ＠＠
for dir in "" "Tt/" "desktop/" ; do
ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6
-echo "configure:8767: checking for ${dir}tt_c.h" >&5
+echo "configure:8829: checking for ${dir}tt_c.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8770 "configure"
+#line 8832 "configure"
#include "confdefs.h"
#include <${dir}tt_c.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -8807,12 +8869,12 ＠＠
xe_msg_checking="for tt_message_create in -ltt"
test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:8811: checking "$xe_msg_checking"" >&5
+echo "configure:8873: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'`
xe_check_libs=" -ltt $extra_libs"
cat > conftest.$ac_ext <<EOF
-#line 8816 "configure"
+#line 8878 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -8823,7 +8885,7 ＠＠
tt_message_create()
; return 0; }
EOF
-if { (eval echo configure:8827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -8877,15 +8939,15 ＠＠
test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6
-echo "configure:8881: checking for Dt/Dt.h" >&5
+echo "configure:8943: checking for Dt/Dt.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8884 "configure"
+#line 8946 "configure"
#include "confdefs.h"
#include <Dt/Dt.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -8908,12 +8970,12 ＠＠
}
test -z "$with_cde" && {
echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:8912: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:8974: checking for DtDndDragStart in -lDtSvc" >&5
ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'`
xe_check_libs=" -lDtSvc "
cat > conftest.$ac_ext <<EOF
-#line 8917 "configure"
+#line 8979 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -8924,7 +8986,7 ＠＠
DtDndDragStart()
; return 0; }
EOF
-if { (eval echo configure:8928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9005,7 +9067,7 ＠＠
if test "$with_dragndrop" != "no" ; then
echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:9009: checking if drag and drop API is needed" >&5
+echo "configure:9071: checking if drag and drop API is needed" >&5
if test -n "$dragndrop_proto" ; then
with_dragndrop=yes
echo "$ac_t""yes (${dragndrop_proto} )" 1>&6
＠＠ -9025,19 +9087,19 ＠＠
fi
echo "checking for LDAP" 1>&6
-echo "configure:9029: checking for LDAP" >&5
+echo "configure:9091: checking for LDAP" >&5
ldap_libs=
test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ldap.h""... $ac_c" 1>&6
-echo "configure:9033: checking for ldap.h" >&5
+echo "configure:9095: checking for ldap.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9036 "configure"
+#line 9098 "configure"
#include "confdefs.h"
#include <ldap.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -9060,15 +9122,15 ＠＠
}
test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for lber.h""... $ac_c" 1>&6
-echo "configure:9064: checking for lber.h" >&5
+echo "configure:9126: checking for lber.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9067 "configure"
+#line 9129 "configure"
#include "confdefs.h"
#include <lber.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -9092,12 +9154,12 ＠＠
if test "$with_ldap" != "no"; then
echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
-echo "configure:9096: checking for ldap_search in -lldap" >&5
+echo "configure:9158: checking for ldap_search in -lldap" >&5
ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'`
xe_check_libs=" -lldap "
cat > conftest.$ac_ext <<EOF
-#line 9101 "configure"
+#line 9163 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9108,7 +9170,7 ＠＠
ldap_search()
; return 0; }
EOF
-if { (eval echo configure:9112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9132,12 +9194,12 ＠＠
xe_msg_checking="for ldap_open in -lldap"
test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:9136: checking "$xe_msg_checking"" >&5
+echo "configure:9198: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lldap -llber"
cat > conftest.$ac_ext <<EOF
-#line 9141 "configure"
+#line 9203 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9148,7 +9210,7 ＠＠
ldap_open()
; return 0; }
EOF
-if { (eval echo configure:9152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9172,12 +9234,12 ＠＠
xe_msg_checking="for ldap_open in -lldap"
test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:9176: checking "$xe_msg_checking"" >&5
+echo "configure:9238: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lldap -llber -lkrb"
cat > conftest.$ac_ext <<EOF
-#line 9181 "configure"
+#line 9243 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9188,7 +9250,7 ＠＠
ldap_open()
; return 0; }
EOF
-if { (eval echo configure:9192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9212,12 +9274,12 ＠＠
xe_msg_checking="for ldap_open in -lldap"
test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:9216: checking "$xe_msg_checking"" >&5
+echo "configure:9278: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lldap -llber -lkrb -ldes"
cat > conftest.$ac_ext <<EOF
-#line 9221 "configure"
+#line 9283 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9228,7 +9290,7 ＠＠
ldap_open()
; return 0; }
EOF
-if { (eval echo configure:9232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9250,12 +9312,12 ＠＠
}
test "$with_ldap_lber" != "yes" && {
echo $ac_n "checking for ber_pvt_opt_on in -llber""... $ac_c" 1>&6
-echo "configure:9254: checking for ber_pvt_opt_on in -llber" >&5
+echo "configure:9316: checking for ber_pvt_opt_on in -llber" >&5
ac_lib_var=`echo lber'_'ber_pvt_opt_on | sed 'y%./+-%__p_%'`
xe_check_libs=" -llber "
cat > conftest.$ac_ext <<EOF
-#line 9259 "configure"
+#line 9321 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9266,7 +9328,7 ＠＠
ber_pvt_opt_on()
; return 0; }
EOF
-if { (eval echo configure:9270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9310,10 +9372,10 ＠＠
for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9314: checking for $ac_func" >&5
+echo "configure:9376: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 9317 "configure"
+#line 9379 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -9336,7 +9398,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:9340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -9375,20 +9437,20 ＠＠
postgresql_libs=
if test "$with_postgresql" != "no"; then
echo "checking for PostgreSQL" 1>&6
-echo "configure:9379: checking for PostgreSQL" >&5
+echo "configure:9441: checking for PostgreSQL" >&5
for header_dir in "" "pgsql/" "postgresql/"; do
ac_safe=`echo "${header_dir}libpq-fe.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ${header_dir}libpq-fe.h""... $ac_c" 1>&6
-echo "configure:9384: checking for ${header_dir}libpq-fe.h" >&5
+echo "configure:9446: checking for ${header_dir}libpq-fe.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9387 "configure"
+#line 9449 "configure"
#include "confdefs.h"
#include <${header_dir}libpq-fe.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9392: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9454: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -9412,12 +9474,12 ＠＠
test -n "$libpq_fe_h_file" && {
echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:9416: checking for PQconnectdb in -lpq" >&5
+echo "configure:9478: checking for PQconnectdb in -lpq" >&5
ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'`
xe_check_libs=" -lpq "
cat > conftest.$ac_ext <<EOF
-#line 9421 "configure"
+#line 9483 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9428,7 +9490,7 ＠＠
PQconnectdb()
; return 0; }
EOF
-if { (eval echo configure:9432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9461,12 +9523,12 ＠＠
echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:9465: checking for PQconnectStart in -lpq" >&5
+echo "configure:9527: checking for PQconnectStart in -lpq" >&5
ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'`
xe_check_libs=" -lpq "
cat > conftest.$ac_ext <<EOF
-#line 9470 "configure"
+#line 9532 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9477,7 +9539,7 ＠＠
PQconnectStart()
; return 0; }
EOF
-if { (eval echo configure:9481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9528,7 +9590,7 ＠＠
if test "$window_system" != "none"; then
echo "checking for graphics libraries" 1>&6
-echo "configure:9532: checking for graphics libraries" >&5
+echo "configure:9594: checking for graphics libraries" >&5
libpath_xpm=
incpath_xpm=
＠＠ -9554,10 +9616,10 ＠＠
CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:9558: checking for Xpm - no older than 3.4f" >&5
+echo "configure:9620: checking for Xpm - no older than 3.4f" >&5
xe_check_libs=-lXpm
cat > conftest.$ac_ext <<EOF
-#line 9561 "configure"
+#line 9623 "configure"
#include "confdefs.h"
#define XPM_NUMBERS
#include <X11/xpm.h>
＠＠ -9566,7 +9628,7 ＠＠
XpmIncludeVersion != XpmLibraryVersion() ? 1 :
XpmIncludeVersion < 30406 ? 2 : 0 ;}
EOF
-if { (eval echo configure:9570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
./conftest dummy_arg; xpm_status=$?;
if test "$xpm_status" = "0"; then
＠＠ -9610,17 +9672,17 ＠＠
libs_x="-lXpm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXpm\" to \$libs_x"; fi
CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6
-echo "configure:9614: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:9676: checking for \"FOR_MSW\" xpm" >&5
xe_check_libs=-lXpm
cat > conftest.$ac_ext <<EOF
-#line 9617 "configure"
+#line 9679 "configure"
#include "confdefs.h"
int main() {
XpmCreatePixmapFromData()
; return 0; }
EOF
-if { (eval echo configure:9624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
xpm_for_msw=no
else
＠＠ -9646,15 +9708,15 ＠＠
test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:9650: checking for compface.h" >&5
+echo "configure:9712: checking for compface.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9653 "configure"
+#line 9715 "configure"
#include "confdefs.h"
#include <compface.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9658: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -9677,12 +9739,12 ＠＠
}
test -z "$with_xface" && {
echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:9681: checking for UnGenFace in -lcompface" >&5
+echo "configure:9743: checking for UnGenFace in -lcompface" >&5
ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcompface "
cat > conftest.$ac_ext <<EOF
-#line 9686 "configure"
+#line 9748 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9693,7 +9755,7 ＠＠
UnGenFace()
; return 0; }
EOF
-if { (eval echo configure:9697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9742,12 +9804,12 ＠＠
if test "$with_png $with_tiff" != "no no"; then
echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:9746: checking for inflate in -lc" >&5
+echo "configure:9808: checking for inflate in -lc" >&5
ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'`
xe_check_libs=" -lc "
cat > conftest.$ac_ext <<EOF
-#line 9751 "configure"
+#line 9813 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9758,7 +9820,7 ＠＠
inflate()
; return 0; }
EOF
-if { (eval echo configure:9762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9777,12 +9839,12 ＠＠
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:9781: checking for inflate in -lz" >&5
+echo "configure:9843: checking for inflate in -lz" >&5
ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`
xe_check_libs=" -lz "
cat > conftest.$ac_ext <<EOF
-#line 9786 "configure"
+#line 9848 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9793,7 +9855,7 ＠＠
inflate()
; return 0; }
EOF
-if { (eval echo configure:9797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9812,12 +9874,12 ＠＠
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:9816: checking for inflate in -lgz" >&5
+echo "configure:9878: checking for inflate in -lgz" >&5
ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgz "
cat > conftest.$ac_ext <<EOF
-#line 9821 "configure"
+#line 9883 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9828,7 +9890,7 ＠＠
inflate()
; return 0; }
EOF
-if { (eval echo configure:9832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9858,15 +9920,15 ＠＠
test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:9862: checking for jpeglib.h" >&5
+echo "configure:9924: checking for jpeglib.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9865 "configure"
+#line 9927 "configure"
#include "confdefs.h"
#include <jpeglib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -9889,12 +9951,12 ＠＠
}
test -z "$with_jpeg" && {
echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:9893: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:9955: checking for jpeg_destroy_decompress in -ljpeg" >&5
ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'`
xe_check_libs=" -ljpeg "
cat > conftest.$ac_ext <<EOF
-#line 9898 "configure"
+#line 9960 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9905,7 +9967,7 ＠＠
jpeg_destroy_decompress()
; return 0; }
EOF
-if { (eval echo configure:9909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9941,10 +10003,10 ＠＠
png_problem=""
test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:9945: checking for pow" >&5
+echo "configure:10007: checking for pow" >&5
cat > conftest.$ac_ext <<EOF
-#line 9948 "configure"
+#line 10010 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pow(); below. */
＠＠ -9967,7 +10029,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:9971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_pow=yes"
else
＠＠ -9988,15 +10050,15 ＠＠
}
test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:9992: checking for png.h" >&5
+echo "configure:10054: checking for png.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9995 "configure"
+#line 10057 "configure"
#include "confdefs.h"
#include <png.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10000: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10019,12 +10081,12 ＠＠
}
test -z "$with_png" && {
echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:10023: checking for png_read_image in -lpng" >&5
+echo "configure:10085: checking for png_read_image in -lpng" >&5
ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`
xe_check_libs=" -lpng "
cat > conftest.$ac_ext <<EOF
-#line 10028 "configure"
+#line 10090 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10035,7 +10097,7 ＠＠
png_read_image()
; return 0; }
EOF
-if { (eval echo configure:10039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10058,10 +10120,10 ＠＠
}
if test -z "$with_png"; then
echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:10062: checking for workable png version information" >&5
+echo "configure:10124: checking for workable png version information" >&5
xe_check_libs="-lpng -lz"
cat > conftest.$ac_ext <<EOF
-#line 10065 "configure"
+#line 10127 "configure"
#include "confdefs.h"
#include <png.h>
int main(int c, char **v) {
＠＠ -10069,7 +10131,7 ＠＠
if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}
EOF
-if { (eval echo configure:10073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:10135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
./conftest dummy_arg; png_status=$?;
if test "$png_status" = "0"; then
＠＠ -10112,15 +10174,15 ＠＠
test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:10116: checking for tiffio.h" >&5
+echo "configure:10178: checking for tiffio.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10119 "configure"
+#line 10181 "configure"
#include "confdefs.h"
#include <tiffio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10143,12 +10205,12 ＠＠
}
test -z "$with_tiff" && {
echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:10147: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:10209: checking for TIFFClientOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'`
xe_check_libs=" -ltiff "
cat > conftest.$ac_ext <<EOF
-#line 10152 "configure"
+#line 10214 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10159,7 +10221,7 ＠＠
TIFFClientOpen()
; return 0; }
EOF
-if { (eval echo configure:10163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10198,15 +10260,15 ＠＠
if test "$with_gtk" = "yes"; then
test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:10202: checking for compface.h" >&5
+echo "configure:10264: checking for compface.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10205 "configure"
+#line 10267 "configure"
#include "confdefs.h"
#include <compface.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10229,12 +10291,12 ＠＠
}
test -z "$with_xface" && {
echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:10233: checking for UnGenFace in -lcompface" >&5
+echo "configure:10295: checking for UnGenFace in -lcompface" >&5
ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcompface "
cat > conftest.$ac_ext <<EOF
-#line 10238 "configure"
+#line 10300 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10245,7 +10307,7 ＠＠
UnGenFace()
; return 0; }
EOF
-if { (eval echo configure:10249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10284,7 +10346,7 ＠＠
if test "$with_x11" = "yes"; then
echo "checking for X11 graphics libraries" 1>&6
-echo "configure:10288: checking for X11 graphics libraries" >&5
+echo "configure:10350: checking for X11 graphics libraries" >&5
fi
case "$with_widgets" in
＠＠ -10294,7 +10356,7 ＠＠
if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then
echo "checking for the Athena widgets" 1>&6
-echo "configure:10298: checking for the Athena widgets" >&5
+echo "configure:10360: checking for the Athena widgets" >&5
case "$with_athena" in
"xaw" | "") athena_variant=Xaw athena_3d=no ;;
＠＠ -10308,12 +10370,12 ＠＠
if test "$athena_3d" = "no"; then
echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:10312: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:10374: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
ac_lib_var=`echo $athena_variant'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$athena_variant "
cat > conftest.$ac_ext <<EOF
-#line 10317 "configure"
+#line 10379 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10324,7 +10386,7 ＠＠
XawScrollbarSetThumb()
; return 0; }
EOF
-if { (eval echo configure:10328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10340,12 +10402,12 ＠＠
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:10344: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:10406: checking for threeDClassRec in -l$athena_variant" >&5
ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$athena_variant "
cat > conftest.$ac_ext <<EOF
-#line 10349 "configure"
+#line 10411 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10356,7 +10418,7 ＠＠
threeDClassRec()
; return 0; }
EOF
-if { (eval echo configure:10360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10387,12 +10449,12 ＠＠
else
echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:10391: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:10453: checking for threeDClassRec in -l$athena_variant" >&5
ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$athena_variant "
cat > conftest.$ac_ext <<EOF
-#line 10396 "configure"
+#line 10458 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10403,7 +10465,7 ＠＠
threeDClassRec()
; return 0; }
EOF
-if { (eval echo configure:10407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10421,12 +10483,12 ＠＠
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6
-echo "configure:10425: checking for threeDClassRec in -lXaw" >&5
+echo "configure:10487: checking for threeDClassRec in -lXaw" >&5
ac_lib_var=`echo Xaw'_'threeDClassRec | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXaw "
cat > conftest.$ac_ext <<EOF
-#line 10430 "configure"
+#line 10492 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10437,7 +10499,7 ＠＠
threeDClassRec()
; return 0; }
EOF
-if { (eval echo configure:10441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10468,15 +10530,15 ＠＠
if test "$athena_3d" = "no"; then
ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10472: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:10534: checking for X11/Xaw/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10475 "configure"
+#line 10537 "configure"
#include "confdefs.h"
#include <X11/Xaw/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10496,15 +10558,15 ＠＠
echo "$ac_t""no" 1>&6
ac_safe=`echo "X11/Xaw/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw/XawInit.h""... $ac_c" 1>&6
-echo "configure:10500: checking for X11/Xaw/XawInit.h" >&5
+echo "configure:10562: checking for X11/Xaw/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10503 "configure"
+#line 10565 "configure"
#include "confdefs.h"
#include <X11/Xaw/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10570: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10530,15 +10592,15 ＠＠
else
ac_safe=`echo "X11/$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/$athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:10534: checking for X11/$athena_variant/XawInit.h" >&5
+echo "configure:10596: checking for X11/$athena_variant/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10537 "configure"
+#line 10599 "configure"
#include "confdefs.h"
#include <X11/$athena_variant/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10604: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10555,15 +10617,15 ＠＠
echo "$ac_t""yes" 1>&6
ac_safe=`echo "X11/$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/$athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10559: checking for X11/$athena_variant/ThreeD.h" >&5
+echo "configure:10621: checking for X11/$athena_variant/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10562 "configure"
+#line 10624 "configure"
#include "confdefs.h"
#include <X11/$athena_variant/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10591,15 +10653,15 ＠＠
if test -z "$athena_h_path"; then
ac_safe=`echo "$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:10595: checking for $athena_variant/XawInit.h" >&5
+echo "configure:10657: checking for $athena_variant/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10598 "configure"
+#line 10660 "configure"
#include "confdefs.h"
#include <$athena_variant/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10603: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10616,15 +10678,15 ＠＠
echo "$ac_t""yes" 1>&6
ac_safe=`echo "$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10620: checking for $athena_variant/ThreeD.h" >&5
+echo "configure:10682: checking for $athena_variant/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10623 "configure"
+#line 10685 "configure"
#include "confdefs.h"
#include <$athena_variant/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10690: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10653,15 +10715,15 ＠＠
if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
ac_safe=`echo "X11/Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:10657: checking for X11/Xaw3d/XawInit.h" >&5
+echo "configure:10719: checking for X11/Xaw3d/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10660 "configure"
+#line 10722 "configure"
#include "confdefs.h"
#include <X11/Xaw3d/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10678,15 +10740,15 ＠＠
echo "$ac_t""yes" 1>&6
ac_safe=`echo "X11/Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10682: checking for X11/Xaw3d/ThreeD.h" >&5
+echo "configure:10744: checking for X11/Xaw3d/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10685 "configure"
+#line 10747 "configure"
#include "confdefs.h"
#include <X11/Xaw3d/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10690: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10718,15 +10780,15 ＠＠
if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
ac_safe=`echo "Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:10722: checking for Xaw3d/XawInit.h" >&5
+echo "configure:10784: checking for Xaw3d/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10725 "configure"
+#line 10787 "configure"
#include "confdefs.h"
#include <Xaw3d/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10730: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10743,15 +10805,15 ＠＠
echo "$ac_t""yes" 1>&6
ac_safe=`echo "Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10747: checking for Xaw3d/ThreeD.h" >&5
+echo "configure:10809: checking for Xaw3d/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10750 "configure"
+#line 10812 "configure"
#include "confdefs.h"
#include <Xaw3d/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10783,15 +10845,15 ＠＠
if test -z "$athena_h_path"; then
ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10787: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:10849: checking for X11/Xaw/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10790 "configure"
+#line 10852 "configure"
#include "confdefs.h"
#include <X11/Xaw/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10795: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10830,15 +10892,15 ＠＠
if test "$with_x11" = "yes"; then
ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:10834: checking for Xm/Xm.h" >&5
+echo "configure:10896: checking for Xm/Xm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10837 "configure"
+#line 10899 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10855,12 +10917,12 ＠＠
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:10859: checking for XmStringFree in -lXm" >&5
+echo "configure:10921: checking for XmStringFree in -lXm" >&5
ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXm "
cat > conftest.$ac_ext <<EOF
-#line 10864 "configure"
+#line 10926 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10871,7 +10933,7 ＠＠
XmStringFree()
; return 0; }
EOF
-if { (eval echo configure:10875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10900,9 +10962,9 ＠＠
if test "$have_motif" = "yes"; then
echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:10904: checking for Lesstif" >&5
+echo "configure:10966: checking for Lesstif" >&5
cat > conftest.$ac_ext <<EOF
-#line 10906 "configure"
+#line 10968 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
#ifdef LESSTIF_VERSION
＠＠ -11275,7 +11337,7 ＠＠
if test "$with_mule" = "yes" ; then
echo "checking for Mule-related features" 1>&6
-echo "configure:11279: checking for Mule-related features" >&5
+echo "configure:11341: checking for Mule-related features" >&5
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining MULE
EOF
＠＠ -11289,15 +11351,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11293: checking for $ac_hdr" >&5
+echo "configure:11355: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11296 "configure"
+#line 11358 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -11328,12 +11390,12 ＠＠
echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:11332: checking for strerror in -lintl" >&5
+echo "configure:11394: checking for strerror in -lintl" >&5
ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'`
xe_check_libs=" -lintl "
cat > conftest.$ac_ext <<EOF
-#line 11337 "configure"
+#line 11399 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11344,7 +11406,7 ＠＠
strerror()
; return 0; }
EOF
-if { (eval echo configure:11348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11377,18 +11439,18 ＠＠
echo "checking for Mule input methods" 1>&6
-echo "configure:11381: checking for Mule input methods" >&5
+echo "configure:11443: checking for Mule input methods" >&5
case "$with_xim" in "" | "yes" )
echo "checking for XIM" 1>&6
-echo "configure:11384: checking for XIM" >&5
+echo "configure:11446: checking for XIM" >&5
echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:11387: checking for XOpenIM in -lX11" >&5
+echo "configure:11449: checking for XOpenIM in -lX11" >&5
ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'`
xe_check_libs=" -lX11 "
cat > conftest.$ac_ext <<EOF
-#line 11392 "configure"
+#line 11454 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11399,7 +11461,7 ＠＠
XOpenIM()
; return 0; }
EOF
-if { (eval echo configure:11403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11423,12 +11485,12 ＠＠
if test "$have_motif $have_lesstif" = "yes no"; then
echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:11427: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:11489: checking for XmImMbLookupString in -lXm" >&5
ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXm "
cat > conftest.$ac_ext <<EOF
-#line 11432 "configure"
+#line 11494 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11439,7 +11501,7 ＠＠
XmImMbLookupString()
; return 0; }
EOF
-if { (eval echo configure:11443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11504,15 +11566,15 ＠＠
if test "$with_xfs" = "yes" ; then
echo "checking for XFontSet" 1>&6
-echo "configure:11508: checking for XFontSet" >&5
+echo "configure:11570: checking for XFontSet" >&5
echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:11511: checking for XmbDrawString in -lX11" >&5
+echo "configure:11573: checking for XmbDrawString in -lX11" >&5
ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'`
xe_check_libs=" -lX11 "
cat > conftest.$ac_ext <<EOF
-#line 11516 "configure"
+#line 11578 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11523,7 +11585,7 ＠＠
XmbDrawString()
; return 0; }
EOF
-if { (eval echo configure:11527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11563,15 +11625,15 ＠＠
test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6
-echo "configure:11567: checking for wnn/jllib.h" >&5
+echo "configure:11629: checking for wnn/jllib.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11570 "configure"
+#line 11632 "configure"
#include "confdefs.h"
#include <wnn/jllib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -11594,15 +11656,15 ＠＠
}
test -z "$with_wnn" && { ac_safe=`echo "wnn/commonhd.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for wnn/commonhd.h""... $ac_c" 1>&6
-echo "configure:11598: checking for wnn/commonhd.h" >&5
+echo "configure:11660: checking for wnn/commonhd.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11601 "configure"
+#line 11663 "configure"
#include "confdefs.h"
#include <wnn/commonhd.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -11627,10 +11689,10 ＠＠
for ac_func in crypt
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11631: checking for $ac_func" >&5
+echo "configure:11693: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 11634 "configure"
+#line 11696 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -11653,7 +11715,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:11657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -11682,12 +11744,12 ＠＠
test "$ac_cv_func_crypt" != "yes" && {
echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:11686: checking for crypt in -lcrypt" >&5
+echo "configure:11748: checking for crypt in -lcrypt" >&5
ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcrypt "
cat > conftest.$ac_ext <<EOF
-#line 11691 "configure"
+#line 11753 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11698,7 +11760,7 ＠＠
crypt()
; return 0; }
EOF
-if { (eval echo configure:11702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11733,12 +11795,12 ＠＠
if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
-echo "configure:11737: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:11799: checking for jl_dic_list_e in -lwnn" >&5
ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
xe_check_libs=" -lwnn "
cat > conftest.$ac_ext <<EOF
-#line 11742 "configure"
+#line 11804 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11749,7 +11811,7 ＠＠
jl_dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:11753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11767,12 +11829,12 ＠＠
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6
-echo "configure:11771: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:11833: checking for jl_dic_list_e in -lwnn4" >&5
ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
xe_check_libs=" -lwnn4 "
cat > conftest.$ac_ext <<EOF
-#line 11776 "configure"
+#line 11838 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11783,7 +11845,7 ＠＠
jl_dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:11787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11801,12 +11863,12 ＠＠
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6
-echo "configure:11805: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:11867: checking for jl_dic_list_e in -lwnn6" >&5
ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
xe_check_libs=" -lwnn6 "
cat > conftest.$ac_ext <<EOF
-#line 11810 "configure"
+#line 11872 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11817,7 +11879,7 ＠＠
jl_dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:11821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11835,12 +11897,12 ＠＠
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6
-echo "configure:11839: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:11901: checking for dic_list_e in -lwnn6_fromsrc" >&5
ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'`
xe_check_libs=" -lwnn6_fromsrc "
cat > conftest.$ac_ext <<EOF
-#line 11844 "configure"
+#line 11906 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11851,7 +11913,7 ＠＠
dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:11855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11896,12 +11958,12 ＠＠
if test "$with_wnn6" != "no"; then
echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6
-echo "configure:11900: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:11962: checking for jl_fi_dic_list in -l$libwnn" >&5
ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$libwnn "
cat > conftest.$ac_ext <<EOF
-#line 11905 "configure"
+#line 11967 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11912,7 +11974,7 ＠＠
jl_fi_dic_list()
; return 0; }
EOF
-if { (eval echo configure:11916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11947,15 +12009,15 ＠＠
if test "$with_canna" != "no"; then
ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:11951: checking for canna/jrkanji.h" >&5
+echo "configure:12013: checking for canna/jrkanji.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11954 "configure"
+#line 12016 "configure"
#include "confdefs.h"
#include <canna/jrkanji.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -11982,15 +12044,15 ＠＠
c_switch_site="$c_switch_site -I/usr/local/canna/include"
ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:11986: checking for canna/jrkanji.h" >&5
+echo "configure:12048: checking for canna/jrkanji.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11989 "configure"
+#line 12051 "configure"
#include "confdefs.h"
#include <canna/jrkanji.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12018,15 +12080,15 ＠＠
test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6
-echo "configure:12022: checking for canna/RK.h" >&5
+echo "configure:12084: checking for canna/RK.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 12025 "configure"
+#line 12087 "configure"
#include "confdefs.h"
#include <canna/RK.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12049,12 +12111,12 ＠＠
}
test -z "$with_canna" && {
echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:12053: checking for RkBgnBun in -lRKC" >&5
+echo "configure:12115: checking for RkBgnBun in -lRKC" >&5
ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'`
xe_check_libs=" -lRKC "
cat > conftest.$ac_ext <<EOF
-#line 12058 "configure"
+#line 12120 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -12065,7 +12127,7 ＠＠
RkBgnBun()
; return 0; }
EOF
-if { (eval echo configure:12069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -12088,12 +12150,12 ＠＠
}
test -z "$with_canna" && {
echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:12092: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:12154: checking for jrKanjiControl in -lcanna" >&5
ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcanna "
cat > conftest.$ac_ext <<EOF
-#line 12097 "configure"
+#line 12159 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -12104,7 +12166,7 ＠＠
jrKanjiControl()
; return 0; }
EOF
-if { (eval echo configure:12108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -12150,12 +12212,12 ＠＠
libs_x="-lXm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi
echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6
-echo "configure:12154: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:12216: checking for layout_object_getvalue in -li18n" >&5
ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'`
xe_check_libs=" -li18n "
cat > conftest.$ac_ext <<EOF
-#line 12159 "configure"
+#line 12221 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -12166,7 +12228,7 ＠＠
layout_object_getvalue()
; return 0; }
EOF
-if { (eval echo configure:12170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -12253,10 +12315,10 ＠＠
for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12257: checking for $ac_func" >&5
+echo "configure:12319: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 12260 "configure"
+#line 12322 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -12279,7 +12341,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:12283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -12320,10 +12382,10 ＠＠
for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12324: checking for $ac_func" >&5
+echo "configure:12386: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 12327 "configure"
+#line 12389 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -12346,7 +12408,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:12350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -12375,10 +12437,10 ＠＠
echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:12379: checking for openpty" >&5
+echo "configure:12441: checking for openpty" >&5
cat > conftest.$ac_ext <<EOF
-#line 12382 "configure"
+#line 12444 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char openpty(); below. */
＠＠ -12401,7 +12463,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:12405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_openpty=yes"
else
＠＠ -12420,12 +12482,12 ＠＠
echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:12424: checking for openpty in -lutil" >&5
+echo "configure:12486: checking for openpty in -lutil" >&5
ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
xe_check_libs=" -lutil "
cat > conftest.$ac_ext <<EOF
-#line 12429 "configure"
+#line 12491 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -12436,7 +12498,7 ＠＠
openpty()
; return 0; }
EOF
-if { (eval echo configure:12440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -12471,15 +12533,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12475: checking for $ac_hdr" >&5
+echo "configure:12537: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12478 "configure"
+#line 12540 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12545: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12516,15 +12578,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12520: checking for $ac_hdr" >&5
+echo "configure:12582: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12523 "configure"
+#line 12585 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12557,15 +12619,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12561: checking for $ac_hdr" >&5
+echo "configure:12623: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12564 "configure"
+#line 12626 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12598,15 +12660,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12602: checking for $ac_hdr" >&5
+echo "configure:12664: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12605 "configure"
+#line 12667 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12642,15 +12704,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12646: checking for $ac_hdr" >&5
+echo "configure:12708: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12649 "configure"
+#line 12711 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12654: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12683,10 +12745,10 ＠＠
for ac_func in isastream
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12687: checking for $ac_func" >&5
+echo "configure:12749: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 12690 "configure"
+#line 12752 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -12709,7 +12771,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:12713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -12740,15 +12802,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12744: checking for $ac_hdr" >&5
+echo "configure:12806: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12747 "configure"
+#line 12809 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12781,10 +12843,10 ＠＠
for ac_func in getloadavg
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12785: checking for $ac_func" >&5
+echo "configure:12847: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 12788 "configure"
+#line 12850 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -12807,7 +12869,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:12811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -12840,15 +12902,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12844: checking for $ac_hdr" >&5
+echo "configure:12906: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12847 "configure"
+#line 12909 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12884,12 +12946,12 ＠＠
echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:12888: checking for kstat_open in -lkstat" >&5
+echo "configure:12950: checking for kstat_open in -lkstat" >&5
ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lkstat "
cat > conftest.$ac_ext <<EOF
-#line 12893 "configure"
+#line 12955 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -12900,7 +12962,7 ＠＠
kstat_open()
; return 0; }
EOF
-if { (eval echo configure:12904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -12935,15 +12997,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12939: checking for $ac_hdr" >&5
+echo "configure:13001: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12942 "configure"
+#line 13004 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12975,12 +13037,12 ＠＠
echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:12979: checking for kvm_read in -lkvm" >&5
+echo "configure:13041: checking for kvm_read in -lkvm" >&5
ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'`
xe_check_libs=" -lkvm "
cat > conftest.$ac_ext <<EOF
-#line 12984 "configure"
+#line 13046 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -12991,7 +13053,7 ＠＠
kvm_read()
; return 0; }
EOF
-if { (eval echo configure:12995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -13025,16 +13087,16 ＠＠
fi
echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:13029: checking whether netdb declares h_errno" >&5
+echo "configure:13091: checking whether netdb declares h_errno" >&5
cat > conftest.$ac_ext <<EOF
-#line 13031 "configure"
+#line 13093 "configure"
#include "confdefs.h"
#include <netdb.h>
int main() {
return h_errno;
; return 0; }
EOF
-if { (eval echo configure:13038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
{ test "$extra_verbose" = "yes" && cat << \EOF
＠＠ -13054,16 +13116,16 ＠＠
rm -f conftest*
echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:13058: checking for sigsetjmp" >&5
+echo "configure:13120: checking for sigsetjmp" >&5
cat > conftest.$ac_ext <<EOF
-#line 13060 "configure"
+#line 13122 "configure"
#include "confdefs.h"
#include <setjmp.h>
int main() {
sigjmp_buf bar; sigsetjmp (bar, 0);
; return 0; }
EOF
-if { (eval echo configure:13067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
{ test "$extra_verbose" = "yes" && cat << \EOF
＠＠ -13083,11 +13145,11 ＠＠
rm -f conftest*
echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:13087: checking whether localtime caches TZ" >&5
+echo "configure:13149: checking whether localtime caches TZ" >&5
if test "$ac_cv_func_tzset" = "yes"; then
cat > conftest.$ac_ext <<EOF
-#line 13091 "configure"
+#line 13153 "configure"
#include "confdefs.h"
#include <time.h>
#if STDC_HEADERS
＠＠ -13122,7 +13184,7 ＠＠
exit (0);
}
EOF
-if { (eval echo configure:13126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
emacs_cv_localtime_cache=no
else
＠＠ -13152,9 +13214,9 ＠＠
if test "$HAVE_TIMEVAL" = "yes"; then
echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:13156: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:13218: checking whether gettimeofday accepts one or two arguments" >&5
cat > conftest.$ac_ext <<EOF
-#line 13158 "configure"
+#line 13220 "configure"
#include "confdefs.h"
#ifdef TIME_WITH_SYS_TIME
＠＠ -13175,7 +13237,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:13179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""two" 1>&6
else
＠＠ -13197,19 +13259,19 ＠＠
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:13201: checking for inline" >&5
+echo "configure:13263: checking for inline" >&5
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 13206 "configure"
+#line 13268 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:13213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
＠＠ -13246,16 +13308,16 ＠＠
fi
echo $ac_n "checking for typeof""... $ac_c" 1>&6
-echo "configure:13250: checking for typeof" >&5
+echo "configure:13312: checking for typeof" >&5
cat > conftest.$ac_ext <<EOF
-#line 13252 "configure"
+#line 13314 "configure"
#include "confdefs.h"
int main() {
int i; __typeof__(i) j;
; return 0; }
EOF
-if { (eval echo configure:13259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
typeofname="__typeof__"
else
＠＠ -13263,14 +13325,14 ＠＠
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 13267 "configure"
+#line 13329 "configure"
#include "confdefs.h"
int main() {
int i; typeof(i) j;
; return 0; }
EOF
-if { (eval echo configure:13274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
typeofname="typeof"
else
＠＠ -13299,17 +13361,17 ＠＠
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:13303: checking for working alloca.h" >&5
+echo "configure:13365: checking for working alloca.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13306 "configure"
+#line 13368 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:13313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
＠＠ -13333,10 +13395,10 ＠＠
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:13337: checking for alloca" >&5
+echo "configure:13399: checking for alloca" >&5
cat > conftest.$ac_ext <<EOF
-#line 13340 "configure"
+#line 13402 "configure"
#include "confdefs.h"
#ifdef __GNUC__
＠＠ -13364,7 +13426,7 ＠＠
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:13368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_alloca_works=yes
else
＠＠ -13403,10 +13465,10 ＠＠
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:13407: checking whether alloca needs Cray hooks" >&5
+echo "configure:13469: checking whether alloca needs Cray hooks" >&5
cat > conftest.$ac_ext <<EOF
-#line 13410 "configure"
+#line 13472 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
＠＠ -13430,10 +13492,10 ＠＠
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13434: checking for $ac_func" >&5
+echo "configure:13496: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 13437 "configure"
+#line 13499 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -13456,7 +13518,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:13460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -13486,10 +13548,10 ＠＠
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:13490: checking stack direction for C alloca" >&5
+echo "configure:13552: checking stack direction for C alloca" >&5
cat > conftest.$ac_ext <<EOF
-#line 13493 "configure"
+#line 13555 "configure"
#include "confdefs.h"
find_stack_direction ()
{
＠＠ -13508,7 +13570,7 ＠＠
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:13512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_c_stack_direction=1
else
＠＠ -13537,9 +13599,9 ＠＠
fi
echo $ac_n "checking for working alloca in function calls""... $ac_c" 1>&6
-echo "configure:13541: checking for working alloca in function calls" >&5
+echo "configure:13603: checking for working alloca in function calls" >&5
cat > conftest.$ac_ext <<EOF
-#line 13543 "configure"
+#line 13605 "configure"
#include "confdefs.h"
#if defined (__CYGWIN__)
＠＠ -13592,7 +13654,7 ＠＠
}
EOF
-if { (eval echo configure:13596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
working_alloca_in_function_calls=yes
else
＠＠ -13615,9 +13677,9 ＠＠
echo $ac_n "checking for working scanf""... $ac_c" 1>&6
-echo "configure:13619: checking for working scanf" >&5
+echo "configure:13681: checking for working scanf" >&5
cat > conftest.$ac_ext <<EOF
-#line 13621 "configure"
+#line 13683 "configure"
#include "confdefs.h"
int
＠＠ -13632,7 +13694,7 ＠＠
}
EOF
-if { (eval echo configure:13636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
working_scanf=yes
else
＠＠ -13655,10 +13717,10 ＠＠
echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:13659: checking for working strcoll" >&5
+echo "configure:13721: checking for working strcoll" >&5
cat > conftest.$ac_ext <<EOF
-#line 13662 "configure"
+#line 13724 "configure"
#include "confdefs.h"
#include <string.h>
main ()
＠＠ -13668,7 +13730,7 ＠＠
strcoll ("123", "456") >= 0);
}
EOF
-if { (eval echo configure:13672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_func_strcoll_works=yes
else
＠＠ -13696,10 +13758,10 ＠＠
for ac_func in getpgrp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13700: checking for $ac_func" >&5
+echo "configure:13762: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 13703 "configure"
+#line 13765 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -13722,7 +13784,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:13726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -13750,10 +13812,10 ＠＠
done
echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:13754: checking whether getpgrp takes no argument" >&5
+echo "configure:13816: checking whether getpgrp takes no argument" >&5
cat > conftest.$ac_ext <<EOF
-#line 13757 "configure"
+#line 13819 "configure"
#include "confdefs.h"
/*
＠＠ -13808,7 +13870,7 ＠＠
}
EOF
-if { (eval echo configure:13812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_func_getpgrp_void=yes
else
＠＠ -13835,10 +13897,10 ＠＠
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:13839: checking for working mmap" >&5
+echo "configure:13901: checking for working mmap" >&5
case "$opsys" in ultrix* ) have_mmap=no ;; *)
cat > conftest.$ac_ext <<EOF
-#line 13842 "configure"
+#line 13904 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <unistd.h>
＠＠ -13871,7 +13933,7 ＠＠
return 1;
}
EOF
-if { (eval echo configure:13875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
have_mmap=yes
else
＠＠ -13900,9 +13962,9 ＠＠
if test "$rel_alloc $have_mmap" = "default yes"; then
if test "$doug_lea_malloc" = "yes"; then
echo $ac_n "checking for M_MMAP_THRESHOLD""... $ac_c" 1>&6
-echo "configure:13904: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:13966: checking for M_MMAP_THRESHOLD" >&5
cat > conftest.$ac_ext <<EOF
-#line 13906 "configure"
+#line 13968 "configure"
#include "confdefs.h"
#include <malloc.h>
int main() {
＠＠ -13914,7 +13976,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:13918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
rel_alloc=no; echo "$ac_t""yes" 1>&6;
else
＠＠ -13939,15 +14001,15 ＠＠
ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:13943: checking for termios.h" >&5
+echo "configure:14005: checking for termios.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13946 "configure"
+#line 14008 "configure"
#include "confdefs.h"
#include <termios.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -13990,15 +14052,15 ＠＠
echo "$ac_t""no" 1>&6
ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for termio.h""... $ac_c" 1>&6
-echo "configure:13994: checking for termio.h" >&5
+echo "configure:14056: checking for termio.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13997 "configure"
+#line 14059 "configure"
#include "confdefs.h"
#include <termio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14030,10 +14092,10 ＠＠
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:14034: checking for socket" >&5
+echo "configure:14096: checking for socket" >&5
cat > conftest.$ac_ext <<EOF
-#line 14037 "configure"
+#line 14099 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char socket(); below. */
＠＠ -14056,7 +14118,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:14060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_socket=yes"
else
＠＠ -14071,15 +14133,15 ＠＠
echo "$ac_t""yes" 1>&6
ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
-echo "configure:14075: checking for netinet/in.h" >&5
+echo "configure:14137: checking for netinet/in.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14078 "configure"
+#line 14140 "configure"
#include "confdefs.h"
#include <netinet/in.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14096,15 +14158,15 ＠＠
echo "$ac_t""yes" 1>&6
ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6
-echo "configure:14100: checking for arpa/inet.h" >&5
+echo "configure:14162: checking for arpa/inet.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14103 "configure"
+#line 14165 "configure"
#include "confdefs.h"
#include <arpa/inet.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14129,9 +14191,9 ＠＠
}
echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:14133: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:14195: checking "for sun_len member in struct sockaddr_un"" >&5
cat > conftest.$ac_ext <<EOF
-#line 14135 "configure"
+#line 14197 "configure"
#include "confdefs.h"
#include <sys/types.h>
＠＠ -14142,7 +14204,7 ＠＠
static struct sockaddr_un x; x.sun_len = 1;
; return 0; }
EOF
-if { (eval echo configure:14146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_SOCKADDR_SUN_LEN
＠＠ -14160,9 +14222,9 ＠＠
fi
rm -f conftest*
echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:14164: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:14226: checking "for ip_mreq struct in netinet/in.h"" >&5
cat > conftest.$ac_ext <<EOF
-#line 14166 "configure"
+#line 14228 "configure"
#include "confdefs.h"
#include <sys/types.h>
＠＠ -14172,7 +14234,7 ＠＠
static struct ip_mreq x;
; return 0; }
EOF
-if { (eval echo configure:14176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_MULTICAST
＠＠ -14203,10 +14265,10 ＠＠
echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:14207: checking for msgget" >&5
+echo "configure:14269: checking for msgget" >&5
cat > conftest.$ac_ext <<EOF
-#line 14210 "configure"
+#line 14272 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char msgget(); below. */
＠＠ -14229,7 +14291,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:14233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_msgget=yes"
else
＠＠ -14244,15 +14306,15 ＠＠
echo "$ac_t""yes" 1>&6
ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6
-echo "configure:14248: checking for sys/ipc.h" >&5
+echo "configure:14310: checking for sys/ipc.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14251 "configure"
+#line 14313 "configure"
#include "confdefs.h"
#include <sys/ipc.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14269,15 +14331,15 ＠＠
echo "$ac_t""yes" 1>&6
ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
-echo "configure:14273: checking for sys/msg.h" >&5
+echo "configure:14335: checking for sys/msg.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14276 "configure"
+#line 14338 "configure"
#include "confdefs.h"
#include <sys/msg.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14315,15 +14377,15 ＠＠
ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:14319: checking for dirent.h" >&5
+echo "configure:14381: checking for dirent.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14322 "configure"
+#line 14384 "configure"
#include "confdefs.h"
#include <dirent.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14350,15 +14412,15 ＠＠
echo "$ac_t""no" 1>&6
ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6
-echo "configure:14354: checking for sys/dir.h" >&5
+echo "configure:14416: checking for sys/dir.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14357 "configure"
+#line 14419 "configure"
#include "confdefs.h"
#include <sys/dir.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14391,15 +14453,15 ＠＠
ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:14395: checking for nlist.h" >&5
+echo "configure:14457: checking for nlist.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14398 "configure"
+#line 14460 "configure"
#include "confdefs.h"
#include <nlist.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14429,22 +14491,22 ＠＠
echo "checking "for sound support"" 1>&6
-echo "configure:14433: checking "for sound support"" >&5
+echo "configure:14495: checking "for sound support"" >&5
test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes
if test "$with_native_sound" != "no"; then
if test -n "$native_sound_lib"; then
ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6
-echo "configure:14440: checking for multimedia/audio_device.h" >&5
+echo "configure:14502: checking for multimedia/audio_device.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14443 "configure"
+#line 14505 "configure"
#include "confdefs.h"
#include <multimedia/audio_device.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14500,12 +14562,12 ＠＠
if test -z "$native_sound_lib"; then
echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:14504: checking for ALopenport in -laudio" >&5
+echo "configure:14566: checking for ALopenport in -laudio" >&5
ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'`
xe_check_libs=" -laudio "
cat > conftest.$ac_ext <<EOF
-#line 14509 "configure"
+#line 14571 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -14516,7 +14578,7 ＠＠
ALopenport()
; return 0; }
EOF
-if { (eval echo configure:14520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -14547,12 +14609,12 ＠＠
if test -z "$native_sound_lib"; then
echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:14551: checking for AOpenAudio in -lAlib" >&5
+echo "configure:14613: checking for AOpenAudio in -lAlib" >&5
ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'`
xe_check_libs=" -lAlib "
cat > conftest.$ac_ext <<EOF
-#line 14556 "configure"
+#line 14618 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -14563,7 +14625,7 ＠＠
AOpenAudio()
; return 0; }
EOF
-if { (eval echo configure:14567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -14611,15 +14673,15 ＠＠
for dir in "machine" "sys" "linux"; do
ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6
-echo "configure:14615: checking for ${dir}/soundcard.h" >&5
+echo "configure:14677: checking for ${dir}/soundcard.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14618 "configure"
+#line 14680 "configure"
#include "confdefs.h"
#include <${dir}/soundcard.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14661,12 +14723,12 ＠＠
if test "$opsys" = "netbsd" ; then
echo $ac_n "checking for _oss_ioctl in -lossaudio""... $ac_c" 1>&6
-echo "configure:14665: checking for _oss_ioctl in -lossaudio" >&5
+echo "configure:14727: checking for _oss_ioctl in -lossaudio" >&5
ac_lib_var=`echo ossaudio'_'_oss_ioctl | sed 'y%./+-%__p_%'`
xe_check_libs=" -lossaudio "
cat > conftest.$ac_ext <<EOF
-#line 14670 "configure"
+#line 14732 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -14677,7 +14739,7 ＠＠
_oss_ioctl()
; return 0; }
EOF
-if { (eval echo configure:14681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -14716,15 +14778,15 ＠＠
if test "$with_nas_sound" != "no"; then
ac_safe=`echo "audio/audiolib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for audio/audiolib.h""... $ac_c" 1>&6
-echo "configure:14720: checking for audio/audiolib.h" >&5
+echo "configure:14782: checking for audio/audiolib.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14723 "configure"
+#line 14785 "configure"
#include "confdefs.h"
#include <audio/audiolib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14742,12 +14804,12 ＠＠
echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:14746: checking for AuOpenServer in -laudio" >&5
+echo "configure:14808: checking for AuOpenServer in -laudio" >&5
ac_lib_var=`echo audio'_'AuOpenServer | sed 'y%./+-%__p_%'`
xe_check_libs=" -laudio "
cat > conftest.$ac_ext <<EOF
-#line 14751 "configure"
+#line 14813 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -14758,7 +14820,7 ＠＠
AuOpenServer()
; return 0; }
EOF
-if { (eval echo configure:14762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -14797,7 +14859,7 ＠＠
fi
libs_x="-laudio $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi
cat > conftest.$ac_ext <<EOF
-#line 14801 "configure"
+#line 14863 "configure"
#include "confdefs.h"
#include <audio/Xtutil.h>
EOF
＠＠ -14828,7 +14890,7 ＠＠
# Extract the first word of "esd-config", so it can be a program name with args.
set dummy esd-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14832: checking for $ac_word" >&5
+echo "configure:14894: checking for $ac_word" >&5
if test -n "$have_esd_config"; then
ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test.
＠＠ -14857,10 +14919,10 ＠＠
c_switch_site="$c_switch_site `esd-config --cflags`" && if test "$extra_verbose" = "yes"; then echo " Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi
LIBS="`esd-config --libs` $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"`esd-config --libs`\" to \$LIBS"; fi
echo $ac_n "checking for esd_play_stream""... $ac_c" 1>&6
-echo "configure:14861: checking for esd_play_stream" >&5
+echo "configure:14923: checking for esd_play_stream" >&5
cat > conftest.$ac_ext <<EOF
-#line 14864 "configure"
+#line 14926 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char esd_play_stream(); below. */
＠＠ -14883,7 +14945,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:14887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_esd_play_stream=yes"
else
＠＠ -14934,7 +14996,7 ＠＠
if test "$with_tty" = "yes" ; then
echo "checking for TTY-related features" 1>&6
-echo "configure:14938: checking for TTY-related features" >&5
+echo "configure:15000: checking for TTY-related features" >&5
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_TTY
EOF
＠＠ -14947,12 +15009,12 ＠＠
if test -z "$with_ncurses"; then
echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:14951: checking for tgetent in -lncurses" >&5
+echo "configure:15013: checking for tgetent in -lncurses" >&5
ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
xe_check_libs=" -lncurses "
cat > conftest.$ac_ext <<EOF
-#line 14956 "configure"
+#line 15018 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -14963,7 +15025,7 ＠＠
tgetent()
; return 0; }
EOF
-if { (eval echo configure:14967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -14996,15 +15058,15 ＠＠
ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:15000: checking for ncurses/curses.h" >&5
+echo "configure:15062: checking for ncurses/curses.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 15003 "configure"
+#line 15065 "configure"
#include "confdefs.h"
#include <ncurses/curses.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -15026,15 +15088,15 ＠＠
ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:15030: checking for ncurses/term.h" >&5
+echo "configure:15092: checking for ncurses/term.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 15033 "configure"
+#line 15095 "configure"
#include "confdefs.h"
#include <ncurses/term.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15100: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -15064,15 +15126,15 ＠＠
c_switch_site="$c_switch_site -I/usr/include/ncurses"
ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:15068: checking for ncurses/curses.h" >&5
+echo "configure:15130: checking for ncurses/curses.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 15071 "configure"
+#line 15133 "configure"
#include "confdefs.h"
#include <ncurses/curses.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15138: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -15107,12 +15169,12 ＠＠
for lib in curses termlib termcap; do
echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:15111: checking for tgetent in -l$lib" >&5
+echo "configure:15173: checking for tgetent in -l$lib" >&5
ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$lib "
cat > conftest.$ac_ext <<EOF
-#line 15116 "configure"
+#line 15178 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15123,7 +15185,7 ＠＠
tgetent()
; return 0; }
EOF
-if { (eval echo configure:15127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15154,12 +15216,12 ＠＠
else
echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:15158: checking for tgetent in -lcurses" >&5
+echo "configure:15220: checking for tgetent in -lcurses" >&5
ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcurses "
cat > conftest.$ac_ext <<EOF
-#line 15163 "configure"
+#line 15225 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15170,7 +15232,7 ＠＠
tgetent()
; return 0; }
EOF
-if { (eval echo configure:15174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15188,12 +15250,12 ＠＠
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:15192: checking for tgetent in -ltermcap" >&5
+echo "configure:15254: checking for tgetent in -ltermcap" >&5
ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
xe_check_libs=" -ltermcap "
cat > conftest.$ac_ext <<EOF
-#line 15197 "configure"
+#line 15259 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15204,7 +15266,7 ＠＠
tgetent()
; return 0; }
EOF
-if { (eval echo configure:15208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15253,15 +15315,15 ＠＠
if test "$with_gpm" != "no"; then
ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for gpm.h""... $ac_c" 1>&6
-echo "configure:15257: checking for gpm.h" >&5
+echo "configure:15319: checking for gpm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 15260 "configure"
+#line 15322 "configure"
#include "confdefs.h"
#include <gpm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -15279,12 +15341,12 ＠＠
echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:15283: checking for Gpm_Open in -lgpm" >&5
+echo "configure:15345: checking for Gpm_Open in -lgpm" >&5
ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgpm "
cat > conftest.$ac_ext <<EOF
-#line 15288 "configure"
+#line 15350 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15295,7 +15357,7 ＠＠
Gpm_Open()
; return 0; }
EOF
-if { (eval echo configure:15299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15347,20 +15409,20 ＠＠
test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
!= "no no no" && echo "checking for database support" 1>&6
-echo "configure:15351: checking for database support" >&5
+echo "configure:15413: checking for database support" >&5
if test "$with_database_gdbm $with_database_dbm" != "no no"; then
ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6
-echo "configure:15356: checking for ndbm.h" >&5
+echo "configure:15418: checking for ndbm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 15359 "configure"
+#line 15421 "configure"
#include "confdefs.h"
#include <ndbm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -15390,12 +15452,12 ＠＠
if test "$with_database_gdbm" != "no"; then
echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:15394: checking for dbm_open in -lgdbm" >&5
+echo "configure:15456: checking for dbm_open in -lgdbm" >&5
ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgdbm "
cat > conftest.$ac_ext <<EOF
-#line 15399 "configure"
+#line 15461 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15406,7 +15468,7 ＠＠
dbm_open()
; return 0; }
EOF
-if { (eval echo configure:15410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15434,10 +15496,10 ＠＠
if test "$with_database_dbm" != "no"; then
echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:15438: checking for dbm_open" >&5
+echo "configure:15500: checking for dbm_open" >&5
cat > conftest.$ac_ext <<EOF
-#line 15441 "configure"
+#line 15503 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dbm_open(); below. */
＠＠ -15460,7 +15522,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:15464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dbm_open=yes"
else
＠＠ -15479,12 +15541,12 ＠＠
echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:15483: checking for dbm_open in -ldbm" >&5
+echo "configure:15545: checking for dbm_open in -ldbm" >&5
ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldbm "
cat > conftest.$ac_ext <<EOF
-#line 15488 "configure"
+#line 15550 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15495,7 +15557,7 ＠＠
dbm_open()
; return 0; }
EOF
-if { (eval echo configure:15499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15536,10 +15598,10 ＠＠
if test "$with_database_berkdb" != "no"; then
echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:15540: checking for Berkeley db.h" >&5
+echo "configure:15602: checking for Berkeley db.h" >&5
for header in "db/db.h" "db.h"; do
cat > conftest.$ac_ext <<EOF
-#line 15543 "configure"
+#line 15605 "configure"
#include "confdefs.h"
#include <stdlib.h>
＠＠ -15561,7 +15623,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:15565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
db_h_file="$header"; break
else
＠＠ -15577,9 +15639,9 ＠＠
if test "$with_database_berkdb" != "no"; then
echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:15581: checking for Berkeley DB version" >&5
+echo "configure:15643: checking for Berkeley DB version" >&5
cat > conftest.$ac_ext <<EOF
-#line 15583 "configure"
+#line 15645 "configure"
#include "confdefs.h"
#include <$db_h_file>
#if DB_VERSION_MAJOR > 1
＠＠ -15591,7 +15653,7 ＠＠
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 15595 "configure"
+#line 15657 "configure"
#include "confdefs.h"
#include <$db_h_file>
#if DB_VERSION_MAJOR > 2
＠＠ -15603,7 +15665,7 ＠＠
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 15607 "configure"
+#line 15669 "configure"
#include "confdefs.h"
#include <$db_h_file>
#if DB_VERSION_MAJOR > 3
＠＠ -15637,10 +15699,10 ＠＠
rm -f conftest*
echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:15641: checking for $dbfunc" >&5
+echo "configure:15703: checking for $dbfunc" >&5
cat > conftest.$ac_ext <<EOF
-#line 15644 "configure"
+#line 15706 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $dbfunc(); below. */
＠＠ -15663,7 +15725,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:15667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$dbfunc=yes"
else
＠＠ -15682,12 +15744,12 ＠＠
echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:15686: checking for $dbfunc in -ldb" >&5
+echo "configure:15748: checking for $dbfunc in -ldb" >&5
ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldb "
cat > conftest.$ac_ext <<EOF
-#line 15691 "configure"
+#line 15753 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15698,7 +15760,7 ＠＠
$dbfunc()
; return 0; }
EOF
-if { (eval echo configure:15702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15732,12 +15794,12 ＠＠
echo "configure: warning: "db_create is really $dbfunc"" 1>&2
echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:15736: checking for $dbfunc in -ldb" >&5
+echo "configure:15798: checking for $dbfunc in -ldb" >&5
ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldb "
cat > conftest.$ac_ext <<EOF
-#line 15741 "configure"
+#line 15803 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15748,7 +15810,7 ＠＠
$dbfunc()
; return 0; }
EOF
-if { (eval echo configure:15752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15807,12 +15869,12 ＠＠
if test "$with_socks" = "yes"; then
echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:15811: checking for SOCKSinit in -lsocks" >&5
+echo "configure:15873: checking for SOCKSinit in -lsocks" >&5
ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'`
xe_check_libs=" -lsocks "
cat > conftest.$ac_ext <<EOF
-#line 15816 "configure"
+#line 15878 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15823,7 +15885,7 ＠＠
SOCKSinit()
; return 0; }
EOF
-if { (eval echo configure:15827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15879,15 +15941,15 ＠＠
if test "$use_number_lib" = "gmp"; then
ac_safe=`echo "gmp.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for gmp.h""... $ac_c" 1>&6
-echo "configure:15883: checking for gmp.h" >&5
+echo "configure:15945: checking for gmp.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 15886 "configure"
+#line 15948 "configure"
#include "confdefs.h"
#include <gmp.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -15905,12 +15967,12 ＠＠
echo $ac_n "checking for __gmpz_init in -lgmp""... $ac_c" 1>&6
-echo "configure:15909: checking for __gmpz_init in -lgmp" >&5
+echo "configure:15971: checking for __gmpz_init in -lgmp" >&5
ac_lib_var=`echo gmp'_'__gmpz_init | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgmp "
cat > conftest.$ac_ext <<EOF
-#line 15914 "configure"
+#line 15976 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15921,7 +15983,7 ＠＠
__gmpz_init()
; return 0; }
EOF
-if { (eval echo configure:15925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15970,15 +16032,15 ＠＠
for library in "" "-lcrypto"; do
ac_safe=`echo "mp.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for mp.h""... $ac_c" 1>&6
-echo "configure:15974: checking for mp.h" >&5
+echo "configure:16036: checking for mp.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 15977 "configure"
+#line 16039 "configure"
#include "confdefs.h"
#include <mp.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -15998,12 +16060,12 ＠＠
xe_msg_checking="for mp_mfree in -lmp"
test -n "$library" && xe_msg_checking="$xe_msg_checking using extra libs $library"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:16002: checking "$xe_msg_checking"" >&5
+echo "configure:16064: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo mp'_'mp_mfree | sed 'y%./+-%__p_%'`
xe_check_libs=" -lmp $library"
cat > conftest.$ac_ext <<EOF
-#line 16007 "configure"
+#line 16069 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -16014,7 +16076,7 ＠＠
mp_mfree()
; return 0; }
EOF
-if { (eval echo configure:16018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -16035,12 +16097,12 ＠＠
xe_msg_checking="for mfree in -lmp"
test -n "$library" && xe_msg_checking="$xe_msg_checking using extra libs $library"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:16039: checking "$xe_msg_checking"" >&5
+echo "configure:16101: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo mp'_'mfree | sed 'y%./+-%__p_%'`
xe_check_libs=" -lmp $library"
cat > conftest.$ac_ext <<EOF
-#line 16044 "configure"
+#line 16106 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -16051,7 +16113,7 ＠＠
mfree()
; return 0; }
EOF
-if { (eval echo configure:16055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -16093,10 +16155,10 ＠＠
LIBS="$LIBS $library" && if test "$extra_verbose" = "yes"; then echo " Appending \"$library\" to \$LIBS"; fi
fi
echo $ac_n "checking for mp_move""... $ac_c" 1>&6
-echo "configure:16097: checking for mp_move" >&5
+echo "configure:16159: checking for mp_move" >&5
cat > conftest.$ac_ext <<EOF
-#line 16100 "configure"
+#line 16162 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mp_move(); below. */
＠＠ -16119,7 +16181,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:16123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_mp_move=yes"
else
＠＠ -16150,10 +16212,10 ＠＠
LIBS="$LIBS $library" && if test "$extra_verbose" = "yes"; then echo " Appending \"$library\" to \$LIBS"; fi
fi
echo $ac_n "checking for move""... $ac_c" 1>&6
-echo "configure:16154: checking for move" >&5
+echo "configure:16216: checking for move" >&5
cat > conftest.$ac_ext <<EOF
-#line 16157 "configure"
+#line 16219 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char move(); below. */
＠＠ -16176,7 +16238,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:16180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_move=yes"
else
＠＠ -16223,11 +16285,11 ＠＠
fi
cat > conftest.$ac_ext <<EOF
-#line 16227 "configure"
+#line 16289 "configure"
#include "confdefs.h"
int main(int c,char *v[]){return 0;}
EOF
-if { (eval echo configure:16231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:16293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
:
else
1.178 +15 -0 XEmacs/xemacs/nt/ChangeLog
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/ChangeLog,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -b -r1.177 -r1.178
--- ChangeLog 2005/01/28 01:54:47 1.177
+++ ChangeLog 2005/01/28 02:36:20 1.178
＠＠ -1,3 +1,18 ＠＠
+2004-11-17 Ben Wing <ben(a)xemacs.org>
+
+ * config.inc.samp:
+ * xemacs.mak (HAVE_WIDGETS):
+ * xemacs.mak (MSW_DEFINES):
+ * xemacs.mak ( NOTE):
+
+2004-11-13 Ben Wing <ben(a)xemacs.org>
+
+ * config.inc.samp:
+ * xemacs.mak (HAVE_WIDGETS):
+ * xemacs.mak (MSW_DEFINES):
+ * xemacs.mak ( NOTE):
+ Support HAVE_WINDOWS_SHORTCUTS_AS_LINKS.
+
2005-01-27 Ben Wing <ben(a)xemacs.org>
* xemacs.mak ({$(MANDIR)}.texi{$(INFODIR)}.info):
1.778 +76 -71 XEmacs/xemacs/src/ChangeLog
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.777
retrieving revision 1.778
diff -u -b -r1.777 -r1.778
--- ChangeLog 2005/01/26 10:36:07 1.777
+++ ChangeLog 2005/01/28 02:36:22 1.778
＠＠ -1,75 +1,5 ＠＠
-2005-01-26 Ben Wing <ben(a)xemacs.org>
-
- * free-hook.c (check_free):
- Fix aliasing warning.
-
-2005-01-26 Ben Wing <ben(a)xemacs.org>
-
- * redisplay.c:
- * redisplay.c (generate_displayable_area):
- * redisplay.c (regenerate_window):
- * redisplay.h:
- * signal.c:
- * signal.c (check_quit):
- Move backtraces to internals manual. Fix some race conditions
- leading to crashes due to incomplete protection of critical
- sections. In signal.c, be more aggressive in catching incomplete
- critical section protection -- we cannot even check for QUIT,
- *EVER*, in a critical section.
+2005-01-27 Ben Wing <ben(a)xemacs.org>
-2005-01-26 Ben Wing <ben(a)xemacs.org>
-
- * emacs.c:
- Update history section.
-
-2005-01-26 Ben Wing <ben(a)xemacs.org>
-
- * lisp.h:
- Clean up and generalize creation of string hash tables.
- Use Hashcode rather than unsigned long.
-
-2005-01-26 Ben Wing <ben(a)xemacs.org>
-
- * emacs-marshals.c:
- * emacs-marshals.c (initialize_marshaller_storage):
- * hash.c:
- * hash.c (string_equal):
- * hash.c (make_hash_table):
- * hash.h:
- * ui-gtk.c (type_already_imported_p):
- Clean up and generalize creation of string hash tables.
-
- * ui-gtk.c (emacs_gtk_boxed_hash):
- * elhash.h:
- * gccache-gtk.c (gc_cache_hash):
- * glyphs-gtk.c (gtk_image_instance_hash):
- * lrecord.h (struct lrecord_implementation):
- * marker.c (marker_hash):
- * objects-gtk.c (gtk_color_instance_hash):
- * objects-msw.c (mswindows_color_instance_hash):
- * objects-tty.c (tty_color_instance_hash):
- * objects-x.c (x_color_instance_hash):
- * objects.c (color_instance_hash):
- * objects.c (font_instance_hash):
- * opaque.c (hash_opaque):
- * opaque.c (hash_opaque_ptr):
- * rangetab.c (range_table_entry_hash):
- * rangetab.c (range_table_hash):
- * specifier.c (specifier_hash):
- * specifier.h (struct specifier_methods):
- * xgccache.c (gc_cache_hash):
- Use Hashcode rather than unsigned long.
-
-2005-01-26 Ben Wing <ben(a)xemacs.org>
-
- * profile.c:
- * profile.c (vars_of_profile):
- * profile.h:
- Add fillers for easier temporary profiling.
- Add RETURN_UNGCPRO_EXIT_PROFILING, RETURN_EXIT_PROFILING.
-
-2004-11-13 Ben Wing <ben(a)xemacs.org>
-
* nt.c:
* fileio.c:
Fix sync comments.
＠＠ -132,6 +62,8 ＠＠
sysfile.h. Add PATHNAME_RESOLVE_LINKS, which only does things
under Windows.
+ Add profiling section for expand_file_name calls.
+
* nt.c (mswindows_rename):
* nt.c (mswindows_unlink):
* sysdep.c (sys_subshell):
＠＠ -149,6 +81,79 ＠＠
Rename play_sound_file to nt_play_sound_file and pass
internally-formatted data to it to avoid converting out and back
again.
+
+ * text.h:
+ is_c -> is_ascii.
+
+2005-01-26 Ben Wing <ben(a)xemacs.org>
+
+ * free-hook.c (check_free):
+ Fix aliasing warning.
+
+2005-01-26 Ben Wing <ben(a)xemacs.org>
+
+ * redisplay.c:
+ * redisplay.c (generate_displayable_area):
+ * redisplay.c (regenerate_window):
+ * redisplay.h:
+ * signal.c:
+ * signal.c (check_quit):
+ Move backtraces to internals manual. Fix some race conditions
+ leading to crashes due to incomplete protection of critical
+ sections. In signal.c, be more aggressive in catching incomplete
+ critical section protection -- we cannot even check for QUIT,
+ *EVER*, in a critical section.
+
+2005-01-26 Ben Wing <ben(a)xemacs.org>
+
+ * emacs.c:
+ Update history section.
+
+2005-01-26 Ben Wing <ben(a)xemacs.org>
+
+ * lisp.h:
+ Clean up and generalize creation of string hash tables.
+ Use Hashcode rather than unsigned long.
+
+2005-01-26 Ben Wing <ben(a)xemacs.org>
+
+ * emacs-marshals.c:
+ * emacs-marshals.c (initialize_marshaller_storage):
+ * hash.c:
+ * hash.c (string_equal):
+ * hash.c (make_hash_table):
+ * hash.h:
+ * ui-gtk.c (type_already_imported_p):
+ Clean up and generalize creation of string hash tables.
+
+ * ui-gtk.c (emacs_gtk_boxed_hash):
+ * elhash.h:
+ * gccache-gtk.c (gc_cache_hash):
+ * glyphs-gtk.c (gtk_image_instance_hash):
+ * lrecord.h (struct lrecord_implementation):
+ * marker.c (marker_hash):
+ * objects-gtk.c (gtk_color_instance_hash):
+ * objects-msw.c (mswindows_color_instance_hash):
+ * objects-tty.c (tty_color_instance_hash):
+ * objects-x.c (x_color_instance_hash):
+ * objects.c (color_instance_hash):
+ * objects.c (font_instance_hash):
+ * opaque.c (hash_opaque):
+ * opaque.c (hash_opaque_ptr):
+ * rangetab.c (range_table_entry_hash):
+ * rangetab.c (range_table_hash):
+ * specifier.c (specifier_hash):
+ * specifier.h (struct specifier_methods):
+ * xgccache.c (gc_cache_hash):
+ Use Hashcode rather than unsigned long.
+
+2005-01-26 Ben Wing <ben(a)xemacs.org>
+
+ * profile.c:
+ * profile.c (vars_of_profile):
+ * profile.h:
+ Add fillers for easier temporary profiling.
+ Add RETURN_UNGCPRO_EXIT_PROFILING, RETURN_EXIT_PROFILING.
2005-01-25 Ben Wing <ben(a)xemacs.org>
1.19 +7 -2 XEmacs/xemacs/src/dired-msw.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: dired-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dired-msw.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- dired-msw.c 2004/12/06 03:52:03 1.18
+++ dired-msw.c 2005/01/28 02:36:24 1.19
＠＠ -206,8 +206,13 ＠＠
/* Now *bufp is the compiled form of PATTERN; don't call anything
which might compile a new regexp until we're done with the loop! */
+ {
+ Ibyte *dir2;
+ LISP_PATHNAME_RESOLVE_LINKS (dirfile, dir2);
+ eicpy_rawz (win32pattern, dir2);
+ }
+
/* for Win32, we need to insure that the pathname ends with "\*". */
- eicpy_lstr (win32pattern, dirfile);
if (!nowild)
{
Charcount len = eicharlen (win32pattern) - 1;
1.153 +1 -0 XEmacs/xemacs/src/emacs.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: emacs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -b -r1.152 -r1.153
--- emacs.c 2005/01/26 10:27:57 1.152
+++ emacs.c 2005/01/28 02:36:24 1.153
＠＠ -2085,6 +2085,7 ＠＠
#if defined (HAVE_MMAP) && defined (REL_ALLOC) && !defined (DOUG_LEA_MALLOC)
vars_of_ralloc ();
#endif /* HAVE_MMAP && REL_ALLOC */
+ vars_of_realpath ();
vars_of_redisplay ();
vars_of_regex ();
#ifdef HAVE_SCROLLBARS
1.103 +10 -145 XEmacs/xemacs/src/event-msw.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: event-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-msw.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- event-msw.c 2005/01/24 23:33:52 1.102
+++ event-msw.c 2005/01/28 02:36:24 1.103
＠＠ -3712,6 +3712,7 ＠＠
Extbyte *fname_ext;
Bytecount fnamelen;
Charcount len = qxeDragQueryFile ((HDROP) wParam, i, NULL, 0);
+ int freeme = 0;
/* The URLs that we make here aren't correct according to section
* 3.10 of rfc1738 because they're missing the //<host>/ part and
* because they may contain reserved characters. But that's OK -
＠＠ -3723,155 +3724,19 ＠＠
ALLOCA, (fname, fnamelen),
Qmswindows_tstr);
+
/* May be a shell link aka "shortcut" - replace fname if so */
-#if !defined (NO_CYGWIN_COM_SUPPORT)
if (!qxestrcasecmp_ascii (fname + fnamelen - 4, ".LNK"))
- {
- /* ####
-
- Note the following in the docs:
-
- Note: The IShellLink interface has an ANSI version
- (IShellLinkA) and a Unicode version (IShellLinkW). The
- version that will be used depends on whether you compile
- for ANSI or Unicode. However, Microsoft® Windows 95 and
- Microsoft® Windows 98 only support IShellLinkA.
-
- We haven't yet implemented COM support in the
- Unicode-splitting library. I don't quite understand how
- COM works yet, but it looks like what's happening is
- that the ShellLink class implements both the IShellLinkA
- and IShellLinkW interfaces. To make this work at
- run-time, we have to do something like this:
-
- -- define a new interface qxeIShellLink that uses
- Extbyte * instead of LPSTR or LPWSTR. (not totally
- necessary since Extbyte * == LPSTR).
-
- -- define a new class qxeShellLink that implements
- qxeIShellLink. the methods on this class need to create
- a shadow ShellLink object to do all the real work, and
- call the corresponding function from either the
- IShellLinkA or IShellLinkW interfaces on this object,
- depending on whether XEUNICODE_P is defined.
-
- -- with appropriate preprocessor magic, of course, we
- could make things appear transparent; but we've decided
- not to do preprocessor magic for the moment.
- */
-
- /* #### Not Unicode-split for the moment; we have to do it
- ourselves. */
- if (XEUNICODE_P)
- {
- IShellLinkW *psl;
-
- if (CoCreateInstance (
- XECOMID (CLSID_ShellLink),
- NULL,
- CLSCTX_INPROC_SERVER,
- XECOMID (IID_IShellLinkW),
- &VOIDP_CAST (psl)) == S_OK)
- {
- IPersistFile *ppf;
-
- if (XECOMCALL2 (psl, QueryInterface,
- XECOMID (IID_IPersistFile),
- &VOIDP_CAST (ppf)) == S_OK)
- {
- Extbyte *fname_unicode;
- WIN32_FIND_DATAW wfd;
- LPWSTR resolved =
- alloca_array (WCHAR, PATH_MAX_EXTERNAL + 1);
-
- TO_EXTERNAL_FORMAT (DATA, (fname, fnamelen),
- C_STRING_ALLOCA,
- fname_unicode,
- Qmswindows_unicode);
-
- if (XECOMCALL2 (ppf, Load,
- (LPWSTR) fname_unicode,
- STGM_READ) == S_OK &&
- /* #### YUCK! Docs read
-
- cchMaxPath
-
- Maximum number of bytes to copy to the buffer pointed to by the
- pszFile parameter.
-
- But "cch" means "count of characters", not bytes. I'll assume the doc
- writers messed up and the programmer was correct. Also, this approach
- is safe even if it's actually the other way around. */
-#if defined (CYGWIN_HEADERS) && W32API_INSTALLED_VER < W32API_VER(2,2)
- /* Another Cygwin prototype error,
- fixed in v2.2 of w32api */
- XECOMCALL4 (psl, GetPath, (LPSTR) resolved,
- PATH_MAX_EXTERNAL, &wfd, 0)
-#else
- XECOMCALL4 (psl, GetPath, resolved,
- PATH_MAX_EXTERNAL, &wfd, 0)
-#endif
- == S_OK)
- TO_INTERNAL_FORMAT (C_STRING, resolved,
- ALLOCA, (fname, fnamelen),
- Qmswindows_tstr);
-
- XECOMCALL0 (ppf, Release);
- }
-
- XECOMCALL0 (psl, Release);
- }
- }
- else
{
- IShellLinkA *psl;
-
- if (CoCreateInstance (
- XECOMID (CLSID_ShellLink),
- NULL,
- CLSCTX_INPROC_SERVER,
- XECOMID (IID_IShellLinkA),
- &VOIDP_CAST (psl)) == S_OK)
- {
- IPersistFile *ppf;
-
- if (XECOMCALL2 (psl, QueryInterface,
- XECOMID (IID_IPersistFile),
- &VOIDP_CAST (ppf)) == S_OK)
- {
- Extbyte *fname_unicode;
- WIN32_FIND_DATAA wfd;
- LPSTR resolved =
- alloca_array (CHAR, PATH_MAX_EXTERNAL + 1);
-
- /* Always Unicode. Not obvious from the
- IPersistFile documentation, but look under
- "Shell Link" for example code. */
- TO_EXTERNAL_FORMAT (DATA, (fname, fnamelen),
- C_STRING_ALLOCA,
- fname_unicode,
- Qmswindows_unicode);
-
- if (XECOMCALL2 (ppf, Load,
- (LPWSTR) fname_unicode,
- STGM_READ) == S_OK
- && XECOMCALL4 (psl, GetPath, resolved,
- PATH_MAX_EXTERNAL, &wfd, 0) == S_OK)
- TO_INTERNAL_FORMAT (C_STRING, resolved,
- ALLOCA, (fname, fnamelen),
- Qmswindows_tstr);
-
- XECOMCALL0 (ppf, Release);
+ fname = mswindows_read_link (fname);
+ freeme = 1;
}
- XECOMCALL0 (psl, Release);
- }
- }
- }
-#endif /* !defined (NO_CYGWIN_COM_SUPPORT) */
{
- fname = urlify_filename (fname);
- l_item = build_intstring (fname);
+ Ibyte *fname2 = urlify_filename (fname);
+ l_item = build_intstring (fname2);
+ xfree (fname2, Ibyte *);
+ if (freeme)
xfree (fname, Ibyte *);
l_dndlist = Fcons (l_item, l_dndlist);
}
1.104 +94 -28 XEmacs/xemacs/src/fileio.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: fileio.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/fileio.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- fileio.c 2005/01/24 23:33:55 1.103
+++ fileio.c 2005/01/28 02:36:24 1.104
＠＠ -23,6 +23,7 ＠＠
/* More syncing: FSF Emacs 19.34.6 by Marc Paquette <marcpa(a)cam.org>
(Note: Sync messages from Marc Paquette may indicate
incomplete synching, so beware.) */
+/* Some functions synched with FSF 21.0.103. */
/* Mule-ized completely except for the #if 0-code including decrypt-string
and encrypt-string. --ben 7-2-00 */
/* #if 0-code Mule-ized, 2-22-03. --ben */
＠＠ -38,6 +39,7 ＠＠
#include "frame.h"
#include "insdel.h"
#include "lstream.h"
+#include "profile.h"
#include "process.h"
#include "redisplay.h"
#include "sysdep.h"
＠＠ -129,6 +131,8 ＠＠
Lisp_Object Qcompute_buffer_file_truename;
+Lisp_Object QSin_expand_file_name;
+
EXFUN (Frunning_temacs_p, 0);
/* DATA can be anything acceptable to signal_error ().
＠＠ -325,6 +329,25 ＠＠
}
+
+Ibyte *
+find_end_of_directory_component (const Ibyte *path, Bytecount len)
+{
+ const Ibyte *p = path + len;
+
+ while (p != path && !IS_DIRECTORY_SEP (p[-1])
+#ifdef WIN32_FILENAMES
+ /* only recognise drive specifier at the beginning */
+ && !(p[-1] == ':'
+ /* handle the "/:d:foo" and "/:foo" cases correctly */
+ && ((p == path + 2 && !IS_DIRECTORY_SEP (*path))
+ || (p == path + 4 && IS_DIRECTORY_SEP (*path))))
+#endif
+ ) p--;
+
+ return (Ibyte *) p;
+}
+
DEFUN ("file-name-directory", Ffile_name_directory, 1, 1, 0, /*
Return the directory component in file name FILENAME.
Return nil if FILENAME does not include a directory.
＠＠ -352,18 +375,8 ＠＠
#endif
beg = XSTRING_DATA (filename);
/* XEmacs: no need to alloca-copy here */
- p = beg + XSTRING_LENGTH (filename);
+ p = find_end_of_directory_component (beg, XSTRING_LENGTH (filename));
- while (p != beg && !IS_DIRECTORY_SEP (p[-1])
-#ifdef WIN32_FILENAMES
- /* only recognise drive specifier at the beginning */
- && !(p[-1] == ':'
- /* handle the "/:d:foo" and "/:foo" cases correctly */
- && ((p == beg + 2 && !IS_DIRECTORY_SEP (*beg))
- || (p == beg + 4 && IS_DIRECTORY_SEP (*beg))))
-#endif
- ) p--;
-
if (p == beg)
return Qnil;
#ifdef WIN32_NATIVE
＠＠ -522,7 +535,11 ＠＠
return call2_check_string (handler, Qfile_name_as_directory, filename);
buf = alloca_ibytes (XSTRING_LENGTH (filename) + 10);
- return build_intstring (file_name_as_directory (buf, XSTRING_DATA (filename)));
+ file_name_as_directory (buf, XSTRING_DATA (filename));
+ if (qxestrcmp (buf, XSTRING_DATA (filename)))
+ return build_intstring (buf);
+ else
+ return filename;
}
/*
＠＠ -735,6 +752,9 ＠＠
int length;
Lisp_Object handler = Qnil;
struct gcpro gcpro1, gcpro2, gcpro3;
+ PROFILE_DECLARE ();
+
+ PROFILE_RECORD_ENTERING_SECTION (QSin_expand_file_name);
/* both of these get set below */
GCPRO3 (name, default_directory, handler);
＠＠ -745,7 +765,9 ＠＠
call the corresponding file handler. */
handler = Ffind_file_name_handler (name, Qexpand_file_name);
if (!NILP (handler))
- RETURN_UNGCPRO (call3_check_string (handler, Qexpand_file_name,
+ RETURN_UNGCPRO_EXIT_PROFILING (QSin_expand_file_name,
+ call3_check_string
+ (handler, Qexpand_file_name,
name, default_directory));
/* Use the buffer's default-directory if DEFAULT_DIRECTORY is omitted. */
＠＠ -762,7 +784,8 ＠＠
{
handler = Ffind_file_name_handler (default_directory, Qexpand_file_name);
if (!NILP (handler))
- RETURN_UNGCPRO (call3 (handler, Qexpand_file_name,
+ RETURN_UNGCPRO_EXIT_PROFILING (QSin_expand_file_name,
+ call3 (handler, Qexpand_file_name,
name, default_directory));
}
＠＠ -927,13 +950,14 ＠＠
}
}
xfree (newnm, Ibyte *);
- RETURN_UNGCPRO (name);
+ RETURN_UNGCPRO_EXIT_PROFILING (QSin_expand_file_name, name);
}
#endif /* WIN32_FILENAMES */
#ifndef WIN32_NATIVE
if (nm == XSTRING_DATA (name))
- RETURN_UNGCPRO (name);
- RETURN_UNGCPRO (build_intstring (nm));
+ RETURN_UNGCPRO_EXIT_PROFILING (QSin_expand_file_name, name);
+ RETURN_UNGCPRO_EXIT_PROFILING (QSin_expand_file_name,
+ build_intstring (nm));
#endif /* not WIN32_NATIVE */
}
}
＠＠ -1301,10 +1325,11 ＠＠
Lisp_Object result = build_intstring (newtarget);
xfree (newtarget, Ibyte *);
- RETURN_UNGCPRO (result);
+ RETURN_UNGCPRO_EXIT_PROFILING (QSin_expand_file_name, result);
}
#else /* not WIN32_FILENAMES */
- RETURN_UNGCPRO (make_string (target, o - target));
+ RETURN_UNGCPRO_EXIT_PROFILING (QSin_expand_file_name,
+ make_string (target, o - target));
#endif /* not WIN32_FILENAMES */
}
＠＠ -1360,7 +1385,7 ＠＠
p = path;
/* Try doing it all at once. */
- if (!qxe_realpath (path, resolved_path))
+ if (!qxe_realpath (path, resolved_path, 0))
{
/* Didn't resolve it -- have to do it one component at a time. */
/* "realpath" is a typically useless, stupid un*x piece of crap.
＠＠ -1379,7 +1404,11 ＠＠
resolved_name are undefined."
Since we depend on undocumented semantics of various system
- realpath()s, we just use our own version in realpath.c. */
+ realpath()s, we just use our own version in realpath.c.
+
+ Note also that our own version differs in its semantics from any
+ standard version, since it accepts and returns internal-format
+ text, not external-format. */
for (;;)
{
Ibyte *pos;
＠＠ -1402,7 +1431,7 ＠＠
if (p != pos)
p = 0;
- if (qxe_realpath (path, resolved_path))
+ if (qxe_realpath (path, resolved_path, 0))
{
if (p)
*p = DIRECTORY_SEP;
＠＠ -2338,7 +2367,7 ＠＠
if (!NILP (handler))
RETURN_UNGCPRO (call2 (handler, Qfile_readable_p, abspath));
-#if defined(WIN32_FILENAMES)
+#if defined (WIN32_FILENAMES)
/* Under MS-DOS and Windows, open does not work for directories. */
UNGCPRO;
if (qxe_access (XSTRING_DATA (abspath), 0) == 0)
＠＠ -2443,9 +2472,42 ＠＠
val = make_string (buf, valsize);
xfree (buf, Ibyte *);
return val;
-#else /* not HAVE_READLINK */
+#elif defined (WIN32_NATIVE)
+ if (mswindows_shortcuts_are_symlinks)
+ {
+ /* We want to resolve the directory component and leave the rest
+ alone. */
+ Ibyte *path = XSTRING_DATA (filename);
+ Ibyte *dirend =
+ find_end_of_directory_component (path, XSTRING_LENGTH (filename));
+ Ibyte *fname;
+ DECLARE_EISTRING (dir);
+
+ if (dirend != path)
+ {
+ Ibyte *resdir;
+ DECLARE_EISTRING (resname);
+
+ eicpy_raw (dir, path, dirend - path);
+ PATHNAME_RESOLVE_LINKS (eidata (dir), resdir);
+ eicpy_rawz (resname, resdir);
+ eicat_rawz (resname, dirend);
+ path = eidata (resname);
+ }
+
+ fname = mswindows_read_link (path);
+ if (!fname)
+ return Qnil;
+ {
+ Lisp_Object val = build_intstring (fname);
+ xfree (fname, Ibyte *);
+ return val;
+ }
+ }
+ return Qnil;
+#else
return Qnil;
-#endif /* not HAVE_READLINK */
+#endif
}
DEFUN ("file-directory-p", Ffile_directory_p, 1, 1, 0, /*
＠＠ -2499,7 +2561,7 ＠＠
return call2 (handler, Qfile_accessible_directory_p,
filename);
-#if !defined(WIN32_NATIVE)
+#if !defined (WIN32_NATIVE)
if (NILP (Ffile_directory_p (filename)))
return (Qnil);
else
＠＠ -4300,6 +4362,10 ＠＠
void
vars_of_fileio (void)
{
+ QSin_expand_file_name =
+ build_msg_string ("(in expand-file-name)");
+ staticpro (&QSin_expand_file_name);
+
DEFVAR_LISP ("auto-save-file-format", &Vauto_save_file_format /*
*Format in which to write auto-save files.
Should be a list of symbols naming formats that are defined in `format-alist'.
1.50 +6 -4 XEmacs/xemacs/src/glyphs.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: glyphs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- glyphs.c 2005/01/24 23:33:58 1.49
+++ glyphs.c 2005/01/28 02:36:25 1.50
＠＠ -1,7 +1,7 ＠＠
/* Generic glyph/image implementation + display tables
Copyright (C) 1994, 1995 Board of Trustees, University of Illinois.
Copyright (C) 1995 Tinker Systems
- Copyright (C) 1995, 1996, 2000, 2001, 2002 Ben Wing
+ Copyright (C) 1995, 1996, 2000, 2001, 2002, 2004 Ben Wing
Copyright (C) 1995 Sun Microsystems
Copyright (C) 1998, 1999, 2000 Andy Piper
＠＠ -2917,11 +2917,13 ＠＠
Lisp_Object
pixmap_to_lisp_data (Lisp_Object name, int ok_if_data_invalid)
{
- char **data;
+ Ascbyte **data;
int result;
- char *fname = 0;
+ Extbyte *fname = 0;
+ Ibyte *resolved;
- LISP_STRING_TO_EXTERNAL (name, fname, Qfile_name);
+ LISP_PATHNAME_RESOLVE_LINKS (name, resolved);
+ C_STRING_TO_EXTERNAL (resolved, fname, Qfile_name);
result = XpmReadFileToData (fname, &data);
if (result == XpmSuccess)
1.120 +2 -0 XEmacs/xemacs/src/lisp.h
(In the diff below, changes in quantity of whitespace are not shown.)
Index: lisp.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- lisp.h 2005/01/26 10:25:05 1.119
+++ lisp.h 2005/01/28 02:36:25 1.120
＠＠ -4305,6 +4305,8 ＠＠
Lisp_Object lisp_strerror (int);
Lisp_Object expand_and_dir_to_file (Lisp_Object, Lisp_Object);
int internal_delete_file (Lisp_Object);
+Ibyte *find_end_of_directory_component (const Ibyte *path,
+ Bytecount len);
/* Defined in filelock.c */
EXFUN (Funlock_buffer, 0);
1.46 +98 -30 XEmacs/xemacs/src/nt.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: nt.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/nt.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- nt.c 2004/12/06 03:52:14 1.45
+++ nt.c 2005/01/28 02:36:25 1.46
＠＠ -30,7 +30,7 ＠＠
incomplete synching, so beware.)
Synched (completely!) with Emacs 20.6 by Ben Wing, 6-23-00.
Largely rewritten by Ben Wing for XEmacs Mule support.
- Synched (completely!) with Emacs 21.1.103 by Ben Wing, 6-13-01.
+ Synched (completely!) with Emacs 21.0.103 by Ben Wing, 6-13-01.
*/
/* This file Mule-ized by Ben Wing, 6-23-00. */
＠＠ -295,7 +295,7 ＠＠
if (qxestrpbrk (name, "*?|<>\""))
return 0;
- C_STRING_TO_TSTR (name, nameext);
+ PATHNAME_CONVERT_OUT (name, nameext);
dir_handle = qxeFindFirstFile (nameext, &find_data);
if (dir_handle != INVALID_HANDLE_VALUE)
{
＠＠ -663,7 +663,7 ＠＠
Ibyte drive[3] = { root_dir[0], ':' };
Extbyte *driveext;
- C_STRING_TO_TSTR (drive, driveext);
+ PATHNAME_CONVERT_OUT (drive, driveext);
if (qxeWNetGetConnection (driveext, remote_name,
sizeof (remote_name) / XETCHAR_SIZE)
== NO_ERROR)
＠＠ -682,7 +682,7 ＠＠
Extbyte type[256 * MAX_XETCHAR_SIZE];
Extbyte *rootdirext;
- C_STRING_TO_TSTR (root_dir, rootdirext);
+ PATHNAME_CONVERT_OUT (root_dir, rootdirext);
/* Info is not cached, or is stale. */
if (!qxeGetVolumeInformation (rootdirext,
＠＠ -869,16 +869,16 ＠＠
{
DECLARE_EISTRING (filename);
Ichar lastch;
+ Extbyte *fileext;
eicpy_rawz (filename, dir_pathname);
lastch = eigetch_char (filename, eicharlen (filename) - 1);
if (!IS_DIRECTORY_SEP (lastch))
eicat_ch (filename, '\\');
eicat_ch (filename, '*');
- eito_external (filename, Qmswindows_tstr);
+ PATHNAME_CONVERT_OUT (eidata (filename), fileext);
- dir_find_handle = qxeFindFirstFile (eiextdata (filename),
- &dir_find_data);
+ dir_find_handle = qxeFindFirstFile (fileext, &dir_find_data);
if (dir_find_handle == INVALID_HANDLE_VALUE)
return NULL;
＠＠ -902,6 +902,33 ＠＠
DECLARE_EISTRING (found);
Bytecount namlen;
+ if (mswindows_shortcuts_are_symlinks)
+ {
+ int len = qxestrlen (val);
+ if (len > 4 && !qxestrcasecmp_ascii (val + len - 4, ".LNK"))
+ {
+ /* If we've found a valid link, then chop off the .LNK ending */
+ DECLARE_EISTRING (linkname);
+ Ichar lastch;
+ Ibyte *resolved;
+
+ /* First check if link is valid */
+ PATHNAME_RESOLVE_LINKS (dir_pathname, resolved);
+ eicpy_rawz (linkname, resolved);
+ lastch = eigetch_char (linkname, eicharlen (linkname) - 1);
+ if (!IS_DIRECTORY_SEP (lastch))
+ eicat_ch (linkname, '\\');
+ eicat_rawz (linkname, val);
+ resolved = mswindows_read_link (eidata (linkname));
+ if (resolved)
+ {
+ xfree (resolved, Ibyte *);
+ len -= 4;
+ val[len] = '\0';
+ }
+ }
+ }
+
eicpy_rawz (found, val);
if (need_to_free)
xfree (val, Ibyte *);
＠＠ -930,7 +957,7 ＠＠
nr.dwDisplayType = RESOURCEDISPLAYTYPE_SERVER;
nr.dwUsage = RESOURCEUSAGE_CONTAINER;
nr.lpLocalName = NULL;
- C_STRING_TO_TSTR (path, nr.lpRemoteName);
+ PATHNAME_CONVERT_OUT (path, nr.lpRemoteName);
nr.lpComment = NULL;
nr.lpProvider = NULL;
＠＠ -1023,7 +1050,7 ＠＠
{
Extbyte *pathext;
- C_STRING_TO_TSTR (path, pathext);
+ PATHNAME_CONVERT_OUT (path, pathext);
if ((attributes = qxeGetFileAttributes (pathext)) == -1)
{
/* Should try mapping GetLastError to errno; for now just indicate
＠＠ -1066,7 +1093,7 ＠＠
return -1;
}
- C_STRING_TO_TSTR (old, oldext);
+ PATHNAME_CONVERT_OUT (old, oldext);
fileh = qxeCreateFile (oldext, 0, 0, NULL, OPEN_EXISTING,
FILE_FLAG_BACKUP_SEMANTICS, NULL);
if (fileh != INVALID_HANDLE_VALUE)
＠＠ -1175,8 +1202,8 ＠＠
seems to make the second rename work properly. */
qxesprintf (p, "_.%s.%u", o, i);
i++;
- C_STRING_TO_EXTERNAL (oldname, oldext, Qfile_name);
- C_STRING_TO_EXTERNAL (temp, tempext, Qfile_name);
+ PATHNAME_CONVERT_OUT (oldname, oldext);
+ PATHNAME_CONVERT_OUT (temp, tempext);
result = rename (oldext, tempext);
}
/* This loop must surely terminate! */
＠＠ -1198,16 +1225,29 ＠＠
{
Extbyte *newext, *tempext;
- C_STRING_TO_EXTERNAL (newname, newext, Qfile_name);
- C_STRING_TO_EXTERNAL (temp, tempext, Qfile_name);
+ PATHNAME_CONVERT_OUT (newname, newext);
+ PATHNAME_CONVERT_OUT (temp, tempext);
+ if (XEUNICODE_P)
+ {
+ result = _wrename ((const wchar_t *) tempext,
+ (const wchar_t *) newext);
+ if (result < 0
+ && (errno == EEXIST || errno == EACCES)
+ && _wchmod ((const wchar_t *) newext, 0666) == 0
+ && _wunlink ((const wchar_t *) newext) == 0)
+ result = _wrename ((const wchar_t *) tempext,
+ (const wchar_t *) newext);
+ }
+ else
+ {
result = rename (tempext, newext);
-
if (result < 0
&& (errno == EEXIST || errno == EACCES)
&& _chmod (newext, 0666) == 0
&& _unlink (newext) == 0)
result = rename (tempext, newext);
}
+ }
return result;
}
＠＠ -1217,10 +1257,18 ＠＠
{
Extbyte *pathout;
- C_STRING_TO_EXTERNAL (path, pathout, Qfile_name);
+ PATHNAME_CONVERT_OUT (path, pathout);
/* On Unix, unlink works without write permission. */
+ if (XEUNICODE_P)
+ {
+ _wchmod ((const wchar_t *) pathout, 0666);
+ return _wunlink ((const wchar_t *) pathout);
+ }
+ else
+ {
_chmod (pathout, 0666);
return _unlink (pathout);
+ }
}
static FILETIME utc_base_ft;
＠＠ -1510,6 +1558,8 ＠＠
{
if (!IS_DIRECTORY_SEP (name[len-1]))
qxestrcat (name, (Ibyte *) "\\");
+ /* File has already been resolved and we don't want to do it again
+ in case of lstat() */
C_STRING_TO_TSTR (name, nameext);
if (qxeGetDriveType (nameext) < 2)
{
＠＠ -1574,13 +1624,15 ＠＠
else
{
if (!NILP (Vmswindows_get_true_file_attributes))
+ /* File has already been resolved and we don't want to do it again
+ in case of lstat() */
C_STRING_TO_TSTR (name, nameext);
if (!NILP (Vmswindows_get_true_file_attributes)
/* No access rights required to get info. */
&& (fh = qxeCreateFile (nameext, 0, 0, NULL, OPEN_EXISTING, 0, NULL))
!= INVALID_HANDLE_VALUE)
{
- /* This is more accurate in terms of gettting the correct number
+ /* This is more accurate in terms of getting the correct number
of links, but is quite slow (it is noticable when Emacs is
making a list of file name completions). */
BY_HANDLE_FILE_INFORMATION info;
＠＠ -1623,6 +1675,22 ＠＠
buf->st_nlink = 1;
fake_inode = 0;
}
+
+ if (mswindows_shortcuts_are_symlinks &&
+ buf->st_mode == _S_IFREG)
+ {
+ len = qxestrlen (name);
+ if (len > 4 && !qxestrcasecmp_ascii (name + len - 4, ".LNK"))
+ {
+ /* check if link is valid */
+ Ibyte *resolved = mswindows_read_link (name);
+ if (resolved)
+ {
+ xfree (resolved, Ibyte *);
+ buf->st_mode = S_IFLNK;
+ }
+ }
+ }
}
SetErrorMode (errm);
＠＠ -1698,7 +1766,7 ＠＠
times = &deftime;
}
- LISP_STRING_TO_TSTR (path, filename);
+ LISP_PATHNAME_CONVERT_OUT (path, filename);
/* APA: SetFileTime fails to set mtime correctly (always 1-Jan-1970) */
#if 0
/* Need write access to set times. */
＠＠ -1768,7 +1836,7 ＠＠
DWORD size, upper_size;
Extbyte *fileext;
- C_STRING_TO_TSTR (filename, fileext);
+ PATHNAME_CONVERT_OUT (filename, fileext);
file = qxeCreateFile (fileext, GENERIC_READ, FILE_SHARE_READ, NULL,
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
＠＠ -1804,7 +1872,7 ＠＠
void *file_base;
Extbyte *fileext;
- C_STRING_TO_TSTR (filename, fileext);
+ PATHNAME_CONVERT_OUT (filename, fileext);
file = qxeCreateFile (fileext, GENERIC_READ | GENERIC_WRITE, 0, NULL,
CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
＠＠ -2007,7 +2075,7 ＠＠
/* first expand it. */
filename = Fexpand_file_name (filename, Qnil);
- LISP_STRING_TO_TSTR (filename, fileext);
+ LISP_PATHNAME_CONVERT_OUT (filename, fileext);
/* luckily, this returns the short version of each element in the path. */
if (qxeGetShortPathName (fileext, shortname,
sizeof (shortname) / XETCHAR_SIZE) == 0)
＠＠ -2121,7 +2189,7 ＠＠
{
Extbyte *driveext;
- C_STRING_TO_TSTR (drive, driveext);
+ PATHNAME_CONVERT_OUT (drive, driveext);
/* Record if this drive letter refers to a fixed drive. */
fixed_drives[DRIVE_INDEX (*drive)] =
1.13 +4 -6 XEmacs/xemacs/src/ntplay.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ntplay.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ntplay.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- ntplay.c 2004/11/04 23:06:45 1.12
+++ ntplay.c 2005/01/28 02:36:26 1.13
＠＠ -35,14 +35,12 ＠＠
int volume, int convert);
void
-play_sound_file (Extbyte *sound_file, int UNUSED (volume))
+nt_play_sound_file (Lisp_Object path, int UNUSED (volume))
{
DWORD flags = SND_ASYNC | SND_NODEFAULT | SND_FILENAME;
- Lisp_Object fname =
- Ffile_name_nondirectory (build_tstr_string (sound_file));
+ Lisp_Object fname = Ffile_name_nondirectory (path);
Extbyte *fnameext;
- CHECK_STRING (fname);
LISP_STRING_TO_TSTR (fname, fnameext);
if (qxeSearchPath (NULL, fnameext, NULL, 0, NULL, NULL) == 0)
＠＠ -50,9 +48,9 ＠＠
/* file isn't in the path so read it as data */
int size;
Binbyte *data;
- int ofd = qxe_open (XSTRING_DATA (fname), O_RDONLY | OPEN_BINARY, 0);
+ int ofd = qxe_open (XSTRING_DATA (path), O_RDONLY | OPEN_BINARY, 0);
- if (ofd <0)
+ if (ofd < 0)
return;
size = lseek (ofd, 0, SEEK_END);
1.38 +6 -3 XEmacs/xemacs/src/process-nt.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: process-nt.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/process-nt.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- process-nt.c 2005/01/24 23:34:05 1.37
+++ process-nt.c 2005/01/28 02:36:26 1.38
＠＠ -764,13 +764,15 ＠＠
if (mswindows_is_executable (XSTRING_DATA (program)))
{
Extbyte *progext;
- LISP_STRING_TO_TSTR (program, progext);
+ LISP_PATHNAME_CONVERT_OUT (program, progext);
image_type = qxeSHGetFileInfo (progext, 0, NULL, 0, SHGFI_EXETYPE);
}
else
{
DECLARE_EISTRING (progext);
- eicpy_lstr (progext, program);
+ Ibyte *prog2;
+ LISP_PATHNAME_RESOLVE_LINKS (program, prog2);
+ eicpy_rawz (progext, prog2);
eicat_ascii (progext, ".exe");
eito_external (progext, Qmswindows_tstr);
image_type = qxeSHGetFileInfo (eiextdata (progext), 0, NULL, 0,
＠＠ -858,6 +860,7 ＠＠
("Bogus return value from `mswindows-construct-process-command-line'",
args_or_ret);
+ /* #### What about path names, which may be links? */
LISP_STRING_TO_TSTR (args_or_ret, command_line);
UNGCPRO; /* args_or_ret */
＠＠ -994,7 +997,7 ＠＠
{
Extbyte *curdirext;
- LISP_STRING_TO_TSTR (cur_dir, curdirext);
+ LISP_PATHNAME_CONVERT_OUT (cur_dir, curdirext);
err = (qxeCreateProcess (NULL, command_line, NULL, NULL, TRUE,
(XEUNICODE_P ?
1.21 +76 -21 XEmacs/xemacs/src/realpath.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: realpath.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/realpath.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- realpath.c 2004/12/06 03:52:17 1.20
+++ realpath.c 2005/01/28 02:36:26 1.21
＠＠ -1,7 +1,7 ＠＠
/*
* realpath.c -- canonicalize pathname by removing symlinks
* Copyright (C) 1993 Rick Sladkey <jrs(a)world.std.com>
- * Copyright (C) 2001, 2002 Ben Wing.
+ * Copyright (C) 2001, 2002, 2004 Ben Wing.
*
This file is part of XEmacs.
＠＠ -31,6 +31,8 ＠＠
#include <config.h>
#include "lisp.h"
+#include "profile.h"
+
#include "sysfile.h"
#include "sysdir.h"
＠＠ -43,6 +45,8 ＠＠
#endif
#endif
+Lisp_Object QSin_qxe_realpath;
+
/* Length of start of absolute filename. */
static int
abs_start (const Ibyte *name)
＠＠ -59,25 +63,31 ＠＠
return IS_DIRECTORY_SEP (*name) ? 1 : 0;
#endif
}
+
+/* Find real name of a file by resolving symbolic links and/or shortcuts
+ under Windows (.LNK links), if such support is enabled.
-/* Find real name of a file by resolving symbolic links and (under Windows)
- looking up the correct case of the file as it appears on the file
- system.
+ If no link found, and LINKS_ONLY is false, look up the correct case in
+ the file system of the last component.
Under Windows, UNC servers and shares are lower-cased. Directories must
be given without trailing '/'. One day, this could read Win2K's reparse
- points. */
+ points.
+ Returns length of characters copied info BUF.
+ DOES NOT ZERO TERMINATE!!!!!
+*/
+
static int
-readlink_and_correct_case (const Ibyte *name, Ibyte *buf,
- int size)
+readlink_or_correct_case (const Ibyte *name, Ibyte *buf, Bytecount size,
+ Boolint links_only)
{
#ifndef WIN32_ANY
- return qxe_readlink (name, buf, size);
+ return qxe_readlink (name, buf, (size_t) size);
#else
# ifdef CYGWIN
Ibyte *tmp;
- int n = qxe_readlink (name, buf, size);
+ int n = qxe_readlink (name, buf, (size_t) size);
if (n >= 0 || errno != EINVAL)
return n;
＠＠ -87,8 +97,33 ＠＠
alloca_ibytes (cygwin_posix_to_win32_path_list_buf_size ((char *) name));
cygwin_posix_to_win32_path_list ((char *) name, (char *) tmp);
name = tmp;
+# else
+ if (mswindows_shortcuts_are_symlinks)
+ {
+ Ibyte *tmp = mswindows_read_link (name);
+
+ if (tmp != NULL)
+ {
+ /* Fucking fixed buffers. */
+ Bytecount len = qxestrlen (tmp);
+ if (len > size)
+ {
+ errno = ENAMETOOLONG;
+ return -1;
+ }
+ memcpy (buf, tmp, len);
+ xfree (tmp, Ibyte *);
+ return len;
+ }
+ }
# endif
+ if (links_only)
+ {
+ errno = EINVAL;
+ return -1;
+ }
+
{
int len = 0;
int err = 0;
＠＠ -144,7 +179,7 ＠＠
FindClose (dir_handle);
}
- if ((len = eilen (result)) < size)
+ if ((len = eilen (result)) <= size)
{
DECLARE_EISTRING (eilastname);
＠＠ -153,7 +188,7 ＠＠
/* Signal that the name is already OK. */
err = EINVAL;
else
- memcpy (buf, eidata (result), len + 1);
+ memcpy (buf, eidata (result), len);
}
else
err = ENAMETOOLONG;
＠＠ -165,14 +200,18 ＠＠
}
/* Mule Note: This function works with and returns
- internally-formatted strings. */
+ internally-formatted strings.
+
+ if LINKS_ONLY is true, don't do case canonicalization under
+ Windows. */
Ibyte *
-qxe_realpath (const Ibyte *path, Ibyte *resolved_path)
+qxe_realpath (const Ibyte *path, Ibyte *resolved_path, Boolint links_only)
{
Ibyte copy_path[PATH_MAX_INTERNAL];
Ibyte *new_path = resolved_path;
Ibyte *max_path;
+ Ibyte *retval = NULL;
#if defined (HAVE_READLINK) || defined (WIN32_ANY)
int readlinks = 0;
Ibyte link_path[PATH_MAX_INTERNAL];
＠＠ -180,6 +219,10 ＠＠
int abslen = abs_start (path);
#endif
+ PROFILE_DECLARE ();
+
+ PROFILE_RECORD_ENTERING_SECTION (QSin_qxe_realpath);
+
restart:
/* Make a copy of the source path since we may need to modify it. */
＠＠ -288,7 +331,7 ＠＠
if (path > max_path)
{
errno = ENAMETOOLONG;
- return NULL;
+ goto done;
}
*new_path++ = *path++;
}
＠＠ -297,7 +340,8 ＠＠
/* See if latest pathname component is a symlink or needs case
correction. */
*new_path = '\0';
- n = readlink_and_correct_case (resolved_path, link_path, PATH_MAX_INTERNAL - 1);
+ n = readlink_or_correct_case (resolved_path, link_path,
+ PATH_MAX_INTERNAL - 1, links_only);
if (n < 0)
{
＠＠ -308,7 +352,7 ＠＠
#else
if (errno != EINVAL)
#endif
- return NULL;
+ goto done;
}
else
{
＠＠ -316,7 +360,7 ＠＠
if (readlinks++ > MAX_READLINKS)
{
errno = ELOOP;
- return NULL;
+ goto done;
}
/* Note: readlink doesn't add the null byte. */
＠＠ -340,7 +384,7 ＠＠
if (qxestrlen (path) + n >= PATH_MAX_INTERNAL)
{
errno = ENAMETOOLONG;
- return NULL;
+ goto done;
}
/* Insert symlink contents into path. */
＠＠ -360,5 +404,16 ＠＠
/* Make sure it's null terminated. */
*new_path = '\0';
- return resolved_path;
+ retval = resolved_path;
+done:
+ PROFILE_RECORD_EXITING_SECTION (QSin_qxe_realpath);
+ return retval;
+}
+
+void
+vars_of_realpath (void)
+{
+ QSin_qxe_realpath =
+ build_msg_string ("(in qxe_realpath)");
+ staticpro (&QSin_qxe_realpath);
}
1.23 +6 -9 XEmacs/xemacs/src/sound.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: sound.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sound.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- sound.c 2004/11/04 23:06:53 1.22
+++ sound.c 2005/01/28 02:36:26 1.23
＠＠ -1,7 +1,7 ＠＠
/* Sound functions.
Copyright (C) 1992, 1993, 1994 Lucid Inc.
Copyright (C) 1994, 1995 Free Software Foundation, Inc.
- Copyright (C) 2002 Ben Wing.
+ Copyright (C) 2002, 2004 Ben Wing.
This file is part of XEmacs.
＠＠ -161,20 +161,17 ＠＠
#ifdef HAVE_NATIVE_SOUND
if (NILP (Vnative_sound_only_on_console) || DEVICE_ON_CONSOLE_P (d))
{
- Extbyte *fileext;
-
-#ifdef WIN32_NATIVE
- /* #### more garbage. we should be passing the internal file name
- to play_sound_file. */
- LISP_STRING_TO_EXTERNAL (file, fileext, Qmswindows_tstr);
+#ifdef WIN32_ANY
+ nt_play_sound_file (file, vol);
#else
- LISP_STRING_TO_EXTERNAL (file, fileext, Qfile_name);
-#endif
+ Extbyte *fileext;
+ LISP_PATHNAME_CONVERT_OUT (file, fileext);
/* The sound code doesn't like getting SIGIO interrupts.
Unix sucks! */
stop_interrupts ();
play_sound_file (fileext, vol);
start_interrupts ();
+#endif /* WIN32_NATIVE */
QUIT;
}
#endif /* HAVE_NATIVE_SOUND */
1.10 +1 -0 XEmacs/xemacs/src/sound.h
(In the diff below, changes in quantity of whitespace are not shown.)
Index: sound.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sound.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- sound.h 2004/11/04 23:06:53 1.9
+++ sound.h 2005/01/28 02:36:26 1.10
＠＠ -27,6 +27,7 ＠＠
/* Defined in *play.c */
void play_sound_file (Extbyte *name, int volume);
+void nt_play_sound_file (Lisp_Object name, int volume);
int play_sound_data (Binbyte *data, int length, int volume);
# define sound_perror(string) \
1.51 +1 -0 XEmacs/xemacs/src/symsinit.h
(In the diff below, changes in quantity of whitespace are not shown.)
Index: symsinit.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symsinit.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- symsinit.h 2004/11/04 23:06:54 1.50
+++ symsinit.h 2005/01/28 02:36:26 1.51
＠＠ -406,6 +406,7 ＠＠
void vars_of_process_unix (void);
void vars_of_profile (void);
void vars_of_ralloc (void);
+void vars_of_realpath (void);
void vars_of_redisplay (void);
void vars_of_regex (void);
void vars_of_scrollbar_x (void);
1.80 +53 -15 XEmacs/xemacs/src/sysdep.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: sysdep.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sysdep.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- sysdep.c 2005/01/24 23:34:11 1.79
+++ sysdep.c 2005/01/28 02:36:27 1.80
＠＠ -628,7 +628,7 ＠＠
if (sh == 0)
sh = (Ibyte *) "sh";
- C_STRING_TO_EXTERNAL (sh, shext, Qfile_name);
+ PATHNAME_CONVERT_OUT (sh, shext);
UNGCPRO;
＠＠ -638,7 +638,10 ＠＠
qxe_chdir (str);
/* Waits for process completion */
- if (_spawnlp (_P_WAIT, shext, shext, NULL) != 0)
+ if (XEUNICODE_P ?
+ _wspawnlp (_P_WAIT, (const wchar_t *) shext,
+ (const wchar_t *) shext, NULL) != 0 :
+ _spawnlp (_P_WAIT, shext, shext, NULL) != 0)
report_process_error ("Can't spawn subshell", Qunbound);
else
return; /* we're done, no need to wait for termination */
＠＠ -2537,18 +2540,6 ＠＠
/* Encapsulations of system calls */
/************************************************************************/
-/* The documentation in VC++ claims that the pathname library functions
- accept strings in the current locale-specific encoding, but that's
- false, because they just call the native Win32 routines directly, which
- always use the system-default encoding (which is what Qmswindows_tstr
- will give us when not XEUNICODE_P). */
-#ifdef WIN32_NATIVE
-#define PATHNAME_CONVERT_OUT(path, pathout) C_STRING_TO_TSTR (path, pathout)
-#else
-#define PATHNAME_CONVERT_OUT(path, pathout) \
- C_STRING_TO_EXTERNAL (path, pathout, Qfile_name)
-#endif
-
/***************** low-level calls ****************/
/*
＠＠ -3180,6 +3171,51 ＠＠
In that case, use ordinary stat instead. */
#ifndef S_IFLNK
return qxe_stat (path, buf);
+#elif defined (WIN32_NATIVE)
+ if (mswindows_shortcuts_are_symlinks)
+ {
+ /* We want to resolve the directory component and leave the rest
+ alone. */
+ Ibyte *dirend = find_end_of_directory_component (path, qxestrlen (path));
+ Bytecount len;
+
+ if (dirend != path)
+ {
+ Ibyte *resdir;
+ Ichar lastch;
+ DECLARE_EISTRING (resname);
+ DECLARE_EISTRING (dir);
+
+ eicpy_raw (dir, path, dirend - path);
+ PATHNAME_RESOLVE_LINKS (eidata (dir), resdir);
+ eicpy_rawz (resname, resdir);
+ lastch = eigetch_char (resname, eicharlen (resname) - 1);
+ if (!IS_DIRECTORY_SEP (lastch))
+ eicat_ch (resname, '\\');
+ eicat_rawz (resname, dirend);
+ path = eidata (resname);
+ }
+
+ /* However, if what we are trying to stat is a link, we need to add
+ the .LNK so that the actual file is statted. */
+ len = qxestrlen (path);
+ if (len > 4 && qxestrcasecmp_ascii (path + len - 4, ".LNK"))
+ {
+ DECLARE_EISTRING (name2);
+ Ibyte *resolved;
+
+ eicpy_rawz (name2, path);
+ eicat_ascii (name2, ".LNK");
+ resolved = mswindows_read_link (eidata (name2));
+ if (resolved)
+ {
+ xfree (resolved, Ibyte *);
+ return mswindows_stat (eidata (name2), buf);
+ }
+ }
+ }
+
+ return mswindows_stat (path, buf);
#else
Extbyte *pathout;
PATHNAME_CONVERT_OUT (path, pathout);
＠＠ -3227,7 +3263,9 ＠＠
qxe_stat (const Ibyte *path, struct stat *buf)
{
#ifdef WIN32_NATIVE
- return mswindows_stat (path, buf);
+ Ibyte *resolved;
+ PATHNAME_RESOLVE_LINKS (path, resolved);
+ return mswindows_stat (resolved, buf);
#else /* not WIN32_NATIVE */
Extbyte *pathout;
PATHNAME_CONVERT_OUT (path, pathout);
1.20 +57 -1 XEmacs/xemacs/src/sysfile.h
(In the diff below, changes in quantity of whitespace are not shown.)
Index: sysfile.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sysfile.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- sysfile.h 2004/12/06 03:52:21 1.19
+++ sysfile.h 2005/01/28 02:36:27 1.20
＠＠ -238,6 +238,13 ＠＠
#undef S_ISSOCK
#endif /* STAT_MACROS_BROKEN. */
+#ifdef WIN32_NATIVE
+/* This is the standard value for S_IFLNK. All of the S_... flags that
+ exist in the MSVCRT have standard values, so their bit tests will
+ magically work. */
+#define S_IFLNK 0120000
+#endif
+
#if !defined(S_ISBLK) && defined(S_IFBLK)
#define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
#endif
＠＠ -376,7 +383,8 ＠＠
int qxe_readlink (const Ibyte *path, Ibyte *buf, size_t bufsiz);
int qxe_fstat (int fd, struct stat *buf);
int qxe_stat (const Ibyte *path, struct stat *buf);
-Ibyte *qxe_realpath (const Ibyte *path, Ibyte resolved_path []);
+Ibyte *qxe_realpath (const Ibyte *path, Ibyte resolved_path [],
+ Boolint links_only);
/* encapsulations: file-manipulation calls */
＠＠ -399,6 +407,10 ＠＠
on systems like SCO 3.2v5 */
void filemodestring (struct stat *, char *);
+#ifdef WIN32_ANY
+extern int mswindows_shortcuts_are_symlinks;
+#endif
+
#endif /* emacs */
＠＠ -506,6 +518,50 ＠＠
#define IS_ANY_SEP(c) IS_DIRECTORY_SEP (c)
#endif /* WIN32_ANY */
+
+#if defined (WIN32_NATIVE)
+#define PATHNAME_RESOLVE_LINKS(path, pathout) \
+do \
+{ \
+ if (mswindows_shortcuts_are_symlinks) \
+ { \
+ Ibyte *_prl_path_ = (Ibyte *) (path); \
+ Ibyte _prl_path2_[PATH_MAX_INTERNAL]; \
+ \
+ if (!qxe_realpath (_prl_path_, _prl_path2_, 1)) \
+ (pathout) = _prl_path_; \
+ else \
+ IBYTE_STRING_TO_ALLOCA (_prl_path2_, pathout); \
+ } \
+ else (pathout) = (Ibyte *) (path); \
+} while (0)
+#else
+#define PATHNAME_RESOLVE_LINKS(path, pathout) ((pathout) = (Ibyte *) (path))
+#endif
+
+#define LISP_PATHNAME_RESOLVE_LINKS(path, pathout) \
+ PATHNAME_RESOLVE_LINKS (XSTRING_DATA (path), pathout)
+
+/* The documentation in VC++ claims that the pathname library functions
+ accept strings in the current locale-specific encoding, but that's
+ false, because they just call the native Win32 routines directly, which
+ always use the system-default encoding (which is what Qmswindows_tstr
+ will give us when not XEUNICODE_P). */
+#ifdef WIN32_NATIVE
+# define PATHNAME_CONVERT_OUT(path, pathout) \
+do \
+{ \
+ const Ibyte *_pco_path_; \
+ PATHNAME_RESOLVE_LINKS (path, _pco_path_); \
+ C_STRING_TO_TSTR (_pco_path_, pathout); \
+} while (0)
+#else
+# define PATHNAME_CONVERT_OUT(path, pathout) \
+ C_STRING_TO_EXTERNAL (path, pathout, Qfile_name)
+#endif
+
+#define LISP_PATHNAME_CONVERT_OUT(path, pathout) \
+ PATHNAME_CONVERT_OUT (XSTRING_DATA (path), pathout)
#endif /* emacs */
1.26 +36 -35 XEmacs/xemacs/src/syswindows.h
(In the diff below, changes in quantity of whitespace are not shown.)
Index: syswindows.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/syswindows.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- syswindows.h 2005/01/24 23:34:11 1.25
+++ syswindows.h 2005/01/28 02:36:27 1.26
＠＠ -942,7 +942,7 ＠＠
Ibyte *lttff; \
\
LOCAL_TO_WIN32_FILE_FORMAT (XSTRING_DATA (path), lttff); \
- C_STRING_TO_TSTR (lttff, out); \
+ PATHNAME_CONVERT_OUT (lttff, out); \
} while (0)
Lisp_Object tstr_to_local_file_format (Extbyte *pathout);
＠＠ -1176,6 +1176,7 ＠＠
Lisp_Object data,
int errnum));
Lisp_Object mswindows_lisp_error (int errnum);
+Ibyte *mswindows_read_link (const Ibyte *fname);
/* in intl-win32.c */
extern Lisp_Object Qmswindows_tstr, Qmswindows_unicode;
1.28 +1 -1 XEmacs/xemacs/src/text.h
(In the diff below, changes in quantity of whitespace are not shown.)
Index: text.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/text.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- text.h 2005/01/24 23:34:12 1.27
+++ text.h 2005/01/28 02:36:27 1.28
＠＠ -2391,7 +2391,7 ＠＠
int eicmp_1 (Eistring *ei, Bytecount off, Charcount charoff,
Bytecount len, Charcount charlen, const Ibyte *data,
- const Eistring *ei2, int is_c, int fold_case);
+ const Eistring *ei2, int is_ascii, int fold_case);
#define eicmp_ei(eistr, eistr2) \
eicmp_1 (eistr, 0, -1, -1, -1, 0, eistr2, 0, 0)
1.25 +238 -2 XEmacs/xemacs/src/win32.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: win32.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/win32.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- win32.c 2005/01/24 23:34:13 1.24
+++ win32.c 2005/01/28 02:36:28 1.25
＠＠ -23,6 +23,8 ＠＠
#include "buffer.h"
#include "console-msw.h"
+#include "hash.h"
+#include "profile.h"
#include "sysfile.h"
#include "sysproc.h"
＠＠ -46,7 +48,10 ＠＠
nil means no, t means yes. */
Lisp_Object Vmswindows_downcase_file_names;
+struct hash_table *mswindows_read_link_hash;
+
int mswindows_windows9x_p;
+Boolint mswindows_shortcuts_are_symlinks;
pfSwitchToThread_t xSwitchToThread;
＠＠ -341,6 +346,7 ＠＠
if (STRINGP (operation))
LISP_STRING_TO_TSTR (operation, opext);
+ /* #### What about path names, which may be links? */
if (STRINGP (parameters))
LISP_STRING_TO_TSTR (parameters, parmext);
if (STRINGP (current_dir))
＠＠ -403,6 +409,228 ＠＠
}
#endif
+struct read_link_hash
+{
+ Ibyte *resolved;
+ DWORD ticks;
+};
+
+static Ibyte *
+mswindows_read_link_1 (const Ibyte *fname)
+{
+#ifdef NO_CYGWIN_COM_SUPPORT
+ return NULL;
+#else
+ Ibyte *retval = NULL;
+ Extbyte *fnameext;
+ HANDLE fh;
+ struct read_link_hash *rlh;
+ DWORD ticks;
+
+ /* The call below to resolve a link is rather time-consuming.
+ I tried implementing a simple cache based on creation and write time
+ of the file, but that didn't help enough -- maybe 30% faster but still
+ a lot of time spent here. So just do something cheesy and don't
+ check again if we've recently (< a second) done so. */
+
+ if (!mswindows_read_link_hash)
+ mswindows_read_link_hash = make_string_hash_table (1000);
+ C_STRING_TO_TSTR (fname, fnameext);
+
+ /* See if we can find a cached value. */
+
+ /* The intermediate cast fools gcc into not outputting strict-aliasing
+ complaints */
+ ticks = GetTickCount ();
+ if (!gethash (fname, mswindows_read_link_hash,
+ (const void **) (void *) &rlh))
+ {
+ rlh = xnew_and_zero (struct read_link_hash);
+ puthash (qxestrdup (fname), rlh, mswindows_read_link_hash);
+ }
+ else if (ticks - rlh->ticks < 1000)
+ {
+ return rlh->resolved ? qxestrdup (rlh->resolved) : NULL;
+ }
+
+ rlh->ticks = ticks;
+
+ /* Retrieve creation/write time of link file. */
+
+ /* No access rights required to get info. */
+ if ((fh = qxeCreateFile (fnameext, 0, 0, NULL, OPEN_EXISTING, 0, NULL))
+ == INVALID_HANDLE_VALUE)
+ {
+ CloseHandle (fh);
+ return NULL;
+ }
+
+ CloseHandle (fh);
+
+ /* ####
+
+ Note the following in the docs:
+
+ Note: The IShellLink interface has an ANSI version
+ (IShellLinkA) and a Unicode version (IShellLinkW). The
+ version that will be used depends on whether you compile
+ for ANSI or Unicode. However, Microsoft® Windows 95 and
+ Microsoft® Windows 98 only support IShellLinkA.
+
+ We haven't yet implemented COM support in the
+ Unicode-splitting library. I don't quite understand how
+ COM works yet, but it looks like what's happening is
+ that the ShellLink class implements both the IShellLinkA
+ and IShellLinkW interfaces. To make this work at
+ run-time, we have to do something like this:
+
+ -- define a new interface qxeIShellLink that uses
+ Extbyte * instead of LPSTR or LPWSTR. (not totally
+ necessary since Extbyte * == LPSTR).
+
+ -- define a new class qxeShellLink that implements
+ qxeIShellLink. the methods on this class need to create
+ a shadow ShellLink object to do all the real work, and
+ call the corresponding function from either the
+ IShellLinkA or IShellLinkW interfaces on this object,
+ depending on whether XEUNICODE_P is defined.
+
+ -- with appropriate preprocessor magic, of course, we
+ could make things appear transparent; but we've decided
+ not to do preprocessor magic for the moment.
+ */
+
+ /* #### Not Unicode-split for the moment; we have to do it
+ ourselves. */
+ if (XEUNICODE_P)
+ {
+ IShellLinkW *psl;
+
+ if (CoCreateInstance (
+ XECOMID (CLSID_ShellLink),
+ NULL,
+ CLSCTX_INPROC_SERVER,
+ XECOMID (IID_IShellLinkW),
+ &VOIDP_CAST (psl)) == S_OK)
+ {
+ IPersistFile *ppf;
+
+ if (XECOMCALL2 (psl, QueryInterface,
+ XECOMID (IID_IPersistFile),
+ &VOIDP_CAST (ppf)) == S_OK)
+ {
+ Extbyte *fname_unicode;
+ WIN32_FIND_DATAW wfd;
+ LPWSTR resolved = alloca_array (WCHAR, PATH_MAX_EXTERNAL + 1);
+
+ /* Always Unicode. Not obvious from the
+ IPersistFile documentation, but look under
+ "Shell Link" for example code. */
+ fname_unicode = fnameext;
+
+ if (XECOMCALL2 (ppf, Load,
+ (LPWSTR) fname_unicode,
+ STGM_READ) == S_OK &&
+ /* #### YUCK! Docs read
+
+ cchMaxPath
+
+ Maximum number of bytes to copy to the buffer pointed
+ to by the pszFile parameter.
+
+ But "cch" means "count of characters", not bytes.
+ I'll assume the doc writers messed up and the
+ programmer was correct. Also, this approach is safe
+ even if it's actually the other way around. */
+#if defined (CYGWIN_HEADERS) && W32API_INSTALLED_VER < W32API_VER(2,2)
+ /* Another Cygwin prototype error,
+ fixed in v2.2 of w32api */
+ XECOMCALL4 (psl, GetPath, (LPSTR) resolved,
+ PATH_MAX_EXTERNAL, &wfd, 0)
+#else
+ XECOMCALL4 (psl, GetPath, resolved,
+ PATH_MAX_EXTERNAL, &wfd, 0)
+#endif
+ == S_OK)
+ TSTR_TO_C_STRING_MALLOC (resolved, retval);
+
+ XECOMCALL0 (ppf, Release);
+ }
+
+ XECOMCALL0 (psl, Release);
+ }
+ }
+ else
+ {
+ IShellLinkA *psl;
+
+ if (CoCreateInstance (
+ XECOMID (CLSID_ShellLink),
+ NULL,
+ CLSCTX_INPROC_SERVER,
+ XECOMID (IID_IShellLinkA),
+ &VOIDP_CAST (psl)) == S_OK)
+ {
+ IPersistFile *ppf;
+
+ if (XECOMCALL2 (psl, QueryInterface,
+ XECOMID (IID_IPersistFile),
+ &VOIDP_CAST (ppf)) == S_OK)
+ {
+ Extbyte *fname_unicode;
+ WIN32_FIND_DATAA wfd;
+ LPSTR resolved = alloca_array (CHAR, PATH_MAX_EXTERNAL + 1);
+
+ /* Always Unicode. Not obvious from the
+ IPersistFile documentation, but look under
+ "Shell Link" for example code. */
+ C_STRING_TO_EXTERNAL (fname, fname_unicode,
+ Qmswindows_unicode);
+
+ if (XECOMCALL2 (ppf, Load,
+ (LPWSTR) fname_unicode,
+ STGM_READ) == S_OK
+ && XECOMCALL4 (psl, GetPath, resolved,
+ PATH_MAX_EXTERNAL, &wfd, 0) == S_OK)
+ TSTR_TO_C_STRING_MALLOC (resolved, retval);
+
+ XECOMCALL0 (ppf, Release);
+ }
+
+ XECOMCALL0 (psl, Release);
+ }
+ }
+
+ /* Cache newly found value */
+ if (rlh->resolved)
+ xfree (rlh->resolved, Ibyte *);
+ rlh->resolved = retval ? qxestrdup (retval) : NULL;
+
+ return retval;
+#endif /* NO_CYGWIN_COM_SUPPORT */
+}
+
+/* Resolve a file that may be a shortcut. Accepts either a file ending
+ with .LNK or without the ending. If a shortcut is found, returns
+ a value that you must xfree(); otherwise NULL. */
+
+Ibyte *
+mswindows_read_link (const Ibyte *fname)
+{
+ int len = qxestrlen (fname);
+ if (len > 4 && !qxestrcasecmp_ascii (fname + len - 4, ".LNK"))
+ return mswindows_read_link_1 (fname);
+ else
+ {
+ DECLARE_EISTRING (name2);
+
+ eicpy_rawz (name2, fname);
+ eicat_ascii (name2, ".LNK");
+ return mswindows_read_link_1 (eidata (name2));
+ }
+}
+
+
#if defined (WIN32_NATIVE) || defined (CYGWIN_BROKEN_SIGNALS)
/* setitimer() does not exist on native MS Windows, and appears broken
＠＠ -414,7 +642,6 ＠＠
mechanism for SIGCHLD. Yuck.)
*/
-
/*--------------------------------------------------------------------*/
/* Signal support */
/*--------------------------------------------------------------------*/
＠＠ -664,11 +891,20 ＠＠
void
vars_of_win32 (void)
{
- DEFVAR_LISP ("mswindows-downcase-file-names", &Vmswindows_downcase_file_names /*
+ DEFVAR_LISP ("mswindows-downcase-file-names",
+ &Vmswindows_downcase_file_names /*
Non-nil means convert all-upper case file names to lower case.
This applies when performing completions and file name expansion.
*/ );
Vmswindows_downcase_file_names = Qnil;
+
+ DEFVAR_BOOL ("mswindows-shortcuts-are-symlinks",
+ &mswindows_shortcuts_are_symlinks /*
+Non-nil means shortcuts (.LNK files) are treated as symbolic links.
+This works also for symlinks created under Cygwin, because they use .LNK
+files to implement symbolic links.
+*/ );
+ mswindows_shortcuts_are_symlinks = 1;
}
void
- 1 participants
- 0 comments
CVS update: MODIFIED: lisp ...
19 years, 11 months
CVS Monitor
CVS Monitor
User: ben
Date: 05/01/28 03:05:08
Modified: xemacs/lisp ChangeLog subr.el
Log:
Some synching of subr.el
subr.el: Some synching with FSF 21.2.
Revision Changes Path
1.618 +6 -0 XEmacs/xemacs/lisp/ChangeLog
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.617
retrieving revision 1.618
diff -u -b -r1.617 -r1.618
--- ChangeLog 2005/01/28 00:32:17 1.617
+++ ChangeLog 2005/01/28 02:05:03 1.618
＠＠ -1,5 +1,11 ＠＠
2005-01-27 Ben Wing <ben(a)xemacs.org>
+ * subr.el:
+ * subr.el (macro-declaration-function): New.
+ Some synching with FSF 21.2.
+
+2005-01-27 Ben Wing <ben(a)xemacs.org>
+
* gtk-marshal.el (find-file):
Propagate hash changes to gtk-marshal.el.
1.36 +49 -2 XEmacs/xemacs/lisp/subr.el
(In the diff below, changes in quantity of whitespace are not shown.)
Index: subr.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/subr.el,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- subr.el 2004/06/17 11:29:39 1.35
+++ subr.el 2005/01/28 02:05:05 1.36
＠＠ -1,12 +1,13 ＠＠
;;; subr.el --- basic lisp subroutines for XEmacs
-;; Copyright (C) 1985, 1986, 1992, 1994-5, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 86, 92, 94, 95, 99, 2000, 2001, 2002, 2003
+;; Free Software Foundation, Inc.
;; Copyright (C) 1995 Tinker Systems and INS Engineering Corp.
;; Copyright (C) 1995 Sun Microsystems.
;; Copyright (C) 2000, 2001, 2002, 2003 Ben Wing.
;; Maintainer: XEmacs Development Team
-;; Keywords: extensions, dumped
+;; Keywords: extensions, dumped, internal
;; This file is part of XEmacs.
＠＠ -49,6 +50,24 ＠＠
(setq custom-declare-variable-list
(cons arguments custom-declare-variable-list)))
+
+(defun macro-declaration-function (macro decl)
+ "Process a declaration found in a macro definition.
+This is set as the value of the variable `macro-declaration-function'.
+MACRO is the name of the macro being defined.
+DECL is a list `(declare ...)' containing the declarations.
+The return value of this function is not used."
+ (dolist (d (cdr decl))
+ (cond ((and (consp d) (eq (car d) 'indent))
+ (put macro 'lisp-indent-function (cadr d)))
+ ((and (consp d) (eq (car d) 'debug))
+ (put macro 'edebug-form-spec (cadr d)))
+ (t
+ (message "Unknown declaration %s" d)))))
+
+(setq macro-declaration-function 'macro-declaration-function)
+
+
;;;; Lisp language features.
(defmacro lambda (&rest cdr)
＠＠ -1600,5 +1619,33 ＠＠
(make-compatible 'eval-next-after-load "")
;; END SYNC WITH FSF 21.2
+
+;; (defun shell-quote-argument (argument) in process.el.
+
+;; (defun make-syntax-table (&optional oldtable) in syntax.el.
+
+;; (defun syntax-after (pos) #### doesn't exist.
+
+;; global-set-key, local-set-key, global-unset-key, local-unset-key in
+;; keymap.el.
+
+;; frame-configuration-p is in frame.el.
+
+;; functionp is built-in.
+
+;; interactive-form in obsolete.el.
+
+;; assq-del-all in obsolete.el.
+
+;; (defun make-temp-file (prefix &optional dir-flag suffix) #### doesn't exist.
+
+;; add-minor-mode in modeline.el.
+
+;; text-clone stuff #### doesn't exist; should go in text-props.el and
+;; requires changes to extents.c (modification hooks).
+
+;; play-sound is built-in.
+
+;; define-mail-user-agent is in simple.el.
;;; subr.el ends here
- 1 participants
- 0 comments
CVS update: MODIFIED: nt ...
19 years, 11 months
CVS Monitor
CVS Monitor
User: ben
Date: 05/01/28 02:54:48
Modified: xemacs/nt ChangeLog xemacs.mak
Log:
Fixes to xemacs.mak
xemacs.mak: Use filename only when calling makeinfo, or it chokes on index
generation.
xemacs.mak: Generate separate .pdb and .map files for temacs/xemacs; may
make profiling possible.
Revision Changes Path
1.177 +11 -0 XEmacs/xemacs/nt/ChangeLog
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/ChangeLog,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -b -r1.176 -r1.177
--- ChangeLog 2005/01/24 23:33:39 1.176
+++ ChangeLog 2005/01/28 01:54:47 1.177
＠＠ -1,3 +1,14 ＠＠
+2005-01-27 Ben Wing <ben(a)xemacs.org>
+
+ * xemacs.mak ({$(MANDIR)}.texi{$(INFODIR)}.info):
+ Use filename only when calling makeinfo, or it chokes on index
+ generation.
+
+ * xemacs.mak (TEMACS_COMMON_LFLAGS):
+ * xemacs.mak ( $(XEMACS_LFLAGS) -section):
+ Generate separate .pdb and .map files for temacs/xemacs; may
+ make profiling possible.
+
2005-01-24 Ben Wing <ben(a)xemacs.org>
* config.inc.samp:
1.111 +7 -4 XEmacs/xemacs/nt/xemacs.mak
(In the diff below, changes in quantity of whitespace are not shown.)
Index: xemacs.mak
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/xemacs.mak,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- xemacs.mak 2005/01/24 23:33:40 1.110
+++ xemacs.mak 2005/01/28 01:54:47 1.111
＠＠ -962,7 +962,7 ＠＠
{$(MANDIR)}.texi{$(INFODIR)}.info:
cd $(MANDIR)
- $(MAKEINFO) $**
+ $(MAKEINFO) $(**F)
XEMACS_SRCS = \
$(MANDIR)\xemacs\abbrevs.texi \
＠＠ -1263,10 +1263,13 ＠＠
oldnames.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib \
shell32.lib wsock32.lib netapi32.lib winmm.lib winspool.lib ole32.lib \
mpr.lib uuid.lib imm32.lib $(LIBC_LIB)
-TEMACS_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS_LINK) \
+TEMACS_COMMON_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS_LINK) \
-base:0x1000000 -stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:windows \
- -pdb:$(BLDSRC)\temacs.pdb -map:$(BLDSRC)\temacs.map \
-heap:0x00100000 -nodefaultlib $(PROFILE_FLAGS) setargv.obj
+TEMACS_LFLAGS=$(TEMACS_COMMON_LFLAGS) \
+ -pdb:$(BLDSRC)\temacs.pdb -map:$(BLDSRC)\temacs.map
+XEMACS_LFLAGS=$(TEMACS_COMMON_LFLAGS) \
+ -pdb:$(BLDSRC)\xemacs.pdb -map:$(BLDSRC)\xemacs.map
########################### Definitions for running temacs.exe/xemacs.exe
＠＠ -1380,7 +1383,7 ＠＠
# Make the resource section read/write since almost all of it is the dump
# data which needs to be writable. This avoids having to copy it.
link.exe ＠<<
- $(TEMACS_LFLAGS) -section:.rsrc,rw -out:$(BLDSRC)\xemacs.exe $(TEMACS_OBJS) $(OUTDIR)\xemacs.res $(TEMACS_LIBS) $(OUTDIR)\dump-id.obj
+ $(XEMACS_LFLAGS) -section:.rsrc,rw -out:$(BLDSRC)\xemacs.exe $(TEMACS_OBJS) $(OUTDIR)\xemacs.res $(TEMACS_LIBS) $(OUTDIR)\dump-id.obj
<<
-$(DEL) $(BLDSRC)\xemacs.dmp
!endif
- 1 participants
- 0 comments
CVS update: MODIFIED: lisp ...
19 years, 11 months
CVS Monitor
CVS Monitor
User: ben
Date: 05/01/28 01:32:27
Modified: xemacs/lisp ChangeLog gtk-marshal.el
Log:
Propagate hash changes to gtk-marshal.el
gtk-marshal.el: Propagate hash changes to gtk-marshal.el.
Revision Changes Path
1.617 +5 -0 XEmacs/xemacs/lisp/ChangeLog
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.616
retrieving revision 1.617
diff -u -b -r1.616 -r1.617
--- ChangeLog 2005/01/26 09:57:14 1.616
+++ ChangeLog 2005/01/28 00:32:17 1.617
＠＠ -1,3 +1,8 ＠＠
+2005-01-27 Ben Wing <ben(a)xemacs.org>
+
+ * gtk-marshal.el (find-file):
+ Propagate hash changes to gtk-marshal.el.
+
2005-01-26 Ben Wing <ben(a)xemacs.org>
* newcomment.el:
1.7 +1 -30 XEmacs/xemacs/lisp/gtk-marshal.el
(In the diff below, changes in quantity of whitespace are not shown.)
Index: gtk-marshal.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/gtk-marshal.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtk-marshal.el 2004/05/02 04:06:52 1.6
+++ gtk-marshal.el 2005/01/28 00:32:20 1.7
＠＠ -261,35 +261,6 ＠＠
(insert "\n
#include \"hash.h\"
-static int
-our_string_eq (const void *st1, const void *st2)
-{
- if (!st1)
- return st2 ? 0 : 1;
- else if (!st2)
- return 0;
- else
- return !strcmp ( (const char *) st1, (const char *) st2);
-}
-
-static unsigned long
-our_string_hash (const void *xv)
-{
- unsigned int h = 0;
- unsigned const char *x = (unsigned const char *) xv;
-
- if (!x) return 0;
-
- while (*x)
- {
- unsigned int g;
- h = (h << 4) + *x++;
- if ((g = h & 0xf0000000) != 0)
- h = (h ^ (g >> 24)) ^ g;
- }
-
- return h;
-}
static struct hash_table *marshaller_hashtable;
＠＠ -297,7 +268,7 ＠＠
{
if (!marshaller_hashtable)
{
- marshaller_hashtable = make_general_hash_table (100, our_string_hash, our_string_eq);
+ marshaller_hashtable = make_string_hash_table (100);
")
(mapc (lambda (x)
- 1 participants
- 0 comments
CVS update: MODIFIED: xemacs ...
19 years, 11 months
CVS Monitor
CVS Monitor
User: ben
Date: 05/01/28 01:12:43
Modified: xemacs/man/xemacs major.texi programs.texi xemacs.texi
Log:
cc-mode patch from Shyamal Prasad
xemacs/programs.texi: Updated it to reflect
current status of programming modes.
xemacs/programs.texi: New section introduces CC
Mode. Introduces customization with reference to CC Mode
manual. Also introduce C/AWK modes in prog-modes package
xemacs/programs.texi: Removed - it was
obsolete. prog-modes package documentation now contains
indentation description for old C mode
xemacs/major.texi: Add description of major mode
hooks. Cleaned up and updated programming mode descriptions.
xemacs/xemacs.texi: Updated Detailed Node listing for new
CC Mode section in programs.texi
Revision Changes Path
1.283 +16 -0 XEmacs/xemacs/man/ChangeLog
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -b -r1.282 -r1.283
--- ChangeLog 2005/01/26 09:48:24 1.282
+++ ChangeLog 2005/01/28 00:12:32 1.283
＠＠ -1,3 +1,19 ＠＠
+2004-10-17 Shyamal Prasad <shyamal(a)member.fsf.org>
+
+ * xemacs/programs.texi (Program Modes): Updated it to reflect
+ current status of programming modes.
+ * xemacs/programs.texi (CC Mode): New section introduces CC
+ Mode. Introduces customization with reference to CC Mode
+ 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
+ * 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
+ CC Mode section in programs.texi
+
+
2005-01-26 Ben Wing <ben(a)xemacs.org>
* internals/internals.texi:
1.3 +57 -9 XEmacs/xemacs/man/xemacs/major.texi
(In the diff below, changes in quantity of whitespace are not shown.)
Index: major.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs/major.texi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- major.texi 1997/10/31 14:53:41 1.2
+++ major.texi 2005/01/28 00:12:39 1.3
＠＠ -26,14 +26,15 ＠＠
Many major modes redefine the syntactical properties of characters
appearing in the buffer. ＠xref{Syntax}.
- The major modes fall into three major groups. Lisp mode (which has
-several variants), C mode, and Muddle mode are for specific programming
-languages. Text mode, Nroff mode, ＠TeX{} mode, and Outline mode are for
-editing English text. The remaining major modes are not intended for use
-on users' files; they are used in buffers created by Emacs for specific
-purposes and include Dired mode for buffers made by Dired (＠pxref{Dired}),
-Mail mode for buffers made by ＠kbd{C-x m} (＠pxref{Sending Mail}), and Shell
-mode for buffers used for communicating with an inferior shell process
+ The major modes fall into three major groups. Programming modes
+(＠pxref{Programs}) are for specific programming languages. Text modes
+(like Nroff mode, ＠TeX{} mode, Outline mode, XML mode, etc.＠:) are for
+editing human readable text. The remaining major modes are not intended
+for direct use in editing user files; they are used in buffers created
+by Emacs for specific purposes. Examples of such modes include Dired
+mode which is used for buffers made by Dired (＠pxref{Dired}), Mail mode
+for buffers made by ＠kbd{C-x m} (＠pxref{Sending Mail}), and Shell mode
+for buffers used for communicating with an inferior shell process
(＠pxref{Interactive Shell}).
Most programming language major modes specify that only blank lines
＠＠ -44,9 +45,10 ＠＠
＠menu
* Choosing Modes:: How major modes are specified or chosen.
+* Mode Hooks:: Customizing a major mode
＠end menu
-＠node Choosing Modes,,Major Modes,Major Modes
+＠node Choosing Modes, Mode Hooks, Major Modes, Major Modes
＠section Choosing Major Modes
You can select a major mode explicitly for the current buffer, but
＠＠ -111,3 +113,49 ＠＠
value is the symbol ＠code{fundamental-mode}, which specifies Fundamental
mode. If ＠code{default-major-mode} is ＠code{nil}, the major mode is
taken from the previously selected buffer.
+
+＠node Mode Hooks, , Choosing Modes, Major Modes
+＠section Mode Hook Variables
+
+＠cindex Hook variables
+＠cindex mode hook
+＠findex add-hook
+＠findex remove-hook
+＠vindex lisp-mode-hook
+＠vindex emacs-lisp-mode-hook
+＠vindex lisp-interaction-mode-hook
+＠vindex scheme-mode-hook
+
+ The last step taken by a major mode, by convention, is to invoke a
+list of user supplied functions that are stored in a ``hook'' variable.
+This allows a user to further customize the major mode, and is
+particularly convenient for setting up buffer local variables
+(＠pxref{Locals}).
+
+ The name of the hook variable is created by appending the string
+＠code{-hook} to the name of the major mode. For example, the hook
+variable used by ＠code{text-mode} would be named ＠code{text-mode-hook}.
+By convention the mode hook function receives no arguments. If a hook
+variable does not exist, or it has the value ＠code{nil}, the major mode
+simply ignores it.
+
+ The recommended way to add functions to a hook variable is with the
+＠code{add-hook} function. For example, to automatically turn on the
+Auto Fill mode when Text mode is invoked the following code can be used in
+the initialization file (＠pxref{Init File})
+
+＠example
+(add-hook 'text-mode-hook 'turn-on-auto-fill)
+＠end example
+
+The ＠code{add-hook} function will check that the function is not already
+listed in the hook variable before adding it. It will also create a hook
+variable with the value ＠code{nil} if one does not exist before adding
+the function. ＠code{add-hook} adds functions to the front of the hook
+variable list. This means that the last hook added is run first by the
+major mode. It is considered very poor style to write hook functions
+that depend on the order that hooks are executed.
+
+Hooks can be removed from hook variables with ＠code{remove-hook}.
+
+
1.7 +216 -228 XEmacs/xemacs/man/xemacs/programs.texi
(In the diff below, changes in quantity of whitespace are not shown.)
Index: programs.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs/programs.texi,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- programs.texi 2001/12/20 07:58:23 1.6
+++ programs.texi 2005/01/28 00:12:39 1.7
＠＠ -1,14 +1,17 ＠＠
＠node Programs, Running, Text, Top
＠chapter Editing Programs
+＠cindex Programming Languages
＠cindex Lisp
-＠cindex C
- Emacs has many commands designed to understand the syntax of programming
-languages such as Lisp and C. These commands can:
+ XEmacs provides specialized support for editing source files for many
+different programming languages. For example it is possible to
＠itemize ＠bullet
＠item
+Follow the usual indentation conventions of the language
+(＠pxref{Grinding}).
+＠item
Move over or kill balanced expressions or ＠dfn{sexps} (＠pxref{Lists}).
＠item
Move over or mark top-level balanced expressions (＠dfn{defuns}, in Lisp;
＠＠ -18,8 +21,7 ＠＠
＠item
Insert, kill, or align comments (＠pxref{Comments}).
＠item
-Follow the usual indentation conventions of the language
-(＠pxref{Grinding}).
+Find functions and symbols in program by name (＠pxref{Tags}).
＠end itemize
The commands available for words, sentences, and paragraphs are useful in
＠＠ -52,6 +54,7 ＠＠
* Change Log:: Maintaining a change history for your program.
* Tags:: Go direct to any function in your program in one
command. Tags remembers which file it is in.
+* CC Mode:: Modes for C, C++, Java and similar languages
* Fortran:: Fortran mode and its special features.
* Asm Mode:: Asm mode and its special features.
＠end menu
＠＠ -60,24 +63,49 ＠＠
＠section Major Modes for Programming Languages
＠cindex Lisp mode
-＠cindex C mode
-＠cindex Scheme mode
- Emacs has several major modes for the programming languages Lisp, Scheme (a
-variant of Lisp), C, Fortran, and Muddle. Ideally, a major mode should be
-implemented for each programming language you might want to edit with
-Emacs; but often the mode for one language can serve for other
-syntactically similar languages. The language modes that exist are those
-that someone decided to take the trouble to write.
-
- There are several variants of Lisp mode, which differ in the way they
-interface to Lisp execution. ＠xref{Lisp Modes}.
-
- Each of the programming language modes defines the ＠key{TAB} key to run
-an indentation function that knows the indentation conventions of that
-language and updates the current line's indentation accordingly. For
-example, in C mode ＠key{TAB} is bound to ＠code{c-indent-line}. ＠key{LFD}
-is normally defined to do ＠key{RET} followed by ＠key{TAB}; thus it, too,
-indents in a mode-specific fashion.
+ Emacs has several major modes (＠pxref{Major Modes}) to support
+programming languages. These major modes will typically understand
+language syntax, provide automatic indentation features, syntax based
+highlighting of text, and will often provide interfaces to the
+programming environment to assist in compiling, executing and debugging
+programs.
+
+ A language mode exist when someone decides to take the trouble to
+write it. At this time many widely used programming languages are
+supported by XEmacs. Examples include Ada, Awk, C, C++, CORBA (IDL),
+Fortran, Java, Lisp, Modula 2, Objective-C, Perl, Pike, Prolog, Python,
+Ruby, Scheme, Simula, SQL, Tcl, Unix Shell scripts, and VHDL. Some of
+these language have seperate manuals, and some times more than one mode
+may be available for a language. For example, there are several
+variants of Lisp mode, which differ in the way they interface to Lisp
+execution. ＠xref{Lisp Modes}.
+
+ Major modes for programming language support are distributed in
+optional XEmacs packages (＠pxref{Packages}) that must be installed
+before use. A notable exception to this rule is that a Lisp Mode is
+integral to XEmacs. The Programming Mode Package (＠file{prog-modes})
+contains many such modes. Some languages are supported by packages of
+their own; prominent examples of such packages include ＠file{cc-mode}
+for C, C++, Java, Objective C etc.＠:, ＠file{python-modes} for Python,
+and ＠file{scheme} for Scheme.
+
+ For a language named ＠var{lang} the major mode for the language will
+typically be named ＠code{＠var{lang}-mode}. For example, the mode for C
+is called ＠code{c-mode}, that for Bourne shell scripts is called
+＠code{sh-mode} and so on. These modes will invoke the functions listed
+in the corresponding hook variables as a last step. ＠xref{Mode Hooks}.
+
+ A mode can be invoked by typing ＠kbd{M-x ＠var{lang}-mode
+＠key{RET}}. However this step is not normally required. If the package
+for a language mode is installed XEmacs usually knows when to
+automatically invoke the mode. This is normally done based on examining
+the file name to determine the language. ＠ref{Choosing Modes}.
+
+ Each of the programming language modes defines the ＠key{TAB} key to
+run an indentation function that knows the indentation conventions of
+that language and updates the current line's indentation accordingly.
+＠key{LFD} is normally defined to do ＠key{RET} followed by ＠key{TAB};
+thus it, too, indents in a mode-specific fashion.
＠kindex DEL
＠findex backward-delete-char-untabify
＠＠ -94,22 +122,6 ＠＠
if enabled in a programming language major mode, indents the new lines
which it creates.
-＠cindex mode hook
-＠vindex c-mode-hook
-＠vindex lisp-mode-hook
-＠vindex emacs-lisp-mode-hook
-＠vindex lisp-interaction-mode-hook
-＠vindex scheme-mode-hook
-＠vindex muddle-mode-hook
- Turning on a major mode calls a user-supplied function called the
-＠dfn{mode hook}, which is the value of a Lisp variable. For example,
-turning on C mode calls the value of the variable ＠code{c-mode-hook} if
-that value exists and is non-＠code{nil}. Mode hook variables for other
-programming language modes include ＠code{lisp-mode-hook},
-＠code{emacs-lisp-mode-hook}, ＠code{lisp-interaction-mode-hook},
-＠code{scheme-mode-hook}, and ＠code{muddle-mode-hook}. The mode hook
-function receives no arguments.＠refill
-
＠node Lists, Defuns, Program Modes, Programs
＠section Lists and Sexps
＠＠ -198,13 +210,6 ＠＠
specified number of times; with a negative argument, it moves in the
opposite direction.
-In languages such as C where the comment-terminator can be recognized,
-the sexp commands move across comments as if they were whitespace. In
-Lisp and other languages where comments run until the end of a line, it
-is very difficult to ignore comments when parsing backwards; therefore,
-in such languages the sexp commands treat the text of comments as if it
-were code.
-
＠kindex C-M-k
＠findex kill-sexp
Killing an sexp at a time can be done with ＠kbd{C-M-k} (＠code{kill-sexp}).
＠＠ -338,7 +343,6 ＠＠
* Basic Indent::
* Multi-line Indent:: Commands to reindent many lines at once.
* Lisp Indent:: Specifying how each Lisp function should be indented.
-* C Indent:: Choosing an indentation style for C code.
＠end menu
＠node Basic Indent, Multi-line Indent, Grinding, Grinding
＠＠ -434,7 +438,7 ＠＠
mark. The command ＠kbd{C-M-\} (＠code{indent-region}) applies ＠key{TAB}
to every line whose first character is between point and mark.
-＠node Lisp Indent, C Indent, Multi-line Indent, Grinding
+＠node Lisp Indent, , Multi-line Indent, Grinding
＠subsection Customizing Lisp Indentation
＠cindex customization
＠＠ -508,185 +512,7 ＠＠
until the end of the list.
＠end table
-＠node C Indent, , Lisp Indent, Grinding
-＠subsection Customizing C Indentation
-
- Two variables control which commands perform C indentation and when.
-
-＠vindex c-auto-newline
- If ＠code{c-auto-newline} is non-＠code{nil}, newlines are inserted both
-before and after braces that you insert and after colons and semicolons.
-Correct C indentation is done on all the lines that are made this way.
-
-＠vindex c-tab-always-indent
- If ＠code{c-tab-always-indent} is non-＠code{nil}, the ＠key{TAB} command
-in C mode does indentation only if point is at the left margin or within
-the line's indentation. If there is non-whitespace to the left of point,
-＠key{TAB} just inserts a tab character in the buffer. Normally,
-this variable is ＠code{nil}, and ＠key{TAB} always reindents the current line.
-
- C does not have anything analogous to particular function names for which
-special forms of indentation are desirable. However, it has a different
-need for customization facilities: many different styles of C indentation
-are in common use.
-
- There are six variables you can set to control the style that Emacs C
-mode will use.
-
-＠table ＠code
-＠item c-indent-level
-Indentation of C statements within surrounding block. The surrounding
-block's indentation is the indentation of the line on which the
-open-brace appears.
-＠item c-continued-statement-offset
-Extra indentation given to a substatement, such as the then-clause of
-an ＠code{if} or body of a ＠code{while}.
-＠item c-brace-offset
-Extra indentation for lines that start with an open brace.
-＠item c-brace-imaginary-offset
-An open brace following other text is treated as if it were this far
-to the right of the start of its line.
-＠item c-argdecl-indent
-Indentation level of declarations of C function arguments.
-＠item c-label-offset
-Extra indentation for a line that is a label, case, or default.
-＠end table
-
-＠vindex c-indent-level
- The variable ＠code{c-indent-level} controls the indentation for C
-statements with respect to the surrounding block. In the example:
-
-＠example
- ＠{
- foo ();
-＠end example
-
-＠noindent
-the difference in indentation between the lines is ＠code{c-indent-level}.
-Its standard value is 2.
-
-If the open-brace beginning the compound statement is not at the beginning
-of its line, the ＠code{c-indent-level} is added to the indentation of the
-line, not the column of the open-brace. For example,
-
-＠example
-if (losing) ＠{
- do_this ();
-＠end example
-
-＠noindent
-One popular indentation style is that which results from setting
-＠code{c-indent-level} to 8 and putting open-braces at the end of a line
-in this way. Another popular style prefers to put the open-brace on a
-separate line.
-
-＠vindex c-brace-imaginary-offset
- In fact, the value of the variable ＠code{c-brace-imaginary-offset} is
-also added to the indentation of such a statement. Normally this variable
-is zero. Think of this variable as the imaginary position of the open
-brace, relative to the first non-blank character on the line. By setting
-the variable to 4 and ＠code{c-indent-level} to 0, you can get this style:
-
-＠example
-if (x == y) ＠{
- do_it ();
- ＠}
-＠end example
-
- When ＠code{c-indent-level} is zero, the statements inside most braces
-line up exactly under the open brace. An exception are braces in column
-zero, like those surrounding a function's body. The statements inside
-those braces are not placed at column zero. Instead,
-＠code{c-brace-offset} and ＠code{c-continued-statement-offset} (see
-below) are added to produce a typical offset between brace levels, and
-the statements are indented that far.
-
-＠vindex c-continued-statement-offset
- ＠code{c-continued-statement-offset} controls the extra indentation for
-a line that starts within a statement (but not within parentheses or
-brackets). These lines are usually statements inside other statements,
-like the then-clauses of ＠code{if} statements and the bodies of
-＠code{while} statements. The ＠code{c-continued-statement-offset}
-parameter determines the difference in indentation between the two lines in:
-
-＠example
-if (x == y)
- do_it ();
-＠end example
-
-＠noindent
-The default value for ＠code{c-continued-statement-offset} is 2. Some
-popular indentation styles correspond to a value of zero for
-＠code{c-continued-statement-offset}.
-
-＠vindex c-brace-offset
- ＠code{c-brace-offset} is the extra indentation given to a line that
-starts with an open-brace. Its standard value is zero;
-compare:
-
-＠example
-if (x == y)
- ＠{
-＠end example
-
-＠noindent
-with:
-
-＠example
-if (x == y)
- do_it ();
-＠end example
-
-＠noindent
-If you set ＠code{c-brace-offset} to 4, the first example becomes:
-
-＠example
-if (x == y)
- ＠{
-＠end example
-
-＠vindex c-argdecl-indent
- ＠code{c-argdecl-indent} controls the indentation of declarations of the
-arguments of a C function. It is absolute: argument declarations receive
-exactly ＠code{c-argdecl-indent} spaces. The standard value is 5 and
-results in code like this:
-＠example
-char *
-index (string, char)
- char *string;
- int char;
-＠end example
-
-＠vindex c-label-offset
- ＠code{c-label-offset} is the extra indentation given to a line that
-contains a label, a case statement, or a ＠code{default:} statement. Its
-standard value is ＠minus{}2 and results in code like this:
-
-＠example
-switch (c)
- ＠{
- case 'x':
-＠end example
-
-＠noindent
-If ＠code{c-label-offset} were zero, the same code would be indented as:
-
-＠example
-switch (c)
- ＠{
- case 'x':
-＠end example
-
-＠noindent
-This example assumes that the other variables above also have their
-default values.
-
-Using the indentation style produced by the default settings of the
-variables just discussed and putting open braces on separate lines
-produces clear and readable files. For an example, look at any of the C
-source files of XEmacs.
-
＠node Matching, Comments, Grinding, Programs
＠section Automatic Display of Matching Parentheses
＠cindex matching parentheses
＠＠ -1003,7 +829,7 ＠＠
not displayed), set it again in final compute_motion.
＠end smallexample
-＠node Tags, Fortran, Change Log, Programs
+＠node Tags, CC Mode, Change Log, Programs
＠section Tags Tables
＠cindex tags table
＠＠ -1709,8 +1535,170 ＠＠
＠kbd{M-x tags-apropos} is like ＠code{apropos} for tags. It reads a regexp,
then finds all the tags in the selected tags table whose entries match that
regexp, and displays the tag names found.
+
+＠node CC Mode, Fortran, Tags, Programs
+＠section Modes for C, C++, Java and similar languages
+＠cindex C Mode
+＠cindex C++ Mode
+＠cindex Java Mode
+＠cindex AWK Mode
+＠cindex Objective C Mode
+＠cindex CORBA IDL Mode
+＠findex c-mode
+＠findex c++-mode
+＠findex java-mode
+＠findex idl-mode
+＠findex awk-mode
+＠findex pike-mode
+＠findex objc-mode
+＠vindex c-mode-hook
+＠vindex c++-mode-hook
+＠vindex java-mode-hook
+＠vindex idl-mode-hook
+＠vindex awk-mode-hook
+＠vindex pike-mode-hook
+＠vindex objc-mode-hook
+＠vindex c-mode-common-hook
+＠vindex c-initialization-hook
+
+ The recommended means for supporting the ``C--like'' programming
+languages in XEmacs is the ＠file{cc-mode} package. CC Mode is not
+included in the basic XEmacs distribution but is available as an
+optional package. If loading a file whose names ends in the ＠file{.cc}
+extension does not automatically invoke a C++ Mode then the
+＠file{cc-mode} package is probably not yet installed. ＠xref{Packages}.
+
+ CC Mode provides modes for editing source files in Awk
+(＠code{awk-mode}), C (＠code{c-mode}), C++ (＠code{c++-mode}), CORBA IDL
+(＠code{idl-mode}), Java (＠code{java-mode}), Objective C
+(＠code{objc-mode}), and Pike (＠code{pike-mode}). All these languages are
+supported with an sophisticated ``indentation engine'' that is feature
+rich, customizable and quite efficient.
+
+ Each language major mode runs hooks in the conventionally named hook
+variables (＠pxref{Mode Hooks}). In addition to this conventional
+behavior all the CC Mode major modes will also run hooks in
+＠code{c-mode-common-hook} ＠emph{before} invoking the major mode specific
+hook.
+
+ CC Mode runs any hooks in ＠code{c-initialization-hook} exactly once
+when it is first loaded.
+
+ CC Mode is a very comprehensive and flexible system and full
+description of its capabilities is beyond the scope of this manual. It
+is strongly recommended that the reader consult the CC Mode
+documentation for details once the package has been
+installed. ＠xref{Top,CC Mode,,cc-mode, The CC Mode Manual}.
+
+＠menu
+* Older Modes:: Older Modes for C and AWK
+* Customizing CC Mode:: An Introduction to Customizing CC Mode.
+＠end menu
+
+
+＠node Older Modes, Customizing CC Mode, CC Mode, CC Mode
+＠subsection Older Modes for C and AWK
+＠cindex Old C Mode
+＠cindex Old AWK Mode
+＠cindex C Mode without CC Mode
+＠cindex AWK Mode without CC Mode
+＠cindex old-c-mode
+
+ XEmacs provides older versions of a C Mode and an AWK Mode in the
+＠file{prog-modes} package. These older modes do not share the
+indentation engine in CC Mode have have their own specific means of
+customizing indentation. To use these modes the ＠file{prog-modes}
+package must be installed.
+
+ This older C mode is known simply as the ``Old C Mode''. It supports
+only the C language and it lacks many of the features of CC Mode.
+However the old C mode offers modest space requirements and very fast
+operation. Old C Mode might be useful in space constrained
+environments, on slow machines, or for editing very large files. This
+old C mode is available in the ＠file{old-c-mode}
+library. ＠xref{old-c-mode,Old C Mode,old-c-mode,prog-modes,The
+Programming Modes Package Manual}.
+
+ The old AWK mode exists for similar reasons. It is available in the
+＠file{awk-mode} library. ＠xref{awk-mode,Old AWK
+Mode,awk-mode,prog-modes,The Programming Modes Package Manual}.
+
+ Note that the prog-modes package will never automatically invoke these
+older modes for a user. However installing the ＠file{cc-mode} package
+＠emph{will} make CC Mode's versions available automatically. As a
+result a user who wants to use these older modes must explicitly load
+the old libraries to use them.
+
+＠node Customizing CC Mode, , Older Modes, CC Mode
+＠subsection Customizing Indentation in CC Mode
+
+ A very brief introduction is included here on customizing CC Mode. CC
+Mode has many features, including useful minor modes, that are
+completely documented in its own manual.
+
+ CC Mode implements several different ``styles'' for C code (and the
+other languages supported by CC Mode). If you need to change the
+indentation style for CC Mode it is recommended that you first see if an
+existing style meets your requirements. The style chosen will affect the
+placement of language elements like braces, function declarations and
+comments. You can choose a style interactively by typing ＠kbd{C-c .} and
+pressing the space bar at the prompt to get a list of supported
+styles. ＠kbd{C-c .} runs the function ＠code{c-set-style} which applies
+to all CC Mode language modes though its name might suggest otherwise. A
+few of the the supported styles are listed below.
+
+＠itemize ＠bullet
+＠item
+``gnu'' --- The recommeded style from the Free Software Foundation for
+GNU software.
+＠item
+``k&r'' --- The classic style from Kernighan and Ritchie.
+＠item
+``linux'' --- The style recommended for code in the Linux kernel.
+＠item
+``bsd'' --- The style recommended for software developed in BSD.
+＠item
+``java --- The ``traditional'' Java style.
+＠end itemize
+
+ The default style in XEmacs is ``gnu'' except for Java mode where it
+is the ``java'' style (this is governed by the variable
+＠code{c-default-style}).
+
+ The styles included in CC Mode all use a buffer local variable called
+＠code{c-basic-offset} as the basic indentation level (this buffer local
+variable is used in all CC Mode language modes though its name might
+suggest otherwise). All indentation is, by default, expressed in
+multiples of ＠code{c-basic-offset}.
+
+ Each style defines a default value for ＠code{c-basic-offset}, for the
+``gnu'' style sets it to 2. A very common customization scenario is
+where a user wants to use an existing style but with a different basic
+offset value. An easy way to do this is to set ＠code{c-basic-offset} in
+the language mode hook after selecting the chosen style.
+
+ For example, a user might want to follow a local coding convention of
+using the ``k&r'' style for C code with indentation in two columns
+multiples (instead of the five column default provided by the CC Mode
+``k&r'' style). This can be achieved with the following code in the
+initialization file (＠pxref{Init File})
+
+＠example
+(defun my-c-mode-hook ()
+ (c-set-style "k&r")
+ (setq c-basic-offset 2))
+(add-hook 'c-mode-hook 'my-c-mode-hook)
+＠end example
+
+ Most customizations for indentation in various CC modes can be
+accomplished by choosing a style and then choosing value for
+＠code{c-basic-offset} that meets the local coding convention. CC Mode
+has a very customizable indentation engine and a furthur discussion is
+really beyond the scope of this manual. ＠xref{Indentation
+Engine,,,cc-mode,The CC Mode Manual}.
+
-＠node Fortran, Asm Mode, Tags, Programs
+＠node Fortran, Asm Mode, CC Mode, Programs
＠section Fortran Mode
＠cindex Fortran mode
1.17 +1 -1 XEmacs/xemacs/man/xemacs/xemacs.texi
(In the diff below, changes in quantity of whitespace are not shown.)
Index: xemacs.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs/xemacs.texi,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- xemacs.texi 2003/08/27 18:07:10 1.16
+++ xemacs.texi 2005/01/28 00:12:39 1.17
＠＠ -472,6 +472,7 ＠＠
* Change Log:: Maintaining a change history for your program.
* Tags:: Go directly to any function in your program in one
command. Tags remembers which file it is in.
+* CC Mode:: Modes for C, C++, Java and similar languages
* Fortran:: Fortran mode and its special features.
* Asm Mode:: Asm mode and its special features.
＠＠ -480,7 +481,6 ＠＠
* Basic Indent::
* Multi-line Indent:: Commands to reindent many lines at once.
* Lisp Indent:: Specifying how each Lisp function should be indented.
-* C Indent:: Choosing an indentation style for C code.
Tags Tables
- 1 participants
- 0 comments
CVS update: MODIFIED: xemacs ...
19 years, 11 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/01/27 23:51:11
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1048 +1 -1 XEmacs/xemacs/version.sh
(In the diff below, changes in quantity of whitespace are not shown.)
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1047
retrieving revision 1.1048
diff -u -b -r1.1047 -r1.1048
--- version.sh 2005/01/26 22:51:35 1.1047
+++ version.sh 2005/01/27 22:51:11 1.1048
＠＠ -8,4 +8,4 ＠＠
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20050126)"
+xemacs_extra_name="(+CVS-20050127)"
- 1 participants
- 0 comments
Notice of CVSROOT-commit by michaels in CVSROOT
19 years, 11 months
CVS Monitor
CVS Monitor
Commit done by michaels
Thu Jan 27 18:53:47 CET 2005
Update of /pack/xemacscvs/CVSROOT
In directory sunsite.dk:/tmp/cvs-serv26916
Modified Files:
loginfo
Log Message:
Removed some debugging stuff.
- 1 participants
- 0 comments
Notice of CVSROOT-commit by michaels in CVSROOT
19 years, 11 months
CVS Monitor
CVS Monitor
Commit done by michaels
Thu Jan 27 18:43:51 CET 2005
Update of /pack/xemacscvs/CVSROOT
In directory sunsite.dk:/tmp/cvs-serv22423
Modified Files:
loginfo
Log Message:
More debugging.
- 1 participants
- 0 comments