CVS update by viteno MODIFIED: xemacs-builds/viteno ...
19 years, 9 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/03/04 22:52:11
Modified: xemacs-builds/viteno package-index setup-packages.ini
Log:
Package database backup:
- xemacs-base-1.95
Revision Changes Path
1.198 +6 -6 XEmacs/xemacs-builds/viteno/package-index
Index: package-index
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/viteno/package-index,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- package-index 2005/02/28 22:12:50 1.197
+++ package-index 2005/03/04 21:52:10 1.198
＠＠ -689,19 +689,19 ＠＠
(package-get-update-base-entry (quote
(xemacs-base
(standards-version 1.1
- version "1.94"
+ version "1.95"
author-version "No-Upstream-Ver"
- date "2004-12-22"
- build-date "2004-12-22"
+ date "2005-03-04"
+ build-date "2005-03-04"
maintainer "XEmacs Development Team <xemacs-beta(a)xemacs.org>"
distribution xemacs
priority high
category "standard"
dump nil
description "Fundamental XEmacs support, you almost certainly need this."
- filename "xemacs-base-1.94-pkg.tar.gz"
- md5sum "2df69c6b18293bca312434d884ea0553"
- size 512986
+ filename "xemacs-base-1.95-pkg.tar.gz"
+ md5sum "284c7db40c8cfc1aa8df091e991e2a06"
+ size 513113
provides (add-log advice-preload advice annotations assoc case-table chistory comint-xemacs comint compile debug ebuff-menu echistory edmacro ehelp electric enriched env facemenu ffap helper imenu iso-syntax macros novice outline passwd pp regexp-opt regi ring shell skeleton sort thing time-stamp timezone tq xbm-button xpm-button)
requires ()
type regular
1.190 +2 -2 XEmacs/xemacs-builds/viteno/setup-packages.ini
Index: setup-packages.ini
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/viteno/setup-packages.ini,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- setup-packages.ini 2005/02/28 22:00:39 1.189
+++ setup-packages.ini 2005/03/04 21:52:10 1.190
＠＠ -348,8 +348,8 ＠＠
install: packages/tramp-1.22-pkg.tar.gz 287589
＠ xemacs-base
-version: 1.94
-install: packages/xemacs-base-1.94-pkg.tar.gz 512986
+version: 1.95
+install: packages/xemacs-base-1.95-pkg.tar.gz 513113
＠ ibuffer
version: 1.09
- 1 participants
- 0 comments
CVS update by viteno MODIFIED: packages/xemacs-packages/xemacs-base ...
19 years, 9 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/03/04 22:46:46
Modified: packages/xemacs-packages/xemacs-base ChangeLog Makefile
Log:
Increment VERSION in Makefile
Revision Changes Path
1.163 +4 -0 XEmacs/packages/xemacs-packages/xemacs-base/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-base/ChangeLog,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- ChangeLog 2005/03/04 19:38:35 1.162
+++ ChangeLog 2005/03/04 21:46:45 1.163
＠＠ -1,3 +1,7 ＠＠
+2005-03-04 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.95 released.
+
2005-02-26 Aidan Kehoe <kehoea(a)parhasard.net>
* compile.el (find-grep): Alias it to grep-find--if you're used to
1.99 +1 -1 XEmacs/packages/xemacs-packages/xemacs-base/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-base/Makefile,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- Makefile 2004/12/22 21:46:41 1.98
+++ Makefile 2005/03/04 21:46:45 1.99
＠＠ -17,7 +17,7 ＠＠
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-VERSION = 1.94
+VERSION = 1.95
AUTHOR_VERSION =
MAINTAINER = XEmacs Development Team <xemacs-beta(a)xemacs.org>
PACKAGE = xemacs-base
- 1 participants
- 0 comments
CVS update by viteno MODIFIED: packages ...
19 years, 9 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/03/04 22:45:45
Modified: packages ChangeLog
Log:
Package release
Revision Changes Path
1.507 +4 -0 XEmacs/packages/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/ChangeLog,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -r1.506 -r1.507
--- ChangeLog 2005/02/28 22:08:45 1.506
+++ ChangeLog 2005/03/04 21:45:44 1.507
＠＠ -1,3 +1,7 ＠＠
+2005-03-04 Norbert Koch <viteno(a)xemacs.org>
+
+ * Packages released: xemacs-base.
+
2005-02-28 Norbert Koch <viteno(a)xemacs.org>
* Packages released: mule-ucs.
- 1 participants
- 0 comments
CVS update by aidan ADDED: packages/xemacs-packages/re-builder ChangeLog Makefile
19 years, 9 months
CVS Monitor
CVS Monitor
User: aidan
Date: 05/03/04 21:29:59
Added: packages/xemacs-packages/re-builder ChangeLog Makefile
OUR-CHANGES package-info.in re-builder.el
re-builder.texi
Log:
Re-builder; new package (with separated docs). Development of regular
expressions with visual feedback.
Revision Changes Path
1.1 XEmacs/packages/xemacs-packages/re-builder/ChangeLog
Index: ChangeLog
===================================================================
2005-02-27 Aidan Kehoe <kehoea(a)parhasard.net>
* Makefile: Created.
1.1 XEmacs/packages/xemacs-packages/re-builder/Makefile
Index: Makefile
===================================================================
# Makefile for the re-builder package.
# This file is part of XEmacs.
# XEmacs is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2, or (at your option) any
# later version.
# XEmacs is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
# You should have received a copy of the GNU General Public License
# along with XEmacs; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
# The GNU Emacs CVS version of re-builder.el is canonical--we're
# distributing this to make it more convenient for XEmacs users.
VERSION = 1.0
AUTHOR_VERSION = 1.20
MAINTAINER = Aidan Kehoe <aidan(a)xemacs.org>
PACKAGE = re-builder
PKG_TYPE = regular
REQUIRES = fsf-compat
CATEGORY = standard
STANDARD_DOCS = t
ELCS = re-builder.elc
include ../../XEmacs.rules
1.1 XEmacs/packages/xemacs-packages/re-builder/OUR-CHANGES
Index: OUR-CHANGES
===================================================================
Index: re-builder.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/re-builder.el,v
retrieving revision 1.20
diff -u -u -r1.20 re-builder.el
--- re-builder.el 27 Feb 2005 10:35:51 -0000 1.20
+++ re-builder.el 27 Feb 2005 17:17:00 -0000
＠＠ -71,6 +71,9 ＠＠
;; is a package by me and its support may go away as it is nearly the
;; same as the `sregex' package in Emacs)
+;; Note that the `sregex,' `rx' and `lisp-re' syntaxes will only be
+;; available in XEmacs if you've installed them yourself.
+
;; Editing symbolic expressions is done through a major mode derived
;; from `emacs-lisp-mode' so you'll get all the good stuff like
;; automatic indentation and font-locking etc.
＠＠ -148,9 +151,9 ＠＠
(defface reb-match-0
'((((class color) (background light))
- :background "lightblue")
+ (:background "lightblue"))
(((class color) (background dark))
- :background "steelblue4")
+ (:background "steelblue4"))
(t
:inverse-video t))
"Used for displaying the whole match."
＠＠ -158,9 +161,9 ＠＠
(defface reb-match-1
'((((class color) (background light))
- :background "aquamarine")
+ (:background "aquamarine"))
(((class color) (background dark))
- :background "blue3")
+ (:background "blue3"))
(t
:inverse-video t))
"Used for displaying the first matching subexpression."
＠＠ -168,9 +171,9 ＠＠
(defface reb-match-2
'((((class color) (background light))
- :background "springgreen")
+ (:background "springgreen"))
(((class color) (background dark))
- :background "chartreuse4")
+ (:background "chartreuse4"))
(t
:inverse-video t))
"Used for displaying the second matching subexpression."
＠＠ -178,9 +181,9 ＠＠
(defface reb-match-3
'((((class color) (background light))
- :background "yellow")
+ (:background "yellow"))
(((class color) (background dark))
- :background "sienna4")
+ (:background "sienna4"))
(t
:inverse-video t))
"Used for displaying the third matching subexpression."
1.1 XEmacs/packages/xemacs-packages/re-builder/package-info.in
Index: package-info.in
===================================================================
(re-builder
(standards-version 1.1
version VERSION
author-version AUTHOR_VERSION
date DATE
build-date BUILD_DATE
maintainer MAINTAINER
distribution xemacs
priority medium
category CATEGORY
dump nil
description "Interactive development tool for regular expressions."
filename FILENAME
md5sum MD5SUM
size SIZE
provides (re-builder)
requires (REQUIRES)
type regular
))
1.1 XEmacs/packages/xemacs-packages/re-builder/re-builder.el
Index: re-builder.el
===================================================================
;;; re-builder.el --- building Regexps with visual feedback
;; Copyright (C) 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
;; Author: Detlev Zundel <dzu(a)gnu.org>
;; Keywords: matching, lisp, tools
;; This file is part of GNU Emacs.
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2, or (at your option)
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
;;; Commentary:
;; When I have to come up with regular expressions that are more
;; complex than simple string matchers, especially if they contain sub
;; expressions, I find myself spending quite some time in the
;; `development cycle'. `re-builder' aims to shorten this time span
;; so I can get on with the more interesting bits.
;; With it you can have immediate visual feedback about how well the
;; regexp behaves to your expectations on the intended data.
;; When called up `re-builder' attaches itself to the current buffer
;; which becomes its target buffer, where all the matching is done.
;; The active window is split so you have a view on the data while
;; authoring the RE. If the edited expression is valid the matches in
;; the target buffer are marked automatically with colored overlays
;; (for non-color displays see below) giving you feedback over the
;; extents of the matched (sub) expressions. The (non-)validity is
;; shown only in the modeline without throwing the errors at you. If
;; you want to know the reason why RE Builder considers it as invalid
;; call `reb-force-update' ("\C-c\C-u") which should reveal the error.
;; The target buffer can be changed with `reb-change-target-buffer'
;; ("\C-c\C-b"). Changing the target buffer automatically removes
;; the overlays from the old buffer and displays the new one in the
;; target window.
;; The `re-builder' keeps the focus while updating the matches in the
;; target buffer so corrections are easy to incorporate. If you are
;; satisfied with the result you can paste the RE to the kill-ring
;; with `reb-copy' ("\C-c\C-w"), quit the `re-builder' ("\C-c\C-q")
;; and use it wherever you need it.
;; As the automatic updates can take some time on large buffers, they
;; can be limited by `reb-auto-match-limit' so that they should not
;; have a negative impact on the editing. Setting it to nil makes
;; even the auto updates go all the way. Forcing an update overrides
;; this limit allowing an easy way to see all matches.
;; Currently `re-builder' understands five different forms of input,
;; namely `read', `string', `rx', `sregex' and `lisp-re' syntax. Read
;; syntax and string syntax are both delimited by `"'s and behave
;; according to their name. With the `string' syntax there's no need
;; to escape the backslashes and double quotes simplifying the editing
;; somewhat. The other three allow editing of symbolic regular
;; expressions supported by the packages of the same name. (`lisp-re'
;; is a package by me and its support may go away as it is nearly the
;; same as the `sregex' package in Emacs)
;; Note that the `sregex,' `rx' and `lisp-re' syntaxes will only be
;; available in XEmacs if you've installed them yourself.
;; Editing symbolic expressions is done through a major mode derived
;; from `emacs-lisp-mode' so you'll get all the good stuff like
;; automatic indentation and font-locking etc.
;; When editing a symbolic regular expression, only the first
;; expression in the RE Builder buffer is considered, which helps
;; limiting the extent of the expression like the `"'s do for the text
;; modes. For the `sregex' syntax the function `sregex' is applied to
;; the evaluated expression read. So you can use quoted arguments
;; with something like '("findme") or you can construct arguments to
;; your hearts delight with a valid ELisp expression. (The compiled
;; string form will be copied by `reb-copy') If you want to take
;; a glance at the corresponding string you can temporarily change the
;; input syntax.
;; Changing the input syntax is transparent (for the obvious exception
;; non-symbolic -> symbolic) so you can change your mind as often as
;; you like.
;; There is also a shortcut function for toggling the
;; `case-fold-search' variable in the target buffer with an immediate
;; update.
;; Q: But what if my display cannot show colored overlays?
;; A: Then the cursor will flash around the matched text making it stand
;; out.
;; Q: But how can I then make out the sub-expressions?
;; A: Thats where the `sub-expression mode' comes in. In it only the
;; digit keys are assigned to perform an update that will flash the
;; corresponding subexp only.
;;; Code:
;; On XEmacs, load the overlay compatibility library
(if (not (fboundp 'make-overlay))
(require 'overlay))
;; User costomizable variables
(defgroup re-builder nil
"Options for the RE Builder."
:group 'lisp
:prefix "reb-")
(defcustom reb-blink-delay 0.5
"*Seconds to blink cursor for next/previous match in RE Builder."
:group 're-builder
:type 'number)
(defcustom reb-mode-hook nil
"*Hooks to run on entering RE Builder mode."
:group 're-builder
:type 'hook)
(defcustom reb-re-syntax 'read
"*Syntax for the REs in the RE Builder.
Can either be `read', `string', `sregex' or `lisp-re'."
:group 're-builder
:type '(choice (const :tag "Read syntax" read)
(const :tag "String syntax" string)
(const :tag "`sregex' syntax" sregex)
(const :tag "`lisp-re' syntax" lisp-re)
(const :tag "`rx' syntax" rx)
(value: string)))
(defcustom reb-auto-match-limit 200
"*Positive integer limiting the matches for RE Builder auto updates.
Set it to nil if you don't want limits here."
:group 're-builder
:type '(restricted-sexp :match-alternatives
(integerp 'nil)))
(defface reb-match-0
'((((class color) (background light))
(:background "lightblue"))
(((class color) (background dark))
(:background "steelblue4"))
(t
:inverse-video t))
"Used for displaying the whole match."
:group 're-builder)
(defface reb-match-1
'((((class color) (background light))
(:background "aquamarine"))
(((class color) (background dark))
(:background "blue3"))
(t
:inverse-video t))
"Used for displaying the first matching subexpression."
:group 're-builder)
(defface reb-match-2
'((((class color) (background light))
(:background "springgreen"))
(((class color) (background dark))
(:background "chartreuse4"))
(t
:inverse-video t))
"Used for displaying the second matching subexpression."
:group 're-builder)
(defface reb-match-3
'((((class color) (background light))
(:background "yellow"))
(((class color) (background dark))
(:background "sienna4"))
(t
:inverse-video t))
"Used for displaying the third matching subexpression."
:group 're-builder)
;; Internal variables below
(defvar reb-mode nil
"Enables the RE Builder minor mode.")
(defvar reb-target-buffer nil
"Buffer to which the RE is applied to.")
(defvar reb-target-window nil
"Window to which the RE is applied to.")
(defvar reb-regexp nil
"Last regexp used by RE Builder.")
(defvar reb-regexp-src nil
"Last regexp used by RE Builder before processing it.
Except for Lisp syntax this is the same as `reb-regexp'.")
(defvar reb-overlays nil
"List of overlays of the RE Builder.")
(defvar reb-window-config nil
"Old window configuration.")
(defvar reb-subexp-mode nil
"Indicates whether sub-exp mode is active.")
(defvar reb-subexp-displayed nil
"Indicates which sub-exp is active.")
(defvar reb-mode-string ""
"String in mode line for additional info.")
(defvar reb-valid-string ""
"String in mode line showing validity of RE.")
(make-variable-buffer-local 'reb-overlays)
(make-variable-buffer-local 'reb-regexp)
(make-variable-buffer-local 'reb-regexp-src)
(defconst reb-buffer "*RE-Builder*"
"Buffer to use for the RE Builder.")
;; Define the local "\C-c" keymap
(defvar reb-mode-map
(let ((map (make-sparse-keymap)))
(define-key map "\C-c\C-c" 'reb-toggle-case)
(define-key map "\C-c\C-q" 'reb-quit)
(define-key map "\C-c\C-w" 'reb-copy)
(define-key map "\C-c\C-s" 'reb-next-match)
(define-key map "\C-c\C-r" 'reb-prev-match)
(define-key map "\C-c\C-i" 'reb-change-syntax)
(define-key map "\C-c\C-e" 'reb-enter-subexp-mode)
(define-key map "\C-c\C-b" 'reb-change-target-buffer)
(define-key map "\C-c\C-u" 'reb-force-update)
map)
"Keymap used by the RE Builder.")
(defun reb-mode ()
"Major mode for interactively building Regular Expressions.
\\{reb-mode-map}"
(interactive)
(kill-all-local-variables)
(setq major-mode 'reb-mode
mode-name "RE Builder")
(use-local-map reb-mode-map)
(reb-mode-common)
(run-hooks 'reb-mode-hook))
(define-derived-mode reb-lisp-mode
emacs-lisp-mode "RE Builder Lisp"
"Major mode for interactively building symbolic Regular Expressions."
(cond ((eq reb-re-syntax 'lisp-re) ; Pull in packages
(require 'lisp-re)) ; as needed
((eq reb-re-syntax 'sregex) ; sregex is not autoloaded
(require 'sregex)) ; right now..
((eq reb-re-syntax 'rx) ; rx-to-string is autoloaded
(require 'rx))) ; require rx anyway
(reb-mode-common))
;; Use the same "\C-c" keymap as `reb-mode' and use font-locking from
;; `emacs-lisp-mode'
(define-key reb-lisp-mode-map "\C-c"
(lookup-key reb-mode-map "\C-c"))
(defvar reb-subexp-mode-map
(let ((m (make-keymap)))
(suppress-keymap m)
;; Again share the "\C-c" keymap for the commands
(define-key m "\C-c" (lookup-key reb-mode-map "\C-c"))
(define-key m "q" 'reb-quit-subexp-mode)
(dotimes (digit 10)
(define-key m (int-to-string digit) 'reb-display-subexp))
m)
"Keymap used by the RE Builder for the subexpression mode.")
(defun reb-mode-common ()
"Setup functions common to functions `reb-mode' and `reb-mode-lisp'."
(setq reb-mode-string ""
reb-valid-string ""
mode-line-buffer-identification
'(25 . ("%b" reb-mode-string reb-valid-string)))
(reb-update-modestring)
(make-local-variable 'after-change-functions)
(add-hook 'after-change-functions
'reb-auto-update)
;; At least make the overlays go away if the buffer is killed
(make-local-variable 'reb-kill-buffer)
(add-hook 'kill-buffer-hook 'reb-kill-buffer)
(reb-auto-update nil nil nil))
;; Handy macro for doing things in other windows
(defmacro reb-with-current-window (window &rest body)
"With WINDOW selected evaluate BODY forms and reselect previous window."
(let ((oldwindow (make-symbol "*oldwindow*")))
`(let ((,oldwindow (selected-window)))
(select-window ,window)
(unwind-protect
(progn
,＠body)
(select-window ,oldwindow)))))
(put 'reb-with-current-window 'lisp-indent-function 0)
(defun reb-color-display-p ()
"Return t if display is capable of displaying colors."
(eq 'color
;; emacs/xemacs compatibility
(if (fboundp 'frame-parameter)
(frame-parameter (selected-frame) 'display-type)
(frame-property (selected-frame) 'display-type))))
(defsubst reb-lisp-syntax-p ()
"Return non-nil if RE Builder uses a Lisp syntax."
(memq reb-re-syntax '(lisp-re sregex rx)))
(defmacro reb-target-binding (symbol)
"Return binding for SYMBOL in the RE Builder target buffer."
`(with-current-buffer reb-target-buffer ,symbol))
;;; This is to help people find this in Apropos.
;;;###autoload
(defun regexp-builder ()
"Alias for `re-builder': Construct a regexp interactively."
(interactive)
(re-builder))
;;;###autoload
(defun re-builder ()
"Construct a regexp interactively."
(interactive)
(if (and (string= (buffer-name) reb-buffer)
(memq major-mode '(reb-mode reb-lisp-mode)))
(message "Already in the RE Builder")
(if reb-target-buffer
(reb-delete-overlays))
(setq reb-target-buffer (current-buffer)
reb-target-window (selected-window)
reb-window-config (current-window-configuration))
(select-window (split-window (selected-window) (- (window-height) 4)))
(switch-to-buffer (get-buffer-create reb-buffer))
(erase-buffer)
(reb-insert-regexp)
(goto-char (+ 2 (point-min)))
(cond
((reb-lisp-syntax-p)
(reb-lisp-mode))
(t (reb-mode)))))
(defun reb-change-target-buffer (buf)
"Change the target buffer and display it in the target window."
(interactive "bSet target buffer to: ")
(let ((buffer (get-buffer buf)))
(if (not buffer)
(error "No such buffer")
(reb-delete-overlays)
(setq reb-target-buffer buffer)
(reb-do-update
(if reb-subexp-mode reb-subexp-displayed nil))
(reb-update-modestring))))
(defun reb-force-update ()
"Force an update in the RE Builder target window without a match limit."
(interactive)
(let ((reb-auto-match-limit nil))
(reb-update-overlays
(if reb-subexp-mode reb-subexp-displayed nil))))
(defun reb-quit ()
"Quit the RE Builder mode."
(interactive)
(setq reb-subexp-mode nil
reb-subexp-displayed nil)
(reb-delete-overlays)
(bury-buffer)
(set-window-configuration reb-window-config))
(defun reb-next-match ()
"Go to next match in the RE Builder target window."
(interactive)
(reb-assert-buffer-in-window)
(reb-with-current-window
reb-target-window
(if (not (re-search-forward reb-regexp (point-max) t))
(message "No more matches.")
(reb-show-subexp
(or (and reb-subexp-mode reb-subexp-displayed) 0)
t))))
(defun reb-prev-match ()
"Go to previous match in the RE Builder target window."
(interactive)
(reb-assert-buffer-in-window)
(reb-with-current-window reb-target-window
(goto-char (1- (point)))
(if (not (re-search-backward reb-regexp (point-min) t))
(message "No more matches.")
(reb-show-subexp
(or (and reb-subexp-mode reb-subexp-displayed) 0)
t))))
(defun reb-toggle-case ()
"Toggle case sensitivity of searches for RE Builder target buffer."
(interactive)
(with-current-buffer reb-target-buffer
(setq case-fold-search (not case-fold-search)))
(reb-update-modestring)
(reb-auto-update nil nil nil t))
(defun reb-copy ()
"Copy current RE into the kill ring for later insertion."
(interactive)
(reb-update-regexp)
(let ((re (with-output-to-string
(print (reb-target-binding reb-regexp)))))
(kill-new (substring re 1 (1- (length re))))
(message "Regexp copied to kill-ring")))
;; The subexpression mode is not electric because the number of
;; matches should be seen rather than a prompt.
(defun reb-enter-subexp-mode ()
"Enter the subexpression mode in the RE Builder."
(interactive)
(setq reb-subexp-mode t)
(reb-update-modestring)
(use-local-map reb-subexp-mode-map)
(message "`0'-`9' to display subexpressions `q' to quit subexp mode."))
(defun reb-show-subexp (subexp &optional pause)
"Visually show limit of subexpression SUBEXP of recent search.
On color displays this just puts point to the end of the expression as
the match should already be marked by an overlay.
On other displays jump to the beginning and the end of it.
If the optional PAUSE is non-nil then pause at the end in any case."
(reb-with-current-window reb-target-window
(if (not (reb-color-display-p))
(progn (goto-char (match-beginning subexp))
(sit-for reb-blink-delay)))
(goto-char (match-end subexp))
(if (or (not (reb-color-display-p)) pause)
(sit-for reb-blink-delay))))
(defun reb-quit-subexp-mode ()
"Quit the subexpression mode in the RE Builder."
(interactive)
(setq reb-subexp-mode nil
reb-subexp-displayed nil)
(reb-update-modestring)
(use-local-map reb-mode-map)
(reb-do-update))
(defun reb-change-syntax (&optional syntax)
"Change the syntax used by the RE Builder.
Optional argument SYNTAX must be specified if called non-interactively."
(interactive
(list (intern
(completing-read "Select syntax: "
(mapcar (lambda (el) (cons (symbol-name el) 1))
'(read string lisp-re sregex rx))
nil t (symbol-name reb-re-syntax)))))
(if (memq syntax '(read string lisp-re sregex rx))
(let ((buffer (get-buffer reb-buffer)))
(setq reb-re-syntax syntax)
(if buffer
(with-current-buffer buffer
(erase-buffer)
(reb-insert-regexp)
(goto-char (+ 2 (point-min)))
(cond ((reb-lisp-syntax-p)
(reb-lisp-mode))
(t (reb-mode))))))
(error "Invalid syntax: %s" syntax)))
;; Non-interactive functions below
(defun reb-do-update (&optional subexp)
"Update matches in the RE Builder target window.
If SUBEXP is non-nil mark only the corresponding sub-expressions."
(reb-assert-buffer-in-window)
(reb-update-regexp)
(reb-update-overlays subexp))
(defun reb-auto-update (beg end lenold &optional force)
"Called from `after-update-functions' to update the display.
BEG, END and LENOLD are passed in from the hook.
An actual update is only done if the regexp has changed or if the
optional fourth argument FORCE is non-nil."
(let ((prev-valid reb-valid-string)
(new-valid
(condition-case nil
(progn
(if (or (reb-update-regexp) force)
(progn
(reb-assert-buffer-in-window)
(reb-do-update)))
"")
(error " *invalid*"))))
(setq reb-valid-string new-valid)
(force-mode-line-update)
;; Through the caching of the re a change invalidating the syntax
;; for symbolic expressions will not delete the overlays so we
;; catch it here
(if (and (reb-lisp-syntax-p)
(not (string= prev-valid new-valid))
(string= prev-valid ""))
(reb-delete-overlays))))
(defun reb-delete-overlays ()
"Delete all RE Builder overlays in the `reb-target-buffer' buffer."
(if (buffer-live-p reb-target-buffer)
(with-current-buffer reb-target-buffer
(mapcar 'delete-overlay reb-overlays)
(setq reb-overlays nil))))
(defun reb-assert-buffer-in-window ()
"Assert that `reb-target-buffer' is displayed in `reb-target-window'."
(if (not (eq reb-target-buffer (window-buffer reb-target-window)))
(set-window-buffer reb-target-window reb-target-buffer)))
(defun reb-update-modestring ()
"Update the variable `reb-mode-string' displayed in the mode line."
(setq reb-mode-string
(concat
(if reb-subexp-mode
(format " (subexp %s)" (or reb-subexp-displayed "-"))
"")
(if (not (reb-target-binding case-fold-search))
" Case"
"")))
(force-mode-line-update))
(defun reb-display-subexp (&optional subexp)
"Highlight only subexpression SUBEXP in the RE Builder."
(interactive)
(setq reb-subexp-displayed
(or subexp (string-to-int (format "%c" last-command-char))))
(reb-update-modestring)
(reb-do-update reb-subexp-displayed))
(defun reb-kill-buffer ()
"When the RE Builder buffer is killed make sure no overlays stay around."
(if (member major-mode '(reb-mode reb-lisp-mode))
(reb-delete-overlays)))
;; The next functions are the interface between the regexp and
;; its textual representation in the RE Builder buffer.
;; They are the only functions concerned with the actual syntax
;; being used.
(defun reb-read-regexp ()
"Read current RE."
(save-excursion
(cond ((eq reb-re-syntax 'read)
(goto-char (point-min))
(read (current-buffer)))
((eq reb-re-syntax 'string)
(goto-char (point-min))
(re-search-forward "\"")
(let ((beg (point)))
(goto-char (point-max))
(re-search-backward "\"")
(buffer-substring-no-properties beg (point))))
((reb-lisp-syntax-p)
(buffer-string)))))
(defun reb-empty-regexp ()
"Return empty RE for current syntax."
(cond ((reb-lisp-syntax-p) "'()")
(t "")))
(defun reb-insert-regexp ()
"Insert current RE."
(let ((re (or (reb-target-binding reb-regexp)
(reb-empty-regexp))))
(cond ((eq reb-re-syntax 'read)
(print re (current-buffer)))
((eq reb-re-syntax 'string)
(insert "\n\"" re "\""))
;; For the Lisp syntax we need the "source" of the regexp
((reb-lisp-syntax-p)
(insert (or (reb-target-binding reb-regexp-src)
(reb-empty-regexp)))))))
(defun reb-cook-regexp (re)
"Return RE after processing it according to `reb-re-syntax'."
(cond ((eq reb-re-syntax 'lisp-re)
(lre-compile-string (eval (car (read-from-string re)))))
((eq reb-re-syntax 'sregex)
(apply 'sregex (eval (car (read-from-string re)))))
((eq reb-re-syntax 'rx)
(rx-to-string (eval (car (read-from-string re)))))
(t re)))
(defun reb-update-regexp ()
"Update the regexp for the target buffer.
Return t if the (cooked) expression changed."
(let* ((re-src (reb-read-regexp))
(re (reb-cook-regexp re-src)))
(with-current-buffer reb-target-buffer
(let ((oldre reb-regexp))
(prog1
(not (string= oldre re))
(setq reb-regexp re)
;; Only update the source re for the lisp formats
(if (reb-lisp-syntax-p)
(setq reb-regexp-src re-src)))))))
;; And now the real core of the whole thing
(defun reb-count-subexps (re)
"Return number of sub-expressions in the regexp RE."
(let ((i 0) (beg 0))
(while (string-match "\\\\(" re beg)
(setq i (1+ i)
beg (match-end 0)))
i))
(defun reb-update-overlays (&optional subexp)
"Switch to `reb-target-buffer' and mark all matches of `reb-regexp'.
If SUBEXP is non-nil mark only the corresponding sub-expressions."
(let* ((re (reb-target-binding reb-regexp))
(subexps (reb-count-subexps re))
(matches 0)
(submatches 0)
firstmatch)
(save-excursion
(set-buffer reb-target-buffer)
(reb-delete-overlays)
(goto-char (point-min))
(while (and (re-search-forward re (point-max) t)
(or (not reb-auto-match-limit)
(< matches reb-auto-match-limit)))
(if (= 0 (length (match-string 0)))
(error "Empty regular expression!"))
(let ((i 0))
(setq matches (1+ matches))
(while (<= i subexps)
(if (and (or (not subexp) (= subexp i))
(match-beginning i))
(let ((overlay (make-overlay (match-beginning i)
(match-end i)))
(face-name (format "reb-match-%d" i)))
(if (not firstmatch)
(setq firstmatch (match-data)))
(setq reb-overlays (cons overlay reb-overlays)
submatches (1+ submatches))
(overlay-put
overlay 'face
(or (intern-soft face-name)
(error "Too many subexpressions - face `%s' not defined"
face-name )))
(overlay-put overlay 'priority i)))
(setq i (1+ i))))))
(let ((count (if subexp submatches matches)))
(message "%s %smatch%s%s"
(if (= 0 count) "No" (int-to-string count))
(if subexp "subexpression " "")
(if (= 1 count) "" "es")
(if (and reb-auto-match-limit
(= reb-auto-match-limit count))
" (limit reached)" "")))
(if firstmatch
(progn (store-match-data firstmatch)
(reb-show-subexp (or subexp 0))))))
(provide 're-builder)
;;; arch-tag: 5c5515ac-4085-4524-a421-033f44f032e7
;;; re-builder.el ends here
1.1 XEmacs/packages/xemacs-packages/re-builder/re-builder.texi
Index: re-builder.texi
===================================================================
\input texinfo ＠c -*-texinfo-*-
＠c Manual for the XEmacs re-builder package.
＠c ** #### something uses these headers, find out how and explain here
＠c %**start of header
＠setfilename re-builder.info
＠settitle Visual development of regular expressions
＠setchapternewpage odd
＠c %**end of header
＠c Version values, for easy modification
＠set VERSION 1.1
＠set UPDATED Friday, March 4, 2005
＠c ** Many people seem to prefer this footenote style
＠footnotestyle end
＠direntry
* re-builder:: Write regular expressions with visual feedback.
＠end direntry
＠c ** It is often convenient to use a macro for names which have unusual
＠c ** spelling or formatting conventions.
＠c Macro to make formatting of the package name consistent.
＠macro pkgname
＠i{re-builder}
＠end macro
＠c Copying permissions, et al
＠c Note that this whole section is repeated thrice, once for the Info
＠c version, once for TeX, and once for HTML.
＠c Note that if you combine this document with others' work, you may
＠c need to change the permissions statement. Make sure you do so in all
＠c three places.
＠c #### Probably not the right place for HTML.
＠html
This file documents the ＠pkgname{} XEmacs package, which provides visual
feedback when developing regular expressions.
This documentation was taken from the source file, ＠file{re-builder.el},
which is subject to the following conditions; because of the nature of
the GNU GPL, this file is as a result also subject to those conditions.
Copyright ＠copyright{} 1999, 2000, 2001, 2002, 2004 Free Software
Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
later version.
GNU Emacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License along
with GNU Emacs; see the file COPYING. If not, write to the Free
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
End of permissions notice.
＠end html
＠ifinfo
This file documents the ＠pkgname{} XEmacs package, which provides visual
feedback when developing regular expressions.
This documentation was taken from the source file, ＠file{re-builder.el},
which is subject to the following conditions; because of the nature of
the GNU GPL, this file is as a result also subject to those conditions.
Copyright ＠copyright{} 1999, 2000, 2001, 2002, 2004 Free Software
Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
later version.
GNU Emacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License along
with GNU Emacs; see the file COPYING. If not, write to the Free
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
End of permissions notice.
＠end ifinfo
＠tex
＠titlepage
＠title R
＠subtitle Last updated ＠value{UPDATED}
＠author Detlev Zundel. Texinfo conversion by Aidan Kehoe.
＠page
This file documents the ＠pkgname{} XEmacs package, which provides visual
feedback when developing regular expressions.
This documentation was taken from the source file, ＠file{re-builder.el},
which is subject to the following conditions; because of the nature of
the GNU GPL, this file is as a result also subject to those conditions.
＠vskip 0pt plus 1filll
Copyright ＠copyright{} 1999, 2000, 2001, 2002, 2004 Free Software
Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
later version.
GNU Emacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License along
with GNU Emacs; see the file COPYING. If not, write to the Free
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
＠end titlepage
＠page
＠end tex
＠ifnottex
＠node Top, Copying, (dir), (dir)
＠top Re-builder on XEmacs
When I have to come up with regular expressions that are more
complex than simple string matchers, especially if they contain sub
expressions, I find myself spending quite some time in the
`development cycle'. `re-builder' aims to shorten this time span
so I can get on with the more interesting bits.
With it you can have immediate visual feedback about how well the
regexp behaves to your expectations on the intended data.
This is version ＠value{VERSION} of the ＠pkgname{} manual, last updated on
＠value{UPDATED}.
＠end ifnottex
＠menu
* Copying:: ＠pkgname{} copying conditions.
* Overview:: ＠pkgname{} history and general information.
For general users:
* Usage:: An overview of the operation of ＠pkgname{}.
* Regex Types:: Types of regular expression handled.
* Questions:: A couple of selected queries.
＠end menu
＠node Copying, Overview, Top, Top
＠chapter ＠pkgname{} Copying Conditions
＠c ** CHECK THE COPYRIGHT DATE(S) AND HOLDER(S)!
Copyright (C) 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
＠pkgname{} is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
＠pkgname{} is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with XEmacs; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
＠node Overview, Usage, Copying, Top
＠chapter An Overview of ＠pkgname{}
When I have to come up with regular expressions that are more complex
than simple string matchers, especially if they contain sub expressions,
I find myself spending quite some time in the `development cycle'.
＠pkgname{} aims to shorten this time span so I can get on with the more
interesting bits.
With it you can have immediate visual feedback about how well the regexp
behaves to your expectations on the intended data.
＠node Usage, Regex Types, Overview, Top
＠chapter Operation of ＠pkgname{}
When called up, with ＠kbd{M-x re-builder RET}, ＠pkgname{} attaches
itself to the current buffer which becomes its target buffer, where all
the matching is done. The active window is split so you have a view on
the data while authoring the RE. If the edited expression is valid the
matches in the target buffer are marked automatically with colored
overlays (for non-color displays see below) giving you feedback over the
extents of the matched (sub) expressions. The (non-)validity is shown
only in the modeline without throwing the errors at you. If you want to
know the reason why RE Builder considers it as invalid call
＠kbd{reb-force-update} (＠kbd{C-c C-u}) which should reveal the error.
The target buffer can be changed with ＠code{reb-change-target-buffer}
(＠kbd{C-c C-b}). Changing the target buffer automatically removes
the overlays from the old buffer and displays the new one in the
target window.
＠pkgname{} keeps the focus while updating the matches in the target
buffer so corrections are easy to incorporate. If you are satisfied
with the result you can paste the RE to the kill-ring with
＠code{reb-copy} (＠kbd{C-c C-w}), quit ＠pkgname{} (＠kbd{C-c C-q}) and use
it wherever you need it.
As the automatic updates can take some time on large buffers, they can
be limited by ＠code{reb-auto-match-limit} so that they should not have a
negative impact on the editing. Setting it to nil makes even the auto
updates go all the way. Forcing an update overrides this limit allowing
an easy way to see all matches.
＠node Regex Types, Questions, Usage, Top
＠chapter Regex Types
Currently ＠pkgname{} understands five different forms of input, namely
＠code{read}, ＠code{string}, ＠code{rx}, ＠code{sregex} and ＠code{lisp-re}
syntax. Read syntax and string syntax are both delimited by ＠code{"}s
and behave according to their name. With the ＠code{string} syntax
there's no need to escape the backslashes and double quotes simplifying
the editing somewhat. The other three allow editing of symbolic regular
expressions supported by the packages of the same name. (＠code{lisp-re}
is a package by me and its support may go away as it is nearly the same
as the ＠code{sregex} package in Emacs)
Note that the ＠code{sregex,} ＠code{rx} and ＠code{lisp-re} syntaxes will
only be available in XEmacs if you've installed them yourself.
Editing symbolic expressions is done through a major mode derived
from ＠code{emacs-lisp-mode} so you'll get all the good stuff like
automatic indentation and font-locking etc.
When editing a symbolic regular expression, only the first expression in
the RE Builder buffer is considered, which helps limiting the extent of
the expression like the ＠code{"}s do for the text modes. For the
＠code{sregex} syntax the function ＠code{sregex} is applied to the
evaluated expression read. So you can use quoted arguments with
something like '("findme") or you can construct arguments to your hearts
delight with a valid ELisp expression. (The compiled string form will
be copied by ＠code{reb-copy}) If you want to take a glance at the
corresponding string you can temporarily change the input syntax.
Changing the input syntax is transparent (for the obvious exception
non-symbolic -> symbolic) so you can change your mind as often as you
like.
There is also a shortcut function for toggling the
＠code{case-fold-search} variable in the target buffer with an immediate
update.
＠node Questions, , Regex Types, Top
＠chapter Questions
Q: But what if my display cannot show colored overlays?
A: Then the cursor will flash around the matched text making it stand out.
Q: But how can I then make out the sub-expressions?
A: Thats where the `sub-expression mode' comes in. In it only the digit
keys are assigned to perform an update that will flash the corresponding
subexp only.
- 1 participants
- 0 comments
CVS update by viteno ([PATCH] Alias grep-find to find-grep) MODIFIED: packages/xemacs-packages/xemacs-base ...
19 years, 9 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/03/04 20:38:36
Modified: packages/xemacs-packages/xemacs-base ChangeLog compile.el
Log:
From: Aidan Kehoe <kehoea(a)parhasard.net>
Subject: [PATCH] Alias grep-find to find-grep
Message-ID: <16928.44117.737288.947152(a)parhasard.net>
Revision Changes Path
1.162 +6 -0 XEmacs/packages/xemacs-packages/xemacs-base/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-base/ChangeLog,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- ChangeLog 2004/12/22 21:46:41 1.161
+++ ChangeLog 2005/03/04 19:38:35 1.162
＠＠ -1,3 +1,9 ＠＠
+2005-02-26 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * compile.el (find-grep): Alias it to grep-find--if you're used to
+ the shell, find and _then_ grep is the word order that springs to
+ mind.
+
2004-12-22 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.94 released.
1.33 +3 -0 XEmacs/packages/xemacs-packages/xemacs-base/compile.el
Index: compile.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-base/compile.el,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- compile.el 2004/06/28 20:19:43 1.32
+++ compile.el 2005/03/04 19:38:35 1.33
＠＠ -768,6 +768,9 ＠＠
(let ((grep-null-device nil)) ; see grep
(grep command-args)))
+;; XEmacs addition
+(defalias find-grep grep-find)
+
;; XEmacs addition: all grep-all-files stuff
(defun construct-grep-all-files-command (find-segment grep-segment)
- 1 participants
- 0 comments
CVS update by malcolmp MODIFIED: xemacs/tests/autoconf ...
19 years, 9 months
CVS Monitor
CVS Monitor
User: malcolmp
Date: 05/03/04 14:34:56
Modified: xemacs/tests/autoconf Tag: sjt-xft regressiontest.pl
Log:
Misc configure.ac fixes. Brought config.sub and config.guess up-to-date.
Revision Changes Path
No revision
No revision
1.418.2.10 +9 -0 XEmacs/xemacs/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.418.2.9
retrieving revision 1.418.2.10
diff -u -r1.418.2.9 -r1.418.2.10
--- ChangeLog 2005/02/22 10:16:50 1.418.2.9
+++ ChangeLog 2005/03/04 13:33:55 1.418.2.10
＠＠ -1,3 +1,12 ＠＠
+2005-03-05 Malcolm Purvis <malcolmp(a)xemacs.org>
+
+ * config.guess:
+ * config.sub: Sync with the latest upstream versions.
+ * configure.ac: Use --verbose for --extra-verbose. Better
+ quoting of arguments. Internal shell vars statr with '_' to avoid
+ name clashes. Pick up the latest changes to configure.in.
+ Improve the testing of Athena 3d widgets.
+
2005-02-21 Stephen J. Turnbull <stephen(a)xemacs.org>
* version.sh (XEMACS_RELEASE_DATE): New version info variable.
1.6.2.2 +9 -3 XEmacs/xemacs/config.guess
Index: config.guess
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/config.guess,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- config.guess 2005/02/01 15:46:05 1.6.2.1
+++ config.guess 2005/03/04 13:33:56 1.6.2.2
＠＠ -1,9 +1,9 ＠＠
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2004-11-12'
+timestamp='2005-02-10'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
＠＠ -53,7 +53,7 ＠＠
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
＠＠ -804,6 +804,9 ＠＠
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
exit 0 ;;
+ amd64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit 0 ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
exit 0 ;;
＠＠ -1196,6 +1199,9 ＠＠
exit 0 ;;
*:QNX:*:4*)
echo i386-pc-qnx
+ exit 0 ;;
+ NSE-?:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
1.5.20.2 +5 -5 XEmacs/xemacs/config.sub
Index: config.sub
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/config.sub,v
retrieving revision 1.5.20.1
retrieving revision 1.5.20.2
diff -u -r1.5.20.1 -r1.5.20.2
--- config.sub 2005/02/01 15:46:05 1.5.20.1
+++ config.sub 2005/03/04 13:33:57 1.5.20.2
＠＠ -1,9 +1,9 ＠＠
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2004-11-30'
+timestamp='2005-02-10'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
＠＠ -70,7 +70,7 ＠＠
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
＠＠ -237,7 +237,7 ＠＠
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32r | m32rle | m68000 | m68k | m88k | mcore \
+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
＠＠ -310,7 +310,7 ＠＠
| ip2k-* | iq2000-* \
| m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
1.232.2.7 +334 -706 XEmacs/xemacs/configure
Index: configure
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v
retrieving revision 1.232.2.6
retrieving revision 1.232.2.7
diff -u -r1.232.2.6 -r1.232.2.7
--- configure 2005/02/22 10:16:50 1.232.2.6
+++ configure 2005/03/04 13:33:57 1.232.2.7
＠＠ -1653,16 +1653,10 ＠＠
-
-
-
-
-
-MAKE_SUBDIR="$MAKE_SUBDIR lib-src" && if test "$extra_verbose" = "yes"; then echo " Appending \"lib-src\" to \$MAKE_SUBDIR"; fi
-INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR lib-src" && if test "$extra_verbose" = "yes"; then echo " Appending \"lib-src\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+MAKE_SUBDIR="$MAKE_SUBDIR lib-src" && if test "$verbose" = "yes"; then echo " Appending \"lib-src\" to \$MAKE_SUBDIR"; fi
+INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR lib-src" && if test "$verbose" = "yes"; then echo " Appending \"lib-src\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
with_dragndrop_default="no"
-
# Check whether --with-mule or --without-mule was given.
if test "${with_mule+set}" = set; then
withval="$with_mule"
＠＠ -1867,64 +1861,56 ＠＠
with_xft_notfirst=""
with_xft_emacs=yes
-
-
with_xft_menubars=yes
-
-
with_xft_tabs=yes
-
-
with_xft_gauges=yes
+_with_xft_types="emacs menubars tabs gauges"
+_with_xft_default="emacs,menubars,tabs,gauges"
-with_xft_types="emacs menubars tabs gauges"
-with_xft_default="emacs,menubars,tabs,gauges"
-
-
# Check whether --with-xft or --without-xft was given.
if test "${with_xft+set}" = set; then
withval="$with_xft"
for x in `echo "$with_xft" | sed -e 's/,/ /g'` ; do
- with_xft_all_default=""
- with_xft_found=""
+ _with_xft_all_default=""
+ _with_xft_found=""
case "$x" in
- n | no | non | none ) with_xft_all_default=no ;;
- a | al | all | both ) with_xft_all_default=yes ;;
+ n | no | non | none ) _with_xft_all_default=no ;;
+ a | al | all | both ) _with_xft_all_default=yes ;;
esac
- if test -z "$with_xft_all_default"; then
- for y in $with_xft_types; do
+ if test -z "$_with_xft_all_default"; then
+ for y in $_with_xft_types; do
if test "$x" = "$y"; then
- with_xft_found=yes
+ _with_xft_found=yes
eval "with_xft_$y=yes"
elif test "$x" = "no$y"; then
- with_xft_found=yes
+ _with_xft_found=yes
eval "with_xft_$y=no"
fi
done
- test -z "$with_xft_found" && with_xft_bogus=yes
+ test -z "$_with_xft_found" && _with_xft_bogus=yes
fi
- if test "$with_xft_bogus" = "yes" -o \
- \( -n "$with_xft_all_default" -a -n "$with_xft_notfirst" \) ; then
+ if test "$_with_xft_bogus" = "yes" -o \
+ \( -n "$_with_xft_all_default" -a -n "$_with_xft_notfirst" \) ; then
(echo "$progname: Usage error:"
echo " " "Valid values for the --with-xft option are:
-$with_xft_types. With prefix \"no\", switch it off.
+$_with_xft_types. With prefix \"no\", switch it off.
Defaults may be overridden with \`all' or \`none' first in the list.
-Hardcoded default is: $with_xft_default."
+Hardcoded default is: $_with_xft_default."
echo " Use \`$progname --help' to show usage.") >&2 && exit 1
- elif test -n "$with_xft_all_default" ; then
- for y in $with_xft_types; do
- eval "with_xft_$y=$with_xft_all_default"
+ elif test -n "$_with_xft_all_default" ; then
+ for y in $_with_xft_types; do
+ eval "with_xft_$y=$_with_xft_all_default"
done
fi
- with_xft_notfirst=yes
+ _with_xft_notfirst=yes
done
-unset with_xft_bogus with_xft_found with_xft_notfirst with_xft_types
-unset with_xft_default with_xft_all_default x y
+unset _with_xft_bogus _with_xft_found _with_xft_notfirst _with_xft_types
+unset _with_xft_default _with_xft_all_default x y
＠＠ -2366,60 +2352,54 ＠＠
enable_database_notfirst=""
enable_database_berkdb=""
-
-
enable_database_dbm=""
-
-
enable_database_gdbm=""
+_enable_database_types="berkdb dbm gdbm"
+_enable_database_default="berkdb,dbm,gdbm"
-enable_database_types="berkdb dbm gdbm"
-enable_database_default="berkdb,dbm,gdbm"
-
-
# Check whether --enable-database or --disable-database was given.
if test "${enable_database+set}" = set; then
enableval="$enable_database"
for x in `echo "$enable_database" | sed -e 's/,/ /g'` ; do
- enable_database_all_default=""
- enable_database_found=""
+ _enable_database_all_default=""
+ _enable_database_found=""
case "$x" in
- n | no | non | none ) enable_database_all_default=no ;;
- a | al | all | both ) enable_database_all_default=yes ;;
+ n | no | non | none ) _enable_database_all_default=no ;;
+ a | al | all | both ) _enable_database_all_default=yes ;;
esac
- if test -z "$enable_database_all_default"; then
- for y in $enable_database_types; do
+ if test -z "$_enable_database_all_default"; then
+ for y in $_enable_database_types; do
if test "$x" = "$y"; then
- enable_database_found=yes
+ _enable_database_found=yes
eval "enable_database_$y=yes"
elif test "$x" = "no$y"; then
- enable_database_found=yes
+ _enable_database_found=yes
eval "enable_database_$y=no"
fi
done
- test -z "$enable_database_found" && enable_database_bogus=yes
+ test -z "$_enable_database_found" && _enable_database_bogus=yes
fi
- if test "$enable_database_bogus" = "yes" -o \
- \( -n "$enable_database_all_default" -a -n "$enable_database_notfirst" \) ; then
+ if test "$_enable_database_bogus" = "yes" -o \
+ \( -n "$_enable_database_all_default" -a -n "$_enable_database_notfirst" \) ; then
(echo "$progname: Usage error:"
echo " " "Valid values for the --enable-database option are:
-$enable_database_types. With prefix \"no\", switch it off.
+$_enable_database_types. With prefix \"no\", switch it off.
Defaults may be overridden with \`all' or \`none' first in the list.
-Hardcoded default is: $enable_database_default."
+Hardcoded default is: $_enable_database_default."
echo " Use \`$progname --help' to show usage.") >&2 && exit 1
- elif test -n "$enable_database_all_default" ; then
- for y in $enable_database_types; do
- eval "enable_database_$y=$enable_database_all_default"
+ elif test -n "$_enable_database_all_default" ; then
+ for y in $_enable_database_types; do
+ eval "enable_database_$y=$_enable_database_all_default"
done
fi
- enable_database_notfirst=yes
+ _enable_database_notfirst=yes
done
-unset enable_database_bogus enable_database_found enable_database_notfirst enable_database_types
-unset enable_database_default enable_database_all_default x y
+unset _enable_database_bogus _enable_database_found _enable_database_notfirst _enable_database_types
+unset _enable_database_default _enable_database_all_default x y
if test "$enable_database_dbm" = "yes" -a "$enable_database_gdbm" = "yes"; then
＠＠ -2434,17 +2414,11 ＠＠
enable_sound_notfirst=""
enable_sound_native=""
-
-
enable_sound_nas=""
-
-
enable_sound_esd=no
-
-
-enable_sound_types="native nas esd"
-enable_sound_default="native,nas,noesd"
+_enable_sound_types="native nas esd"
+_enable_sound_default="native,nas,noesd"
＠＠ -2452,42 +2426,42 ＠＠
if test "${enable_sound+set}" = set; then
enableval="$enable_sound"
for x in `echo "$enable_sound" | sed -e 's/,/ /g'` ; do
- enable_sound_all_default=""
- enable_sound_found=""
+ _enable_sound_all_default=""
+ _enable_sound_found=""
case "$x" in
- n | no | non | none ) enable_sound_all_default=no ;;
- a | al | all | both ) enable_sound_all_default=yes ;;
+ n | no | non | none ) _enable_sound_all_default=no ;;
+ a | al | all | both ) _enable_sound_all_default=yes ;;
esac
- if test -z "$enable_sound_all_default"; then
- for y in $enable_sound_types; do
+ if test -z "$_enable_sound_all_default"; then
+ for y in $_enable_sound_types; do
if test "$x" = "$y"; then
- enable_sound_found=yes
+ _enable_sound_found=yes
eval "enable_sound_$y=yes"
elif test "$x" = "no$y"; then
- enable_sound_found=yes
+ _enable_sound_found=yes
eval "enable_sound_$y=no"
fi
done
- test -z "$enable_sound_found" && enable_sound_bogus=yes
+ test -z "$_enable_sound_found" && _enable_sound_bogus=yes
fi
- if test "$enable_sound_bogus" = "yes" -o \
- \( -n "$enable_sound_all_default" -a -n "$enable_sound_notfirst" \) ; then
+ if test "$_enable_sound_bogus" = "yes" -o \
+ \( -n "$_enable_sound_all_default" -a -n "$_enable_sound_notfirst" \) ; then
(echo "$progname: Usage error:"
echo " " "Valid values for the --enable-sound option are:
-$enable_sound_types. With prefix \"no\", switch it off.
+$_enable_sound_types. With prefix \"no\", switch it off.
Defaults may be overridden with \`all' or \`none' first in the list.
-Hardcoded default is: $enable_sound_default."
+Hardcoded default is: $_enable_sound_default."
echo " Use \`$progname --help' to show usage.") >&2 && exit 1
- elif test -n "$enable_sound_all_default" ; then
- for y in $enable_sound_types; do
- eval "enable_sound_$y=$enable_sound_all_default"
+ elif test -n "$_enable_sound_all_default" ; then
+ for y in $_enable_sound_types; do
+ eval "enable_sound_$y=$_enable_sound_all_default"
done
fi
- enable_sound_notfirst=yes
+ _enable_sound_notfirst=yes
done
-unset enable_sound_bogus enable_sound_found enable_sound_notfirst enable_sound_types
-unset enable_sound_default enable_sound_all_default x y
+unset _enable_sound_bogus _enable_sound_found _enable_sound_notfirst _enable_sound_types
+unset _enable_sound_default _enable_sound_all_default x y
＠＠ -2500,18 +2474,18 ＠＠
# Check whether --with-athena or --without-athena was given.
if test "${with_athena+set}" = set; then
withval="$with_athena"
- with_athena_bogus=yes
- for x in xaw xaw3d next 95 xpm ; do
+ _with_athena_bogus=yes
+ for x in xaw 3d next 95 xpm ; do
if test $x = $with_athena ; then
- with_athena_bogus=no
+ _with_athena_bogus=no
fi
done
- if test "$with_athena_bogus" = "yes" ; then
+ if test "$_with_athena_bogus" = "yes" ; then
(echo "$progname: Usage error:"
-echo " " "The --with-athena option must have one of these values: \`xaw',\`xaw3d',\`next',\`95',\`xpm'."
+echo " " "The --with-athena option must have one of these values: \`xaw',\`3d',\`next',\`95',\`xpm'."
echo " Use \`$progname --help' to show usage.") >&2 && exit 1
fi
-unset with_athena_bogus
+unset _with_athena_bogus
＠＠ -2521,18 +2495,18 ＠＠
# Check whether --with-xim or --without-xim was given.
if test "${with_xim+set}" = set; then
withval="$with_xim"
- with_xim_bogus=yes
+ _with_xim_bogus=yes
for x in yes no xlib motif ; do
if test $x = $with_xim ; then
- with_xim_bogus=no
+ _with_xim_bogus=no
fi
done
- if test "$with_xim_bogus" = "yes" ; then
+ if test "$_with_xim_bogus" = "yes" ; then
(echo "$progname: Usage error:"
echo " " "The --with-xim option must have one of these values: \`yes',\`no',\`xlib',\`motif'."
echo " Use \`$progname --help' to show usage.") >&2 && exit 1
fi
-unset with_xim_bogus
+unset _with_xim_bogus
＠＠ -2542,18 +2516,18 ＠＠
# Check whether --with-mail-locking or --without-mail-locking was given.
if test "${with_mail_locking+set}" = set; then
withval="$with_mail_locking"
- with_mail_locking_bogus=yes
+ _with_mail_locking_bogus=yes
for x in lockf flock file locking mmdf pop ; do
if test $x = $with_mail_locking ; then
- with_mail_locking_bogus=no
+ _with_mail_locking_bogus=no
fi
done
- if test "$with_mail_locking_bogus" = "yes" ; then
+ if test "$_with_mail_locking_bogus" = "yes" ; then
(echo "$progname: Usage error:"
echo " " "The --with-mail-locking option must have one of these values: \`lockf',\`flock',\`file',\`locking',\`mmdf',\`pop'."
echo " Use \`$progname --help' to show usage.") >&2 && exit 1
fi
-unset with_mail_locking_bogus
+unset _with_mail_locking_bogus
＠＠ -2563,18 +2537,18 ＠＠
# Check whether --enable-bignum or --disable-bignum was given.
if test "${enable_bignum+set}" = set; then
enableval="$enable_bignum"
- enable_bignum_bogus=yes
+ _enable_bignum_bogus=yes
for x in no gmp mp ; do
if test $x = $enable_bignum ; then
- enable_bignum_bogus=no
+ _enable_bignum_bogus=no
fi
done
- if test "$enable_bignum_bogus" = "yes" ; then
+ if test "$_enable_bignum_bogus" = "yes" ; then
(echo "$progname: Usage error:"
echo " " "The --enable-bignum option must have one of these values: \`no',\`gmp',\`mp'."
echo " Use \`$progname --help' to show usage.") >&2 && exit 1
fi
-unset enable_bignum_bogus
+unset _enable_bignum_bogus
＠＠ -2584,35 +2558,17 ＠＠
enable_error_checking_notfirst=""
enable_error_checking_extents=""
-
-
enable_error_checking_types=""
-
-
enable_error_checking_text=""
-
-
enable_error_checking_gc=""
-
-
enable_error_checking_malloc=""
-
-
enable_error_checking_byte_code=""
-
-
enable_error_checking_glyphs=""
-
-
enable_error_checking_display=""
-
-
enable_error_checking_structures=""
-
-
-enable_error_checking_types="extents types text gc malloc byte_code glyphs display structures"
-enable_error_checking_default="extents,types,text,gc,malloc,byte_code,glyphs,display,structures"
+_enable_error_checking_types="extents types text gc malloc byte_code glyphs display structures"
+_enable_error_checking_default="extents,types,text,gc,malloc,byte_code,glyphs,display,structures"
＠＠ -2620,42 +2576,42 ＠＠
if test "${enable_error_checking+set}" = set; then
enableval="$enable_error_checking"
for x in `echo "$enable_error_checking" | sed -e 's/,/ /g'` ; do
- enable_error_checking_all_default=""
- enable_error_checking_found=""
+ _enable_error_checking_all_default=""
+ _enable_error_checking_found=""
case "$x" in
- n | no | non | none ) enable_error_checking_all_default=no ;;
- a | al | all | both ) enable_error_checking_all_default=yes ;;
+ n | no | non | none ) _enable_error_checking_all_default=no ;;
+ a | al | all | both ) _enable_error_checking_all_default=yes ;;
esac
- if test -z "$enable_error_checking_all_default"; then
- for y in $enable_error_checking_types; do
+ if test -z "$_enable_error_checking_all_default"; then
+ for y in $_enable_error_checking_types; do
if test "$x" = "$y"; then
- enable_error_checking_found=yes
+ _enable_error_checking_found=yes
eval "enable_error_checking_$y=yes"
elif test "$x" = "no$y"; then
- enable_error_checking_found=yes
+ _enable_error_checking_found=yes
eval "enable_error_checking_$y=no"
fi
done
- test -z "$enable_error_checking_found" && enable_error_checking_bogus=yes
+ test -z "$_enable_error_checking_found" && _enable_error_checking_bogus=yes
fi
- if test "$enable_error_checking_bogus" = "yes" -o \
- \( -n "$enable_error_checking_all_default" -a -n "$enable_error_checking_notfirst" \) ; then
+ if test "$_enable_error_checking_bogus" = "yes" -o \
+ \( -n "$_enable_error_checking_all_default" -a -n "$_enable_error_checking_notfirst" \) ; then
(echo "$progname: Usage error:"
echo " " "Valid values for the --enable-error-checking option are:
-$enable_error_checking_types. With prefix \"no\", switch it off.
+$_enable_error_checking_types. With prefix \"no\", switch it off.
Defaults may be overridden with \`all' or \`none' first in the list.
-Hardcoded default is: $enable_error_checking_default."
+Hardcoded default is: $_enable_error_checking_default."
echo " Use \`$progname --help' to show usage.") >&2 && exit 1
- elif test -n "$enable_error_checking_all_default" ; then
- for y in $enable_error_checking_types; do
- eval "enable_error_checking_$y=$enable_error_checking_all_default"
+ elif test -n "$_enable_error_checking_all_default" ; then
+ for y in $_enable_error_checking_types; do
+ eval "enable_error_checking_$y=$_enable_error_checking_all_default"
done
fi
- enable_error_checking_notfirst=yes
+ _enable_error_checking_notfirst=yes
done
-unset enable_error_checking_bogus enable_error_checking_found enable_error_checking_notfirst enable_error_checking_types
-unset enable_error_checking_default enable_error_checking_all_default x y
+unset _enable_error_checking_bogus _enable_error_checking_found _enable_error_checking_notfirst _enable_error_checking_types
+unset _enable_error_checking_default _enable_error_checking_all_default x y
＠＠ -2665,18 +2621,18 ＠＠
# Check whether --enable-menubars or --disable-menubars was given.
if test "${enable_menubars+set}" = set; then
enableval="$enable_menubars"
- enable_menubars_bogus=yes
+ _enable_menubars_bogus=yes
for x in yes no lucid motif athena gtk msw ; do
if test $x = $enable_menubars ; then
- enable_menubars_bogus=no
+ _enable_menubars_bogus=no
fi
done
- if test "$enable_menubars_bogus" = "yes" ; then
+ if test "$_enable_menubars_bogus" = "yes" ; then
(echo "$progname: Usage error:"
echo " " "The --enable-menubars option must have one of these values: \`yes',\`no',\`lucid',\`motif',\`athena',\`gtk',\`msw'."
echo " Use \`$progname --help' to show usage.") >&2 && exit 1
fi
-unset enable_menubars_bogus
+unset _enable_menubars_bogus
＠＠ -2686,18 +2642,18 ＠＠
# Check whether --enable-scrollbars or --disable-scrollbars was given.
if test "${enable_scrollbars+set}" = set; then
enableval="$enable_scrollbars"
- enable_scrollbars_bogus=yes
+ _enable_scrollbars_bogus=yes
for x in yes no lucid motif athena gtk msw ; do
if test $x = $enable_scrollbars ; then
- enable_scrollbars_bogus=no
+ _enable_scrollbars_bogus=no
fi
done
- if test "$enable_scrollbars_bogus" = "yes" ; then
+ if test "$_enable_scrollbars_bogus" = "yes" ; then
(echo "$progname: Usage error:"
echo " " "The --enable-scrollbars option must have one of these values: \`yes',\`no',\`lucid',\`motif',\`athena',\`gtk',\`msw'."
echo " Use \`$progname --help' to show usage.") >&2 && exit 1
fi
-unset enable_scrollbars_bogus
+unset _enable_scrollbars_bogus
＠＠ -2707,18 +2663,18 ＠＠
# Check whether --enable-dialogs or --disable-dialogs was given.
if test "${enable_dialogs+set}" = set; then
enableval="$enable_dialogs"
- enable_dialogs_bogus=yes
+ _enable_dialogs_bogus=yes
for x in yes no lucid motif athena gtk msw ; do
if test $x = $enable_dialogs ; then
- enable_dialogs_bogus=no
+ _enable_dialogs_bogus=no
fi
done
- if test "$enable_dialogs_bogus" = "yes" ; then
+ if test "$_enable_dialogs_bogus" = "yes" ; then
(echo "$progname: Usage error:"
echo " " "The --enable-dialogs option must have one of these values: \`yes',\`no',\`lucid',\`motif',\`athena',\`gtk',\`msw'."
echo " Use \`$progname --help' to show usage.") >&2 && exit 1
fi
-unset enable_dialogs_bogus
+unset _enable_dialogs_bogus
＠＠ -2728,18 +2684,18 ＠＠
# Check whether --enable-widgets or --disable-widgets was given.
if test "${enable_widgets+set}" = set; then
enableval="$enable_widgets"
- enable_widgets_bogus=yes
+ _enable_widgets_bogus=yes
for x in yes no lucid motif athena gtk msw ; do
if test $x = $enable_widgets ; then
- enable_widgets_bogus=no
+ _enable_widgets_bogus=no
fi
done
- if test "$enable_widgets_bogus" = "yes" ; then
+ if test "$_enable_widgets_bogus" = "yes" ; then
(echo "$progname: Usage error:"
echo " " "The --enable-widgets option must have one of these values: \`yes',\`no',\`lucid',\`motif',\`athena',\`gtk',\`msw'."
echo " Use \`$progname --help' to show usage.") >&2 && exit 1
fi
-unset enable_widgets_bogus
+unset _enable_widgets_bogus
＠＠ -2952,7 +2908,7 ＠＠
. "$srcdir/version.sh" || exit 1;
if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
-: "${extra_verbose=$beta}"
+: "${verbose=$beta}"
version="${emacs_major_version}.${emacs_minor_version}"
cat >>confdefs.h <<_ACEOF
#define EMACS_MAJOR_VERSION $emacs_major_version
＠＠ -3031,39 +2987,39 ＠＠
if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
-test "${enable_error_checking_extents=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+test "${enable_error_checking_extents:=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
#define ERROR_CHECK_EXTENTS 1
_ACEOF
-test "${enable_error_checking_types=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+test "${enable_error_checking_types:=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
#define ERROR_CHECK_TYPES 1
_ACEOF
-test "${enable_error_checking_text=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+test "${enable_error_checking_text:=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
#define ERROR_CHECK_TEXT 1
_ACEOF
-test "${enable_error_checking_gc=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+test "${enable_error_checking_gc:=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
#define ERROR_CHECK_GC 1
_ACEOF
-test "${enable_error_checking_malloc=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+test "${enable_error_checking_malloc:=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
#define ERROR_CHECK_MALLOC 1
_ACEOF
-test "${enable_error_checking_byte_code=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+test "${enable_error_checking_byte_code:=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
#define ERROR_CHECK_BYTE_CODE 1
_ACEOF
-test "${enable_error_checking_glyphs=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+test "${enable_error_checking_glyphs:=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
#define ERROR_CHECK_GLYPHS 1
_ACEOF
-test "${enable_error_checking_display=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+test "${enable_error_checking_display:=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
#define ERROR_CHECK_DISPLAY 1
_ACEOF
-test "${enable_error_checking_structures=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+test "${enable_error_checking_structures:=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
#define ERROR_CHECK_STRUCTURES 1
_ACEOF
＠＠ -3266,7 +3222,7 ＠＠
* ) opsys=hpux ;;
esac
- case "$opsys" in hpux9 | hpux10 ) extra_objs="$extra_objs strcat.o" && if test "$extra_verbose" = "yes"; then
+ case "$opsys" in hpux9 | hpux10 ) extra_objs="$extra_objs strcat.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"strcat.o\""
fi ;; esac
＠＠ -7702,6 +7658,7 ＠＠
lib_gcc=
fi
+test "$verbose" = "yes" && \
for var in libs_machine libs_system libs_termcap libs_standard objects_machine objects_system c_switch_machine c_switch_system ld_switch_machine ld_switch_system unexec ld_switch_shared ld lib_gcc ld_text_start_addr start_files ordinary_link have_terminfo mail_use_flock mail_use_lockf; do eval "echo \"$var = '\$$var'\""; done && echo ""
case "$opsys" in mingw* | cygwin*)
＠＠ -7710,7 +7667,7 ＠＠
cygwin_include="-I$cygwin_include/../include" ;
extra_includes="$cygwin_include/mingw $cygwin_include" ;
case "$opsys" in mingw*)
- c_switch_system="$c_switch_system $extra_includes" && if test "$extra_verbose" = "yes"; then echo " Appending \"$extra_includes\" to \$c_switch_system"; fi ;;
+ c_switch_system="$c_switch_system $extra_includes" && if test "$verbose" = "yes"; then echo " Appending \"$extra_includes\" to \$c_switch_system"; fi ;;
esac
;;
esac
＠＠ -7718,7 +7675,7 ＠＠
test "$ordinary_link" = "no" -a -z "$libs_standard" && libs_standard="-lc"
-test "$__DECC" = "yes" && c_switch_site="$c_switch_site -std1" && if test "$extra_verbose" = "yes"; then echo " Appending \"-std1\" to \$c_switch_site"; fi
+test "$__DECC" = "yes" && c_switch_site="$c_switch_site -std1" && if test "$verbose" = "yes"; then echo " Appending \"-std1\" to \$c_switch_site"; fi
if test "$__USLC__" = yes; then
echo "$as_me:$LINENO: checking for whether the -Kalloca compiler flag is needed" >&5
＠＠ -7820,7 +7777,7 ＠＠
conftest$ac_exeext conftest.$ac_ext
echo "$as_me:$LINENO: result: $need_kalloca" >&5
echo "${ECHO_T}$need_kalloca" >&6
- test "$need_kalloca" = "yes" && c_switch_system="$c_switch_system -Kalloca" && if test "$extra_verbose" = "yes"; then echo " Appending \"-Kalloca\" to \$c_switch_system"; fi
+ test "$need_kalloca" = "yes" && c_switch_system="$c_switch_system -Kalloca" && if test "$verbose" = "yes"; then echo " Appending \"-Kalloca\" to \$c_switch_system"; fi
fi
if test "$CC" != "$XEMACS_CC"; then
＠＠ -8043,7 +8000,7 ＠＠
case "`ld --help 2>&1`" in
*-z\ nocombreloc* ) echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
- ld_switch_site="-z nocombreloc $ld_switch_site" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-z nocombreloc\" to \$ld_switch_site"; fi ;;
+ ld_switch_site="-z nocombreloc $ld_switch_site" && if test "$verbose" = "yes"; then echo " Prepending \"-z nocombreloc\" to \$ld_switch_site"; fi ;;
*) echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6 ;;
esac
＠＠ -8115,16 +8072,16 ＠＠
done
fi
-test -n "$objects_machine" && extra_objs="$extra_objs $objects_machine" && if test "$extra_verbose" = "yes"; then
+test -n "$objects_machine" && extra_objs="$extra_objs $objects_machine" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"$objects_machine\""
fi
-test -n "$objects_system" && extra_objs="$extra_objs $objects_system" && if test "$extra_verbose" = "yes"; then
+test -n "$objects_system" && extra_objs="$extra_objs $objects_system" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"$objects_system\""
fi
-test -n "$unexec" && test ! "$enable_pdump" = "yes" && extra_objs="$extra_objs $unexec" && if test "$extra_verbose" = "yes"; then
+test -n "$unexec" && test ! "$enable_pdump" = "yes" && extra_objs="$extra_objs $unexec" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"$unexec\""
fi
-test "$enable_pdump" = "yes" && extra_objs="$extra_objs dumper.o" && if test "$extra_verbose" = "yes"; then
+test "$enable_pdump" = "yes" && extra_objs="$extra_objs dumper.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"dumper.o\""
fi
＠＠ -8140,14 +8097,14 ＠＠
#define DYNODUMP 1
_ACEOF
- MAKE_SUBDIR="$MAKE_SUBDIR dynodump" && if test "$extra_verbose" = "yes"; then echo " Appending \"dynodump\" to \$MAKE_SUBDIR"; fi
- SRC_SUBDIR_DEPS="$SRC_SUBDIR_DEPS dynodump" && if test "$extra_verbose" = "yes"; then echo " Appending \"dynodump\" to \$SRC_SUBDIR_DEPS"; fi
+ MAKE_SUBDIR="$MAKE_SUBDIR dynodump" && if test "$verbose" = "yes"; then echo " Appending \"dynodump\" to \$MAKE_SUBDIR"; fi
+ SRC_SUBDIR_DEPS="$SRC_SUBDIR_DEPS dynodump" && if test "$verbose" = "yes"; then echo " Appending \"dynodump\" to \$SRC_SUBDIR_DEPS"; fi
case "$machine" in
sparc ) dynodump_arch=sparc ;;
*86* ) dynodump_arch=i386 ;;
powerpc ) dynodump_arch=ppc ;;
esac
- test "$GCC" = "yes" && ld_switch_site="$ld_switch_site -fno-gnu-linker" && if test "$extra_verbose" = "yes"; then echo " Appending \"-fno-gnu-linker\" to \$ld_switch_site"; fi
+ test "$GCC" = "yes" && ld_switch_site="$ld_switch_site -fno-gnu-linker" && if test "$verbose" = "yes"; then echo " Appending \"-fno-gnu-linker\" to \$ld_switch_site"; fi
fi
＠＠ -8236,7 +8193,7 ＠＠
echo "$as_me:$LINENO: result: $ac_cv_lib_c_terminateAndUnload" >&5
echo "${ECHO_T}$ac_cv_lib_c_terminateAndUnload" >&6
if test $ac_cv_lib_c_terminateAndUnload = yes; then
- libs_system="$libs_system -lC" && if test "$extra_verbose" = "yes"; then echo " Appending \"-lC\" to \$libs_system"; fi
+ libs_system="$libs_system -lC" && if test "$verbose" = "yes"; then echo " Appending \"-lC\" to \$libs_system"; fi
fi
fi
＠＠ -8310,6 +8267,8 ＠＠
if test -z "$compiler_version"; then
compiler_version="detection failed (please report this)"
fi
+echo "$as_me:$LINENO: result: $compiler_version" >&5
+echo "${ECHO_T}$compiler_version" >&6
echo "$as_me:$LINENO: checking for standard C library version information" >&5
echo $ECHO_N "checking for standard C library version information... $ECHO_C" >&6
＠＠ -8351,6 +8310,8 ＠＠
if test -z "libc_version"; then
libc_version="detection failed (please report this)"
fi
+echo "$as_me:$LINENO: result: $libc_version" >&5
+echo "${ECHO_T}$libc_version" >&6
case "$with_site_libraries" in *:* ) with_site_libraries="`echo '' $with_site_libraries | sed -e 's/^ //' -e 's/:/ /g'`";; esac
＠＠ -8362,7 +8323,7 ＠＠
{ echo "Error:" "Invalid site library \`$arg': no such directory" >&2; exit 1; }
arg="-L${arg}" ;;
esac
- ld_switch_site="$ld_switch_site $arg" && if test "$extra_verbose" = "yes"; then echo " Appending \"$arg\" to \$ld_switch_site"; fi
+ ld_switch_site="$ld_switch_site $arg" && if test "$verbose" = "yes"; then echo " Appending \"$arg\" to \$ld_switch_site"; fi
done
fi
＠＠ -8375,7 +8336,7 ＠＠
{ echo "Error:" "Invalid site include \`$arg': no such directory" >&2; exit 1; }
arg="-I${arg}" ;;
esac
- c_switch_site="$c_switch_site $arg" && if test "$extra_verbose" = "yes"; then echo " Appending \"$arg\" to \$c_switch_site"; fi
+ c_switch_site="$c_switch_site $arg" && if test "$verbose" = "yes"; then echo " Appending \"$arg\" to \$c_switch_site"; fi
done
fi
＠＠ -8390,16 +8351,16 ＠＠
{ echo "Error:" "Invalid site prefix \`$dir': no such directory \`$lib_dir'" >&2; exit 1; }
else
if test -d "$inc_dir"; then
- c_switch_site="$c_switch_site "-I$inc_dir"" && if test "$extra_verbose" = "yes"; then echo " Appending \""-I$inc_dir"\" to \$c_switch_site"; fi
+ c_switch_site="$c_switch_site "-I$inc_dir"" && if test "$verbose" = "yes"; then echo " Appending \""-I$inc_dir"\" to \$c_switch_site"; fi
fi
- ld_switch_site="$ld_switch_site "-L$lib_dir"" && if test "$extra_verbose" = "yes"; then echo " Appending \""-L$lib_dir"\" to \$ld_switch_site"; fi
+ ld_switch_site="$ld_switch_site "-L$lib_dir"" && if test "$verbose" = "yes"; then echo " Appending \""-L$lib_dir"\" to \$ld_switch_site"; fi
fi
done
fi
for dir in "/usr/ccs/lib"; do
- test -d "$dir" && ld_switch_system="$ld_switch_system -L${dir}" && if test "$extra_verbose" = "yes"; then echo " Appending \"-L${dir}\" to \$ld_switch_system"; fi
+ test -d "$dir" && ld_switch_system="$ld_switch_system -L${dir}" && if test "$verbose" = "yes"; then echo " Appending \"-L${dir}\" to \$ld_switch_system"; fi
done
case "$with_site_runtime_libraries" in *:* ) with_site_runtime_libraries="`echo '' $with_site_runtime_libraries | sed -e 's/^ //' -e 's/:/ /g'`";; esac
＠＠ -8568,7 +8529,7 ＠＠
shift
done
fi
- test "$extra_verbose" = "yes" && echo "Setting runpath to $runpath"
+ test "$verbose" = "yes" && echo "Setting runpath to $runpath"
fi
fi
＠＠ -14300,7 +14261,7 ＠＠
then echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6;
else echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; ld_switch_site="$ld_switch_site -xildoff" && if test "$extra_verbose" = "yes"; then echo " Appending \"-xildoff\" to \$ld_switch_site"; fi
+echo "${ECHO_T}yes" >&6; ld_switch_site="$ld_switch_site -xildoff" && if test "$verbose" = "yes"; then echo " Appending \"-xildoff\" to \$ld_switch_site"; fi
fi
else echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
＠＠ -14313,7 +14274,7 ＠＠
case "`ld -h 2>&1`" in
*-z\ ignore\|record* ) echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
- ld_switch_site="-z ignore $ld_switch_site" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-z ignore\" to \$ld_switch_site"; fi ;;
+ ld_switch_site="-z ignore $ld_switch_site" && if test "$verbose" = "yes"; then echo " Prepending \"-z ignore\" to \$ld_switch_site"; fi ;;
*) echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6 ;;
esac
＠＠ -14321,8 +14282,8 ＠＠
fi
-{ echo "$as_me:$LINENO: checking \"for specified window system\"..." >&5
-echo "$as_me: checking \"for specified window system\"..." >&6;}
+{ echo "$as_me:$LINENO: checking for specified window system..." >&5
+echo "$as_me: checking for specified window system..." >&6;}
GNOME_CONFIG=no
＠＠ -14352,8 +14313,8 ＠＠
#define HAVE_GNOME 1
_ACEOF
- libs_gtk="$libs_gtk ${GNOME_LIBS}" && if test "$extra_verbose" = "yes"; then echo " Appending \"${GNOME_LIBS}\" to \$libs_gtk"; fi
- c_switch_gtk="$c_switch_gtk ${GNOME_CFLAGS}" && if test "$extra_verbose" = "yes"; then echo " Appending \"${GNOME_CFLAGS}\" to \$c_switch_gtk"; fi
+ libs_gtk="$libs_gtk ${GNOME_LIBS}" && if test "$verbose" = "yes"; then echo " Appending \"${GNOME_LIBS}\" to \$libs_gtk"; fi
+ c_switch_gtk="$c_switch_gtk ${GNOME_CFLAGS}" && if test "$verbose" = "yes"; then echo " Appending \"${GNOME_CFLAGS}\" to \$c_switch_gtk"; fi
fi
if test "$with_gtk" != "no";then
＠＠ -14392,7 +14353,7 ＠＠
echo "$as_me:$LINENO: checking gtk libs" >&5
echo $ECHO_N "checking gtk libs... $ECHO_C" >&6
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
+ libs_gtk="$libs_gtk ${GTK_LIBS}" && if test "$verbose" = "yes"; then echo " Appending \"${GTK_LIBS}\" to \$libs_gtk"; fi
echo "$as_me:$LINENO: result: ${GTK_LIBS}" >&5
echo "${ECHO_T}${GTK_LIBS}" >&6
＠＠ -14402,7 +14363,7 ＠＠
if test "$GCC" = "yes"; then
GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow"
fi
- c_switch_gtk="$c_switch_gtk ${GTK_CFLAGS}" && if test "$extra_verbose" = "yes"; then echo " Appending \"${GTK_CFLAGS}\" to \$c_switch_gtk"; fi
+ c_switch_gtk="$c_switch_gtk ${GTK_CFLAGS}" && if test "$verbose" = "yes"; then echo " Appending \"${GTK_CFLAGS}\" to \$c_switch_gtk"; fi
echo "$as_me:$LINENO: result: ${GTK_CFLAGS}" >&5
echo "${ECHO_T}${GTK_CFLAGS}" >&6
＠＠ -14465,7 +14426,7 ＠＠
echo "$as_me:$LINENO: result: $ac_cv_lib_gdk_imlib_main" >&5
echo "${ECHO_T}$ac_cv_lib_gdk_imlib_main" >&6
if test $ac_cv_lib_gdk_imlib_main = yes; then
- libs_gtk="-lgdk_imlib $libs_gtk" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lgdk_imlib\" to \$libs_gtk"; fi
+ libs_gtk="-lgdk_imlib $libs_gtk" && if test "$verbose" = "yes"; then echo " Prepending \"-lgdk_imlib\" to \$libs_gtk"; fi
fi
echo "$as_me:$LINENO: checking for Imlib_init in -lImlib" >&5
＠＠ -14533,7 +14494,7 ＠＠
echo "$as_me:$LINENO: result: $ac_cv_lib_Imlib_Imlib_init" >&5
echo "${ECHO_T}$ac_cv_lib_Imlib_Imlib_init" >&6
if test $ac_cv_lib_Imlib_Imlib_init = yes; then
- libs_gtk="$libs_gtk -lImlib" && if test "$extra_verbose" = "yes"; then echo " Appending \"-lImlib\" to \$libs_gtk"; fi
+ libs_gtk="$libs_gtk -lImlib" && if test "$verbose" = "yes"; then echo " Appending \"-lImlib\" to \$libs_gtk"; fi
fi
＠＠ -14895,7 +14856,7 ＠＠
echo "$as_me:$LINENO: result: $ac_cv_lib_xml_main" >&5
echo "${ECHO_T}$ac_cv_lib_xml_main" >&6
if test $ac_cv_lib_xml_main = yes; then
- libs_gtk="-lxml $libs_gtk" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lxml\" to \$libs_gtk"; fi
+ libs_gtk="-lxml $libs_gtk" && if test "$verbose" = "yes"; then echo " Prepending \"-lxml\" to \$libs_gtk"; fi
fi
echo "$as_me:$LINENO: checking for main in -lglade" >&5
＠＠ -14957,7 +14918,7 ＠＠
echo "$as_me:$LINENO: result: $ac_cv_lib_glade_main" >&5
echo "${ECHO_T}$ac_cv_lib_glade_main" >&6
if test $ac_cv_lib_glade_main = yes; then
- libs_gtk="-lglade $libs_gtk" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lglade\" to \$libs_gtk"; fi
+ libs_gtk="-lglade $libs_gtk" && if test "$verbose" = "yes"; then echo " Prepending \"-lglade\" to \$libs_gtk"; fi
fi
echo "$as_me:$LINENO: checking for main in -lglade-gnome" >&5
＠＠ -15019,7 +14980,7 ＠＠
echo "$as_me:$LINENO: result: $ac_cv_lib_glade_gnome_main" >&5
echo "${ECHO_T}$ac_cv_lib_glade_gnome_main" >&6
if test $ac_cv_lib_glade_gnome_main = yes; then
- libs_gtk="-lglade-gnome $libs_gtk" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lglade-gnome\" to \$libs_gtk"; fi
+ libs_gtk="-lglade-gnome $libs_gtk" && if test "$verbose" = "yes"; then echo " Prepending \"-lglade-gnome\" to \$libs_gtk"; fi
fi
cat >conftest.$ac_ext <<_ACEOF
＠＠ -16477,8 +16438,8 ＠＠
#define HAVE_X_WINDOWS 1
_ACEOF
- MAKE_SUBDIR="$MAKE_SUBDIR lwlib" && if test "$extra_verbose" = "yes"; then echo " Appending \"lwlib\" to \$MAKE_SUBDIR"; fi
- SRC_SUBDIR_DEPS="$SRC_SUBDIR_DEPS lwlib" && if test "$extra_verbose" = "yes"; then echo " Appending \"lwlib\" to \$SRC_SUBDIR_DEPS"; fi
+ MAKE_SUBDIR="$MAKE_SUBDIR lwlib" && if test "$verbose" = "yes"; then echo " Appending \"lwlib\" to \$MAKE_SUBDIR"; fi
+ SRC_SUBDIR_DEPS="$SRC_SUBDIR_DEPS lwlib" && if test "$verbose" = "yes"; then echo " Appending \"lwlib\" to \$SRC_SUBDIR_DEPS"; fi
if test "${ac_cv_header_Xm_Xm_h+set}" = set; then
echo "$as_me:$LINENO: checking for Xm/Xm.h" >&5
＠＠ -16697,11 +16658,11 ＠＠
if test -d "$lib_dir" -a -d "$inc_dir"; then
case "$x_libraries" in *"$lib_dir"* ) ;; *)
x_libraries="$lib_dir $x_libraries"
- X_LIBS="-L${lib_dir} $X_LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-L${lib_dir}\" to \$X_LIBS"; fi ;;
+ X_LIBS="-L${lib_dir} $X_LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-L${lib_dir}\" to \$X_LIBS"; fi ;;
esac
case "$x_includes" in "$inc_dir"* ) ;; *)
x_includes="$inc_dir $x_includes"
- X_CFLAGS="-I${inc_dir} $X_CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-I${inc_dir}\" to \$X_CFLAGS"; fi ;;
+ X_CFLAGS="-I${inc_dir} $X_CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \"-I${inc_dir}\" to \$X_CFLAGS"; fi ;;
esac
break; fi
done
＠＠ -16712,17 +16673,17 ＠＠
if test -d "$lib_dir" -a -d "$inc_dir"; then
case "$x_libraries" in *"$lib_dir"* ) ;; *)
x_libraries="$x_libraries $lib_dir"
- X_LIBS="$X_LIBS -L${lib_dir}" && if test "$extra_verbose" = "yes"; then echo " Appending \"-L${lib_dir}\" to \$X_LIBS"; fi
+ X_LIBS="$X_LIBS -L${lib_dir}" && if test "$verbose" = "yes"; then echo " Appending \"-L${lib_dir}\" to \$X_LIBS"; fi
esac
case "$x_includes" in "$inc_dir"* ) ;; *)
x_includes="$x_includes $inc_dir"
- X_CFLAGS="$X_CFLAGS -I${inc_dir}" && if test "$extra_verbose" = "yes"; then echo " Appending \"-I${inc_dir}\" to \$X_CFLAGS"; fi
+ X_CFLAGS="$X_CFLAGS -I${inc_dir}" && if test "$verbose" = "yes"; then echo " Appending \"-I${inc_dir}\" to \$X_CFLAGS"; fi
esac
break; fi
done
case "$opsys" in
- decosf*) if test "$GCC" = yes -a -d /usr/shlib; then X_LIBS="$X_LIBS -L/usr/shlib" && if test "$extra_verbose" = "yes"; then echo " Appending \"-L/usr/shlib\" to \$X_LIBS"; fi; fi ;;
+ decosf*) if test "$GCC" = yes -a -d /usr/shlib; then X_LIBS="$X_LIBS -L/usr/shlib" && if test "$verbose" = "yes"; then echo " Appending \"-L/usr/shlib\" to \$X_LIBS"; fi; fi ;;
esac
ld_switch_x_site="$X_LIBS"
＠＠ -16784,12 +16745,12 ＠＠
shift
done
fi
- test "$extra_verbose" = "yes" && echo "Setting runpath to $runpath"
+ test "$verbose" = "yes" && echo "Setting runpath to $runpath"
fi
fi
- if test "$extra_verbose" = "yes"; then
+ if test "$verbose" = "yes"; then
echo; echo "X11 compilation variables:"
for var in x_libraries x_includes X_CFLAGS X_LIBS X_PRE_LIBS X_EXTRA_LIBS; do eval "echo \"$var = '\$$var'\""; done
echo
＠＠ -17142,7 +17103,7 ＠＠
fi
libs_x="-lX11"
- test "$extra_verbose" = "yes" && echo " Setting libs_x to \"-lX11\""
+ test "$verbose" = "yes" && echo " Setting libs_x to \"-lX11\""
echo "$as_me:$LINENO: checking for XShapeSelectInput in -lXext" >&5
echo $ECHO_N "checking for XShapeSelectInput in -lXext... $ECHO_C" >&6
＠＠ -17209,7 +17170,7 ＠＠
echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeSelectInput" >&5
echo "${ECHO_T}$ac_cv_lib_Xext_XShapeSelectInput" >&6
if test $ac_cv_lib_Xext_XShapeSelectInput = yes; then
- libs_x="-lXext $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXext\" to \$libs_x"; fi
+ libs_x="-lXext $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXext\" to \$libs_x"; fi
fi
＠＠ -17278,7 +17239,7 ＠＠
echo "$as_me:$LINENO: result: $ac_cv_lib_Xt_XtOpenDisplay" >&5
echo "${ECHO_T}$ac_cv_lib_Xt_XtOpenDisplay" >&6
if test $ac_cv_lib_Xt_XtOpenDisplay = yes; then
- libs_x="-lXt $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXt\" to \$libs_x"; fi
+ libs_x="-lXt $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXt\" to \$libs_x"; fi
else
{ { echo "$as_me:$LINENO: error: Unable to find X11 libraries." >&5
echo "$as_me: error: Unable to find X11 libraries." >&2;}
＠＠ -17440,7 +17401,8 ＠＠
-for ac_header in X11/Xlocale.h
+
+for ac_header in X11/Xlocale.h X11/Xfuncproto.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
＠＠ -17822,11 +17784,11 ＠＠
fi
}
if test "$with_xmu" = "no"; then
- extra_objs="$extra_objs xmu.o" && if test "$extra_verbose" = "yes"; then
+ extra_objs="$extra_objs xmu.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"xmu.o\""
fi
else
- libs_x="-lXmu $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXmu\" to \$libs_x"; fi
+ libs_x="-lXmu $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXmu\" to \$libs_x"; fi
cat >>confdefs.h <<\_ACEOF
#define HAVE_XMU 1
_ACEOF
＠＠ -17892,14 +17854,14 ＠＠
echo "$as_me:$LINENO: result: $ac_cv_lib_Xbsd_main" >&5
echo "${ECHO_T}$ac_cv_lib_Xbsd_main" >&6
if test $ac_cv_lib_Xbsd_main = yes; then
- libs_x="-lXbsd $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXbsd\" to \$libs_x"; fi
+ libs_x="-lXbsd $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXbsd\" to \$libs_x"; fi
fi
if test "$unexec" = "unexaix.o" -a "$x11_release" = "6"; then
if test "$GCC" = "yes"; then
- X_CFLAGS="-mthreads $X_CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-mthreads\" to \$X_CFLAGS"; fi
- libs_x="-mthreads $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-mthreads\" to \$libs_x"; fi
+ X_CFLAGS="-mthreads $X_CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \"-mthreads\" to \$X_CFLAGS"; fi
+ libs_x="-mthreads $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-mthreads\" to \$libs_x"; fi
else
case "$CC" in
"xlc" ) CC="xlc_r" ;;
＠＠ -18293,7 +18255,7 ＠＠
echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryExtension" >&5
echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderQueryExtension" >&6
if test $ac_cv_lib_Xrender_XRenderQueryExtension = yes; then
- libs_x="-lXrender $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXrender\" to \$libs_x"; fi
+ libs_x="-lXrender $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXrender\" to \$libs_x"; fi
else
{ echo "Error:" "Unable to find libXrender for --with-xft" >&2; exit 1; }
fi
＠＠ -18363,7 +18325,7 ＠＠
echo "$as_me:$LINENO: result: $ac_cv_lib_fontconfig_FcPatternCreate" >&5
echo "${ECHO_T}$ac_cv_lib_fontconfig_FcPatternCreate" >&6
if test $ac_cv_lib_fontconfig_FcPatternCreate = yes; then
- libs_x="-lfontconfig $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lfontconfig\" to \$libs_x"; fi
+ libs_x="-lfontconfig $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lfontconfig\" to \$libs_x"; fi
else
{ echo "Error:" "Unable to find libfontconfig for --with-xft" >&2; exit 1; }
fi
＠＠ -18433,7 +18395,7 ＠＠
echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftFontOpen" >&5
echo "${ECHO_T}$ac_cv_lib_Xft_XftFontOpen" >&6
if test $ac_cv_lib_Xft_XftFontOpen = yes; then
- libs_x="-lXft $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXft\" to \$libs_x"; fi
+ libs_x="-lXft $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXft\" to \$libs_x"; fi
else
{ echo "Error:" "Unable to find libXft for --with-xft" >&2; exit 1; }
fi
＠＠ -18524,15 +18486,15 ＠＠
if test "$with_netinstall" = "yes"; then
- MAKE_SUBDIR="$MAKE_SUBDIR netinstall" && if test "$extra_verbose" = "yes"; then echo " Appending \"netinstall\" to \$MAKE_SUBDIR"; fi
- SRC_SUBDIR_DEPS="$SRC_SUBDIR_DEPS netinstall" && if test "$extra_verbose" = "yes"; then echo " Appending \"netinstall\" to \$SRC_SUBDIR_DEPS"; fi
- INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR netinstall" && if test "$extra_verbose" = "yes"; then echo " Appending \"netinstall\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+ MAKE_SUBDIR="$MAKE_SUBDIR netinstall" && if test "$verbose" = "yes"; then echo " Appending \"netinstall\" to \$MAKE_SUBDIR"; fi
+ SRC_SUBDIR_DEPS="$SRC_SUBDIR_DEPS netinstall" && if test "$verbose" = "yes"; then echo " Appending \"netinstall\" to \$SRC_SUBDIR_DEPS"; fi
+ INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR netinstall" && if test "$verbose" = "yes"; then echo " Appending \"netinstall\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
fi
install_pp="$srcdir/lib-src/installexe.sh"
- libs_system="$libs_system -limm32 -lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lole32 -luuid -lwinspool -lmpr" && if test "$extra_verbose" = "yes"; then echo " Appending \"-limm32 -lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lole32 -luuid -lwinspool -lmpr\" to \$libs_system"; fi
+ libs_system="$libs_system -limm32 -lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lole32 -luuid -lwinspool -lmpr" && if test "$verbose" = "yes"; then echo " Appending \"-limm32 -lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lole32 -luuid -lwinspool -lmpr\" to \$libs_system"; fi
if test "$with_dragndrop" != no; then
- dragndrop_proto="$dragndrop_proto msw" && if test "$extra_verbose" = "yes"; then echo " Appending \"msw\" to \$dragndrop_proto"; fi
+ dragndrop_proto="$dragndrop_proto msw" && if test "$verbose" = "yes"; then echo " Appending \"msw\" to \$dragndrop_proto"; fi
with_dragndrop=yes
fi
if test "$window_system" != x11; then
＠＠ -18619,7 +18581,7 ＠＠
if test "$with_x11" != "yes"; then
for feature in with_tooltalk with_cde with_offix with_wmcommand with_xim with_xmu enable_sound_nas
do
- if eval "test -n \"\${feature}\" -a \"\${feature}\" != no" ; then
+ if eval "test -n \"\$${feature}\" -a \"\$${feature}\" != \"no\"" ; then
{ echo "$as_me:$LINENO: WARNING: --$feature ignored: Not valid without X support" >&5
echo "$as_me: WARNING: --$feature ignored: Not valid without X support" >&2;}
fi
＠＠ -18796,7 +18758,7 ＠＠
esac
{ echo "$as_me:$LINENO: checking for WM_COMMAND option..." >&5
-echo "$as_me: checking for WM_COMMAND option..." >&6;};
+echo "$as_me: checking for WM_COMMAND option..." >&6;}
if test "$with_wmcommand" != "no"; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_WMCOMMAND 1
＠＠ -20472,9 +20434,9 ＠＠
#define HAVE_SHLIB 1
_ACEOF
- MAKE_SUBDIR="$MAKE_SUBDIR src" && if test "$extra_verbose" = "yes"; then echo " Appending \"src\" to \$MAKE_SUBDIR"; fi
- INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR src" && if test "$extra_verbose" = "yes"; then echo " Appending \"src\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
- test -n "$libdl" && LIBS="-l${libdl} $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-l${libdl}\" to \$LIBS"; fi
+ MAKE_SUBDIR="$MAKE_SUBDIR src" && if test "$verbose" = "yes"; then echo " Appending \"src\" to \$MAKE_SUBDIR"; fi
+ INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR src" && if test "$verbose" = "yes"; then echo " Appending \"src\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+ test -n "$libdl" && LIBS="-l${libdl} $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-l${libdl}\" to \$LIBS"; fi
for ac_func in dlerror _dlerror
＠＠ -20859,7 +20821,7 ＠＠
#define TT_C_H_FILE "$tt_c_h_file"
_ACEOF
- libs_x="$tt_libs $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"$tt_libs\" to \$libs_x"; fi
+ libs_x="$tt_libs $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"$tt_libs\" to \$libs_x"; fi
fi
test -z "$with_cde" && { if test "${ac_cv_header_Dt_Dt_h+set}" = set; then
＠＠ -21089,8 +21051,8 ＠＠
#define HAVE_CDE 1
_ACEOF
- libs_x="-lDtSvc $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lDtSvc\" to \$libs_x"; fi
- dragndrop_proto="$dragndrop_proto CDE" && if test "$extra_verbose" = "yes"; then echo " Appending \"CDE\" to \$dragndrop_proto"; fi
+ libs_x="-lDtSvc $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lDtSvc\" to \$libs_x"; fi
+ dragndrop_proto="$dragndrop_proto CDE" && if test "$verbose" = "yes"; then echo " Appending \"CDE\" to \$dragndrop_proto"; fi
with_tooltalk=yes # CDE requires Tooltalk
need_motif=yes # CDE requires Motif
fi
＠＠ -21123,11 +21085,11 ＠＠
#define HAVE_OFFIX_DND 1
_ACEOF
- dnd_objs="$dnd_objs offix.o" && if test "$extra_verbose" = "yes"; then echo " Appending \"offix.o\" to \$dnd_objs"; fi
- dragndrop_proto="$dragndrop_proto OffiX" && if test "$extra_verbose" = "yes"; then echo " Appending \"OffiX\" to \$dragndrop_proto"; fi
+ dnd_objs="$dnd_objs offix.o" && if test "$verbose" = "yes"; then echo " Appending \"offix.o\" to \$dnd_objs"; fi
+ dragndrop_proto="$dragndrop_proto OffiX" && if test "$verbose" = "yes"; then echo " Appending \"OffiX\" to \$dragndrop_proto"; fi
fi
if test "$with_gtk" = "yes"; then
- dragndrop_proto="$dragndrop_proto GTK" && if test "$extra_verbose" = "yes"; then echo " Appending \"GTK\" to \$dragndrop_proto"; fi
+ dragndrop_proto="$dragndrop_proto GTK" && if test "$verbose" = "yes"; then echo " Appending \"GTK\" to \$dragndrop_proto"; fi
fi
if test "$with_dragndrop" != "no" ; then
＠＠ -21141,7 +21103,7 ＠＠
#define HAVE_DRAGNDROP 1
_ACEOF
- extra_objs="$extra_objs dragdrop.o" && if test "$extra_verbose" = "yes"; then echo " Appending \"dragdrop.o\" to \$extra_objs"; fi
+ extra_objs="$extra_objs dragdrop.o" && if test "$verbose" = "yes"; then echo " Appending \"dragdrop.o\" to \$extra_objs"; fi
else
with_dragndrop=no
echo "$as_me:$LINENO: result: no" >&5
＠＠ -21788,15 +21750,15 ＠＠
_ACEOF
if test "$with_ldap_des" = "yes" ; then
- ldap_libs="-ldes $ldap_libs" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-ldes\" to \$ldap_libs"; fi
+ ldap_libs="-ldes $ldap_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-ldes\" to \$ldap_libs"; fi
fi
if test "$with_ldap_krb" = "yes" ; then
- ldap_libs="-lkrb $ldap_libs" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lkrb\" to \$ldap_libs"; fi
+ ldap_libs="-lkrb $ldap_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-lkrb\" to \$ldap_libs"; fi
fi
if test "$with_ldap_lber" = "yes" ; then
- ldap_libs="-llber $ldap_libs" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-llber\" to \$ldap_libs"; fi
+ ldap_libs="-llber $ldap_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-llber\" to \$ldap_libs"; fi
fi
- ldap_libs="-lldap $ldap_libs" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lldap\" to \$ldap_libs"; fi
+ ldap_libs="-lldap $ldap_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-lldap\" to \$ldap_libs"; fi
save_LIBS="$LIBS" LIBS="$LIBS $ldap_libs"
＠＠ -21904,10 +21866,10 ＠＠
done
LIBS="$save_LIBS"
- MAKE_SUBDIR="$MAKE_SUBDIR modules/ldap" && if test "$extra_verbose" = "yes"; then echo " Appending \"modules/ldap\" to \$MAKE_SUBDIR"; fi
+ MAKE_SUBDIR="$MAKE_SUBDIR modules/ldap" && if test "$verbose" = "yes"; then echo " Appending \"modules/ldap\" to \$MAKE_SUBDIR"; fi
need_modules_common=yes
if test "$enable_modules" = "yes"; then
- INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/ldap" && if test "$extra_verbose" = "yes"; then echo " Appending \"modules/ldap\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+ INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/ldap" && if test "$verbose" = "yes"; then echo " Appending \"modules/ldap\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
fi
fi
＠＠ -22215,11 +22177,11 ＠＠
#define LIBPQ_FE_H_FILE "$libpq_fe_h_file"
_ACEOF
- postgresql_libs="-lpq $postgresql_libs" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lpq\" to \$postgresql_libs"; fi
- MAKE_SUBDIR="$MAKE_SUBDIR modules/postgresql" && if test "$extra_verbose" = "yes"; then echo " Appending \"modules/postgresql\" to \$MAKE_SUBDIR"; fi
+ postgresql_libs="-lpq $postgresql_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-lpq\" to \$postgresql_libs"; fi
+ MAKE_SUBDIR="$MAKE_SUBDIR modules/postgresql" && if test "$verbose" = "yes"; then echo " Appending \"modules/postgresql\" to \$MAKE_SUBDIR"; fi
need_modules_common=yes
if test "$enable_modules" = "yes"; then
- INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/postgresql" && if test "$extra_verbose" = "yes"; then echo " Appending \"modules/postgresql\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
+ INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/postgresql" && if test "$verbose" = "yes"; then echo " Appending \"modules/postgresql\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
fi
elif test "$with_postgresql" = "yes"; then
{ echo "Error:" "Required PostgreSQL support cannot be provided. Check --with-site-prefixes." >&2; exit 1; }
＠＠ -22253,8 +22215,8 ＠＠
esac
xpm_problem=""
if test -z "$with_xpm"; then
- 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
+ CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
+ LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
echo "$as_me:$LINENO: checking for Xpm - no older than 3.4f" >&5
echo $ECHO_N "checking for Xpm - no older than 3.4f... $ECHO_C" >&6
xe_check_libs=-lXpm
＠＠ -22326,9 +22288,9 ＠＠
#define HAVE_XPM 1
_ACEOF
- LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
- 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
+ LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
+ libs_x="-lXpm $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXpm\" to \$libs_x"; fi
+ CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
echo "$as_me:$LINENO: checking for \"FOR_MSW\" xpm" >&5
echo $ECHO_N "checking for \"FOR_MSW\" xpm... $ECHO_C" >&6
xe_check_libs=-lXpm
＠＠ -22609,7 +22571,7 ＠＠
#define HAVE_XFACE 1
_ACEOF
- libs_x="-lcompface $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lcompface\" to \$libs_x"; fi
+ libs_x="-lcompface $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lcompface\" to \$libs_x"; fi
fi
if test "$with_gif" != "no"; then
＠＠ -22754,7 +22716,7 ＠＠
echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflate" >&5
echo "${ECHO_T}$ac_cv_lib_z_inflate" >&6
if test $ac_cv_lib_z_inflate = yes; then
- libs_x="-lz $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lz\" to \$libs_x"; fi
+ libs_x="-lz $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lz\" to \$libs_x"; fi
else
echo "$as_me:$LINENO: checking for inflate in -lgz" >&5
＠＠ -22822,7 +22784,7 ＠＠
echo "$as_me:$LINENO: result: $ac_cv_lib_gz_inflate" >&5
echo "${ECHO_T}$ac_cv_lib_gz_inflate" >&6
if test $ac_cv_lib_gz_inflate = yes; then
- libs_x="-lgz $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lgz\" to \$libs_x"; fi
+ libs_x="-lgz $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lgz\" to \$libs_x"; fi
fi
fi
＠＠ -23051,7 +23013,7 ＠＠
#define HAVE_JPEG 1
_ACEOF
- libs_x="-ljpeg $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-ljpeg\" to \$libs_x"; fi
+ libs_x="-ljpeg $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-ljpeg\" to \$libs_x"; fi
fi
png_problem=""
＠＠ -23434,7 +23396,7 ＠＠
#define HAVE_PNG 1
_ACEOF
- libs_x="-lpng $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lpng\" to \$libs_x"; fi
+ libs_x="-lpng $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lpng\" to \$libs_x"; fi
fi
test -z "$with_tiff" && { if test "${ac_cv_header_tiffio_h+set}" = set; then
＠＠ -23657,7 +23619,7 ＠＠
#define HAVE_TIFF 1
_ACEOF
- libs_x="-ltiff $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-ltiff\" to \$libs_x"; fi
+ libs_x="-ltiff $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-ltiff\" to \$libs_x"; fi
fi
fi
＠＠ -23883,7 +23845,7 ＠＠
#define HAVE_XFACE 1
_ACEOF
- libs_gtk="-lcompface $libs_gtk" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lcompface\" to \$libs_gtk"; fi
+ libs_gtk="-lcompface $libs_gtk" && if test "$verbose" = "yes"; then echo " Prepending \"-lcompface\" to \$libs_gtk"; fi
fi
fi
＠＠ -24498,25 +24460,23 ＠＠
else
as_ac_Header=`echo "ac_cv_header_X11/$athena_variant/XawInit.h" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for X11/$athena_variant/XawInit.h" >&5
+echo "$as_me:$LINENO: checking for X11/$athena_variant/XawInit.h" >&5
echo $ECHO_N "checking for X11/$athena_variant/XawInit.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking X11/$athena_variant/XawInit.h usability" >&5
-echo $ECHO_N "checking X11/$athena_variant/XawInit.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
+
+#if HAVE_X11_XFUNCPROTO_H
+#include <X11/Xfuncproto.h>
+#endif
+
+
#include <X11/$athena_variant/XawInit.h>
_ACEOF
rm -f conftest.$ac_objext
＠＠ -24541,100 +24501,17 ＠＠
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_header_compiler=yes
+ eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+eval "$as_ac_Header=no"
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking X11/$athena_variant/XawInit.h presence" >&5
-echo $ECHO_N "checking X11/$athena_variant/XawInit.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <X11/$athena_variant/XawInit.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: X11/$athena_variant/XawInit.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: X11/$athena_variant/XawInit.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: X11/$athena_variant/XawInit.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: X11/$athena_variant/XawInit.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: X11/$athena_variant/XawInit.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: X11/$athena_variant/XawInit.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: X11/$athena_variant/XawInit.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: X11/$athena_variant/XawInit.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: X11/$athena_variant/XawInit.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: X11/$athena_variant/XawInit.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: X11/$athena_variant/XawInit.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: X11/$athena_variant/XawInit.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: X11/$athena_variant/XawInit.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: X11/$athena_variant/XawInit.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: X11/$athena_variant/XawInit.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: X11/$athena_variant/XawInit.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for X11/$athena_variant/XawInit.h" >&5
-echo $ECHO_N "checking for X11/$athena_variant/XawInit.h... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
as_ac_Header=`echo "ac_cv_header_X11/$athena_variant/ThreeD.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
＠＠ -24785,25 +24662,23 ＠＠
if test -z "$athena_h_path"; then
as_ac_Header=`echo "ac_cv_header_$athena_variant/XawInit.h" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $athena_variant/XawInit.h" >&5
+echo "$as_me:$LINENO: checking for $athena_variant/XawInit.h" >&5
echo $ECHO_N "checking for $athena_variant/XawInit.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $athena_variant/XawInit.h usability" >&5
-echo $ECHO_N "checking $athena_variant/XawInit.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
+
+#if HAVE_X11_XFUNCPROTO_H
+#include <X11/Xfuncproto.h>
+#endif
+
+
#include <$athena_variant/XawInit.h>
_ACEOF
rm -f conftest.$ac_objext
＠＠ -24828,100 +24703,17 ＠＠
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_header_compiler=yes
+ eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+eval "$as_ac_Header=no"
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $athena_variant/XawInit.h presence" >&5
-echo $ECHO_N "checking $athena_variant/XawInit.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$athena_variant/XawInit.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $athena_variant/XawInit.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $athena_variant/XawInit.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $athena_variant/XawInit.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $athena_variant/XawInit.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $athena_variant/XawInit.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $athena_variant/XawInit.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $athena_variant/XawInit.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $athena_variant/XawInit.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $athena_variant/XawInit.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $athena_variant/XawInit.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $athena_variant/XawInit.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $athena_variant/XawInit.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $athena_variant/XawInit.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $athena_variant/XawInit.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $athena_variant/XawInit.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $athena_variant/XawInit.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $athena_variant/XawInit.h" >&5
-echo $ECHO_N "checking for $athena_variant/XawInit.h... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
as_ac_Header=`echo "ac_cv_header_$athena_variant/ThreeD.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
＠＠ -25072,25 +24864,23 ＠＠
fi
if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
- if test "${ac_cv_header_X11_Xaw3d_XawInit_h+set}" = set; then
- echo "$as_me:$LINENO: checking for X11/Xaw3d/XawInit.h" >&5
+ echo "$as_me:$LINENO: checking for X11/Xaw3d/XawInit.h" >&5
echo $ECHO_N "checking for X11/Xaw3d/XawInit.h... $ECHO_C" >&6
if test "${ac_cv_header_X11_Xaw3d_XawInit_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw3d_XawInit_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_Xaw3d_XawInit_h" >&6
else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking X11/Xaw3d/XawInit.h usability" >&5
-echo $ECHO_N "checking X11/Xaw3d/XawInit.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
+
+#if HAVE_X11_XFUNCPROTO_H
+#include <X11/Xfuncproto.h>
+#endif
+
+
#include <X11/Xaw3d/XawInit.h>
_ACEOF
rm -f conftest.$ac_objext
＠＠ -25115,100 +24905,17 ＠＠
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_header_compiler=yes
+ ac_cv_header_X11_Xaw3d_XawInit_h=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ac_cv_header_X11_Xaw3d_XawInit_h=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking X11/Xaw3d/XawInit.h presence" >&5
-echo $ECHO_N "checking X11/Xaw3d/XawInit.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <X11/Xaw3d/XawInit.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: X11/Xaw3d/XawInit.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: X11/Xaw3d/XawInit.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: X11/Xaw3d/XawInit.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: X11/Xaw3d/XawInit.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: X11/Xaw3d/XawInit.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: X11/Xaw3d/XawInit.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: X11/Xaw3d/XawInit.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: X11/Xaw3d/XawInit.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: X11/Xaw3d/XawInit.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: X11/Xaw3d/XawInit.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: X11/Xaw3d/XawInit.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: X11/Xaw3d/XawInit.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: X11/Xaw3d/XawInit.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: X11/Xaw3d/XawInit.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: X11/Xaw3d/XawInit.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: X11/Xaw3d/XawInit.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for X11/Xaw3d/XawInit.h" >&5
-echo $ECHO_N "checking for X11/Xaw3d/XawInit.h... $ECHO_C" >&6
-if test "${ac_cv_header_X11_Xaw3d_XawInit_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_X11_Xaw3d_XawInit_h=$ac_header_preproc
-fi
echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw3d_XawInit_h" >&5
echo "${ECHO_T}$ac_cv_header_X11_Xaw3d_XawInit_h" >&6
-
-fi
if test $ac_cv_header_X11_Xaw3d_XawInit_h = yes; then
if test "${ac_cv_header_X11_Xaw3d_ThreeD_h+set}" = set; then
echo "$as_me:$LINENO: checking for X11/Xaw3d/ThreeD.h" >&5
＠＠ -25362,25 +25069,23 ＠＠
fi
if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
- if test "${ac_cv_header_Xaw3d_XawInit_h+set}" = set; then
- echo "$as_me:$LINENO: checking for Xaw3d/XawInit.h" >&5
+ echo "$as_me:$LINENO: checking for Xaw3d/XawInit.h" >&5
echo $ECHO_N "checking for Xaw3d/XawInit.h... $ECHO_C" >&6
if test "${ac_cv_header_Xaw3d_XawInit_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_Xaw3d_XawInit_h" >&5
-echo "${ECHO_T}$ac_cv_header_Xaw3d_XawInit_h" >&6
else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking Xaw3d/XawInit.h usability" >&5
-echo $ECHO_N "checking Xaw3d/XawInit.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
+
+#if HAVE_X11_XFUNCPROTO_H
+#include <X11/Xfuncproto.h>
+#endif
+
+
#include <Xaw3d/XawInit.h>
_ACEOF
rm -f conftest.$ac_objext
＠＠ -25405,100 +25110,17 ＠＠
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_header_compiler=yes
+ ac_cv_header_Xaw3d_XawInit_h=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+ac_cv_header_Xaw3d_XawInit_h=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking Xaw3d/XawInit.h presence" >&5
-echo $ECHO_N "checking Xaw3d/XawInit.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <Xaw3d/XawInit.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: Xaw3d/XawInit.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: Xaw3d/XawInit.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: Xaw3d/XawInit.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: Xaw3d/XawInit.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: Xaw3d/XawInit.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: Xaw3d/XawInit.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: Xaw3d/XawInit.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: Xaw3d/XawInit.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: Xaw3d/XawInit.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: Xaw3d/XawInit.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: Xaw3d/XawInit.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: Xaw3d/XawInit.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: Xaw3d/XawInit.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: Xaw3d/XawInit.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: Xaw3d/XawInit.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: Xaw3d/XawInit.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for Xaw3d/XawInit.h" >&5
-echo $ECHO_N "checking for Xaw3d/XawInit.h... $ECHO_C" >&6
-if test "${ac_cv_header_Xaw3d_XawInit_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_Xaw3d_XawInit_h=$ac_header_preproc
-fi
echo "$as_me:$LINENO: result: $ac_cv_header_Xaw3d_XawInit_h" >&5
echo "${ECHO_T}$ac_cv_header_Xaw3d_XawInit_h" >&6
-
-fi
if test $ac_cv_header_Xaw3d_XawInit_h = yes; then
if test "${ac_cv_header_Xaw3d_ThreeD_h+set}" = set; then
echo "$as_me:$LINENO: checking for Xaw3d/ThreeD.h" >&5
＠＠ -26107,9 +25729,9 ＠＠
{ echo "Error:" "Could not find a suitable Athena library to build with." >&2; exit 1; }
fi
- lwlib_objs="$lwlib_objs lwlib-Xaw.o" && if test "$extra_verbose" = "yes"; then echo " Appending \"lwlib-Xaw.o\" to \$lwlib_objs"; fi
+ lwlib_objs="$lwlib_objs lwlib-Xaw.o" && if test "$verbose" = "yes"; then echo " Appending \"lwlib-Xaw.o\" to \$lwlib_objs"; fi
- libs_x="-l$athena_lib $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-l$athena_lib\" to \$libs_x"; fi
+ libs_x="-l$athena_lib $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-l$athena_lib\" to \$libs_x"; fi
cat >>confdefs.h <<_ACEOF
#define ATHENA_Scrollbar_h_ "$athena_h_path/Scrollbar.h"
＠＠ -26180,24 +25802,24 ＠＠
#define NEED_MOTIF 1
_ACEOF
- lwlib_objs="$lwlib_objs lwlib-Xm.o" && if test "$extra_verbose" = "yes"; then echo " Appending \"lwlib-Xm.o\" to \$lwlib_objs"; fi
+ lwlib_objs="$lwlib_objs lwlib-Xm.o" && if test "$verbose" = "yes"; then echo " Appending \"lwlib-Xm.o\" to \$lwlib_objs"; fi
need_motif=yes ;;
esac
-test "$enable_menubars" = "lucid" && lwlib_objs="$lwlib_objs xlwmenu.o" && if test "$extra_verbose" = "yes"; then echo " Appending \"xlwmenu.o\" to \$lwlib_objs"; fi
-test "$enable_menubars" = "motif" && lwlib_objs="$lwlib_objs xlwmenu.o" && if test "$extra_verbose" = "yes"; then echo " Appending \"xlwmenu.o\" to \$lwlib_objs"; fi
-test "$enable_scrollbars" = "lucid" && lwlib_objs="$lwlib_objs xlwscrollbar.o" && if test "$extra_verbose" = "yes"; then echo " Appending \"xlwscrollbar.o\" to \$lwlib_objs"; fi
+test "$enable_menubars" = "lucid" && lwlib_objs="$lwlib_objs xlwmenu.o" && if test "$verbose" = "yes"; then echo " Appending \"xlwmenu.o\" to \$lwlib_objs"; fi
+test "$enable_menubars" = "motif" && lwlib_objs="$lwlib_objs xlwmenu.o" && if test "$verbose" = "yes"; then echo " Appending \"xlwmenu.o\" to \$lwlib_objs"; fi
+test "$enable_scrollbars" = "lucid" && lwlib_objs="$lwlib_objs xlwscrollbar.o" && if test "$verbose" = "yes"; then echo " Appending \"xlwscrollbar.o\" to \$lwlib_objs"; fi
test "$enable_widgets" != "no" && test "$enable_widgets" != "msw" && \
- lwlib_objs="$lwlib_objs xlwtabs.o xlwgcs.o" && if test "$extra_verbose" = "yes"; then echo " Appending \"xlwtabs.o xlwgcs.o\" to \$lwlib_objs"; fi
+ lwlib_objs="$lwlib_objs xlwtabs.o xlwgcs.o" && if test "$verbose" = "yes"; then echo " Appending \"xlwtabs.o xlwgcs.o\" to \$lwlib_objs"; fi
case "$enable_widgets" in athena* )
- lwlib_objs="$lwlib_objs xlwradio.o xlwcheckbox.o xlwgauge.o" && if test "$extra_verbose" = "yes"; then echo " Appending \"xlwradio.o xlwcheckbox.o xlwgauge.o\" to \$lwlib_objs"; fi;;
+ lwlib_objs="$lwlib_objs xlwradio.o xlwcheckbox.o xlwgauge.o" && if test "$verbose" = "yes"; then echo " Appending \"xlwradio.o xlwcheckbox.o xlwgauge.o\" to \$lwlib_objs"; fi;;
esac
case "$all_widgets" in *lucid* )
cat >>confdefs.h <<\_ACEOF
#define NEED_LUCID 1
_ACEOF
- lwlib_objs="$lwlib_objs lwlib-Xlw.o" && if test "$extra_verbose" = "yes"; then echo " Appending \"lwlib-Xlw.o\" to \$lwlib_objs"; fi ;;
+ lwlib_objs="$lwlib_objs lwlib-Xlw.o" && if test "$verbose" = "yes"; then echo " Appending \"lwlib-Xlw.o\" to \$lwlib_objs"; fi ;;
esac
＠＠ -26692,7 +26314,7 ＠＠
#define XIM_XLIB 1
_ACEOF
- extra_objs="$extra_objs input-method-xlib.o" && if test "$extra_verbose" = "yes"; then
+ extra_objs="$extra_objs input-method-xlib.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"input-method-xlib.o\""
fi
fi
＠＠ -26702,7 +26324,7 ＠＠
_ACEOF
need_motif=yes
- extra_objs="$extra_objs input-method-motif.o" && if test "$extra_verbose" = "yes"; then
+ extra_objs="$extra_objs input-method-motif.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"input-method-motif.o\""
fi
fi
＠＠ -26790,7 +26412,7 ＠＠
_ACEOF
if test "$with_xim" = "no" ; then
- extra_objs="$extra_objs input-method-xlib.o" && if test "$extra_verbose" = "yes"; then
+ extra_objs="$extra_objs input-method-xlib.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"input-method-xlib.o\""
fi
fi
＠＠ -27548,7 +27170,7 ＠＠
#define HAVE_WNN 1
_ACEOF
- libs_x="-l$libwnn $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-l$libwnn\" to \$libs_x"; fi
+ libs_x="-l$libwnn $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-l$libwnn\" to \$libs_x"; fi
if test "$with_wnn6" != "no"; then
as_ac_Lib=`echo "ac_cv_lib_$libwnn''_jl_fi_dic_list" | $as_tr_sh`
echo "$as_me:$LINENO: checking for jl_fi_dic_list in -l$libwnn" >&5
＠＠ -28213,7 +27835,7 ＠＠
#define HAVE_CANNA 1
_ACEOF
- libs_x="-lcanna -lRKC $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lcanna -lRKC\" to \$libs_x"; fi
+ libs_x="-lcanna -lRKC $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lcanna -lRKC\" to \$libs_x"; fi
fi
else for feature in xim canna wnn; do
＠＠ -28226,7 +27848,7 ＠＠
fi
if test "$need_motif" = "yes" ; then
- libs_x="-lXm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi
+ libs_x="-lXm $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi
echo "$as_me:$LINENO: checking for layout_object_getvalue in -li18n" >&5
echo $ECHO_N "checking for layout_object_getvalue in -li18n... $ECHO_C" >&6
if test "${ac_cv_lib_i18n_layout_object_getvalue+set}" = set; then
＠＠ -28292,7 +27914,7 ＠＠
echo "$as_me:$LINENO: result: $ac_cv_lib_i18n_layout_object_getvalue" >&5
echo "${ECHO_T}$ac_cv_lib_i18n_layout_object_getvalue" >&6
if test $ac_cv_lib_i18n_layout_object_getvalue = yes; then
- libs_x="-li18n $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-li18n\" to \$libs_x"; fi
+ libs_x="-li18n $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-li18n\" to \$libs_x"; fi
fi
＠＠ -28352,7 +27974,7 ＠＠
shift
done
fi
- test "$extra_verbose" = "yes" && echo "Setting runpath to $runpath"
+ test "$verbose" = "yes" && echo "Setting runpath to $runpath"
fi
fi
＠＠ -28953,7 +28575,7 ＠＠
done
- test "$need_libutil" = "yes" && libs_system="$libs_system -lutil" && if test "$extra_verbose" = "yes"; then echo " Appending \"-lutil\" to \$libs_system"; fi
+ test "$need_libutil" = "yes" && libs_system="$libs_system -lutil" && if test "$verbose" = "yes"; then echo " Appending \"-lutil\" to \$libs_system"; fi
fi
case "$opsys" in
＠＠ -30069,7 +29691,7 ＠＠
done
else
- extra_objs="$extra_objs getloadavg.o" && if test "$extra_verbose" = "yes"; then
+ extra_objs="$extra_objs getloadavg.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"getloadavg.o\""
fi
＠＠ -30712,7 +30334,7 ＠＠
;;
esac
-test "$ac_cv_c_inline" != "no" -a "$GCC" = "yes" && extra_objs="$extra_objs inline.o" && if test "$extra_verbose" = "yes"; then
+test "$ac_cv_c_inline" != "no" -a "$GCC" = "yes" && extra_objs="$extra_objs inline.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"inline.o\""
fi
＠＠ -31177,7 +30799,7 ＠＠
fi
- test -n "$ALLOCA" && extra_objs="$extra_objs $ALLOCA" && if test "$extra_verbose" = "yes"; then
+ test -n "$ALLOCA" && extra_objs="$extra_objs $ALLOCA" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"$ALLOCA\""
fi
fi
＠＠ -33323,8 +32945,8 ＠＠
-{ echo "$as_me:$LINENO: checking \"for sound support\"..." >&5
-echo "$as_me: checking \"for sound support\"..." >&6;}
+{ echo "$as_me:$LINENO: checking for sound support..." >&5
+echo "$as_me: checking for sound support..." >&6;}
test -n "$with_native_sound_lib" && enable_sound_native=yes
if test "$enable_sound_native" != "no"; then
＠＠ -33468,7 +33090,7 ＠＠
fi
if test $ac_cv_header_multimedia_audio_device_h = yes; then
sound_found=yes sound_cflags=""
- extra_objs="$extra_objs sunplay.o" && if test "$extra_verbose" = "yes"; then
+ extra_objs="$extra_objs sunplay.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"sunplay.o\""
fi
fi
＠＠ -33495,7 +33117,7 ＠＠
with_native_sound_lib="$sun_sound_lib"
sound_cflags="$sun_sound_cflags"
sound_found=yes
- extra_objs="$extra_objs sunplay.o" && if test "$extra_verbose" = "yes"; then
+ extra_objs="$extra_objs sunplay.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"sunplay.o\""
fi
fi
＠＠ -33576,7 +33198,7 ＠＠
fi
if test -n "$with_native_sound_lib"; then
sound_found=yes sound_cflags=""
- extra_objs="$extra_objs sgiplay.o" && if test "$extra_verbose" = "yes"; then
+ extra_objs="$extra_objs sgiplay.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"sgiplay.o\""
fi
fi ;;
＠＠ -33653,7 +33275,7 ＠＠
fi
if test -n "$with_native_sound_lib"; then
sound_found=yes
- extra_objs="$extra_objs hpplay.o" && if test "$extra_verbose" = "yes"; then
+ extra_objs="$extra_objs hpplay.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"hpplay.o\""
fi
if test "$GCC" = "yes" # Kludge city
＠＠ -33668,7 +33290,7 ＠＠
if test "$with_msw" = "yes"; then
sound_found=yes
with_native_sound_lib=
- extra_objs="$extra_objs ntplay.o" && if test "$extra_verbose" = "yes"; then
+ extra_objs="$extra_objs ntplay.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"ntplay.o\""
fi
fi
＠＠ -33903,7 +33525,7 ＠＠
if test "$sound_found" = "yes"; then
need_miscplay=yes
- extra_objs="$extra_objs linuxplay.o" && if test "$extra_verbose" = "yes"; then
+ extra_objs="$extra_objs linuxplay.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"linuxplay.o\""
fi
cat >>confdefs.h <<_ACEOF
＠＠ -33929,7 +33551,7 ＠＠
#define HAVE_NATIVE_SOUND 1
_ACEOF
- test -n "$with_native_sound_lib" && LIBS="$with_native_sound_lib $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"$with_native_sound_lib\" to \$LIBS"; fi
+ test -n "$with_native_sound_lib" && LIBS="$with_native_sound_lib $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"$with_native_sound_lib\" to \$LIBS"; fi
fi
if test "$enable_sound_nas" != "no"; then
＠＠ -34149,10 +33771,10 ＠＠
#define HAVE_NAS_SOUND 1
_ACEOF
- extra_objs="$extra_objs nas.o" && if test "$extra_verbose" = "yes"; then
+ extra_objs="$extra_objs nas.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"nas.o\""
fi
- libs_x="-laudio $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi
+ libs_x="-laudio $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
＠＠ -34219,8 +33841,8 ＠＠
if test "$have_esd_config" = "yes"; then
save_c_switch_site="$c_switch_site" save_LIBS="$LIBS"
- 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
+ c_switch_site="$c_switch_site `esd-config --cflags`" && if test "$verbose" = "yes"; then echo " Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi
+ LIBS="`esd-config --libs` $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"`esd-config --libs`\" to \$LIBS"; fi
echo "$as_me:$LINENO: checking for esd_play_stream" >&5
echo $ECHO_N "checking for esd_play_stream... $ECHO_C" >&6
if test "${ac_cv_func_esd_play_stream+set}" = set; then
＠＠ -34322,7 +33944,7 ＠＠
if test "$have_esd_sound" = "yes"; then
enable_sound_esd=yes
need_miscplay=yes
- extra_objs="$extra_objs esd.o" && if test "$extra_verbose" = "yes"; then
+ extra_objs="$extra_objs esd.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"esd.o\""
fi
cat >>confdefs.h <<\_ACEOF
＠＠ -34336,7 +33958,7 ＠＠
fi
fi
-test "$need_miscplay" = "yes" && extra_objs="$extra_objs miscplay.o" && if test "$extra_verbose" = "yes"; then
+test "$need_miscplay" = "yes" && extra_objs="$extra_objs miscplay.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"miscplay.o\""
fi
＠＠ -34712,10 +34334,10 ＠＠
fi
- extra_objs="$extra_objs terminfo.o" && if test "$extra_verbose" = "yes"; then
+ extra_objs="$extra_objs terminfo.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"terminfo.o\""
fi
- LIBS="-lncurses $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lncurses\" to \$LIBS"; fi
+ LIBS="-lncurses $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-lncurses\" to \$LIBS"; fi
if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then
save_c_switch_site="$c_switch_site"
＠＠ -34869,11 +34491,11 ＠＠
fi
fi
else if test "$have_terminfo" = "yes"; then
- extra_objs="$extra_objs terminfo.o" && if test "$extra_verbose" = "yes"; then
+ extra_objs="$extra_objs terminfo.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"terminfo.o\""
fi
if test -n "$libs_termcap"; then
- LIBS="$libs_termcap $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"$libs_termcap\" to \$LIBS"; fi
+ LIBS="$libs_termcap $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"$libs_termcap\" to \$LIBS"; fi
else
for lib in curses termlib termcap; do
as_ac_Lib=`echo "ac_cv_lib_$lib''_tgetent" | $as_tr_sh`
＠＠ -34942,17 +34564,17 ＠＠
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- LIBS="-l${lib} $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-l${lib}\" to \$LIBS"; fi; break
+ LIBS="-l${lib} $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-l${lib}\" to \$LIBS"; fi; break
fi
done
fi
- else extra_objs="$extra_objs tparam.o" && if test "$extra_verbose" = "yes"; then
+ else extra_objs="$extra_objs tparam.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"tparam.o\""
fi
case "$opsys" in *-hp-hpux* ) libs_termcap="-ltermcap" ;; esac
if test -n "$libs_termcap"; then
- LIBS="$libs_termcap $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"$libs_termcap\" to \$LIBS"; fi
+ LIBS="$libs_termcap $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"$libs_termcap\" to \$LIBS"; fi
else
echo "$as_me:$LINENO: checking for tgetent in -lcurses" >&5
echo $ECHO_N "checking for tgetent in -lcurses... $ECHO_C" >&6
＠＠ -35019,7 +34641,7 ＠＠
echo "$as_me:$LINENO: result: $ac_cv_lib_curses_tgetent" >&5
echo "${ECHO_T}$ac_cv_lib_curses_tgetent" >&6
if test $ac_cv_lib_curses_tgetent = yes; then
- LIBS="-lcurses $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lcurses\" to \$LIBS"; fi
+ LIBS="-lcurses $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-lcurses\" to \$LIBS"; fi
else
echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6
＠＠ -35086,9 +34708,9 ＠＠
echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5
echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6
if test $ac_cv_lib_termcap_tgetent = yes; then
- LIBS="-ltermcap $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-ltermcap\" to \$LIBS"; fi
+ LIBS="-ltermcap $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-ltermcap\" to \$LIBS"; fi
else
- extra_objs="$extra_objs termcap.o" && if test "$extra_verbose" = "yes"; then
+ extra_objs="$extra_objs termcap.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"termcap.o\""
fi
fi
＠＠ -35324,7 +34946,7 ＠＠
#define HAVE_GPM 1
_ACEOF
- LIBS="-lgpm $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lgpm\" to \$LIBS"; fi
+ LIBS="-lgpm $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-lgpm\" to \$LIBS"; fi
elif test "$with_gpm" = "yes"; then
{ echo "Error:" "GPM requested, but gpm.h or libgpm seems to be missing." >&2; exit 1; }
else
＠＠ -35746,7 +35368,7 ＠＠
fi
-test -n "$libdbm" && LIBS=""$libdbm" $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$libdbm"\" to \$LIBS"; fi
+test -n "$libdbm" && LIBS=""$libdbm" $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \""$libdbm"\" to \$LIBS"; fi
test "$enable_database_gdbm" = "yes" -o \
"$enable_database_dbm" = "yes" && \
cat >>confdefs.h <<\_ACEOF
＠＠ -36150,7 +35772,7 ＠＠
#define HAVE_BERKELEY_DB 1
_ACEOF
- test "$need_libdb" = "yes" && LIBS="-ldb $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-ldb\" to \$LIBS"; fi
+ test "$need_libdb" = "yes" && LIBS="-ldb $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-ldb\" to \$LIBS"; fi
else enable_database_berkdb=no
fi
fi
＠＠ -36249,7 +35871,7 ＠＠
#define USAGE_TRACKING 1
_ACEOF
- LIBS="-Bstatic -lut -Bdynamic $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-Bstatic -lut -Bdynamic\" to \$LIBS"; fi
+ LIBS="-Bstatic -lut -Bdynamic $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-Bstatic -lut -Bdynamic\" to \$LIBS"; fi
fi
if test "$enable_bignum" = "gmp"; then
＠＠ -36472,7 +36094,7 ＠＠
#define WITH_GMP 1
_ACEOF
- LIBS="-lgmp $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lgmp\" to \$LIBS"; fi
+ LIBS="-lgmp $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-lgmp\" to \$LIBS"; fi
else
{ echo "Error:" "Required GMP numeric support cannot be provided." >&2; exit 1; }
fi
＠＠ -36764,9 +36386,9 ＠＠
#define MP_PREFIX 1
_ACEOF
- LIBS="$LIBS -lmp" && if test "$extra_verbose" = "yes"; then echo " Appending \"-lmp\" to \$LIBS"; fi
+ LIBS="$LIBS -lmp" && if test "$verbose" = "yes"; then echo " Appending \"-lmp\" to \$LIBS"; fi
if test "$library" != ""; then
- LIBS="$LIBS $library" && if test "$extra_verbose" = "yes"; then echo " Appending \"$library\" to \$LIBS"; fi
+ LIBS="$LIBS $library" && if test "$verbose" = "yes"; then echo " Appending \"$library\" to \$LIBS"; fi
fi
echo "$as_me:$LINENO: checking for mp_move" >&5
echo $ECHO_N "checking for mp_move... $ECHO_C" >&6
＠＠ -36866,9 +36488,9 ＠＠
fi
elif test "$have_mfree" = "yes"; then
- LIBS="$LIBS -lmp" && if test "$extra_verbose" = "yes"; then echo " Appending \"-lmp\" to \$LIBS"; fi
+ LIBS="$LIBS -lmp" && if test "$verbose" = "yes"; then echo " Appending \"-lmp\" to \$LIBS"; fi
if test "$library" != ""; then
- LIBS="$LIBS $library" && if test "$extra_verbose" = "yes"; then echo " Appending \"$library\" to \$LIBS"; fi
+ LIBS="$LIBS $library" && if test "$verbose" = "yes"; then echo " Appending \"$library\" to \$LIBS"; fi
fi
echo "$as_me:$LINENO: checking for move" >&5
echo $ECHO_N "checking for move... $ECHO_C" >&6
＠＠ -37108,7 +36730,7 ＠＠
if test "$enable_modules" = "no"; then
- MAKE_SUBDIR="$MAKE_SUBDIR src" && if test "$extra_verbose" = "yes"; then echo " Appending \"src\" to \$MAKE_SUBDIR"; fi
+ MAKE_SUBDIR="$MAKE_SUBDIR src" && if test "$verbose" = "yes"; then echo " Appending \"src\" to \$MAKE_SUBDIR"; fi
fi
＠＠ -37152,7 +36774,7 ＠＠
done
fi
-if test "$extra_verbose" = "yes"; then
+if test "$verbose" = "yes"; then
echo ""
for var in extra_objs c_switch_general c_switch_window_system c_switch_all ld_switch_general ld_switch_window_system ld_switch_all ld_libs_general ld_libs_window_system ld_libs_all; do eval "echo \"$var = '\$$var'\""; done
echo ""
＠＠ -37160,23 +36782,23 ＠＠
if test -f "$srcdir/src/.gdbinit" -a ! -f "src/.gdbinit"; then
- test "$extra_verbose" = "yes" && echo "creating src/.gdbinit"
+ test "$verbose" = "yes" && echo "creating src/.gdbinit"
echo "source $srcdir/src/.gdbinit" > "src/.gdbinit"
fi
if test -f "$srcdir/src/.dbxrc" -a ! -f "src/.dbxrc"; then
- test "$extra_verbose" = "yes" && echo "creating src/.dbxrc"
+ test "$verbose" = "yes" && echo "creating src/.dbxrc"
echo ". $srcdir/src/.dbxrc" > "src/.dbxrc"
fi
if test -f "$srcdir/TAGS" -a ! -f "TAGS"; then
- test "$extra_verbose" = "yes" && echo "creating TAGS"
+ test "$verbose" = "yes" && echo "creating TAGS"
echo "
$srcdir/TAGS,include" > "TAGS"
fi
if test "$__SUNPRO_C" = "yes"; then
- test "$extra_verbose" = "yes" && echo "creating .sbinit"
+ test "$verbose" = "yes" && echo "creating .sbinit"
( echo "# For use with Sun WorkShop's Source browser."
echo "# See sbquery(1) and sbinit(4) for more information"
for dir in $MAKE_SUBDIR; do echo "import $dir"; done
＠＠ -37529,6 +37151,12 ＠＠
XEmacs ${emacs_major_version}.${emacs_minor_version}${xemacs_betaname} \"$xemacs_codename\" $xemacs_extra_name configured for \`$ac_cv_build'.
"
+echo " WARNING: --------------------------------------------------------------"
+echo " WARNING: This was produced from a new autoconf-2.5 based configuration."
+echo " WARNING: If this configuration seems buggy then copy etc/configure-21.3"
+echo " WARNING: to configure and try again. Also please report the bug."
+echo " WARNING: --------------------------------------------------------------"
+
echo "
Compilation Environment and Installation Defaults:"
echo " Source code location: $srcdir"
1.1.14.8 +111 -85 XEmacs/xemacs/configure.ac
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.1.14.7
retrieving revision 1.1.14.8
diff -u -r1.1.14.7 -r1.1.14.8
--- configure.ac 2005/02/22 10:17:07 1.1.14.7
+++ configure.ac 2005/03/04 13:34:18 1.1.14.8
＠＠ -98,32 +98,32 ＠＠
define([PRINT_VAR],[for var in patsubst([$1],[[
]+],[ ]); do eval "echo \"$var = '\$$var'\""; done])
-dnl XE_ADD_OBJS(foo.o ...)
+dnl XE_ADD_OBJS(foo.o)
define([XE_ADD_OBJS],
[extra_objs="$extra_objs [$1]" && dnl
- if test "$extra_verbose" = "yes"; then
+ if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"[$1]\""
fi])dnl XE_ADD_OBJS
dnl XE_APPEND(value, varname)
define([XE_APPEND],
[[$2]="$[$2] [$1]" && dnl
- if test "$extra_verbose" = "yes"; then echo " Appending \"[$1]\" to \$[$2]"; fi])
+ if test "$verbose" = "yes"; then echo " Appending \"[$1]\" to \$[$2]"; fi])
dnl XE_PREPEND(value, varname)
define([XE_PREPEND],
[[$2]="[$1] $[$2]" && dnl
- if test "$extra_verbose" = "yes"; then echo " Prepending \"[$1]\" to \$[$2]"; fi])
+ if test "$verbose" = "yes"; then echo " Prepending \"[$1]\" to \$[$2]"; fi])
dnl XE_DIE(message)
define([XE_DIE], [{ echo "Error:" $1 >&2; exit 1; }])
dnl XE_CHECK_FEATURE_DEPENDENCY(feature1, feature2)
define([XE_CHECK_FEATURE_DEPENDENCY],
-[if test "$with_$1 $with_$2" = "yes no"; then
- USAGE_ERROR("--with-$1 requires --with-$2")
-elif test "$with_$2" = "no" ; then with_$1=no
-elif test "$with_$1" = "yes"; then with_$2=yes
+[if test "$with_[$1] $with_[$2]" = "yes no"; then
+ USAGE_ERROR("--with-[$1] requires --with-[$2]")
+elif test "$with_[$2]" = "no" ; then with_[$1]=no
+elif test "$with_[$1]" = "yes"; then with_[$2]=yes
fi
])
＠＠ -213,7 +213,7 ＠＠
if test -n "$runpath"; then
ld_switch_run="${dash_r}${runpath}"
XE_PROTECT_LINKER_FLAGS(ld_switch_run)
- test "$extra_verbose" = "yes" && echo "Setting runpath to $runpath"
+ test "$verbose" = "yes" && echo "Setting runpath to $runpath"
fi
fi
])dnl
＠＠ -247,16 +247,16 ＠＠
dnl found then an error is generated.
dnl
define([XE_PARSE_KEYWORD_OPTION],
-[[$1]_bogus=yes
+[_[$1]_bogus=yes
for x in XE_KEYWORD_LIST ; do
if test $x = $[$1] ; then
- [$1]_bogus=no
+ _[$1]_bogus=no
fi
done
- if test "$[$1]_bogus" = "yes" ; then
+ if test "$_[$1]_bogus" = "yes" ; then
USAGE_ERROR(["The [$2] option must have one of these values: m4_translit(XE_KEYWORD_VALUES,[:],[,])."])
fi
-unset [$1]_bogus
+unset _[$1]_bogus
undefine([XE_KEYWORD_LIST])dnl
undefine([XE_KEYWORD_VALUES])])
dnl
＠＠ -316,18 +316,16 ＠＠
dnl XE_EXPAND_COMPLEX_OPTION(prefix, component, yesno)
dnl ---------------------------------------------------
dnl
-dnl #### documented as XE_COMPLEX_OPTION_DEFAULT(prefix, component, yesno)
-dnl #### in Malcolm's version?
dnl Internal macro create the option's shell variable containing the default
dnl value and to note the values in an option list.
dnl
define([XE_EXPAND_COMPLEX_OPTION],
[[$1]_[$2]=[$3]
-m4_append([XE_COMPONENT_LIST],[$2],[ ])
+m4_append([XE_COMPONENT_LIST],[$2],[ ])dnl
dnl Separate with a ':' instead of a ',' (see <prefix>_default below) to avoid
dnl confusion with marco parameter lists.
-m4_append([XE_COMPONENT_DEFAULT],[m4_if([$3],no,no)[$2]],[:])
-])
+m4_append([XE_COMPONENT_DEFAULT],[m4_if([$3],no,no)[$2]],[:])dnl
+])dnl
dnl
dnl XE_EXPAND_COMPLEX_OPTIONS(prefix, option_list)
dnl ----------------------------------------------
＠＠ -338,7 +336,7 ＠＠
[m4_if([$2], [[]], [],
[XE_EXPAND_COMPLEX_OPTION([$1], m4_fst($2))[]dnl
XE_EXPAND_COMPLEX_OPTIONS([$1], m4_cdr($2))])])
-
+dnl
dnl XE_INIT_COMPLEX_OPTION(prefix, option_list)
dnl -------------------------------------------
dnl
＠＠ -352,8 +350,8 ＠＠
[[$1]_notfirst=""
dnl
XE_EXPAND_COMPLEX_OPTIONS($＠)
-[$1]_types="XE_COMPONENT_LIST"
-[$1]_default="m4_translit(XE_COMPONENT_DEFAULT,[:],[,])"
+_[$1]_types="XE_COMPONENT_LIST"
+_[$1]_default="m4_translit(XE_COMPONENT_DEFAULT,[:],[,])"
dnl Undefine these macros so that they can be reused by later complex
dnl options.
undefine([XE_COMPONENT_LIST])
＠＠ -368,45 +366,45 ＠＠
dnl
define([XE_PARSE_COMPLEX_OPTION],
[for x in `echo "$[$1]" | sed -e 's/,/ /g'` ; do
- [$1]_all_default=""
- [$1]_found=""
+ _[$1]_all_default=""
+ _[$1]_found=""
case "$x" in
- n | no | non | none ) [$1]_all_default=no ;;
- a | al | all | both ) [$1]_all_default=yes ;;
+ n | no | non | none ) _[$1]_all_default=no ;;
+ a | al | all | both ) _[$1]_all_default=yes ;;
esac
- if test -z "$[$1]_all_default"; then
- for y in $[$1]_types; do
+ if test -z "$_[$1]_all_default"; then
+ for y in $_[$1]_types; do
dnl echo "testing x='$x' against y='$y'"
if test "$x" = "$y"; then
dnl echo "$x" = "$y"
- [$1]_found=yes
+ _[$1]_found=yes
dnl echo eval `echo "[$1]_$y=yes"`
eval "[$1]_$y=yes"
elif test "$x" = "no$y"; then
dnl echo "$x" = "no$y"
- [$1]_found=yes
+ _[$1]_found=yes
dnl echo eval `echo "[$1]_$y=no"`
eval "[$1]_$y=no"
fi
done
- test -z "$[$1]_found" && [$1]_bogus=yes
+ test -z "$_[$1]_found" && _[$1]_bogus=yes
fi
- if test "$[$1]_bogus" = "yes" -o \
- \( -n "$[$1]_all_default" -a -n "$[$1]_notfirst" \) ; then
+ if test "$_[$1]_bogus" = "yes" -o \
+ \( -n "$_[$1]_all_default" -a -n "$_[$1]_notfirst" \) ; then
USAGE_ERROR(["Valid values for the [$2] option are:
-$[$1]_types. With prefix \"no\", switch it off.
+$_[$1]_types. With prefix \"no\", switch it off.
Defaults may be overridden with \`all' or \`none' first in the list.
-Hardcoded default is: $[$1]_default."])
- elif test -n "$[$1]_all_default" ; then
- for y in $[$1]_types; do
- eval "[$1]_$y=$[$1]_all_default"
+Hardcoded default is: $_[$1]_default."])
+ elif test -n "$_[$1]_all_default" ; then
+ for y in $_[$1]_types; do
+ eval "[$1]_$y=$_[$1]_all_default"
done
fi
- [$1]_notfirst=yes
+ _[$1]_notfirst=yes
done
-unset [$1]_bogus [$1]_found [$1]_notfirst [$1]_types
-unset [$1]_default [$1]_all_default x y
+unset _[$1]_bogus _[$1]_found _[$1]_notfirst _[$1]_types
+unset _[$1]_default _[$1]_all_default x y
])
dnl XE_COMPLEX_OPTION(option, yesno)
＠＠ -416,7 +414,7 ＠＠
dnl yes or no or "" (which means maybe).
dnl
define([XE_COMPLEX_OPTION],[[$1,$2]])
-
+dnl
dnl XE_COMPLEX_OPTION_HELP_STRING(flag, long, short, components, libraries)
dnl -----------------------------------------------------------------------
dnl Boilerplate help string for complex options.
＠＠ -426,7 +424,7 ＠＠
[AC_HELP_STRING([$1],[Compile with support for $2. Components that can use
$3 are $4. Prefix component with `no' to disable its use of $3. Requires
$5 support. Default is $6.])])
-
+dnl
dnl XE_COMPLEX_ARG_WITH(PACKAGE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE,
dnl [XE_COMPLEX_OPTION(a,yes), ....])
dnl --------------------------------------------------------------------------
＠＠ -440,7 +438,7 ＠＠
[XE_PARSE_COMPLEX_OPTION([with_]patsubst([$1], -, _), [--with-$1])
$3
],[$4])])
-
+dnl
dnl XE_COMPLEX_ARG_ENABLE(FEATURE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE,
dnl [XE_COMPLEX_OPTION, ....])
dnl --------------------------------------------------------------------------
＠＠ -463,7 +461,7 ＠＠
dnl Command line argument processing.
dnl Note that AC_HELP_STRING compresses whitespace, wraps, and indents the
dnl string to fit the --help display; there's no need to preformat.
-
+dnl
dnl Error-checking on old-style flags
AC_ARG_WITH([mule],[],[XE_DIE([--enable-mule, NOT --with-mule])],[])
AC_ARG_WITH([menubars],[],[XE_DIE([--enable-menubars, NOT --with-menubars])],[])
＠＠ -1047,7 +1045,7 ＠＠
. "$srcdir/version.sh" || exit 1;
dnl Must do the following first to determine verbosity for AC_DEFINE
if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
-: "${extra_verbose=$beta}"
+: "${verbose=$beta}"
version="${emacs_major_version}.${emacs_minor_version}"
AC_DEFINE_UNQUOTED(EMACS_MAJOR_VERSION, $emacs_major_version)
AC_DEFINE_UNQUOTED(EMACS_MINOR_VERSION, $emacs_minor_version)
＠＠ -1097,15 +1095,15 ＠＠
dnl Error checking default to "yes" in beta versions, to "no" in releases.
dnl Same goes for --enable-debug and --extra-verbosity.
if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
-test "${enable_error_checking_extents=$beta}" = yes && AC_DEFINE(ERROR_CHECK_EXTENTS)
-test "${enable_error_checking_types=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TYPES)
-test "${enable_error_checking_text=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TEXT)
-test "${enable_error_checking_gc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GC)
-test "${enable_error_checking_malloc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_MALLOC)
-test "${enable_error_checking_byte_code=$beta}" = yes && AC_DEFINE(ERROR_CHECK_BYTE_CODE)
-test "${enable_error_checking_glyphs=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GLYPHS)
-test "${enable_error_checking_display=$beta}" = yes && AC_DEFINE(ERROR_CHECK_DISPLAY)
-test "${enable_error_checking_structures=$beta}" = yes && AC_DEFINE(ERROR_CHECK_STRUCTURES)
+test "${enable_error_checking_extents:=$beta}" = yes && AC_DEFINE(ERROR_CHECK_EXTENTS)
+test "${enable_error_checking_types:=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TYPES)
+test "${enable_error_checking_text:=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TEXT)
+test "${enable_error_checking_gc:=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GC)
+test "${enable_error_checking_malloc:=$beta}" = yes && AC_DEFINE(ERROR_CHECK_MALLOC)
+test "${enable_error_checking_byte_code:=$beta}" = yes && AC_DEFINE(ERROR_CHECK_BYTE_CODE)
+test "${enable_error_checking_glyphs:=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GLYPHS)
+test "${enable_error_checking_display:=$beta}" = yes && AC_DEFINE(ERROR_CHECK_DISPLAY)
+test "${enable_error_checking_structures:=$beta}" = yes && AC_DEFINE(ERROR_CHECK_STRUCTURES)
dnl enable_debug=yes must be set when error checking is present. This should be
dnl fixed up.
dnl enable_debug implies other options
＠＠ -2014,7 +2012,7 ＠＠
fi
dnl For debugging...
-dnl test "$extra_verbose" = "yes" && \
+test "$verbose" = "yes" && \
PRINT_VAR(libs_machine libs_system libs_termcap libs_standard
objects_machine objects_system c_switch_machine c_switch_system
ld_switch_machine ld_switch_system unexec ld_switch_shared
＠＠ -2441,6 +2439,7 ＠＠
if test -z "$compiler_version"; then
compiler_version="detection failed (please report this)"
fi
+AC_MSG_RESULT([$compiler_version])
AC_MSG_CHECKING(for standard C library version information)
＠＠ -2487,6 +2486,7 ＠＠
if test -z "libc_version"; then
libc_version="detection failed (please report this)"
fi
+AC_MSG_RESULT([$libc_version])
dnl ---------------------------------------------------------------
dnl Add site and system specific flags to compile and link commands
＠＠ -2841,7 +2841,7 ＠＠
AC_CHECK_FUNCS(mkstemp)
dnl Determine type of mail locking from configure args and s&m headers
-AC_CHECKING(type of mail spool file locking)
+AC_CHECKING([type of mail spool file locking])
AC_CHECK_FUNCS(lockf flock)
dnl The mail_use_xxx variables are set according to the s&m headers.
test -z "$with_mail_locking" -a "$mail_use_flock" = "yes" && with_mail_locking=flock
＠＠ -2904,7 +2904,7 ＠＠
dnl Choose a window system
dnl ----------------------
-AC_CHECKING("for specified window system")
+AC_CHECKING([for specified window system])
dnl Autodetection of Gdk libraries and includes
dnl -------------------------------------------
＠＠ -3138,7 +3138,7 ＠＠
XE_COMPUTE_RUNPATH()
- if test "$extra_verbose" = "yes"; then
+ if test "$verbose" = "yes"; then
echo; echo "X11 compilation variables:"
PRINT_VAR(x_libraries x_includes X_CFLAGS X_LIBS X_PRE_LIBS X_EXTRA_LIBS)
echo
＠＠ -3164,7 +3164,7 ＠＠
test ! -z "$bitmapdirs" && AC_DEFINE_UNQUOTED(BITMAPDIR, "$bitmapdirs")
dnl Autodetect defines extracted from X config by xmkmf, e.g. NARROWPROTO
- AC_CHECKING(for X defines extracted by xmkmf)
+ AC_CHECKING([for X defines extracted by xmkmf])
rm -fr conftestdir
if mkdir conftestdir; then
cd conftestdir
＠＠ -3212,7 +3212,7 ＠＠
-b i486-linuxaout)
fi
libs_x="-lX11"
- test "$extra_verbose" = "yes" && echo " Setting libs_x to \"-lX11\""
+ test "$verbose" = "yes" && echo " Setting libs_x to \"-lX11\""
dnl Autodetect -lXext
AC_CHECK_LIB(Xext, XShapeSelectInput, XE_PREPEND(-lXext, libs_x))
＠＠ -3237,7 +3237,7 ＠＠
AC_CHECK_FUNCS(XConvertCase)
- AC_CHECK_HEADERS(X11/Xlocale.h)
+ AC_CHECK_HEADERS(X11/Xlocale.h X11/Xfuncproto.h)
dnl XFree86 has a non-standard prototype for this X11R6 function
AC_CHECK_FUNCS(XRegisterIMInstantiateCallback)
＠＠ -3328,7 +3328,7 ＠＠
fi dnl $with_x11 = yes
if test "$with_msw" != "no"; then
- AC_CHECKING(for MS-Windows)
+ AC_CHECKING([for MS-Windows])
AC_CHECK_LIB(gdi32,main,with_msw=yes)
if test "$with_msw" = "yes"; then
AC_DEFINE(HAVE_MS_WINDOWS)
＠＠ -3402,7 +3402,7 ＠＠
dnl fi
for feature in with_tooltalk with_cde with_offix with_wmcommand with_xim with_xmu enable_sound_nas
do
- if eval "test -n \"\${feature}\" -a \"\${feature}\" != no" ; then
+ if eval "test -n \"\$${feature}\" -a \"\$${feature}\" != \"no\"" ; then
AC_MSG_WARN([--$feature ignored: Not valid without X support])
fi
eval "${feature}=no"
＠＠ -3437,7 +3437,7 ＠＠
esac
dnl Enable or disable proper handling of WM_COMMAND
-AC_CHECKING(for WM_COMMAND option);
+AC_CHECKING([for WM_COMMAND option])
dnl if test "$with_wmcommand" = "yes"; then
if test "$with_wmcommand" != "no"; then
AC_DEFINE(HAVE_WMCOMMAND)
＠＠ -3473,7 +3473,7 ＠＠
dnl This must come before the detection code for anything that is in a module
if test "$enable_modules" != "no"; then
- AC_CHECKING(for module support)
+ AC_CHECKING([for module support])
case "$opsys" in
mingw* | cygwin* ) have_dl=yes ;;
＠＠ -3677,7 +3677,7 ＠＠
fi
dnl Autodetect LDAP
-AC_CHECKING(for LDAP)
+AC_CHECKING([for LDAP])
ldap_libs=
test -z "$with_ldap" && { AC_CHECK_HEADER(ldap.h, ,with_ldap=no) }
test -z "$with_ldap" && { AC_CHECK_HEADER(lber.h, ,with_ldap=no) }
＠＠ -3727,7 +3727,7 ＠＠
dnl that prefix must be specified using the --with-site-prefixes flag.
postgresql_libs=
if test "$with_postgresql" != "no"; then
- AC_CHECKING(for PostgreSQL)
+ AC_CHECKING([for PostgreSQL])
dnl Look for these standard header file locations, known to be used on Linux
for header_dir in "" "pgsql/" "postgresql/"; do
＠＠ -3948,7 +3948,7 ＠＠
dnl ----------------------
if test "$with_x11" = "yes"; then
- AC_CHECKING(for X11 graphics libraries)
+ AC_CHECKING([for X11 graphics libraries])
fi
dnl We don't automatically trigger widgets if athena is present
＠＠ -3960,7 +3960,7 ＠＠
esac
if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then
- AC_CHECKING(for the Athena widgets)
+ AC_CHECKING([for the Athena widgets])
dnl What in heck did the user actually want?
case "$with_athena" in
＠＠ -4008,13 +4008,23 ＠＠
dnl Curse this `Lets replace standard libraries' thing that they did. :/
AC_CHECK_HEADER(X11/$athena_variant/XawInit.h,
[AC_CHECK_HEADER(X11/$athena_variant/ThreeD.h,
- [athena_h_path=X11/$athena_variant])])
+ [athena_h_path=X11/$athena_variant])],[],
+[
+#if HAVE_X11_XFUNCPROTO_H
+#include <X11/Xfuncproto.h>
+#endif
+])
dnl Is the variant specific header directory directly under include?
if test -z "$athena_h_path"; then
AC_CHECK_HEADER($athena_variant/XawInit.h,
[AC_CHECK_HEADER($athena_variant/ThreeD.h,
- athena_h_path=$athena_variant)])
+ athena_h_path=$athena_variant)],[],
+[
+#if HAVE_X11_XFUNCPROTO_H
+#include <X11/Xfuncproto.h>
+#endif
+])
fi
dnl If we couldn't find the specific variant, try the generic Athena 3d headers
＠＠ -4024,7 +4034,12 ＠＠
[
AC_MSG_WARN([Assuming that X11/Xaw3d headers are suitable for $athena_variant.])
athena_h_path=X11/Xaw3d
- ])])
+ ])],[],
+[
+#if HAVE_X11_XFUNCPROTO_H
+#include <X11/Xfuncproto.h>
+#endif
+])
fi
dnl Also generic 3d headers directly under include dir
＠＠ -4034,7 +4049,12 ＠＠
[
AC_MSG_WARN([Assuming that Xaw3d headers are suitable for $athena_variant.])
athena_h_path=Xaw3d
- ])])
+ ])],[],
+[
+#if HAVE_X11_XFUNCPROTO_H
+#include <X11/Xfuncproto.h>
+#endif
+])
fi
dnl If nothing yet found, see if Xaw is a 3d header set...
＠＠ -4242,19 +4262,19 ＠＠
fi
if test "$enable_mule" = "yes" ; then
- AC_CHECKING(for Mule-related features)
+ AC_CHECKING([for Mule-related features])
AC_DEFINE(MULE)
dnl Use -lintl to get internationalized strerror for Mule
AC_CHECK_HEADERS(libintl.h)
AC_CHECK_LIB(intl, strerror)
- AC_CHECKING(for Mule input methods)
+ AC_CHECKING([for Mule input methods])
dnl Do we have the XmIm* routines? And if so, do we want to use them?
dnl XIM seems to be flaky except on Solaris...
dnl test -z "$with_xim" -a "$opsys" != "sol2" && with_xim=no
case "$with_xim" in "" | "yes" )
- AC_CHECKING(for XIM)
+ AC_CHECKING([for XIM])
AC_CHECK_LIB(X11, XOpenIM, with_xim=xlib, with_xim=no)
dnl XIM + Lesstif is not (yet?) usable
if test "$have_motif $have_lesstif" = "yes no"; then
＠＠ -4279,7 +4299,7 ＠＠
dnl "with_xfs" = "yes"
if test "$with_xfs" = "yes" ; then
- AC_CHECKING(for XFontSet)
+ AC_CHECKING([for XFontSet])
AC_CHECK_LIB(X11, XmbDrawString, [:], with_xfs=no)
if test "$with_xfs" = "yes" && test "$enable_menubars" = "lucid"; then
AC_DEFINE(USE_XFONTSET)
＠＠ -4737,7 +4757,7 ＠＠
dnl Check for sound of various sorts.
dnl Autodetect native sound
-AC_CHECKING("for sound support")
+AC_CHECKING([for sound support])
test -n "$with_native_sound_lib" && enable_sound_native=yes
if test "$enable_sound_native" != "no"; then
＠＠ -4901,7 +4921,7 ＠＠
test -z "$with_tty" && with_tty=yes
if test "$with_tty" = "yes" ; then
- AC_CHECKING(for TTY-related features)
+ AC_CHECKING([for TTY-related features])
AC_DEFINE(HAVE_TTY)
dnl Autodetect ncurses.
＠＠ -4986,7 +5006,7 ＠＠
dnl By default, we check for DBM support in libgdbm, then libc, then libdbm.
test "$enable_database_gdbm $enable_database_dbm $enable_database_berkdb" \
- != "no no no" && AC_CHECKING(for database support)
+ != "no no no" && AC_CHECKING([for database support])
dnl Check for ndbm.h, required for either kind of DBM support.
if test "$enable_database_gdbm $enable_database_dbm" != "no no"; then
＠＠ -5241,7 +5261,7 ＠＠
done
fi
-if test "$extra_verbose" = "yes"; then
+if test "$verbose" = "yes"; then
echo ""
PRINT_VAR(extra_objs
c_switch_general c_switch_window_system c_switch_all
＠＠ -5256,26 +5276,26 ＠＠
dnl Create a .gdbinit useful for debugging XEmacs
if test -f "$srcdir/src/.gdbinit" -a ! -f "src/.gdbinit"; then
- test "$extra_verbose" = "yes" && echo "creating src/.gdbinit"
+ test "$verbose" = "yes" && echo "creating src/.gdbinit"
echo "source $srcdir/src/.gdbinit" > "src/.gdbinit"
fi
dnl Create a .dbxrc useful for debugging XEmacs
if test -f "$srcdir/src/.dbxrc" -a ! -f "src/.dbxrc"; then
- test "$extra_verbose" = "yes" && echo "creating src/.dbxrc"
+ test "$verbose" = "yes" && echo "creating src/.dbxrc"
echo ". $srcdir/src/.dbxrc" > "src/.dbxrc"
fi
dnl Create a useful TAGS file
if test -f "$srcdir/TAGS" -a ! -f "TAGS"; then
- test "$extra_verbose" = "yes" && echo "creating TAGS"
+ test "$verbose" = "yes" && echo "creating TAGS"
echo "
$srcdir/TAGS,include" > "TAGS"
fi
dnl Create top level .sbinit for Sun compilers
if test "$__SUNPRO_C" = "yes"; then
- test "$extra_verbose" = "yes" && echo "creating .sbinit"
+ test "$verbose" = "yes" && echo "creating .sbinit"
( echo "# For use with Sun WorkShop's Source browser."
echo "# See sbquery(1) and sbinit(4) for more information"
for dir in $MAKE_SUBDIR; do echo "import $dir"; done
＠＠ -5567,6 +5587,12 ＠＠
XEmacs ${emacs_major_version}.${emacs_minor_version}${xemacs_betaname} \"$xemacs_codename\" $xemacs_extra_name configured for \`$ac_cv_build'.
"
+echo " WARNING: --------------------------------------------------------------"
+echo " WARNING: This was produced from a new autoconf-2.5 based configuration."
+echo " WARNING: If this configuration seems buggy then copy etc/configure-21.3"
+echo " WARNING: to configure and try again. Also please report the bug."
+echo " WARNING: --------------------------------------------------------------"
+
echo "
Compilation Environment and Installation Defaults:"
echo " Source code location: $srcdir"
No revision
No revision
1.62.2.2 +4 -0 XEmacs/xemacs/tests/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/ChangeLog,v
retrieving revision 1.62.2.1
retrieving revision 1.62.2.2
diff -u -r1.62.2.1 -r1.62.2.2
--- ChangeLog 2005/02/01 15:47:12 1.62.2.1
+++ ChangeLog 2005/03/04 13:34:51 1.62.2.2
＠＠ -1,3 +1,7 ＠＠
+2005-03-05 Malcolm Purvis <malcolmp(a)xemacs.org>
+
+ * autoconf/regressiontest.pl: Added explict test for '--with-athena=3d'
+
2005-01-30 Stephen J. Turnbull <stephen(a)xemacs.org>
* autoconf/regressiontest.pl: Basename of configure need not be
No revision
No revision
1.1.2.2 +1 -0 XEmacs/xemacs/tests/autoconf/Attic/regressiontest.pl
Index: regressiontest.pl
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/autoconf/Attic/regressiontest.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- regressiontest.pl 2005/02/01 15:47:15 1.1.2.1
+++ regressiontest.pl 2005/03/04 13:34:55 1.1.2.2
＠＠ -82,6 +82,7 ＠＠
"--infodir=/tmp/foo" => undef,
"--libdir=/tmp/foo" => undef,
"--exec-prefix=/tmp/foo" => undef,
+ "--with-athena=3d" => undef,
"--with-mule --with-xft=emacs --debug --error-checking=all --with-xim=xlib --with-widgets=athena --with-athena=3d --with-dialogs=athena --memory-usage-stats --use-number-lib=gmp --site-prefixes=/opt/local:/sw --with-ldap=no --use-union-type" => "--enable-mule --with-xft=emacs --enable-debug --enable-error-checking=all --with-xim=xlib --enable-widgets=athena --with-athena=3d --enable-dialogs=athena --enable-memory-usage-stats --enable-bignum=gmp --with-site-prefixes=/opt/local:/sw --with-ldap=no --enable-union-type"
);
- 1 participants
- 0 comments
CVS update by viteno MODIFIED: xemacs ...
19 years, 9 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/03/03 23:51:14
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1085 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1084
retrieving revision 1.1085
diff -u -r1.1084 -r1.1085
--- version.sh 2005/03/02 22:51:31 1.1084
+++ version.sh 2005/03/03 22:51:13 1.1085
＠＠ -8,5 +8,5 ＠＠
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20050302)"
+xemacs_extra_name="(+CVS-20050303)"
xemacs_release_date="2005-02-18"
- 1 participants
- 0 comments
CVS update by viteno MODIFIED: xemacs ...
19 years, 9 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/03/02 23:51:31
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1084 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1083
retrieving revision 1.1084
diff -u -r1.1083 -r1.1084
--- version.sh 2005/03/01 22:51:30 1.1083
+++ version.sh 2005/03/02 22:51:31 1.1084
＠＠ -8,5 +8,5 ＠＠
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20050301)"
+xemacs_extra_name="(+CVS-20050302)"
xemacs_release_date="2005-02-18"
- 1 participants
- 0 comments
CVS update by aidan MODIFIED: xemacsweb/People/aidan.kehoe ...
19 years, 9 months
CVS Monitor
CVS Monitor
User: aidan
Date: 05/03/02 23:23:05
Modified: xemacsweb/People/aidan.kehoe index.content
Log:
Think the sentence in German was a bit twee.
Revision Changes Path
1.4 +2 -2 XEmacs/xemacsweb/People/aidan.kehoe/index.content
Index: index.content
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/People/aidan.kehoe/index.content,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.content 2005/02/15 00:38:44 1.3
+++ index.content 2005/03/02 22:23:05 1.4
＠＠ -8,8 +8,8 ＠＠
<p> Aidan just moved to Berlin, where he's looking for a job, and five
million unemployed locals speak the language better than he
- does. „Gute Strategie, nicht wahr? Aber Deutschland gefällt
- mir.‟</p>
+ does. Still, the EU means that work permits aren't a problem, and if
+ you're annoyed by the little things, Germany is a good place to live.</p>
<p> He's into character set pedantry, getting annoyed when code isn't
Mule-clean, and he much prefers Unicode, however that Platonic ideal may
- 1 participants
- 0 comments
CVS update by adrian MODIFIED: xemacs/lisp ...
19 years, 9 months
CVS Monitor
CVS Monitor
User: adrian
Date: 05/03/02 22:37:56
Modified: xemacs/lisp ChangeLog about.el
Log:
xemacs-21.5-clean: Re: Patch my ego
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2005-02-28 Simon Josefsson <jas(a)extundo.com>
* about.el (xemacs-hackers): Add jas.
(about-other-current-hackers): Likewise.
(about-url-alist): Add URL for jas.
(about-personal-info): Document jas.
(about-hacker-contribution): Describe jas contributions.
Revision Changes Path
1.649 +8 -0 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.648
retrieving revision 1.649
diff -u -r1.648 -r1.649
--- ChangeLog 2005/02/28 20:21:43 1.648
+++ ChangeLog 2005/03/02 21:37:54 1.649
＠＠ -1,3 +1,11 ＠＠
+2005-02-28 Simon Josefsson <jas(a)extundo.com>
+
+ * about.el (xemacs-hackers): Add jas.
+ (about-other-current-hackers): Likewise.
+ (about-url-alist): Add URL for jas.
+ (about-personal-info): Document jas.
+ (about-hacker-contribution): Describe jas contributions.
+
2005-02-28 Aidan Kehoe <kehoea(a)parhasard.net>
* select.el (selected-text-type): Removed.
1.66 +32 -3 XEmacs/xemacs/lisp/about.el
Index: about.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/about.el,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- about.el 2005/02/22 07:16:07 1.65
+++ about.el 2005/03/02 21:37:55 1.66
＠＠ -1,6 +1,6 ＠＠
;;; about.el --- the About The Authors page (shameless self promotion).
-;; Copyright (c) 1997 Free Software Foundation, Inc.
+;; Copyright (c) 1997, 2005 Free Software Foundation, Inc.
;; Copyright (C) 2001, 2005 Ben Wing.
;; Keywords: extensions
＠＠ -126,6 +126,7 ＠＠
(james "Jerry James" "james(a)xemacs.org")
(jan "Jan Vroonhof" "jan(a)xemacs.org")
(jareth "Jareth Hein" "jareth(a)xemacs.org")
+ (jas "Simon Josefsson" "simon(a)xemacs.org")
(jason "Jason R. Mastaler" "jason(a)xemacs.org")
(jens "Jens Lautenbacher" "jens(a)xemacs.org")
(jmiller "Jeff Miller" "jmiller(a)xemacs.org")
＠＠ -183,8 +184,8 ＠＠
(defvar about-once-and-future-hackers
'(aj ajc alastair baw bw cgw chr craig cthomp dan devin dkindred dmoore eb
- gunnar hbs hisashi hmuller hobley jareth jens juhp jwz kyle marcpa mcook
- mly ograf pelegri pez rickc rose slb stig stigb thiessel vladimir))
+ gunnar hbs hisashi hmuller hobley jareth jas jens juhp jwz kyle marcpa
+ mcook mly ograf pelegri pez rickc rose slb stig stigb thiessel vladimir))
;; The CAR of alist elements is a valid argument to `about-url-link'.
;; It is preferred to a simple string, because it makes maintenance
＠＠ -207,6 +208,7 ＠＠
(fabrice . "http://www.ese-metz.fr/~popineau/")
(fptex . "http://www.fptex.org/")
(james . "http://www.ittc.ku.edu/~james/")
+ (jas . "http://josefsson.org/")
(jason . "http://www.mastaler.com/")
(juhp . "http://www.01.246.ne.jp/~juhp/")
(jwz . "http://www.jwz.org/")
＠＠ -1123,6 +1125,25 ＠＠
graphics and a garbage collector, but is multithreaded to boot!
Unfortunately his XEmacs time is directly limited by the amount of
traffic on the M40.\n"))
+ (jas
+ (widget-insert "\
+
+Simon lives in Stockholm where he has discovered that computers
+can be a powerful procrastinating tool. Combined with a
+frustrating desire to see computers simply work, he spends most
+of his time complaining. Occasionally he rises up to the task
+and produces something that others may complain about, which
+brings him increased satisfaction with every bug report. Today
+he is pretending to be a network security guy, with a preference
+for standardization issues, while secretly longing to start a
+cafe or becoming a theoretical computer scientist. His personal
+interest is literature, and to some extent traveling, but will
+try anything for fun, such as juggling, skiing, wine, and
+long-distance biking.
+
+See: ")
+ (about-url-link 'jas nil "Visit Simon's homepage")
+ (widget-insert ".\n"))
(jareth
(widget-insert "\
Jareth Hein is a mountain boy who abandoned his home state of Colorado
＠＠ -1690,6 +1711,14 ＠＠
(widget-insert "\
Owner of cvs.xemacs.org, the machine that holds the XEmacs CVS
repository, and author of some of the graphics code in XEmacs.\n"))
+ (jas
+ (widget-insert "\
+Wrote and/or integrated several packages for Gnus, such as
+support for IMAP, Sieve, format=flowed, GnuTLS, S/MIME, and PGP.
+Irregularly synchronizes lisp code between Emacs and XEmacs. He
+maintains the mail-lib, sieve, sasl, pgg and ecrypto XEmacs
+packages. Operates the secondary DNS and mail server for
+xemacs.org.\n"))
(jason
(widget-insert "\
Beta tester, manager of the various XEmacs mailing lists and binary
- 1 participants
- 0 comments