CVS update by stephent xemacs ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: stephent
Date: 05/10/21 16:08:16
Modified: xemacs CHANGES-beta
Log:
Preparing for release of 21.5.23 "daikon".
Revision Changes Path
1.229 +29 -5 XEmacs/xemacs/CHANGES-beta
Index: CHANGES-beta
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/CHANGES-beta,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -p -r1.228 -r1.229
--- CHANGES-beta 2005/10/04 16:43:29 1.228
+++ CHANGES-beta 2005/10/21 14:08:15 1.229
＠＠ -2,46 +2,70 ＠＠ to 21.5.23 "daikon"
Major features
+-- New: all-singing, all-dancing --with/--enable aliasing. -- Malcolm Purvis
+-- New: native NT support for building gmp, db, postgresql, ldap. -- Ben Wing
-- New: non-XPM color images can be mouse pointers. -- Ben Wing
User-Visible Bug Fixes and Minor Improvements
+-- Fix: change address for crash reporting to xemacs-beta. -- Ben Wing
-- Fix: crash due to duplicate subrs with MC_ALLOC and modules. -- Marcus Crestani
+-- Improve: memory usage reporting, especially with MC_ALLOC. -- Ben Wing
+-- Improve: remove obsolete autoconf 2.13 files. -- Malcolm Purvis.
+-- Improve: --with-cflags-optimization now forces optimization. -- Ben Wing
Build Infrastructure
-- Fix: Cygwin, non-X build needs XPM header and library files in XE_CFLAGS. -- Mike Alexander, Rick Rankin
--- Fix: Stop installexe.sh from adding redundant exe extension. -- Rick Rankin
+-- Fix: guess VC++ version; set debug and browser flags appropriately. -- Ben Wing
+-- Fix: pass -I$(SRC) to minitar.c so it compiles. -- Ben Wing
+-- Fix: pass module sources, not objects, to make-docfile. -- Ben Wing
+-- Fix: stop installexe.sh from adding redundant exe extension. -- Rick Rankin
-- Fix: variable initialization misordering in xemacs.mak. -- Adrian Aichner
+-- Improve: Canna API is now a module. -- Stephen Turnbull
+-- Improve: delete more stuff in `make clean'. -- Ben Wing
+-- Improve: options now added to one OPT_*, rather than many FOO_*, variables. -- Ben Wing
-- Improve: replace support for autoconf 2.13 with warning to use autoconf 2.59. -- Malcolm Purvis
-- Improve: update config.inc.samp to recent versions and add gmp, db, postgresql, ldap support; also optimization in non-debug builds. -- Ben Wing
-- Improve: xemacs.mak now caters to VC++ version, support for building gmp, db, postgresql, ldap; other fixes. -- Ben Wing
Documentation
+-- Fix: force C-h N to find etc/NEWS, not some package's. -- Steve Youngs
-- Fix: texinfmt.el can build all Info files again. -- Adrian Aichner
-- Fix: typos in Texinfo docs. -- Adrian Aichner
-- Improve: Texinfo docs about specifiers. -- Ben Wing
-- Improve: comment style, 'foo -> `foo'. -- Ben Wing
--- Improve: rewrite nt/README
+-- Improve: mule-cmds docstrings. -- Stephen Turnbull
+-- Improve: emodules.texi tells how to add modules to core. -- Stephen Turnbull
+-- Improve: nt/README tells how to compile optional libs. -- Ben Wing
+-- New: FAQ on `rebaseall' under Cygwin. -- Ben Wing
+-- New: internals documents XEmacs treatment of --with/--enable configure args. -- Malcolm Purvis
Lisp API
+-- Fix: finder-find-library returns accurate filename. -- Adrian Aichner
+-- Fix: xemacs-composefunc kvetching when noninteractive. -- Stephen Turnbull
-- Improve: GC now triggers on relative, not absolute, consing. -- Ben Wing
-- Improve: memory usage reporting. -- Ben Wing
+-- Improve: sync build-report.el to Adrian's version. -- Stephen Turnbull
+-- Improve: sync read-buffer, line-number-at-pos, delete-dups, occur to GNU Emacs 22.0.50. -- Malcolm Purvis
+-- New: batch-build-report command. -- Stephen Turnbull
+-- New: next-error from GNU Emacs. -- Malcolm Purvis
-- New: `specifier-instantiator' and related primitives. -- Ben Wing
Internal API and Implementation
--- Fix: Non-MULE needs mswindows_current_locale too. -- Mike Alexander
-- Fix: address of register variable can't be taken. -- Ben Wing
-- Fix: bitrot in sysdep.c and nt.c. -- Ben Wing
-- Fix: bug in range tables with non-default closure. -- Ben Wing
-- Fix: don't use C++ reserved words "new" and "catch", append '_'. -- Ben Wing
-- Fix: initialization in mc-alloc. -- Marcus Crestani
+-- Fix: non-MULE needs mswindows_current_locale too. -- Mike Alexander
-- Fix: setlocale return string is volatile, dup it. -- Olivier Galibert
--- Improve: include from ../src so <config.h> works in lib-src. -- Ben Wing
--- Improve: minitar.c now includes config.h. -- Ben Wing
+-- Fix: unexec for _LP64 ELF architectures. -- Andrey Slusar
+-- Fix: use of config.h, especially in Windows files. -- Ben Wing
+-- Improve: use _CRT_SECURE_NO_DEPRECATE to suppress VC8 warnings. -- Ben Wing
-- Improve: warning elimination. -- Ben Wing
to 21.5.22 "cucumber"
- 1 participants
- 0 comments
CVS update by viteno packages/xemacs-packages/erc ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/10/21 15:39:58
Modified: packages/xemacs-packages/erc ChangeLog Makefile
Log:
Increment VERSION in Makefile
Revision Changes Path
1.36 +4 -0 XEmacs/packages/xemacs-packages/erc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- ChangeLog 2005/10/20 22:49:50 1.35
+++ ChangeLog 2005/10/21 13:39:58 1.36
＠＠ -1,3 +1,7 ＠＠
+2005-10-21 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 0.19 released.
+
2005-10-21 Adrian Aichner <adrian(a)xemacs.org>
* Full sync with upstream revision 1.776.
1.30 +1 -1 XEmacs/packages/xemacs-packages/erc/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- Makefile 2005/10/20 22:49:50 1.29
+++ Makefile 2005/10/21 13:39:58 1.30
＠＠ -18,7 +18,7 ＠＠
# Boston, MA 02111-1307, USA.
-VERSION = 0.18
+VERSION = 0.19
AUTHOR_VERSION = Version 5.0 Revision: 1.776
MAINTAINER = Adrian Aichner <adrian(a)xemacs.org>
PACKAGE = erc
- 1 participants
- 0 comments
CVS update by viteno packages ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/10/21 15:39:19
Modified: packages ChangeLog
Log:
Package release
Revision Changes Path
1.574 +4 -0 XEmacs/packages/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/ChangeLog,v
retrieving revision 1.573
retrieving revision 1.574
diff -u -p -r1.573 -r1.574
--- ChangeLog 2005/10/18 14:59:33 1.573
+++ ChangeLog 2005/10/21 13:39:18 1.574
＠＠ -1,3 +1,7 ＠＠
+2005-10-21 Norbert Koch <viteno(a)xemacs.org>
+
+ * Packages released: erc.
+
2005-10-18 Norbert Koch <viteno(a)xemacs.org>
* Packages released: sh-script.
- 1 participants
- 0 comments
CVS update by stephent xemacs/lisp ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: stephent
Date: 05/10/21 12:34:37
Modified: xemacs/lisp ChangeLog build-report.el
Log:
Note sync to build package build-report.el v1.49.
Revision Changes Path
1.684 +4 -0 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.683
retrieving revision 1.684
diff -u -p -r1.683 -r1.684
--- ChangeLog 2005/10/21 10:23:15 1.683
+++ ChangeLog 2005/10/21 10:34:34 1.684
＠＠ -1,3 +1,7 ＠＠
+2005-10-21 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * build-report.el: Note synch to XEmacs build package version 1.49.
+
2005-10-04 Stephen J. Turnbull <stephen(a)xemacs.org>
* build-report.el (build-report): Refactor into interactive
1.14 +3 -3 XEmacs/xemacs/lisp/build-report.el
Index: build-report.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/build-report.el,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- build-report.el 2005/10/21 10:23:16 1.13
+++ build-report.el 2005/10/21 10:34:35 1.14
＠＠ -3,8 +3,8 ＠＠
;; Copyright (C) 1997-2003 Adrian Aichner
;; Author: Adrian Aichner <adrian(a)xemacs.org>
-;; Date: $Date: 2005/10/21 10:23:16 $
-;; Version: $Revision: 1.13 $
+;; Date: $Date: 2005/10/21 10:34:35 $
+;; Version: $Revision: 1.14 $
;; Keywords: internal
;; This file is part of XEmacs.
＠＠ -24,7 +24,7 ＠＠
;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
;; 02111-1307, USA.
-;;; Synched up with: Not synched.
+;;; Synched up with: XEmacs build package build-report.el Revision 1.49.
;;; Commentary:
- 1 participants
- 0 comments
CVS update by stephent xemacs/lisp ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: stephent
Date: 05/10/21 12:23:20
Modified: xemacs/lisp ChangeLog build-report.el
Log:
Make build-report play nicely in batch. <87k6g7kw4q.fsf(a)tleepslib.sk.tsukuba.ac.jp>
Revision Changes Path
1.683 +8 -0 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.682
retrieving revision 1.683
diff -u -p -r1.682 -r1.683
--- ChangeLog 2005/10/18 20:49:41 1.682
+++ ChangeLog 2005/10/21 10:23:15 1.683
＠＠ -1,3 +1,11 ＠＠
+2005-10-04 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * build-report.el (build-report): Refactor into interactive
+ portion and `build-report-create-report'.
+ (build-report-create-report): New function.
+ (batch-build-report): Non-interactive version of `build-report'
+ using `build-report-create-report'.
+
2005-10-10 Malcolm Purvis <malcolmp(a)xemacs.org>
* minibuf.el:
1.13 +76 -50 XEmacs/xemacs/lisp/build-report.el
Index: build-report.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/build-report.el,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- build-report.el 2005/10/05 04:11:25 1.12
+++ build-report.el 2005/10/21 10:23:16 1.13
＠＠ -3,8 +3,8 ＠＠
;; Copyright (C) 1997-2003 Adrian Aichner
;; Author: Adrian Aichner <adrian(a)xemacs.org>
-;; Date: $Date: 2005/10/05 04:11:25 $
-;; Version: $Revision: 1.12 $
+;; Date: $Date: 2005/10/21 10:23:16 $
+;; Version: $Revision: 1.13 $
;; Keywords: internal
;; This file is part of XEmacs.
＠＠ -318,59 +318,85 ＠＠ See also `mail-user-agent', `build-repor
(setq prompts (cdr prompts))
(setq arg (cons (read-string prompt "" 'hist) arg)))
arg)))
+ (let ((destination-address
+ ;; `build-report-destination' used to be a single string, so
+ ;; let's test if we really get a list of destinations.
+ (if (listp build-report-destination)
+ (read-string
+ "Build Report Destination: "
+ (car build-report-destination)
+ 'build-report-destination)
+ (read-string
+ "Build Report Destination: "
+ build-report-destination)
+ )))
+ (save-excursion
+ (build-report-create-report destination-address args))))
+
+;;;###autoload
+(defun batch-build-report (&optional status destination)
+ "Format a build report. Save it as \"./BUILD-REPORT\".
+If the file \"./BUILD-REPORT-COMMENT\" is readable, insert its contents.
+Optional STATUS is a string to insert in the subject. It defaults to
+\"Success\". \(This will be made customizable.)
+Optional DESTINATION is a string containing the destination mailbox. It
+defaults to \"XEmacs Build Reports <xemacs-buildreports(a)xemacs.org>\".
+\(This will be made customizable.)
+This function may be invoked as a command."
+ (interactive)
+ (unless (stringp status) (setq status "Success"))
+ (unless (stringp destination)
+ (setq destination "XEmacs Build Reports <xemacs-buildreports(a)xemacs.org>"))
(save-excursion
- (if (file-exists-p build-report-installation-file)
- (multiple-value-bind
- (major minor beta codename extraname configuration)
- (build-report-installation-data build-report-installation-file)
- (setq build-report-subject
- (format "[%%s] XEmacs %s.%s%s \"%s\" %s%s"
- major minor beta codename extraname configuration)))
+ (build-report-create-report destination
+ ;; #### listify in the internal function?
+ (list status)))
+ (when (file-readable-p "BUILD-REPORT-COMMENT")
+ (insert-file "BUILD-REPORT-COMMENT"))
+ (write-file "BUILD-REPORT"))
+
+(defun build-report-create-report (destination status)
+ "Format current buffer as an XEmacs build report to DESTINATION.
+
+DESTINATION is the mailbox to which the report will be submitted.
+STATUS is the status of the build.
+You probably don't want to use this function; see `build-report' for the
+interactive command, and `batch-build-report' for a command suitable for
+use in shell scripts and Makefiles."
+ (if (file-exists-p build-report-installation-file)
(multiple-value-bind
- (major minor beta codename extraname)
- (build-report-version-file-data build-report-version-file)
- (setq build-report-subject
- (format "[%%s] XEmacs %s.%s%s \"%s\" %s%s"
- major minor beta codename extraname system-configuration))))
- (compose-mail
- ;; `build-report-destination' used to be a single string, so
- ;; let's test if we really get a list of destinations.
- (if (listp build-report-destination)
- (read-string
- "Build Report Destination: "
- (car build-report-destination)
- 'build-report-destination)
- (read-string
- "Build Report Destination: "
- build-report-destination)
- )
- (apply 'format build-report-subject args)
- nil
- nil
- nil
- nil
- nil)
- (let* ((report-begin (point))
- (files (reverse (build-report-make-output-get)))
- (file (car files)))
- (while file
- (if (file-exists-p file)
- (insert (build-report-insert-make-output report-begin file))
- (insert (format "%s not found!\n" file)))
- (insert "\n")
- (setq files (cdr files))
- (setq file (car files)))
- (if (file-exists-p build-report-installation-file)
- (insert (build-report-insert-installation-file
- report-begin
- build-report-installation-insert-all))
- (insert (format "%s not found!\n" build-report-installation-file)))
-;;; (when (and (>= major 21) (>= minor 2) (or (null beta) (>= beta 32)))
-;;; (insert "\n")
-;;; (insert (build-report-insert-config-inc report-begin)))
+ (major minor beta codename extraname configuration)
+ (build-report-installation-data build-report-installation-file)
+ (setq build-report-subject
+ (format "[%%s] XEmacs %s.%s%s \"%s\" %s%s"
+ major minor beta codename extraname configuration)))
+ (multiple-value-bind
+ (major minor beta codename extraname)
+ (build-report-version-file-data build-report-version-file)
+ (setq build-report-subject
+ (format "[%%s] XEmacs %s.%s%s \"%s\" %s%s"
+ major minor beta codename extraname system-configuration))))
+ (compose-mail destination
+ (apply 'format build-report-subject status)
+ nil nil nil nil nil)
+ (let* ((report-begin (point))
+ (files (reverse (build-report-make-output-get)))
+ (file (car files)))
+ (while file
+ (if (file-exists-p file)
+ (insert (build-report-insert-make-output report-begin file))
+ (insert (format "%s not found!\n" file)))
(insert "\n")
- (insert (build-report-insert-header report-begin))
- (goto-char report-begin))))
+ (setq files (cdr files))
+ (setq file (car files)))
+ (if (file-exists-p build-report-installation-file)
+ (insert (build-report-insert-installation-file
+ report-begin
+ build-report-installation-insert-all))
+ (insert (format "%s not found!\n" build-report-installation-file)))
+ (insert "\n")
+ (insert (build-report-insert-header report-begin))
+ (goto-char report-begin)))
(defun build-report-insert-header (where)
"Inserts the build-report-header at the point specified by `where'."
- 1 participants
- 0 comments
CVS update by stephent xemacs/src ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: stephent
Date: 05/10/21 11:19:46
Modified: xemacs/src ChangeLog
Log:
Remove redundant change log.
Revision Changes Path
1.869 +0 -22 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.868
retrieving revision 1.869
diff -u -p -r1.868 -r1.869
--- ChangeLog 2005/10/14 01:21:57 1.868
+++ ChangeLog 2005/10/21 09:19:40 1.869
＠＠ -74,28 +74,6 ＠＠
new -> new_.
-2005-09-27 Ben Wing <ben(a)xemacs.org>
-
- * alloc.c (garbage_collect_1):
- Avoid use of reserved C++ `catch'.
-
- * alloc.c:
- * alloc.c (gc_plist_hack):
- * alloc.c (HACK_O_MATIC):
- * alloc.c (Fgarbage_collect):
- * alloc.c (Ftotal_memory_usage):
- * alloc.c (Flisp_object_memory_usage):
- * alloc.c (recompute_need_to_garbage_collect):
- * alloc.c (common_init_alloc_early):
- * alloc.c (syms_of_alloc):
- * alloc.c (vars_of_alloc):
- Rename underused `memory-usage' to `total-memory-usage'.
- Add `lisp-object-memory-usage'. Reimplement `gc-cons-percentage'
- to be a percentage of total Lisp object allocation (not total
- memory of all sorts, which is hard to calculate in any case) and
- give it a preliminary value of 40%. Use EMACS_INT instead of
- int in a couple of places.
-
2005-09-26 Marcus Crestani <crestani(a)xemacs.org>
* symbols.c (check_module_subr): Fix new allocator's module
- 1 participants
- 0 comments
CVS update by adrian packages/xemacs-packages/erc, Makefile, erc.el ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: adrian
Date: 05/10/21 00:49:53
Modified: packages/xemacs-packages/erc ChangeLog ChangeLog.upstream
Makefile erc-compat.el erc-match.el erc-nets.el
erc.el
Log:
packages: Sync erc after cooperation with upstream
-------------------- ChangeLog entries follow: --------------------
xemacs-packages/erc/ChangeLog addition:
2005-10-21 Adrian Aichner <adrian(a)xemacs.org>
* Full sync with upstream revision 1.776.
* ChangeLog.upstream:
* Makefile (AUTHOR_VERSION):
* erc-compat.el:
* erc-compat.el (erc-compat-version):
* erc-compat.el (erc-make-obsolete): New.
* erc-compat.el (erc-make-obsolete-variable): New.
* erc-match.el:
* erc-match.el (erc-match-version):
* erc-match.el (erc-current-nick-highlight-type):
* erc-match.el (erc-beep-match-types): New.
* erc-match.el (erc-beep-on-match): New.
* erc-nets.el:
* erc-nets.el (erc-nets-version):
* erc-nets.el (erc-current-network):
* erc.el:
* erc.el (erc-version-string):
* erc.el (fboundp):
* erc.el (erc-send-command):
Revision Changes Path
1.35 +22 -0 XEmacs/packages/xemacs-packages/erc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- ChangeLog 2005/10/16 17:20:31 1.34
+++ ChangeLog 2005/10/20 22:49:50 1.35
＠＠ -1,3 +1,25 ＠＠
+2005-10-21 Adrian Aichner <adrian(a)xemacs.org>
+
+ * Full sync with upstream revision 1.776.
+ * ChangeLog.upstream:
+ * Makefile (AUTHOR_VERSION):
+ * erc-compat.el:
+ * erc-compat.el (erc-compat-version):
+ * erc-compat.el (erc-make-obsolete): New.
+ * erc-compat.el (erc-make-obsolete-variable): New.
+ * erc-match.el:
+ * erc-match.el (erc-match-version):
+ * erc-match.el (erc-current-nick-highlight-type):
+ * erc-match.el (erc-beep-match-types): New.
+ * erc-match.el (erc-beep-on-match): New.
+ * erc-nets.el:
+ * erc-nets.el (erc-nets-version):
+ * erc-nets.el (erc-current-network):
+ * erc.el:
+ * erc.el (erc-version-string):
+ * erc.el (fboundp):
+ * erc.el (erc-send-command):
+
2005-10-16 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 0.18 released.
1.9 +28 -0 XEmacs/packages/xemacs-packages/erc/ChangeLog.upstream
Index: ChangeLog.upstream
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/ChangeLog.upstream,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ChangeLog.upstream 2005/10/15 18:15:26 1.8
+++ ChangeLog.upstream 2005/10/20 22:49:50 1.9
＠＠ -1,3 +1,31 ＠＠
+2005-10-20 Diane Murray <disumu(a)x3y2z1.net>
+
+ * erc-match.el (erc-current-nick-highlight-type): Set to `keyword'
+ as default.
+ (erc-beep-match-types): New variable.
+ (erc-text-matched-hook): Doc fix. Added `erc-beep-on-match' to
+ customization options.
+ (erc-beep-on-match): New function. If the MATCH-TYPE is found in
+ `erc-beep-match-types', beep.
+
+ * erc-compat.el (erc-make-obsolete, erc-make-obsolete-variable):
+ New functions to deal with the difference in the number of
+ arguments accepted by `make-obsolete' and `make-obsolete-variable'
+ in Emacs and XEmacs.
+
+ * erc.el, erc-nets.el: Use `erc-make-obsolete' and
+ `erc-make-obsolete-variable'.
+
+ * erc-compat.el (erc-make-obsolete, erc-make-obsolete-variable):
+ Handle `wrong-number-of-arguments' error instead of checking for
+ xemacs feature as future versions of XEmacs might accept three
+ arguments.
+
+2005-10-18 Edward O'Connor <ted(a)oconnor.cx>
+
+ * erc.el: Tell emacs-lisp-mode how to font-lock define-erc-module
+ docstrings.
+
2005-10-08 Diane Murray <disumu(a)x3y2z1.net>
* AUTHORS, CREDITS, ChangeLog, ChangeLog.2002, ChangeLog.2004:
1.29 +1 -1 XEmacs/packages/xemacs-packages/erc/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- Makefile 2005/10/16 17:20:31 1.28
+++ Makefile 2005/10/20 22:49:50 1.29
＠＠ -19,7 +19,7 ＠＠
VERSION = 0.18
-AUTHOR_VERSION = Version 5.0 Revision: 1.774
+AUTHOR_VERSION = Version 5.0 Revision: 1.776
MAINTAINER = Adrian Aichner <adrian(a)xemacs.org>
PACKAGE = erc
PKG_TYPE = regular
1.7 +24 -2 XEmacs/packages/xemacs-packages/erc/erc-compat.el
Index: erc-compat.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-compat.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- erc-compat.el 2005/10/15 18:15:27 1.6
+++ erc-compat.el 2005/10/20 22:49:50 1.7
＠＠ -1,6 +1,6 ＠＠
;;; erc-compat.el --- ERC compatibility code for XEmacs
-;; Copyright (C) 2002,2003 Free Software Foundation, Inc.
+;; Copyright (C) 2002,2003,2005 Free Software Foundation, Inc.
;; Author: Alex Schroeder <alex(a)gnu.org>
;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient
＠＠ -28,7 +28,7 ＠＠
;;; Code:
-(defconst erc-compat-version "$Revision: 1.23 $"
+(defconst erc-compat-version "$Revision: 1.25 $"
"ERC compat revision.")
;; erc-define-minor-mode: the easy-mmode-define-minor-mode available
＠＠ -256,6 +256,28 ＠＠ starting with a character."
(delete-itimer timer))
(t
(error "Cannot find `cancel-timer' variant"))))
+
+;; Emacs accepts three arguments to `make-obsolete', `make-obsolete-variable'
+;; XEmacs only takes two arguments
+(defun erc-make-obsolete (old-name new-name when)
+ "Make the byte-compiler warn that OLD-NAME is obsolete.
+The warning will say that NEW-NAME should be used instead.
+WHEN should be a string indicating when the function was
+first made obsolete, either the file's revision number or an
+ERC release version number."
+ (condition-case nil
+ (make-obsolete old-name new-name when)
+ (wrong-number-of-arguments (make-obsolete old-name new-name))))
+
+(defun erc-make-obsolete-variable (old-name new-name when)
+ "Make the byte-compiler warn that OLD-NAME is obsolete.
+The warning will say that NEW-NAME should be used instead.
+WHEN should be a string indicating when the variable was
+first made obsolete, either the file's revision number or an
+ERC release version number."
+ (condition-case nil
+ (make-obsolete-variable old-name new-name when)
+ (wrong-number-of-arguments (make-obsolete-variable old-name new-name))))
(provide 'erc-compat)
1.10 +24 -5 XEmacs/packages/xemacs-packages/erc/erc-match.el
Index: erc-match.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-match.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- erc-match.el 2005/10/15 18:15:28 1.9
+++ erc-match.el 2005/10/20 22:49:51 1.10
＠＠ -1,6 +1,6 ＠＠
;;; erc-match.el --- Highlight messages matching certain regexps
-;; Copyright (C) 2002,2003,2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002,2003,2004,2005 Free Software Foundation, Inc.
;; Copyright (C) 2004 Jeremy Bertram Maitin-Shepard
;; Author: Andreas Fuchs <asf(a)void.at>
＠＠ -38,7 +38,7 ＠＠
;; Customisation:
-(defconst erc-match-version "$Revision: 1.45 $"
+(defconst erc-match-version "$Revision: 1.46 $"
"ERC match mode revision.")
(defgroup erc-match nil
＠＠ -85,7 +85,7 ＠＠ Useful to mark nicks from dangerous host
:group 'erc-match
:type '(repeat regexp))
-(defcustom erc-current-nick-highlight-type nil
+(defcustom erc-current-nick-highlight-type 'keyword
"*Determines how to highlight text in which your current nickname appears
\(does not apply to text sent by you\).
＠＠ -213,12 +213,25 ＠＠ be formatted. The various format specs a
:group 'erc-match
:type 'string)
+(defcustom erc-beep-match-types '(current-nick)
+ "Types of matches to beep for when a match occurs.
+The function `erc-beep-on-match' needs to be added to `erc-text-matched-hook'
+for beeping to work."
+ :group 'erc-match
+ :type '(choice (repeat :tag "Beep on match" (choice
+ (const current-nick)
+ (const keyword)
+ (const pal)
+ (const dangerous-host)
+ (const fool)))
+ (const :tag "Don't beep" nil)))
+
(defcustom erc-text-matched-hook '(erc-log-matches)
"Hook run when text matches a given match-type.
Functions in this hook are passed as arguments:
\(match-type nick!user＠host message) where MATCH-TYPE is a symbol of:
-keyword, pal, dangerous-host, fool"
- :options '(erc-log-matches erc-hide-fools)
+current-nick, keyword, pal, dangerous-host, fool"
+ :options '(erc-log-matches erc-hide-fools erc-beep-on-match)
:group 'erc-match
:type 'hook)
＠＠ -625,6 +638,12 ＠＠ This function should be called from `erc
(erc-put-text-properties (point-min) (point-max)
'(invisible intangible)
(current-buffer))))
+
+(defun erc-beep-on-match (match-type nickuserhost message)
+ "Beep when text matches.
+This function is meant to be called from `erc-text-matched-hook'."
+ (when (member match-type erc-beep-match-types)
+ (beep)))
(provide 'erc-match)
1.8 +3 -6 XEmacs/packages/xemacs-packages/erc/erc-nets.el
Index: erc-nets.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-nets.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- erc-nets.el 2005/10/15 18:15:29 1.7
+++ erc-nets.el 2005/10/20 22:49:51 1.8
＠＠ -1,6 +1,6 ＠＠
;;; erc-nets.el --- IRC networks
-;; Copyright (C) 2002,2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002,2004,2005 Free Software Foundation, Inc.
;; Author: Mario Lang <mlang(a)lexx.delysid.org>
;; Keywords: comm
＠＠ -27,7 +27,7 ＠＠
(require 'erc)
-(defconst erc-nets-version "$Revision: 1.20 $"
+(defconst erc-nets-version "$Revision: 1.21 $"
"ERC networks revision.")
;; Variables
＠＠ -726,11 +726,8 ＠＠ network as a symbol."
(with-current-buffer (erc-server-buffer)
(intern (downcase (symbol-name erc-network)))))
-(condition-case nil
- (make-obsolete 'erc-current-network 'erc-network
+(erc-make-obsolete 'erc-current-network 'erc-network
"Obsolete since erc-nets 1.5")
- (wrong-number-of-arguments (make-obsolete 'erc-current-network
- 'erc-network)))
(defun erc-network-name ()
"Returns the name of the current network as a string."
1.13 +11 -9 XEmacs/packages/xemacs-packages/erc/erc.el
Index: erc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc.el,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- erc.el 2005/10/15 18:15:30 1.12
+++ erc.el 2005/10/20 22:49:51 1.13
＠＠ -64,7 +64,7 ＠＠
;;; Code:
-(defconst erc-version-string "Version 5.0 (CVS) $Revision: 1.774 $"
+(defconst erc-version-string "Version 5.0 (CVS) $Revision: 1.776 $"
"ERC version. This is used by function `erc-version'.")
(require 'cl)
＠＠ -123,21 +123,21 ＠＠
(if (fboundp 'defvaralias)
(progn
(defvaralias 'erc-announced-server-name 'erc-server-announced-name)
- (make-obsolete-variable 'erc-announced-server-name
- 'erc-server-announced-name
- "ERC 5.1")
+ (erc-make-obsolete-variable 'erc-announced-server-name
+ 'erc-server-announced-name
+ "ERC 5.1")
(defvaralias 'erc-process 'erc-server-process)
- (make-obsolete-variable 'erc-process 'erc-server-process "ERC 5.1")
+ (erc-make-obsolete-variable 'erc-process 'erc-server-process "ERC 5.1")
(defvaralias 'erc-default-coding-system 'erc-server-coding-system)
- (make-obsolete-variable 'erc-default-coding-system
- 'erc-server-coding-system
- "ERC 5.1"))
+ (erc-make-obsolete-variable 'erc-default-coding-system
+ 'erc-server-coding-system
+ "ERC 5.1"))
(message (concat "ERC: You're using an old version of Emacs; "
"this might break backward-compatibility attempts "
"for old versions of ERC.")))
(defalias 'erc-send-command 'erc-server-send)
-(make-obsolete 'erc-send-command 'erc-server-send "ERC 5.1")
+(erc-make-obsolete 'erc-send-command 'erc-server-send "ERC 5.1")
;; tunable connection and authentication parameters
＠＠ -1206,6 +1206,8 ＠＠ With arg, turn ERC %S mode on if and onl
(downcase (symbol-name alias)))))
(quote
,mode))))))
+
+(put 'define-erc-module 'doc-string-elt 3)
(defun erc-once-with-server-event (event &rest forms)
"Execute FORMS the next time EVENT occurs in the `current-buffer'.
- 1 participants
- 0 comments
CVS update by viteno xemacs ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/10/20 23:50:58
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1318 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1317
retrieving revision 1.1318
diff -u -p -r1.1317 -r1.1318
--- version.sh 2005/10/19 21:51:05 1.1317
+++ version.sh 2005/10/20 21:50:57 1.1318
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20051019)"
+xemacs_extra_name="(+CVS-20051020)"
xemacs_release_date="2005-02-18"
- 1 participants
- 0 comments
CVS update by malcolmp xemacs/man/internals ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: malcolmp
Date: 05/10/20 14:38:08
Modified: xemacs/man/internals internals.texi
Log:
Alias --enable configure options to --with. Update internals.texi to reflect
changes.
Revision Changes Path
1.462 +7 -0 XEmacs/xemacs/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -p -r1.461 -r1.462
--- ChangeLog 2005/10/14 01:00:44 1.461
+++ ChangeLog 2005/10/20 12:37:42 1.462
＠＠ -1,3 +1,10 ＠＠
+2005-10-15 Malcolm Purvis <malcolmp(a)xemacs.org>
+
+ * configure.ac: Added XE_MERGED_ARG to alias all local --enable
+ and --with options. Configure can only be built with autoconf
+ 2.59. Prevent many unwanted blank lines from appearing in
+ configure.
+
2005-10-13 Ben Wing <ben(a)xemacs.org>
* configure.ac (XE_COMPLEX_ARG_ENABLE):
1.255 +1562 -437 XEmacs/xemacs/configure
Index: configure
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -p -r1.254 -r1.255
--- configure 2005/10/05 04:37:54 1.254
+++ configure 2005/10/20 12:37:43 1.255
＠＠ -892,85 +892,10 ＠＠ if test -n "$ac_init_help"; then
cat <<\_ACEOF
Optional Features:
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --with-toolbars Enable toolbar support. Default: yes.
- --enable-mule Compile with Mule (MUlti-Lingual Emacs) support,
- needed to support non-Latin-1 (including Asian)
- languages.
- --enable-default-eol-detection
- Turns on by default auto-detection of end-of-line
- type when reading a file. Applies to those platforms
- where auto-detection is off by default (non-Mule
- Unix). Has no effect otherwise.
- --enable-external-widget
- Support XEmacs server for text widgets in other
- applications.
- --enable-kkcc Enable new GC algorithms.
- --enable-mc-alloc Enable new allocator.
- --enable-union-type Use union definition of Lisp_Object type. Known to
- trigger bugs in some compilers.
- --enable-pdump Enable portable LISP preloader.
- --enable-dump-in-exec Enable dumping into executable (enabled by default
- for `pdump', not enabled by default in combination
- with `mc-alloc').
- --enable-debug Enable additional debugging information. No time
- cost.
- --enable-assertions
- --enable-memory-usage-stats
- Enable LISP memory usage API.
- --enable-clash-detection
- Disable use of lock files to detect multiple edits
- of the same file.
- --enable-modules Compile in experimental support for dynamically
- loaded libraries (Dynamic Shared Objects).
- --enable-quick-build Speed up the build cycle by leaving out steps where
- XEmacs will still work (more or less) without them.
- Potentially dangerous if you don't know what you're
- doing. This (1) doesn't garbage-collect after
- loading each file during dumping, (2) doesn't
- automatically rebuild the DOC file (remove it by
- hand to get it rebuilt), (3) Removes config.h,
- lisp.h and associated files from the dependency
- lists, so changes to these files don't automatically
- cause all .c files to be rebuilt.
- --enable-database Compile with database support. Valid types are `no'
- or a comma-separated list of one or more of `berkdb'
- and either `dbm' or `gnudbm'.
- --enable-sound Compile with sound support. Valid types are
- `native', `nas' and `esd'. Prefix a type with 'no'
- to disable. The first type can be `none' or `all'.
- `none' means `nonative,nonas,noesd'. `all' means
- `native,nas,esd'. Later options override earlier
- ones for the same TYPE. The default is to autodetect
- all sound support except for ESD which defaults to
- off.
- --enable-bignum=TYPE Compile in support for bignums, ratios, or bigfloats
- using library support. TYPE must be one of "gmp"
- (for GNU MP), "mp" (for BSD MP), or "no" (disabled).
- --enable-error-checking Compile with internal error-checking added. Causes
- noticeable loss of speed. Valid types are extents,
- bufpos, malloc, gc, types, text, byte_code, glyphs,
- display, structures.
- --enable-menubars=TYPE Use TYPE menubars (lucid, motif, or no). The Lucid
- widgets emulate Motif (mostly) but are faster.
- *WARNING* The Motif menubar is currently broken.
- Lucid menubars are the default.
- --enable-scrollbars=TYPE
- Use TYPE scrollbars (lucid, motif, athena, or no).
- Lucid scrollbars are the default.
- --enable-dialogs=TYPE Use TYPE dialog boxes (lucid, motif, athena, or no).
- There are no true Lucid dialogs; Motif dialogs will
- be used if Motif can be found, else Athena is used.
- --enable-widgets Use TYPE native widgets (lucid, motif, athena, or
- no). Other widget types are currently unsupported.
- There are no true Lucid widgets; Motif widgets will
- be used if Motif can be found, else Athena is used.
-
-Optional Packages:
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
-
+ --with-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-FEATURE[=ARG] alias for --with-FEATURE
+ --without-FEATURE do not use FEATURE (same as --with-FEATURE=no)
+ --disable-FEATURE alias for --without-FEATURE
--with-prefix=no Don't compile the value for `prefix' into the
executable.
--with-site-lisp=no Allow for a site-lisp directory in the XEmacs
＠＠ -1024,11 +949,20 ＠＠ Optional Packages:
--with-xmu Use Xmu utilities. Default: yes.
--with-purify Support memory debugging using Purify.
--with-quantify Support performance debugging using Quantify.
+ --with-toolbars Enable toolbar support. Default: yes.
--with-tty Enable TTY support. Default: yes.
--with-xfs Enable XFontSet support for internationalized
menubar. Incompatible with `--with-xim=motif'.
- `--enable-menubars=lucid' (the default) is
+ `--with-menubars=lucid' (the default) is
desirable.
+ --with-mule Compile with Mule (Multi-Lingual Emacs) support,
+ needed to support non-Latin-1 (including Asian)
+ languages.
+ --with-default-eol-detection
+ Turns on by default auto-detection of end-of-line
+ type when reading a file. Applies to those platforms
+ where auto-detection is off by default (non-Mule
+ Unix). Has no effect otherwise.
--with-canna Support the Canna Japanese input method. Requires
Mule.
--with-wnn Support the Wnn Asian language input method.
＠＠ -1073,24 +1007,62 ＠＠ Optional Packages:
--with-package-prefix Specify packages root.
--with-package-path Search path for package hierarchies.
+ --with-external-widget
+ Support XEmacs server for text widgets in other
+ applications.
+ --with-kkcc Enable new GC algorithms.
+ --with-mc-alloc Enable new allocator.
+ --with-union-type Use union definition of Lisp_Object type. Known to
+ trigger bugs in some compilers.
+ --with-pdump Enable portable LISP preloader.
+ --with-dump-in-exec Enable dumping into executable (enabled by default
+ for `pdump', not enabled by default in combination
+ with `mc-alloc').
+ --with-debug Enable additional debugging information. No time
+ cost.
+ --with-assertions
+ --with-memory-usage-stats
+ Enable LISP memory usage API.
+ --with-clash-detection
+ Disable use of lock files to detect multiple edits
+ of the same file.
+ --with-modules Compile in experimental support for dynamically
+ loaded libraries (Dynamic Shared Objects).
+ --with-quick-build Speed up the build cycle by leaving out steps where
+ XEmacs will still work (more or less) without them.
+ Potentially dangerous if you don't know what you're
+ doing. This (1) doesn't garbage-collect after
+ loading each file during dumping, (2) doesn't
+ automatically rebuild the DOC file (remove it by
+ hand to get it rebuilt), (3) Removes config.h,
+ lisp.h and associated files from the dependency
+ lists, so changes to these files don't automatically
+ cause all .c files to be rebuilt.
--with-compiler C compiler to use
--with-xemacs-compiler compiler to use to compile just the xemacs
executable and C modules. If you want to compile
XEmacs as C++, use e.g.
`--with-xemacs-compiler=g++'. This turns on a lot of
additional error-checking.
- --with-cflags Compiler flags (such as -O); setting this overrides
- all default compiler flags except those that control
- warnings.
+ --with-cflags Compiler flags. These flags will be placed after any
+ flags inserted for warnings, debugging or
+ optimization; setting this does not disable the
+ insertion of those flags. Use configure settings
+ such as `--with-optimization=no' or
+ `enable-debug=no' to turn them off, or override them
+ with `--with-cflags-optimization',
+ `--with-cflags-debugging', or `with-cflags-warning'.
--with-cflags-warning Override compiler flags used to control warnings.
Normally, don't set this, as XEmacs already turns on
the maximum safe warning level.
--with-cflags-optimization=FLAGS
Override compiler flags used to control
- optimization. Only has an effect when optimization
- is enabled. Normally, don't set this, as XEmacs will
- already set the maximum safe optimization flags
- appropriate for the compiler being invoked.
+ optimization. If blank, forces no optimization; if
+ non-blank, forces optimization. Normally, don't set
+ this; XEmacs automatically sets the maximum safe
+ optimization flags appropriate for the compiler
+ being invoked. If you just want to turn optimization
+ on or off, use `with-optimization' instead.
--with-cflags-debugging=FLAGS
Override compiler flags used to add debugging
information to the executable. Normally, debugging
＠＠ -1107,11 +1079,48 ＠＠ Optional Packages:
--with-debug-malloc Use a debugging malloc.
--with-system-malloc Use the system malloc, not the one distributed with
XEmacs.
+ --with-database Compile with database support. Valid types are `no'
+ or a comma-separated list of one or more of `berkdb'
+ and either `dbm' or `gnudbm'.
+ --with-sound Compile with sound support. Valid types are
+ `native', `nas' and `esd'. Prefix a type with 'no'
+ to disable. The first type can be `none' or `all'.
+ `none' means `nonative,nonas,noesd'. `all' means
+ `native,nas,esd'. Later options override earlier
+ ones for the same TYPE. The default is to autodetect
+ all sound support except for ESD which defaults to
+ off.
--with-athena Use TYPE Athena widgets (xaw, 3d, next, 95, or xpm).
+
--with-mail-locking Specify the locking to be used by movemail to
prevent concurrent updates of mail spool files.
Valid types are `lockf', `flock', `dot', `locking'
or `mmdf'.
+ --with-bignum=TYPE Compile in support for bignums, ratios, or bigfloats
+ using library support. TYPE must be one of "gmp"
+ (for GNU MP), "mp" (for BSD MP), or "no" (disabled).
+ --with-error-checking Compile with internal error-checking added. Causes
+ noticeable loss of speed. Valid types are extents,
+ bufpos, malloc, gc, types, text, byte_code, glyphs,
+ display, structures.
+ --with-menubars=TYPE Use TYPE menubars (lucid, motif, or no). The Lucid
+ widgets emulate Motif (mostly) but are faster.
+ *WARNING* The Motif menubar is currently broken.
+ Lucid menubars are the default.
+ --with-scrollbars=TYPE
+ Use TYPE scrollbars (lucid, motif, athena, or no).
+ Lucid scrollbars are the default.
+ --with-dialogs=TYPE Use TYPE dialog boxes (lucid, motif, athena, or no).
+ There are no true Lucid dialogs; Motif dialogs will
+ be used if Motif can be found, else Athena is used.
+ --with-widgets Use TYPE native widgets (lucid, motif, athena, or
+ no). Other widget types are currently unsupported.
+ There are no true Lucid widgets; Motif widgets will
+ be used if Motif can be found, else Athena is used.
+
+Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-x use the X Window System
Some influential environment variables:
＠＠ -1613,435 +1622,958 ＠＠ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
progname="`echo $0 | sed 's:^\./\./:\./:'`"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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"
- { echo "Error:" --enable-mule, NOT --with-mule >&2; exit 1; }
-fi;
-
-# Check whether --with-menubars or --without-menubars was given.
-if test "${with_menubars+set}" = set; then
- withval="$with_menubars"
- { echo "Error:" --enable-menubars, NOT --with-menubars >&2; exit 1; }
-fi;
-
-# Check whether --with-scrollbars or --without-scrollbars was given.
-if test "${with_scrollbars+set}" = set; then
- withval="$with_scrollbars"
- { echo "Error:" --enable-scrollbars, NOT --with-scrollbars >&2; exit 1; }
-fi;
-
-# Check whether --with-dialogs or --without-dialogs was given.
-if test "${with_dialogs+set}" = set; then
- withval="$with_dialogs"
- { echo "Error:" --enable-dialogs, NOT --with-dialogs >&2; exit 1; }
-fi;
-
-# Check whether --with-widgets or --without-widgets was given.
-if test "${with_widgets+set}" = set; then
- withval="$with_widgets"
- { echo "Error:" --enable-widgets, NOT --with-widgets >&2; exit 1; }
-fi;
-
-# Check whether --with-sound or --without-sound was given.
-if test "${with_sound+set}" = set; then
- withval="$with_sound"
- { echo "Error:" --enable-sound, NOT --with-sound >&2; exit 1; }
-fi;
-
-# Check whether --with-default-eol-detection or --without-default-eol-detection was given.
-if test "${with_default_eol_detection+set}" = set; then
- withval="$with_default_eol_detection"
- { echo "Error:" --enable-default-eol-detection, NOT --with-default-eol-detection >&2; exit 1; }
-fi;
-
-# Check whether --with-clash-detection or --without-clash-detection was given.
-if test "${with_clash_detection+set}" = set; then
- withval="$with_clash_detection"
- { echo "Error:" --enable-clash-detection, NOT --with-clash-detection >&2; exit 1; }
-fi;
-
-# Check whether --with-database or --without-database was given.
-if test "${with_database+set}" = set; then
- withval="$with_database"
- { echo "Error:" --enable-database, NOT --with-database >&2; exit 1; }
+# If --with-prefix or --without-prefix were given then copy the value to the
+# equivalent enable_prefix variable.
+if test "${with_prefix+set}" = set; then
+ echo prefix Setting enable to "$with_prefix"
+ enable_prefix="$with_prefix"
fi;
-
-# Check whether --with-modules or --without-modules was given.
-if test "${with_modules+set}" = set; then
- withval="$with_modules"
- { echo "Error:" --enable-modules, NOT --with-modules >&2; exit 1; }
+# If -enable-prefix or --disable-prefix were given then copy the value to the
+# equivalent with_prefix variable.
+if test "${enable_prefix+set}" = set; then
+ echo prefix Setting with to "$enable_prefix"
+ with_prefix="$enable_prefix"
fi;
-
-# Check whether --with-toolbars or --without-toolbars was given.
-if test "${with_toolbars+set}" = set; then
- withval="$with_toolbars"
- { echo "Error:" --enable-toolbars, NOT --with-toolbars >&2; exit 1; }
-fi;
-
-
-
# Check whether --with-prefix or --without-prefix was given.
if test "${with_prefix+set}" = set; then
+ enableval="$with_prefix"
withval="$with_prefix"
true
else
with_prefix=yes
fi;
-
+# If --with-site-lisp or --without-site-lisp were given then copy the value to the
+# equivalent enable_site-lisp variable.
+if test "${with_site_lisp+set}" = set; then
+ echo site-lisp Setting enable to "$with_site_lisp"
+ enable_site_lisp="$with_site_lisp"
+fi;
+# If -enable-site-lisp or --disable-site-lisp were given then copy the value to the
+# equivalent with_site-lisp variable.
+if test "${enable_site_lisp+set}" = set; then
+ echo site-lisp Setting with to "$enable_site_lisp"
+ with_site_lisp="$enable_site_lisp"
+fi;
# Check whether --with-site-lisp or --without-site-lisp was given.
if test "${with_site_lisp+set}" = set; then
+ enableval="$with_site_lisp"
withval="$with_site_lisp"
true
else
with_site_lisp=no
fi;
-
+# If --with-site-modules or --without-site-modules were given then copy the value to the
+# equivalent enable_site-modules variable.
+if test "${with_site_modules+set}" = set; then
+ echo site-modules Setting enable to "$with_site_modules"
+ enable_site_modules="$with_site_modules"
+fi;
+# If -enable-site-modules or --disable-site-modules were given then copy the value to the
+# equivalent with_site-modules variable.
+if test "${enable_site_modules+set}" = set; then
+ echo site-modules Setting with to "$enable_site_modules"
+ with_site_modules="$enable_site_modules"
+fi;
# Check whether --with-site-modules or --without-site-modules was given.
if test "${with_site_modules+set}" = set; then
+ enableval="$with_site_modules"
withval="$with_site_modules"
fi;
-
+# If --with-gtk or --without-gtk were given then copy the value to the
+# equivalent enable_gtk variable.
+if test "${with_gtk+set}" = set; then
+ echo gtk Setting enable to "$with_gtk"
+ enable_gtk="$with_gtk"
+fi;
+# If -enable-gtk or --disable-gtk were given then copy the value to the
+# equivalent with_gtk variable.
+if test "${enable_gtk+set}" = set; then
+ echo gtk Setting with to "$enable_gtk"
+ with_gtk="$enable_gtk"
+fi;
# Check whether --with-gtk or --without-gtk was given.
if test "${with_gtk+set}" = set; then
+ enableval="$with_gtk"
withval="$with_gtk"
true
else
with_gtk=no
fi;
-
+# If --with-gnome or --without-gnome were given then copy the value to the
+# equivalent enable_gnome variable.
+if test "${with_gnome+set}" = set; then
+ echo gnome Setting enable to "$with_gnome"
+ enable_gnome="$with_gnome"
+fi;
+# If -enable-gnome or --disable-gnome were given then copy the value to the
+# equivalent with_gnome variable.
+if test "${enable_gnome+set}" = set; then
+ echo gnome Setting with to "$enable_gnome"
+ with_gnome="$enable_gnome"
+fi;
# Check whether --with-gnome or --without-gnome was given.
if test "${with_gnome+set}" = set; then
+ enableval="$with_gnome"
withval="$with_gnome"
true
else
with_gnome=no
fi;
-
+# If --with-msw or --without-msw were given then copy the value to the
+# equivalent enable_msw variable.
+if test "${with_msw+set}" = set; then
+ echo msw Setting enable to "$with_msw"
+ enable_msw="$with_msw"
+fi;
+# If -enable-msw or --disable-msw were given then copy the value to the
+# equivalent with_msw variable.
+if test "${enable_msw+set}" = set; then
+ echo msw Setting with to "$enable_msw"
+ with_msw="$enable_msw"
+fi;
# Check whether --with-msw or --without-msw was given.
if test "${with_msw+set}" = set; then
+ enableval="$with_msw"
withval="$with_msw"
fi;
-
+# If --with-gcc or --without-gcc were given then copy the value to the
+# equivalent enable_gcc variable.
+if test "${with_gcc+set}" = set; then
+ echo gcc Setting enable to "$with_gcc"
+ enable_gcc="$with_gcc"
+fi;
+# If -enable-gcc or --disable-gcc were given then copy the value to the
+# equivalent with_gcc variable.
+if test "${enable_gcc+set}" = set; then
+ echo gcc Setting with to "$enable_gcc"
+ with_gcc="$enable_gcc"
+fi;
# Check whether --with-gcc or --without-gcc was given.
if test "${with_gcc+set}" = set; then
+ enableval="$with_gcc"
withval="$with_gcc"
fi;
-
+# If --with-dynamic or --without-dynamic were given then copy the value to the
+# equivalent enable_dynamic variable.
+if test "${with_dynamic+set}" = set; then
+ echo dynamic Setting enable to "$with_dynamic"
+ enable_dynamic="$with_dynamic"
+fi;
+# If -enable-dynamic or --disable-dynamic were given then copy the value to the
+# equivalent with_dynamic variable.
+if test "${enable_dynamic+set}" = set; then
+ echo dynamic Setting with to "$enable_dynamic"
+ with_dynamic="$enable_dynamic"
+fi;
# Check whether --with-dynamic or --without-dynamic was given.
if test "${with_dynamic+set}" = set; then
+ enableval="$with_dynamic"
withval="$with_dynamic"
fi;
-
+# If --with-ncurses or --without-ncurses were given then copy the value to the
+# equivalent enable_ncurses variable.
+if test "${with_ncurses+set}" = set; then
+ echo ncurses Setting enable to "$with_ncurses"
+ enable_ncurses="$with_ncurses"
+fi;
+# If -enable-ncurses or --disable-ncurses were given then copy the value to the
+# equivalent with_ncurses variable.
+if test "${enable_ncurses+set}" = set; then
+ echo ncurses Setting with to "$enable_ncurses"
+ with_ncurses="$enable_ncurses"
+fi;
# Check whether --with-ncurses or --without-ncurses was given.
if test "${with_ncurses+set}" = set; then
+ enableval="$with_ncurses"
withval="$with_ncurses"
fi;
-
+# If --with-dnet or --without-dnet were given then copy the value to the
+# equivalent enable_dnet variable.
+if test "${with_dnet+set}" = set; then
+ echo dnet Setting enable to "$with_dnet"
+ enable_dnet="$with_dnet"
+fi;
+# If -enable-dnet or --disable-dnet were given then copy the value to the
+# equivalent with_dnet variable.
+if test "${enable_dnet+set}" = set; then
+ echo dnet Setting with to "$enable_dnet"
+ with_dnet="$enable_dnet"
+fi;
# Check whether --with-dnet or --without-dnet was given.
if test "${with_dnet+set}" = set; then
+ enableval="$with_dnet"
withval="$with_dnet"
fi;
-
+# If --with-socks or --without-socks were given then copy the value to the
+# equivalent enable_socks variable.
+if test "${with_socks+set}" = set; then
+ echo socks Setting enable to "$with_socks"
+ enable_socks="$with_socks"
+fi;
+# If -enable-socks or --disable-socks were given then copy the value to the
+# equivalent with_socks variable.
+if test "${enable_socks+set}" = set; then
+ echo socks Setting with to "$enable_socks"
+ with_socks="$enable_socks"
+fi;
# Check whether --with-socks or --without-socks was given.
if test "${with_socks+set}" = set; then
+ enableval="$with_socks"
withval="$with_socks"
fi;
-
+# If --with-dragndrop or --without-dragndrop were given then copy the value to the
+# equivalent enable_dragndrop variable.
+if test "${with_dragndrop+set}" = set; then
+ echo dragndrop Setting enable to "$with_dragndrop"
+ enable_dragndrop="$with_dragndrop"
+fi;
+# If -enable-dragndrop or --disable-dragndrop were given then copy the value to the
+# equivalent with_dragndrop variable.
+if test "${enable_dragndrop+set}" = set; then
+ echo dragndrop Setting with to "$enable_dragndrop"
+ with_dragndrop="$enable_dragndrop"
+fi;
# Check whether --with-dragndrop or --without-dragndrop was given.
if test "${with_dragndrop+set}" = set; then
+ enableval="$with_dragndrop"
withval="$with_dragndrop"
fi;
-
+# If --with-cde or --without-cde were given then copy the value to the
+# equivalent enable_cde variable.
+if test "${with_cde+set}" = set; then
+ echo cde Setting enable to "$with_cde"
+ enable_cde="$with_cde"
+fi;
+# If -enable-cde or --disable-cde were given then copy the value to the
+# equivalent with_cde variable.
+if test "${enable_cde+set}" = set; then
+ echo cde Setting with to "$enable_cde"
+ with_cde="$enable_cde"
+fi;
# Check whether --with-cde or --without-cde was given.
if test "${with_cde+set}" = set; then
+ enableval="$with_cde"
withval="$with_cde"
fi;
-
+# If --with-offix or --without-offix were given then copy the value to the
+# equivalent enable_offix variable.
+if test "${with_offix+set}" = set; then
+ echo offix Setting enable to "$with_offix"
+ enable_offix="$with_offix"
+fi;
+# If -enable-offix or --disable-offix were given then copy the value to the
+# equivalent with_offix variable.
+if test "${enable_offix+set}" = set; then
+ echo offix Setting with to "$enable_offix"
+ with_offix="$enable_offix"
+fi;
# Check whether --with-offix or --without-offix was given.
if test "${with_offix+set}" = set; then
+ enableval="$with_offix"
withval="$with_offix"
fi;
-
+# If --with-gpm or --without-gpm were given then copy the value to the
+# equivalent enable_gpm variable.
+if test "${with_gpm+set}" = set; then
+ echo gpm Setting enable to "$with_gpm"
+ enable_gpm="$with_gpm"
+fi;
+# If -enable-gpm or --disable-gpm were given then copy the value to the
+# equivalent with_gpm variable.
+if test "${enable_gpm+set}" = set; then
+ echo gpm Setting with to "$enable_gpm"
+ with_gpm="$enable_gpm"
+fi;
# Check whether --with-gpm or --without-gpm was given.
if test "${with_gpm+set}" = set; then
+ enableval="$with_gpm"
withval="$with_gpm"
fi;
-
+# If --with-xpm or --without-xpm were given then copy the value to the
+# equivalent enable_xpm variable.
+if test "${with_xpm+set}" = set; then
+ echo xpm Setting enable to "$with_xpm"
+ enable_xpm="$with_xpm"
+fi;
+# If -enable-xpm or --disable-xpm were given then copy the value to the
+# equivalent with_xpm variable.
+if test "${enable_xpm+set}" = set; then
+ echo xpm Setting with to "$enable_xpm"
+ with_xpm="$enable_xpm"
+fi;
# Check whether --with-xpm or --without-xpm was given.
if test "${with_xpm+set}" = set; then
+ enableval="$with_xpm"
withval="$with_xpm"
fi;
-
+# If --with-xface or --without-xface were given then copy the value to the
+# equivalent enable_xface variable.
+if test "${with_xface+set}" = set; then
+ echo xface Setting enable to "$with_xface"
+ enable_xface="$with_xface"
+fi;
+# If -enable-xface or --disable-xface were given then copy the value to the
+# equivalent with_xface variable.
+if test "${enable_xface+set}" = set; then
+ echo xface Setting with to "$enable_xface"
+ with_xface="$enable_xface"
+fi;
# Check whether --with-xface or --without-xface was given.
if test "${with_xface+set}" = set; then
+ enableval="$with_xface"
withval="$with_xface"
fi;
-
+# If --with-gif or --without-gif were given then copy the value to the
+# equivalent enable_gif variable.
+if test "${with_gif+set}" = set; then
+ echo gif Setting enable to "$with_gif"
+ enable_gif="$with_gif"
+fi;
+# If -enable-gif or --disable-gif were given then copy the value to the
+# equivalent with_gif variable.
+if test "${enable_gif+set}" = set; then
+ echo gif Setting with to "$enable_gif"
+ with_gif="$enable_gif"
+fi;
# Check whether --with-gif or --without-gif was given.
if test "${with_gif+set}" = set; then
+ enableval="$with_gif"
withval="$with_gif"
fi;
-
+# If --with-jpeg or --without-jpeg were given then copy the value to the
+# equivalent enable_jpeg variable.
+if test "${with_jpeg+set}" = set; then
+ echo jpeg Setting enable to "$with_jpeg"
+ enable_jpeg="$with_jpeg"
+fi;
+# If -enable-jpeg or --disable-jpeg were given then copy the value to the
+# equivalent with_jpeg variable.
+if test "${enable_jpeg+set}" = set; then
+ echo jpeg Setting with to "$enable_jpeg"
+ with_jpeg="$enable_jpeg"
+fi;
# Check whether --with-jpeg or --without-jpeg was given.
if test "${with_jpeg+set}" = set; then
+ enableval="$with_jpeg"
withval="$with_jpeg"
fi;
-
+# If --with-png or --without-png were given then copy the value to the
+# equivalent enable_png variable.
+if test "${with_png+set}" = set; then
+ echo png Setting enable to "$with_png"
+ enable_png="$with_png"
+fi;
+# If -enable-png or --disable-png were given then copy the value to the
+# equivalent with_png variable.
+if test "${enable_png+set}" = set; then
+ echo png Setting with to "$enable_png"
+ with_png="$enable_png"
+fi;
# Check whether --with-png or --without-png was given.
if test "${with_png+set}" = set; then
+ enableval="$with_png"
withval="$with_png"
fi;
-
+# If --with-tiff or --without-tiff were given then copy the value to the
+# equivalent enable_tiff variable.
+if test "${with_tiff+set}" = set; then
+ echo tiff Setting enable to "$with_tiff"
+ enable_tiff="$with_tiff"
+fi;
+# If -enable-tiff or --disable-tiff were given then copy the value to the
+# equivalent with_tiff variable.
+if test "${enable_tiff+set}" = set; then
+ echo tiff Setting with to "$enable_tiff"
+ with_tiff="$enable_tiff"
+fi;
# Check whether --with-tiff or --without-tiff was given.
if test "${with_tiff+set}" = set; then
+ enableval="$with_tiff"
withval="$with_tiff"
fi;
-
+# If --with-zlib or --without-zlib were given then copy the value to the
+# equivalent enable_zlib variable.
+if test "${with_zlib+set}" = set; then
+ echo zlib Setting enable to "$with_zlib"
+ enable_zlib="$with_zlib"
+fi;
+# If -enable-zlib or --disable-zlib were given then copy the value to the
+# equivalent with_zlib variable.
+if test "${enable_zlib+set}" = set; then
+ echo zlib Setting with to "$enable_zlib"
+ with_zlib="$enable_zlib"
+fi;
# Check whether --with-zlib or --without-zlib was given.
if test "${with_zlib+set}" = set; then
+ enableval="$with_zlib"
withval="$with_zlib"
fi;
-
+# If --with-wmcommand or --without-wmcommand were given then copy the value to the
+# equivalent enable_wmcommand variable.
+if test "${with_wmcommand+set}" = set; then
+ echo wmcommand Setting enable to "$with_wmcommand"
+ enable_wmcommand="$with_wmcommand"
+fi;
+# If -enable-wmcommand or --disable-wmcommand were given then copy the value to the
+# equivalent with_wmcommand variable.
+if test "${enable_wmcommand+set}" = set; then
+ echo wmcommand Setting with to "$enable_wmcommand"
+ with_wmcommand="$enable_wmcommand"
+fi;
# Check whether --with-wmcommand or --without-wmcommand was given.
if test "${with_wmcommand+set}" = set; then
+ enableval="$with_wmcommand"
withval="$with_wmcommand"
fi;
-
+# If --with-xmu or --without-xmu were given then copy the value to the
+# equivalent enable_xmu variable.
+if test "${with_xmu+set}" = set; then
+ echo xmu Setting enable to "$with_xmu"
+ enable_xmu="$with_xmu"
+fi;
+# If -enable-xmu or --disable-xmu were given then copy the value to the
+# equivalent with_xmu variable.
+if test "${enable_xmu+set}" = set; then
+ echo xmu Setting with to "$enable_xmu"
+ with_xmu="$enable_xmu"
+fi;
# Check whether --with-xmu or --without-xmu was given.
if test "${with_xmu+set}" = set; then
+ enableval="$with_xmu"
withval="$with_xmu"
fi;
-
+# If --with-purify or --without-purify were given then copy the value to the
+# equivalent enable_purify variable.
+if test "${with_purify+set}" = set; then
+ echo purify Setting enable to "$with_purify"
+ enable_purify="$with_purify"
+fi;
+# If -enable-purify or --disable-purify were given then copy the value to the
+# equivalent with_purify variable.
+if test "${enable_purify+set}" = set; then
+ echo purify Setting with to "$enable_purify"
+ with_purify="$enable_purify"
+fi;
# Check whether --with-purify or --without-purify was given.
if test "${with_purify+set}" = set; then
+ enableval="$with_purify"
withval="$with_purify"
fi;
-
+# If --with-quantify or --without-quantify were given then copy the value to the
+# equivalent enable_quantify variable.
+if test "${with_quantify+set}" = set; then
+ echo quantify Setting enable to "$with_quantify"
+ enable_quantify="$with_quantify"
+fi;
+# If -enable-quantify or --disable-quantify were given then copy the value to the
+# equivalent with_quantify variable.
+if test "${enable_quantify+set}" = set; then
+ echo quantify Setting with to "$enable_quantify"
+ with_quantify="$enable_quantify"
+fi;
# Check whether --with-quantify or --without-quantify was given.
if test "${with_quantify+set}" = set; then
+ enableval="$with_quantify"
withval="$with_quantify"
fi;
-# Check whether --enable-toolbars or --disable-toolbars was given.
+# If --with-toolbars or --without-toolbars were given then copy the value to the
+# equivalent enable_toolbars variable.
+if test "${with_toolbars+set}" = set; then
+ echo toolbars Setting enable to "$with_toolbars"
+ enable_toolbars="$with_toolbars"
+fi;
+# If -enable-toolbars or --disable-toolbars were given then copy the value to the
+# equivalent with_toolbars variable.
if test "${enable_toolbars+set}" = set; then
- enableval="$enable_toolbars"
-
+ echo toolbars Setting with to "$enable_toolbars"
+ with_toolbars="$enable_toolbars"
fi;
+# Check whether --with-toolbars or --without-toolbars was given.
+if test "${with_toolbars+set}" = set; then
+ enableval="$with_toolbars"
+ withval="$with_toolbars"
+fi;
+# If --with-tty or --without-tty were given then copy the value to the
+# equivalent enable_tty variable.
+if test "${with_tty+set}" = set; then
+ echo tty Setting enable to "$with_tty"
+ enable_tty="$with_tty"
+fi;
+# If -enable-tty or --disable-tty were given then copy the value to the
+# equivalent with_tty variable.
+if test "${enable_tty+set}" = set; then
+ echo tty Setting with to "$enable_tty"
+ with_tty="$enable_tty"
+fi;
# Check whether --with-tty or --without-tty was given.
if test "${with_tty+set}" = set; then
+ enableval="$with_tty"
withval="$with_tty"
fi;
-
+# If --with-xfs or --without-xfs were given then copy the value to the
+# equivalent enable_xfs variable.
+if test "${with_xfs+set}" = set; then
+ echo xfs Setting enable to "$with_xfs"
+ enable_xfs="$with_xfs"
+fi;
+# If -enable-xfs or --disable-xfs were given then copy the value to the
+# equivalent with_xfs variable.
+if test "${enable_xfs+set}" = set; then
+ echo xfs Setting with to "$enable_xfs"
+ with_xfs="$enable_xfs"
+fi;
# Check whether --with-xfs or --without-xfs was given.
if test "${with_xfs+set}" = set; then
+ enableval="$with_xfs"
withval="$with_xfs"
+fi;
+# If --with-mule or --without-mule were given then copy the value to the
+# equivalent enable_mule variable.
+if test "${with_mule+set}" = set; then
+ echo mule Setting enable to "$with_mule"
+ enable_mule="$with_mule"
fi;
-# Check whether --enable-mule or --disable-mule was given.
+# If -enable-mule or --disable-mule were given then copy the value to the
+# equivalent with_mule variable.
if test "${enable_mule+set}" = set; then
- enableval="$enable_mule"
+ echo mule Setting with to "$enable_mule"
+ with_mule="$enable_mule"
+fi;
+# Check whether --with-mule or --without-mule was given.
+if test "${with_mule+set}" = set; then
+ enableval="$with_mule"
+ withval="$with_mule"
fi;
-# Check whether --enable-default-eol-detection or --disable-default-eol-detection was given.
+# If --with-default-eol-detection or --without-default-eol-detection were given then copy the value to the
+# equivalent enable_default-eol-detection variable.
+if test "${with_default_eol_detection+set}" = set; then
+ echo default-eol-detection Setting enable to "$with_default_eol_detection"
+ enable_default_eol_detection="$with_default_eol_detection"
+fi;
+# If -enable-default-eol-detection or --disable-default-eol-detection were given then copy the value to the
+# equivalent with_default-eol-detection variable.
if test "${enable_default_eol_detection+set}" = set; then
- enableval="$enable_default_eol_detection"
-
+ echo default-eol-detection Setting with to "$enable_default_eol_detection"
+ with_default_eol_detection="$enable_default_eol_detection"
fi;
+# Check whether --with-default-eol-detection or --without-default-eol-detection was given.
+if test "${with_default_eol_detection+set}" = set; then
+ enableval="$with_default_eol_detection"
+ withval="$with_default_eol_detection"
+fi;
+# If --with-canna or --without-canna were given then copy the value to the
+# equivalent enable_canna variable.
+if test "${with_canna+set}" = set; then
+ echo canna Setting enable to "$with_canna"
+ enable_canna="$with_canna"
+fi;
+# If -enable-canna or --disable-canna were given then copy the value to the
+# equivalent with_canna variable.
+if test "${enable_canna+set}" = set; then
+ echo canna Setting with to "$enable_canna"
+ with_canna="$enable_canna"
+fi;
# Check whether --with-canna or --without-canna was given.
if test "${with_canna+set}" = set; then
+ enableval="$with_canna"
withval="$with_canna"
fi;
-
+# If --with-wnn or --without-wnn were given then copy the value to the
+# equivalent enable_wnn variable.
+if test "${with_wnn+set}" = set; then
+ echo wnn Setting enable to "$with_wnn"
+ enable_wnn="$with_wnn"
+fi;
+# If -enable-wnn or --disable-wnn were given then copy the value to the
+# equivalent with_wnn variable.
+if test "${enable_wnn+set}" = set; then
+ echo wnn Setting with to "$enable_wnn"
+ with_wnn="$enable_wnn"
+fi;
# Check whether --with-wnn or --without-wnn was given.
if test "${with_wnn+set}" = set; then
+ enableval="$with_wnn"
withval="$with_wnn"
fi;
-
+# If --with-wnn6 or --without-wnn6 were given then copy the value to the
+# equivalent enable_wnn6 variable.
+if test "${with_wnn6+set}" = set; then
+ echo wnn6 Setting enable to "$with_wnn6"
+ enable_wnn6="$with_wnn6"
+fi;
+# If -enable-wnn6 or --disable-wnn6 were given then copy the value to the
+# equivalent with_wnn6 variable.
+if test "${enable_wnn6+set}" = set; then
+ echo wnn6 Setting with to "$enable_wnn6"
+ with_wnn6="$enable_wnn6"
+fi;
# Check whether --with-wnn6 or --without-wnn6 was given.
if test "${with_wnn6+set}" = set; then
+ enableval="$with_wnn6"
withval="$with_wnn6"
fi;
-
+# If --with-workshop or --without-workshop were given then copy the value to the
+# equivalent enable_workshop variable.
+if test "${with_workshop+set}" = set; then
+ echo workshop Setting enable to "$with_workshop"
+ enable_workshop="$with_workshop"
+fi;
+# If -enable-workshop or --disable-workshop were given then copy the value to the
+# equivalent with_workshop variable.
+if test "${enable_workshop+set}" = set; then
+ echo workshop Setting with to "$enable_workshop"
+ with_workshop="$enable_workshop"
+fi;
# Check whether --with-workshop or --without-workshop was given.
if test "${with_workshop+set}" = set; then
+ enableval="$with_workshop"
withval="$with_workshop"
fi;
-
+# If --with-sparcworks or --without-sparcworks were given then copy the value to the
+# equivalent enable_sparcworks variable.
+if test "${with_sparcworks+set}" = set; then
+ echo sparcworks Setting enable to "$with_sparcworks"
+ enable_sparcworks="$with_sparcworks"
+fi;
+# If -enable-sparcworks or --disable-sparcworks were given then copy the value to the
+# equivalent with_sparcworks variable.
+if test "${enable_sparcworks+set}" = set; then
+ echo sparcworks Setting with to "$enable_sparcworks"
+ with_sparcworks="$enable_sparcworks"
+fi;
# Check whether --with-sparcworks or --without-sparcworks was given.
if test "${with_sparcworks+set}" = set; then
+ enableval="$with_sparcworks"
withval="$with_sparcworks"
fi;
-
+# If --with-tooltalk or --without-tooltalk were given then copy the value to the
+# equivalent enable_tooltalk variable.
+if test "${with_tooltalk+set}" = set; then
+ echo tooltalk Setting enable to "$with_tooltalk"
+ enable_tooltalk="$with_tooltalk"
+fi;
+# If -enable-tooltalk or --disable-tooltalk were given then copy the value to the
+# equivalent with_tooltalk variable.
+if test "${enable_tooltalk+set}" = set; then
+ echo tooltalk Setting with to "$enable_tooltalk"
+ with_tooltalk="$enable_tooltalk"
+fi;
# Check whether --with-tooltalk or --without-tooltalk was given.
if test "${with_tooltalk+set}" = set; then
+ enableval="$with_tooltalk"
withval="$with_tooltalk"
fi;
-
+# If --with-ldap or --without-ldap were given then copy the value to the
+# equivalent enable_ldap variable.
+if test "${with_ldap+set}" = set; then
+ echo ldap Setting enable to "$with_ldap"
+ enable_ldap="$with_ldap"
+fi;
+# If -enable-ldap or --disable-ldap were given then copy the value to the
+# equivalent with_ldap variable.
+if test "${enable_ldap+set}" = set; then
+ echo ldap Setting with to "$enable_ldap"
+ with_ldap="$enable_ldap"
+fi;
# Check whether --with-ldap or --without-ldap was given.
if test "${with_ldap+set}" = set; then
+ enableval="$with_ldap"
withval="$with_ldap"
fi;
-
+# If --with-postgresql or --without-postgresql were given then copy the value to the
+# equivalent enable_postgresql variable.
+if test "${with_postgresql+set}" = set; then
+ echo postgresql Setting enable to "$with_postgresql"
+ enable_postgresql="$with_postgresql"
+fi;
+# If -enable-postgresql or --disable-postgresql were given then copy the value to the
+# equivalent with_postgresql variable.
+if test "${enable_postgresql+set}" = set; then
+ echo postgresql Setting with to "$enable_postgresql"
+ with_postgresql="$enable_postgresql"
+fi;
# Check whether --with-postgresql or --without-postgresql was given.
if test "${with_postgresql+set}" = set; then
+ enableval="$with_postgresql"
withval="$with_postgresql"
fi;
-
+# If --with-pop or --without-pop were given then copy the value to the
+# equivalent enable_pop variable.
+if test "${with_pop+set}" = set; then
+ echo pop Setting enable to "$with_pop"
+ enable_pop="$with_pop"
+fi;
+# If -enable-pop or --disable-pop were given then copy the value to the
+# equivalent with_pop variable.
+if test "${enable_pop+set}" = set; then
+ echo pop Setting with to "$enable_pop"
+ with_pop="$enable_pop"
+fi;
# Check whether --with-pop or --without-pop was given.
if test "${with_pop+set}" = set; then
+ enableval="$with_pop"
withval="$with_pop"
fi;
-
+# If --with-kerberos or --without-kerberos were given then copy the value to the
+# equivalent enable_kerberos variable.
+if test "${with_kerberos+set}" = set; then
+ echo kerberos Setting enable to "$with_kerberos"
+ enable_kerberos="$with_kerberos"
+fi;
+# If -enable-kerberos or --disable-kerberos were given then copy the value to the
+# equivalent with_kerberos variable.
+if test "${enable_kerberos+set}" = set; then
+ echo kerberos Setting with to "$enable_kerberos"
+ with_kerberos="$enable_kerberos"
+fi;
# Check whether --with-kerberos or --without-kerberos was given.
if test "${with_kerberos+set}" = set; then
+ enableval="$with_kerberos"
withval="$with_kerberos"
fi;
-
+# If --with-hesiod or --without-hesiod were given then copy the value to the
+# equivalent enable_hesiod variable.
+if test "${with_hesiod+set}" = set; then
+ echo hesiod Setting enable to "$with_hesiod"
+ enable_hesiod="$with_hesiod"
+fi;
+# If -enable-hesiod or --disable-hesiod were given then copy the value to the
+# equivalent with_hesiod variable.
+if test "${enable_hesiod+set}" = set; then
+ echo hesiod Setting with to "$enable_hesiod"
+ with_hesiod="$enable_hesiod"
+fi;
# Check whether --with-hesiod or --without-hesiod was given.
if test "${with_hesiod+set}" = set; then
+ enableval="$with_hesiod"
withval="$with_hesiod"
fi;
-
+# If --with-infodock or --without-infodock were given then copy the value to the
+# equivalent enable_infodock variable.
+if test "${with_infodock+set}" = set; then
+ echo infodock Setting enable to "$with_infodock"
+ enable_infodock="$with_infodock"
+fi;
+# If -enable-infodock or --disable-infodock were given then copy the value to the
+# equivalent with_infodock variable.
+if test "${enable_infodock+set}" = set; then
+ echo infodock Setting with to "$enable_infodock"
+ with_infodock="$enable_infodock"
+fi;
# Check whether --with-infodock or --without-infodock was given.
if test "${with_infodock+set}" = set; then
+ enableval="$with_infodock"
withval="$with_infodock"
fi;
-
+# If --with-native-sound-lib or --without-native-sound-lib were given then copy the value to the
+# equivalent enable_native-sound-lib variable.
+if test "${with_native_sound_lib+set}" = set; then
+ echo native-sound-lib Setting enable to "$with_native_sound_lib"
+ enable_native_sound_lib="$with_native_sound_lib"
+fi;
+# If -enable-native-sound-lib or --disable-native-sound-lib were given then copy the value to the
+# equivalent with_native-sound-lib variable.
+if test "${enable_native_sound_lib+set}" = set; then
+ echo native-sound-lib Setting with to "$enable_native_sound_lib"
+ with_native_sound_lib="$enable_native_sound_lib"
+fi;
# Check whether --with-native-sound-lib or --without-native-sound-lib was given.
if test "${with_native_sound_lib+set}" = set; then
+ enableval="$with_native_sound_lib"
withval="$with_native_sound_lib"
fi;
-
+# If --with-netinstall or --without-netinstall were given then copy the value to the
+# equivalent enable_netinstall variable.
+if test "${with_netinstall+set}" = set; then
+ echo netinstall Setting enable to "$with_netinstall"
+ enable_netinstall="$with_netinstall"
+fi;
+# If -enable-netinstall or --disable-netinstall were given then copy the value to the
+# equivalent with_netinstall variable.
+if test "${enable_netinstall+set}" = set; then
+ echo netinstall Setting with to "$enable_netinstall"
+ with_netinstall="$enable_netinstall"
+fi;
# Check whether --with-netinstall or --without-netinstall was given.
if test "${with_netinstall+set}" = set; then
+ enableval="$with_netinstall"
withval="$with_netinstall"
else
with_netinstall="no"
fi;
-
+# If --with-optimization or --without-optimization were given then copy the value to the
+# equivalent enable_optimization variable.
+if test "${with_optimization+set}" = set; then
+ echo optimization Setting enable to "$with_optimization"
+ enable_optimization="$with_optimization"
+fi;
+# If -enable-optimization or --disable-optimization were given then copy the value to the
+# equivalent with_optimization variable.
+if test "${enable_optimization+set}" = set; then
+ echo optimization Setting with to "$enable_optimization"
+ with_optimization="$enable_optimization"
+fi;
# Check whether --with-optimization or --without-optimization was given.
if test "${with_optimization+set}" = set; then
+ enableval="$with_optimization"
withval="$with_optimization"
fi;
-
+# If --with-ipv6-cname or --without-ipv6-cname were given then copy the value to the
+# equivalent enable_ipv6-cname variable.
+if test "${with_ipv6_cname+set}" = set; then
+ echo ipv6-cname Setting enable to "$with_ipv6_cname"
+ enable_ipv6_cname="$with_ipv6_cname"
+fi;
+# If -enable-ipv6-cname or --disable-ipv6-cname were given then copy the value to the
+# equivalent with_ipv6-cname variable.
+if test "${enable_ipv6_cname+set}" = set; then
+ echo ipv6-cname Setting with to "$enable_ipv6_cname"
+ with_ipv6_cname="$enable_ipv6_cname"
+fi;
# Check whether --with-ipv6-cname or --without-ipv6-cname was given.
if test "${with_ipv6_cname+set}" = set; then
+ enableval="$with_ipv6_cname"
withval="$with_ipv6_cname"
else
with_ipv6_cname="no"
fi;
-
+# If --with-site-includes or --without-site-includes were given then copy the value to the
+# equivalent enable_site-includes variable.
+if test "${with_site_includes+set}" = set; then
+ echo site-includes Setting enable to "$with_site_includes"
+ enable_site_includes="$with_site_includes"
+fi;
+# If -enable-site-includes or --disable-site-includes were given then copy the value to the
+# equivalent with_site-includes variable.
+if test "${enable_site_includes+set}" = set; then
+ echo site-includes Setting with to "$enable_site_includes"
+ with_site_includes="$enable_site_includes"
+fi;
# Check whether --with-site-includes or --without-site-includes was given.
if test "${with_site_includes+set}" = set; then
+ enableval="$with_site_includes"
withval="$with_site_includes"
fi;
-
+# If --with-site-libraries or --without-site-libraries were given then copy the value to the
+# equivalent enable_site-libraries variable.
+if test "${with_site_libraries+set}" = set; then
+ echo site-libraries Setting enable to "$with_site_libraries"
+ enable_site_libraries="$with_site_libraries"
+fi;
+# If -enable-site-libraries or --disable-site-libraries were given then copy the value to the
+# equivalent with_site-libraries variable.
+if test "${enable_site_libraries+set}" = set; then
+ echo site-libraries Setting with to "$enable_site_libraries"
+ with_site_libraries="$enable_site_libraries"
+fi;
# Check whether --with-site-libraries or --without-site-libraries was given.
if test "${with_site_libraries+set}" = set; then
+ enableval="$with_site_libraries"
withval="$with_site_libraries"
fi;
-
+# If --with-site-prefixes or --without-site-prefixes were given then copy the value to the
+# equivalent enable_site-prefixes variable.
+if test "${with_site_prefixes+set}" = set; then
+ echo site-prefixes Setting enable to "$with_site_prefixes"
+ enable_site_prefixes="$with_site_prefixes"
+fi;
+# If -enable-site-prefixes or --disable-site-prefixes were given then copy the value to the
+# equivalent with_site-prefixes variable.
+if test "${enable_site_prefixes+set}" = set; then
+ echo site-prefixes Setting with to "$enable_site_prefixes"
+ with_site_prefixes="$enable_site_prefixes"
+fi;
# Check whether --with-site-prefixes or --without-site-prefixes was given.
if test "${with_site_prefixes+set}" = set; then
+ enableval="$with_site_prefixes"
withval="$with_site_prefixes"
fi;
-
+# If --with-statedir or --without-statedir were given then copy the value to the
+# equivalent enable_statedir variable.
+if test "${with_statedir+set}" = set; then
+ echo statedir Setting enable to "$with_statedir"
+ enable_statedir="$with_statedir"
+fi;
+# If -enable-statedir or --disable-statedir were given then copy the value to the
+# equivalent with_statedir variable.
+if test "${enable_statedir+set}" = set; then
+ echo statedir Setting with to "$enable_statedir"
+ with_statedir="$enable_statedir"
+fi;
# Check whether --with-statedir or --without-statedir was given.
if test "${with_statedir+set}" = set; then
+ enableval="$with_statedir"
withval="$with_statedir"
else
with_statedir='${prefix}/lib'
fi;
-
+# If --with-lispdir or --without-lispdir were given then copy the value to the
+# equivalent enable_lispdir variable.
+if test "${with_lispdir+set}" = set; then
+ echo lispdir Setting enable to "$with_lispdir"
+ enable_lispdir="$with_lispdir"
+fi;
+# If -enable-lispdir or --disable-lispdir were given then copy the value to the
+# equivalent with_lispdir variable.
+if test "${enable_lispdir+set}" = set; then
+ echo lispdir Setting with to "$enable_lispdir"
+ with_lispdir="$enable_lispdir"
+fi;
# Check whether --with-lispdir or --without-lispdir was given.
if test "${with_lispdir+set}" = set; then
+ enableval="$with_lispdir"
withval="$with_lispdir"
cat >>confdefs.h <<\_ACEOF
#define LISPDIR_USER_DEFINED 1
＠＠ -2050,9 +2582,21 ＠＠ _ACEOF
else
with_lispdir='${datadir}/${instvardir}/lisp'
fi;
-
+# If --with-archlibdir or --without-archlibdir were given then copy the value to the
+# equivalent enable_archlibdir variable.
+if test "${with_archlibdir+set}" = set; then
+ echo archlibdir Setting enable to "$with_archlibdir"
+ enable_archlibdir="$with_archlibdir"
+fi;
+# If -enable-archlibdir or --disable-archlibdir were given then copy the value to the
+# equivalent with_archlibdir variable.
+if test "${enable_archlibdir+set}" = set; then
+ echo archlibdir Setting with to "$enable_archlibdir"
+ with_archlibdir="$enable_archlibdir"
+fi;
# Check whether --with-archlibdir or --without-archlibdir was given.
if test "${with_archlibdir+set}" = set; then
+ enableval="$with_archlibdir"
withval="$with_archlibdir"
cat >>confdefs.h <<\_ACEOF
#define ARCHLIBDIR_USER_DEFINED 1
＠＠ -2061,9 +2605,21 ＠＠ _ACEOF
else
with_archlibdir='${libdir}/${instvardir}/${configuration}'
fi;
-
+# If --with-moduledir or --without-moduledir were given then copy the value to the
+# equivalent enable_moduledir variable.
+if test "${with_moduledir+set}" = set; then
+ echo moduledir Setting enable to "$with_moduledir"
+ enable_moduledir="$with_moduledir"
+fi;
+# If -enable-moduledir or --disable-moduledir were given then copy the value to the
+# equivalent with_moduledir variable.
+if test "${enable_moduledir+set}" = set; then
+ echo moduledir Setting with to "$enable_moduledir"
+ with_moduledir="$enable_moduledir"
+fi;
# Check whether --with-moduledir or --without-moduledir was given.
if test "${with_moduledir+set}" = set; then
+ enableval="$with_moduledir"
withval="$with_moduledir"
cat >>confdefs.h <<\_ACEOF
#define MODULEDIR_USER_DEFINED 1
＠＠ -2072,9 +2628,21 ＠＠ _ACEOF
else
with_moduledir='${libdir}/${instvardir}/${configuration}/modules'
fi;
-
+# If --with-etcdir or --without-etcdir were given then copy the value to the
+# equivalent enable_etcdir variable.
+if test "${with_etcdir+set}" = set; then
+ echo etcdir Setting enable to "$with_etcdir"
+ enable_etcdir="$with_etcdir"
+fi;
+# If -enable-etcdir or --disable-etcdir were given then copy the value to the
+# equivalent with_etcdir variable.
+if test "${enable_etcdir+set}" = set; then
+ echo etcdir Setting with to "$enable_etcdir"
+ with_etcdir="$enable_etcdir"
+fi;
# Check whether --with-etcdir or --without-etcdir was given.
if test "${with_etcdir+set}" = set; then
+ enableval="$with_etcdir"
withval="$with_etcdir"
cat >>confdefs.h <<\_ACEOF
#define ETCDIR_USER_DEFINED 1
＠＠ -2083,18 +2651,42 ＠＠ _ACEOF
else
with_etcdir='${datadir}/${instvardir}/etc'
fi;
-
+# If --with-infopath or --without-infopath were given then copy the value to the
+# equivalent enable_infopath variable.
+if test "${with_infopath+set}" = set; then
+ echo infopath Setting enable to "$with_infopath"
+ enable_infopath="$with_infopath"
+fi;
+# If -enable-infopath or --disable-infopath were given then copy the value to the
+# equivalent with_infopath variable.
+if test "${enable_infopath+set}" = set; then
+ echo infopath Setting with to "$enable_infopath"
+ with_infopath="$enable_infopath"
+fi;
# Check whether --with-infopath or --without-infopath was given.
if test "${with_infopath+set}" = set; then
+ enableval="$with_infopath"
withval="$with_infopath"
cat >>confdefs.h <<\_ACEOF
#define INFOPATH_USER_DEFINED 1
_ACEOF
fi;
-
+# If --with-docdir or --without-docdir were given then copy the value to the
+# equivalent enable_docdir variable.
+if test "${with_docdir+set}" = set; then
+ echo docdir Setting enable to "$with_docdir"
+ enable_docdir="$with_docdir"
+fi;
+# If -enable-docdir or --disable-docdir were given then copy the value to the
+# equivalent with_docdir variable.
+if test "${enable_docdir+set}" = set; then
+ echo docdir Setting with to "$enable_docdir"
+ with_docdir="$enable_docdir"
+fi;
# Check whether --with-docdir or --without-docdir was given.
if test "${with_docdir+set}" = set; then
+ enableval="$with_docdir"
withval="$with_docdir"
cat >>confdefs.h <<\_ACEOF
#define DOCDIR_USER_DEFINED 1
＠＠ -2103,189 +2695,553 ＠＠ _ACEOF
else
with_docdir='${archlibdir}'
fi;
-
+# If --with-site-runtime-libraries or --without-site-runtime-libraries were given then copy the value to the
+# equivalent enable_site-runtime-libraries variable.
+if test "${with_site_runtime_libraries+set}" = set; then
+ echo site-runtime-libraries Setting enable to "$with_site_runtime_libraries"
+ enable_site_runtime_libraries="$with_site_runtime_libraries"
+fi;
+# If -enable-site-runtime-libraries or --disable-site-runtime-libraries were given then copy the value to the
+# equivalent with_site-runtime-libraries variable.
+if test "${enable_site_runtime_libraries+set}" = set; then
+ echo site-runtime-libraries Setting with to "$enable_site_runtime_libraries"
+ with_site_runtime_libraries="$enable_site_runtime_libraries"
+fi;
# Check whether --with-site-runtime-libraries or --without-site-runtime-libraries was given.
if test "${with_site_runtime_libraries+set}" = set; then
+ enableval="$with_site_runtime_libraries"
withval="$with_site_runtime_libraries"
fi;
-
+# If --with-package-prefix or --without-package-prefix were given then copy the value to the
+# equivalent enable_package-prefix variable.
+if test "${with_package_prefix+set}" = set; then
+ echo package-prefix Setting enable to "$with_package_prefix"
+ enable_package_prefix="$with_package_prefix"
+fi;
+# If -enable-package-prefix or --disable-package-prefix were given then copy the value to the
+# equivalent with_package-prefix variable.
+if test "${enable_package_prefix+set}" = set; then
+ echo package-prefix Setting with to "$enable_package_prefix"
+ with_package_prefix="$enable_package_prefix"
+fi;
# Check whether --with-package-prefix or --without-package-prefix was given.
if test "${with_package_prefix+set}" = set; then
+ enableval="$with_package_prefix"
withval="$with_package_prefix"
cat >>confdefs.h <<\_ACEOF
#define PACKAGE_PATH_USER_DEFINED 1
_ACEOF
fi;
-
+# If --with-package-path or --without-package-path were given then copy the value to the
+# equivalent enable_package-path variable.
+if test "${with_package_path+set}" = set; then
+ echo package-path Setting enable to "$with_package_path"
+ enable_package_path="$with_package_path"
+fi;
+# If -enable-package-path or --disable-package-path were given then copy the value to the
+# equivalent with_package-path variable.
+if test "${enable_package_path+set}" = set; then
+ echo package-path Setting with to "$enable_package_path"
+ with_package_path="$enable_package_path"
+fi;
# Check whether --with-package-path or --without-package-path was given.
if test "${with_package_path+set}" = set; then
+ enableval="$with_package_path"
withval="$with_package_path"
cat >>confdefs.h <<\_ACEOF
#define PACKAGE_PATH_USER_DEFINED 1
_ACEOF
fi;
-# Check whether --enable-external-widget or --disable-external-widget was given.
+# If --with-external-widget or --without-external-widget were given then copy the value to the
+# equivalent enable_external-widget variable.
+if test "${with_external_widget+set}" = set; then
+ echo external-widget Setting enable to "$with_external_widget"
+ enable_external_widget="$with_external_widget"
+fi;
+# If -enable-external-widget or --disable-external-widget were given then copy the value to the
+# equivalent with_external-widget variable.
if test "${enable_external_widget+set}" = set; then
- enableval="$enable_external_widget"
-
+ echo external-widget Setting with to "$enable_external_widget"
+ with_external_widget="$enable_external_widget"
fi;
-# Check whether --enable-kkcc or --disable-kkcc was given.
+# Check whether --with-external-widget or --without-external-widget was given.
+if test "${with_external_widget+set}" = set; then
+ enableval="$with_external_widget"
+ withval="$with_external_widget"
+
+fi;
+# If --with-kkcc or --without-kkcc were given then copy the value to the
+# equivalent enable_kkcc variable.
+if test "${with_kkcc+set}" = set; then
+ echo kkcc Setting enable to "$with_kkcc"
+ enable_kkcc="$with_kkcc"
+fi;
+# If -enable-kkcc or --disable-kkcc were given then copy the value to the
+# equivalent with_kkcc variable.
if test "${enable_kkcc+set}" = set; then
- enableval="$enable_kkcc"
+ echo kkcc Setting with to "$enable_kkcc"
+ with_kkcc="$enable_kkcc"
+fi;
+# Check whether --with-kkcc or --without-kkcc was given.
+if test "${with_kkcc+set}" = set; then
+ enableval="$with_kkcc"
+ withval="$with_kkcc"
+else
+ enable_kkcc=yes
+fi;
+# If --with-mc-alloc or --without-mc-alloc were given then copy the value to the
+# equivalent enable_mc-alloc variable.
+if test "${with_mc_alloc+set}" = set; then
+ echo mc-alloc Setting enable to "$with_mc_alloc"
+ enable_mc_alloc="$with_mc_alloc"
fi;
-# Check whether --enable-mc-alloc or --disable-mc-alloc was given.
+# If -enable-mc-alloc or --disable-mc-alloc were given then copy the value to the
+# equivalent with_mc-alloc variable.
if test "${enable_mc_alloc+set}" = set; then
- enableval="$enable_mc_alloc"
+ echo mc-alloc Setting with to "$enable_mc_alloc"
+ with_mc_alloc="$enable_mc_alloc"
+fi;
+# Check whether --with-mc-alloc or --without-mc-alloc was given.
+if test "${with_mc_alloc+set}" = set; then
+ enableval="$with_mc_alloc"
+ withval="$with_mc_alloc"
+else
+ enable_mc_alloc=yes
fi;
-# Check whether --enable-union-type or --disable-union-type was given.
+# If --with-union-type or --without-union-type were given then copy the value to the
+# equivalent enable_union-type variable.
+if test "${with_union_type+set}" = set; then
+ echo union-type Setting enable to "$with_union_type"
+ enable_union_type="$with_union_type"
+fi;
+# If -enable-union-type or --disable-union-type were given then copy the value to the
+# equivalent with_union-type variable.
if test "${enable_union_type+set}" = set; then
- enableval="$enable_union_type"
-
+ echo union-type Setting with to "$enable_union_type"
+ with_union_type="$enable_union_type"
fi;
-# Check whether --enable-pdump or --disable-pdump was given.
+# Check whether --with-union-type or --without-union-type was given.
+if test "${with_union_type+set}" = set; then
+ enableval="$with_union_type"
+ withval="$with_union_type"
+
+fi;
+# If --with-pdump or --without-pdump were given then copy the value to the
+# equivalent enable_pdump variable.
+if test "${with_pdump+set}" = set; then
+ echo pdump Setting enable to "$with_pdump"
+ enable_pdump="$with_pdump"
+fi;
+# If -enable-pdump or --disable-pdump were given then copy the value to the
+# equivalent with_pdump variable.
if test "${enable_pdump+set}" = set; then
- enableval="$enable_pdump"
-
+ echo pdump Setting with to "$enable_pdump"
+ with_pdump="$enable_pdump"
fi;
-# Check whether --enable-dump-in-exec or --disable-dump-in-exec was given.
+# Check whether --with-pdump or --without-pdump was given.
+if test "${with_pdump+set}" = set; then
+ enableval="$with_pdump"
+ withval="$with_pdump"
+
+fi;
+# If --with-dump-in-exec or --without-dump-in-exec were given then copy the value to the
+# equivalent enable_dump-in-exec variable.
+if test "${with_dump_in_exec+set}" = set; then
+ echo dump-in-exec Setting enable to "$with_dump_in_exec"
+ enable_dump_in_exec="$with_dump_in_exec"
+fi;
+# If -enable-dump-in-exec or --disable-dump-in-exec were given then copy the value to the
+# equivalent with_dump-in-exec variable.
if test "${enable_dump_in_exec+set}" = set; then
- enableval="$enable_dump_in_exec"
-
+ echo dump-in-exec Setting with to "$enable_dump_in_exec"
+ with_dump_in_exec="$enable_dump_in_exec"
fi;
-# Check whether --enable-debug or --disable-debug was given.
+# Check whether --with-dump-in-exec or --without-dump-in-exec was given.
+if test "${with_dump_in_exec+set}" = set; then
+ enableval="$with_dump_in_exec"
+ withval="$with_dump_in_exec"
+
+fi;
+# If --with-debug or --without-debug were given then copy the value to the
+# equivalent enable_debug variable.
+if test "${with_debug+set}" = set; then
+ echo debug Setting enable to "$with_debug"
+ enable_debug="$with_debug"
+fi;
+# If -enable-debug or --disable-debug were given then copy the value to the
+# equivalent with_debug variable.
if test "${enable_debug+set}" = set; then
- enableval="$enable_debug"
-
+ echo debug Setting with to "$enable_debug"
+ with_debug="$enable_debug"
fi;
-# Check whether --enable-assertions or --disable-assertions was given.
+# Check whether --with-debug or --without-debug was given.
+if test "${with_debug+set}" = set; then
+ enableval="$with_debug"
+ withval="$with_debug"
+
+fi;
+# If --with-assertions or --without-assertions were given then copy the value to the
+# equivalent enable_assertions variable.
+if test "${with_assertions+set}" = set; then
+ echo assertions Setting enable to "$with_assertions"
+ enable_assertions="$with_assertions"
+fi;
+# If -enable-assertions or --disable-assertions were given then copy the value to the
+# equivalent with_assertions variable.
if test "${enable_assertions+set}" = set; then
- enableval="$enable_assertions"
-
+ echo assertions Setting with to "$enable_assertions"
+ with_assertions="$enable_assertions"
fi;
-# Check whether --enable-memory-usage-stats or --disable-memory-usage-stats was given.
+# Check whether --with-assertions or --without-assertions was given.
+if test "${with_assertions+set}" = set; then
+ enableval="$with_assertions"
+ withval="$with_assertions"
+
+fi;
+# If --with-memory-usage-stats or --without-memory-usage-stats were given then copy the value to the
+# equivalent enable_memory-usage-stats variable.
+if test "${with_memory_usage_stats+set}" = set; then
+ echo memory-usage-stats Setting enable to "$with_memory_usage_stats"
+ enable_memory_usage_stats="$with_memory_usage_stats"
+fi;
+# If -enable-memory-usage-stats or --disable-memory-usage-stats were given then copy the value to the
+# equivalent with_memory-usage-stats variable.
if test "${enable_memory_usage_stats+set}" = set; then
- enableval="$enable_memory_usage_stats"
+ echo memory-usage-stats Setting with to "$enable_memory_usage_stats"
+ with_memory_usage_stats="$enable_memory_usage_stats"
+fi;
+# Check whether --with-memory-usage-stats or --without-memory-usage-stats was given.
+if test "${with_memory_usage_stats+set}" = set; then
+ enableval="$with_memory_usage_stats"
+ withval="$with_memory_usage_stats"
fi;
-# Check whether --enable-clash-detection or --disable-clash-detection was given.
+# If --with-clash-detection or --without-clash-detection were given then copy the value to the
+# equivalent enable_clash-detection variable.
+if test "${with_clash_detection+set}" = set; then
+ echo clash-detection Setting enable to "$with_clash_detection"
+ enable_clash_detection="$with_clash_detection"
+fi;
+# If -enable-clash-detection or --disable-clash-detection were given then copy the value to the
+# equivalent with_clash-detection variable.
if test "${enable_clash_detection+set}" = set; then
- enableval="$enable_clash_detection"
+ echo clash-detection Setting with to "$enable_clash_detection"
+ with_clash_detection="$enable_clash_detection"
+fi;
+# Check whether --with-clash-detection or --without-clash-detection was given.
+if test "${with_clash_detection+set}" = set; then
+ enableval="$with_clash_detection"
+ withval="$with_clash_detection"
+fi;
+# If --with-modules or --without-modules were given then copy the value to the
+# equivalent enable_modules variable.
+if test "${with_modules+set}" = set; then
+ echo modules Setting enable to "$with_modules"
+ enable_modules="$with_modules"
fi;
-# Check whether --enable-modules or --disable-modules was given.
+# If -enable-modules or --disable-modules were given then copy the value to the
+# equivalent with_modules variable.
if test "${enable_modules+set}" = set; then
- enableval="$enable_modules"
+ echo modules Setting with to "$enable_modules"
+ with_modules="$enable_modules"
+fi;
+# Check whether --with-modules or --without-modules was given.
+if test "${with_modules+set}" = set; then
+ enableval="$with_modules"
+ withval="$with_modules"
fi;
-# Check whether --enable-quick-build or --disable-quick-build was given.
+# If --with-quick-build or --without-quick-build were given then copy the value to the
+# equivalent enable_quick-build variable.
+if test "${with_quick_build+set}" = set; then
+ echo quick-build Setting enable to "$with_quick_build"
+ enable_quick_build="$with_quick_build"
+fi;
+# If -enable-quick-build or --disable-quick-build were given then copy the value to the
+# equivalent with_quick-build variable.
if test "${enable_quick_build+set}" = set; then
- enableval="$enable_quick_build"
-
+ echo quick-build Setting with to "$enable_quick_build"
+ with_quick_build="$enable_quick_build"
fi;
+# Check whether --with-quick-build or --without-quick-build was given.
+if test "${with_quick_build+set}" = set; then
+ enableval="$with_quick_build"
+ withval="$with_quick_build"
+fi;
+# If --with-compiler or --without-compiler were given then copy the value to the
+# equivalent enable_compiler variable.
+if test "${with_compiler+set}" = set; then
+ echo compiler Setting enable to "$with_compiler"
+ enable_compiler="$with_compiler"
+fi;
+# If -enable-compiler or --disable-compiler were given then copy the value to the
+# equivalent with_compiler variable.
+if test "${enable_compiler+set}" = set; then
+ echo compiler Setting with to "$enable_compiler"
+ with_compiler="$enable_compiler"
+fi;
# Check whether --with-compiler or --without-compiler was given.
if test "${with_compiler+set}" = set; then
+ enableval="$with_compiler"
withval="$with_compiler"
fi;
-
+# If --with-xemacs-compiler or --without-xemacs-compiler were given then copy the value to the
+# equivalent enable_xemacs-compiler variable.
+if test "${with_xemacs_compiler+set}" = set; then
+ echo xemacs-compiler Setting enable to "$with_xemacs_compiler"
+ enable_xemacs_compiler="$with_xemacs_compiler"
+fi;
+# If -enable-xemacs-compiler or --disable-xemacs-compiler were given then copy the value to the
+# equivalent with_xemacs-compiler variable.
+if test "${enable_xemacs_compiler+set}" = set; then
+ echo xemacs-compiler Setting with to "$enable_xemacs_compiler"
+ with_xemacs_compiler="$enable_xemacs_compiler"
+fi;
# Check whether --with-xemacs-compiler or --without-xemacs-compiler was given.
if test "${with_xemacs_compiler+set}" = set; then
+ enableval="$with_xemacs_compiler"
withval="$with_xemacs_compiler"
fi;
-
+# If --with-cflags or --without-cflags were given then copy the value to the
+# equivalent enable_cflags variable.
+if test "${with_cflags+set}" = set; then
+ echo cflags Setting enable to "$with_cflags"
+ enable_cflags="$with_cflags"
+fi;
+# If -enable-cflags or --disable-cflags were given then copy the value to the
+# equivalent with_cflags variable.
+if test "${enable_cflags+set}" = set; then
+ echo cflags Setting with to "$enable_cflags"
+ with_cflags="$enable_cflags"
+fi;
# Check whether --with-cflags or --without-cflags was given.
if test "${with_cflags+set}" = set; then
+ enableval="$with_cflags"
withval="$with_cflags"
fi;
-
+# If --with-cflags-warning or --without-cflags-warning were given then copy the value to the
+# equivalent enable_cflags-warning variable.
+if test "${with_cflags_warning+set}" = set; then
+ echo cflags-warning Setting enable to "$with_cflags_warning"
+ enable_cflags_warning="$with_cflags_warning"
+fi;
+# If -enable-cflags-warning or --disable-cflags-warning were given then copy the value to the
+# equivalent with_cflags-warning variable.
+if test "${enable_cflags_warning+set}" = set; then
+ echo cflags-warning Setting with to "$enable_cflags_warning"
+ with_cflags_warning="$enable_cflags_warning"
+fi;
# Check whether --with-cflags-warning or --without-cflags-warning was given.
if test "${with_cflags_warning+set}" = set; then
+ enableval="$with_cflags_warning"
withval="$with_cflags_warning"
fi;
-
+# If --with-cflags-optimization or --without-cflags-optimization were given then copy the value to the
+# equivalent enable_cflags-optimization variable.
+if test "${with_cflags_optimization+set}" = set; then
+ echo cflags-optimization Setting enable to "$with_cflags_optimization"
+ enable_cflags_optimization="$with_cflags_optimization"
+fi;
+# If -enable-cflags-optimization or --disable-cflags-optimization were given then copy the value to the
+# equivalent with_cflags-optimization variable.
+if test "${enable_cflags_optimization+set}" = set; then
+ echo cflags-optimization Setting with to "$enable_cflags_optimization"
+ with_cflags_optimization="$enable_cflags_optimization"
+fi;
# Check whether --with-cflags-optimization or --without-cflags-optimization was given.
if test "${with_cflags_optimization+set}" = set; then
+ enableval="$with_cflags_optimization"
withval="$with_cflags_optimization"
fi;
-
+# If --with-cflags-debugging or --without-cflags-debugging were given then copy the value to the
+# equivalent enable_cflags-debugging variable.
+if test "${with_cflags_debugging+set}" = set; then
+ echo cflags-debugging Setting enable to "$with_cflags_debugging"
+ enable_cflags_debugging="$with_cflags_debugging"
+fi;
+# If -enable-cflags-debugging or --disable-cflags-debugging were given then copy the value to the
+# equivalent with_cflags-debugging variable.
+if test "${enable_cflags_debugging+set}" = set; then
+ echo cflags-debugging Setting with to "$enable_cflags_debugging"
+ with_cflags_debugging="$enable_cflags_debugging"
+fi;
# Check whether --with-cflags-debugging or --without-cflags-debugging was given.
if test "${with_cflags_debugging+set}" = set; then
+ enableval="$with_cflags_debugging"
withval="$with_cflags_debugging"
fi;
-
+# If --with-cpp or --without-cpp were given then copy the value to the
+# equivalent enable_cpp variable.
+if test "${with_cpp+set}" = set; then
+ echo cpp Setting enable to "$with_cpp"
+ enable_cpp="$with_cpp"
+fi;
+# If -enable-cpp or --disable-cpp were given then copy the value to the
+# equivalent with_cpp variable.
+if test "${enable_cpp+set}" = set; then
+ echo cpp Setting with to "$enable_cpp"
+ with_cpp="$enable_cpp"
+fi;
# Check whether --with-cpp or --without-cpp was given.
if test "${with_cpp+set}" = set; then
+ enableval="$with_cpp"
withval="$with_cpp"
CPP="$with_cpp"
fi;
-
+# If --with-cppflags or --without-cppflags were given then copy the value to the
+# equivalent enable_cppflags variable.
+if test "${with_cppflags+set}" = set; then
+ echo cppflags Setting enable to "$with_cppflags"
+ enable_cppflags="$with_cppflags"
+fi;
+# If -enable-cppflags or --disable-cppflags were given then copy the value to the
+# equivalent with_cppflags variable.
+if test "${enable_cppflags+set}" = set; then
+ echo cppflags Setting with to "$enable_cppflags"
+ with_cppflags="$enable_cppflags"
+fi;
# Check whether --with-cppflags or --without-cppflags was given.
if test "${with_cppflags+set}" = set; then
+ enableval="$with_cppflags"
withval="$with_cppflags"
CPPFLAGS="$with_cppflags"
fi;
-
+# If --with-libs or --without-libs were given then copy the value to the
+# equivalent enable_libs variable.
+if test "${with_libs+set}" = set; then
+ echo libs Setting enable to "$with_libs"
+ enable_libs="$with_libs"
+fi;
+# If -enable-libs or --disable-libs were given then copy the value to the
+# equivalent with_libs variable.
+if test "${enable_libs+set}" = set; then
+ echo libs Setting with to "$enable_libs"
+ with_libs="$enable_libs"
+fi;
# Check whether --with-libs or --without-libs was given.
if test "${with_libs+set}" = set; then
+ enableval="$with_libs"
withval="$with_libs"
LIBS="$with_libs"
fi;
-
+# If --with-ldflags or --without-ldflags were given then copy the value to the
+# equivalent enable_ldflags variable.
+if test "${with_ldflags+set}" = set; then
+ echo ldflags Setting enable to "$with_ldflags"
+ enable_ldflags="$with_ldflags"
+fi;
+# If -enable-ldflags or --disable-ldflags were given then copy the value to the
+# equivalent with_ldflags variable.
+if test "${enable_ldflags+set}" = set; then
+ echo ldflags Setting with to "$enable_ldflags"
+ with_ldflags="$enable_ldflags"
+fi;
# Check whether --with-ldflags or --without-ldflags was given.
if test "${with_ldflags+set}" = set; then
+ enableval="$with_ldflags"
withval="$with_ldflags"
LDFLAGS="$with_ldflags"
fi;
-
+# If --with-rel-alloc or --without-rel-alloc were given then copy the value to the
+# equivalent enable_rel-alloc variable.
+if test "${with_rel_alloc+set}" = set; then
+ echo rel-alloc Setting enable to "$with_rel_alloc"
+ enable_rel_alloc="$with_rel_alloc"
+fi;
+# If -enable-rel-alloc or --disable-rel-alloc were given then copy the value to the
+# equivalent with_rel-alloc variable.
+if test "${enable_rel_alloc+set}" = set; then
+ echo rel-alloc Setting with to "$enable_rel_alloc"
+ with_rel_alloc="$enable_rel_alloc"
+fi;
# Check whether --with-rel-alloc or --without-rel-alloc was given.
if test "${with_rel_alloc+set}" = set; then
+ enableval="$with_rel_alloc"
withval="$with_rel_alloc"
else
with_rel_alloc='default'
fi;
-
+# If --with-dlmalloc or --without-dlmalloc were given then copy the value to the
+# equivalent enable_dlmalloc variable.
+if test "${with_dlmalloc+set}" = set; then
+ echo dlmalloc Setting enable to "$with_dlmalloc"
+ enable_dlmalloc="$with_dlmalloc"
+fi;
+# If -enable-dlmalloc or --disable-dlmalloc were given then copy the value to the
+# equivalent with_dlmalloc variable.
+if test "${enable_dlmalloc+set}" = set; then
+ echo dlmalloc Setting with to "$enable_dlmalloc"
+ with_dlmalloc="$enable_dlmalloc"
+fi;
# Check whether --with-dlmalloc or --without-dlmalloc was given.
if test "${with_dlmalloc+set}" = set; then
+ enableval="$with_dlmalloc"
withval="$with_dlmalloc"
else
with_dlmalloc='default'
fi;
-
+# If --with-debug-malloc or --without-debug-malloc were given then copy the value to the
+# equivalent enable_debug-malloc variable.
+if test "${with_debug_malloc+set}" = set; then
+ echo debug-malloc Setting enable to "$with_debug_malloc"
+ enable_debug_malloc="$with_debug_malloc"
+fi;
+# If -enable-debug-malloc or --disable-debug-malloc were given then copy the value to the
+# equivalent with_debug-malloc variable.
+if test "${enable_debug_malloc+set}" = set; then
+ echo debug-malloc Setting with to "$enable_debug_malloc"
+ with_debug_malloc="$enable_debug_malloc"
+fi;
# Check whether --with-debug-malloc or --without-debug-malloc was given.
if test "${with_debug_malloc+set}" = set; then
+ enableval="$with_debug_malloc"
withval="$with_debug_malloc"
fi;
-
+# If --with-system-malloc or --without-system-malloc were given then copy the value to the
+# equivalent enable_system-malloc variable.
+if test "${with_system_malloc+set}" = set; then
+ echo system-malloc Setting enable to "$with_system_malloc"
+ enable_system_malloc="$with_system_malloc"
+fi;
+# If -enable-system-malloc or --disable-system-malloc were given then copy the value to the
+# equivalent with_system-malloc variable.
+if test "${enable_system_malloc+set}" = set; then
+ echo system-malloc Setting with to "$enable_system_malloc"
+ with_system_malloc="$enable_system_malloc"
+fi;
# Check whether --with-system-malloc or --without-system-malloc was given.
if test "${with_system_malloc+set}" = set; then
+ enableval="$with_system_malloc"
withval="$with_system_malloc"
else
＠＠ -2294,118 +3250,154 ＠＠ fi;
#Enable code.
-enable_database_notfirst=""
+_database_notfirst=""
+with_database_berkdb=""
enable_database_berkdb=""
+with_database_dbm=""
enable_database_dbm=""
+with_database_gdbm=""
enable_database_gdbm=""
-_enable_database_types="berkdb dbm gdbm"
-_enable_database_default="berkdb,dbm,gdbm"
+_database_types="berkdb dbm gdbm"
+_database_default="berkdb,dbm,gdbm"
-# Check whether --enable-database or --disable-database was given.
+# If --with-database or --without-database were given then copy the value to the
+# equivalent enable_database variable.
+if test "${with_database+set}" = set; then
+ echo database Setting enable to "$with_database"
+ enable_database="$with_database"
+fi;
+# If -enable-database or --disable-database were given then copy the value to the
+# equivalent with_database variable.
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=""
+ echo database Setting with to "$enable_database"
+ with_database="$enable_database"
+fi;
+# Check whether --with-database or --without-database was given.
+if test "${with_database+set}" = set; then
+ enableval="$with_database"
+ withval="$with_database"
+ for x in `echo "$with_database" | sed -e 's/,/ /g'` ; do
+ _database_all_default=""
+ _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 ) _database_all_default=no ;;
+ a | al | all | both ) _database_all_default=yes ;;
esac
- if test -z "$_enable_database_all_default"; then
- for y in $_enable_database_types; do
+ if test -z "$_database_all_default"; then
+ for y in $_database_types; do
if test "$x" = "$y"; then
- _enable_database_found=yes
- eval "enable_database_$y=yes"
+ _database_found=yes
+ eval "with_database_$y=yes"
+ eval "enable_database_$y=yes"
elif test "$x" = "no$y"; then
- _enable_database_found=yes
- eval "enable_database_$y=no"
+ _database_found=yes
+ eval "with_database_$y=no"
+ eval "enable_database_$y=no"
fi
done
- test -z "$_enable_database_found" && _enable_database_bogus=yes
+ test -z "$_database_found" && _database_bogus=yes
fi
- if test "$_enable_database_bogus" = "yes" -o \
- \( -n "$_enable_database_all_default" -a -n "$_enable_database_notfirst" \) ; then
+ if test "$_database_bogus" = "yes" -o \
+ \( -n "$_database_all_default" -a -n "$_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.
+echo " " "Valid values for the --with-database option are:
+$_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: $_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 "$_database_all_default" ; then
+ for y in $_database_types; do
+ eval "database_$y=$_database_all_default"
done
fi
- _enable_database_notfirst=yes
+ _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 _database_bogus _database_found _database_notfirst _database_types
+unset _database_default _database_all_default x y
if test "$enable_database_dbm" = "yes" -a "$enable_database_gdbm" = "yes"; then
(echo "$progname: Usage error:"
echo " " "Only one of \`dbm' and \`gnudbm' may be specified
-with the \`--enable-database' option."
+with the \`--with-database' option."
echo " Use \`$progname --help' to show usage.") >&2 && exit 1
fi
fi;
-enable_sound_notfirst=""
+_sound_notfirst=""
+with_sound_native=""
enable_sound_native=""
+with_sound_nas=""
enable_sound_nas=""
+with_sound_esd=no
enable_sound_esd=no
-_enable_sound_types="native nas esd"
-_enable_sound_default="native,nas,noesd"
+_sound_types="native nas esd"
+_sound_default="native,nas,noesd"
-# Check whether --enable-sound or --disable-sound was given.
+# If --with-sound or --without-sound were given then copy the value to the
+# equivalent enable_sound variable.
+if test "${with_sound+set}" = set; then
+ echo sound Setting enable to "$with_sound"
+ enable_sound="$with_sound"
+fi;
+# If -enable-sound or --disable-sound were given then copy the value to the
+# equivalent with_sound variable.
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=""
+ echo sound Setting with to "$enable_sound"
+ with_sound="$enable_sound"
+fi;
+# Check whether --with-sound or --without-sound was given.
+if test "${with_sound+set}" = set; then
+ enableval="$with_sound"
+ withval="$with_sound"
+ for x in `echo "$with_sound" | sed -e 's/,/ /g'` ; do
+ _sound_all_default=""
+ _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 ) _sound_all_default=no ;;
+ a | al | all | both ) _sound_all_default=yes ;;
esac
- if test -z "$_enable_sound_all_default"; then
- for y in $_enable_sound_types; do
+ if test -z "$_sound_all_default"; then
+ for y in $_sound_types; do
if test "$x" = "$y"; then
- _enable_sound_found=yes
- eval "enable_sound_$y=yes"
+ _sound_found=yes
+ eval "with_sound_$y=yes"
+ eval "enable_sound_$y=yes"
elif test "$x" = "no$y"; then
- _enable_sound_found=yes
- eval "enable_sound_$y=no"
+ _sound_found=yes
+ eval "with_sound_$y=no"
+ eval "enable_sound_$y=no"
fi
done
- test -z "$_enable_sound_found" && _enable_sound_bogus=yes
+ test -z "$_sound_found" && _sound_bogus=yes
fi
- if test "$_enable_sound_bogus" = "yes" -o \
- \( -n "$_enable_sound_all_default" -a -n "$_enable_sound_notfirst" \) ; then
+ if test "$_sound_bogus" = "yes" -o \
+ \( -n "$_sound_all_default" -a -n "$_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.
+echo " " "Valid values for the --with-sound option are:
+$_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: $_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 "$_sound_all_default" ; then
+ for y in $_sound_types; do
+ eval "sound_$y=$_sound_all_default"
done
fi
- _enable_sound_notfirst=yes
+ _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 _sound_bogus _sound_found _sound_notfirst _sound_types
+unset _sound_default _sound_all_default x y
＠＠ -2414,85 +3406,134 ＠＠ else
fi;
-
+# If --with-athena or --without-athena were given then copy the value to the
+# equivalent enable_athena variable.
+if test "${with_athena+set}" = set; then
+ echo athena Setting enable to "$with_athena"
+ enable_athena="$with_athena"
+fi;
+# If -enable-athena or --disable-athena were given then copy the value to the
+# equivalent with_athena variable.
+if test "${enable_athena+set}" = set; then
+ echo athena Setting with to "$enable_athena"
+ with_athena="$enable_athena"
+fi;
# Check whether --with-athena or --without-athena was given.
if test "${with_athena+set}" = set; then
+ enableval="$with_athena"
withval="$with_athena"
- _with_athena_bogus=yes
+ _athena_bogus=yes
for x in xaw 3d next 95 xpm ; do
if test $x = $with_athena ; then
- _with_athena_bogus=no
+ _athena_bogus=no
fi
done
- if test "$_with_athena_bogus" = "yes" ; then
+ if test "$_athena_bogus" = "yes" ; then
(echo "$progname: Usage error:"
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 _athena_bogus
fi;
-
+# If --with-xim or --without-xim were given then copy the value to the
+# equivalent enable_xim variable.
+if test "${with_xim+set}" = set; then
+ echo xim Setting enable to "$with_xim"
+ enable_xim="$with_xim"
+fi;
+# If -enable-xim or --disable-xim were given then copy the value to the
+# equivalent with_xim variable.
+if test "${enable_xim+set}" = set; then
+ echo xim Setting with to "$enable_xim"
+ with_xim="$enable_xim"
+fi;
# Check whether --with-xim or --without-xim was given.
if test "${with_xim+set}" = set; then
+ enableval="$with_xim"
withval="$with_xim"
- _with_xim_bogus=yes
+ _xim_bogus=yes
for x in yes no xlib motif ; do
if test $x = $with_xim ; then
- _with_xim_bogus=no
+ _xim_bogus=no
fi
done
- if test "$_with_xim_bogus" = "yes" ; then
+ if test "$_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 _xim_bogus
fi;
-
+# If --with-mail-locking or --without-mail-locking were given then copy the value to the
+# equivalent enable_mail-locking variable.
+if test "${with_mail_locking+set}" = set; then
+ echo mail-locking Setting enable to "$with_mail_locking"
+ enable_mail_locking="$with_mail_locking"
+fi;
+# If -enable-mail-locking or --disable-mail-locking were given then copy the value to the
+# equivalent with_mail-locking variable.
+if test "${enable_mail_locking+set}" = set; then
+ echo mail-locking Setting with to "$enable_mail_locking"
+ with_mail_locking="$enable_mail_locking"
+fi;
# Check whether --with-mail-locking or --without-mail-locking was given.
if test "${with_mail_locking+set}" = set; then
+ enableval="$with_mail_locking"
withval="$with_mail_locking"
- _with_mail_locking_bogus=yes
+ _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
+ _mail_locking_bogus=no
fi
done
- if test "$_with_mail_locking_bogus" = "yes" ; then
+ if test "$_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 _mail_locking_bogus
fi;
-# Check whether --enable-bignum or --disable-bignum was given.
+# If --with-bignum or --without-bignum were given then copy the value to the
+# equivalent enable_bignum variable.
+if test "${with_bignum+set}" = set; then
+ echo bignum Setting enable to "$with_bignum"
+ enable_bignum="$with_bignum"
+fi;
+# If -enable-bignum or --disable-bignum were given then copy the value to the
+# equivalent with_bignum variable.
if test "${enable_bignum+set}" = set; then
- enableval="$enable_bignum"
- _enable_bignum_bogus=yes
+ echo bignum Setting with to "$enable_bignum"
+ with_bignum="$enable_bignum"
+fi;
+# Check whether --with-bignum or --without-bignum was given.
+if test "${with_bignum+set}" = set; then
+ enableval="$with_bignum"
+ withval="$with_bignum"
+ _bignum_bogus=yes
for x in no gmp mp ; do
- if test $x = $enable_bignum ; then
- _enable_bignum_bogus=no
+ if test $x = $with_bignum ; then
+ _bignum_bogus=no
fi
done
- if test "$_enable_bignum_bogus" = "yes" ; then
+ if test "$_bignum_bogus" = "yes" ; then
(echo "$progname: Usage error:"
-echo " " "The --enable-bignum option must have one of these values: \`no',\`gmp',\`mp'."
+echo " " "The --with-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 _bignum_bogus
＠＠ -2500,146 +3541,222 ＠＠ else
enable_bignum="no"
fi;
-enable_error_checking_notfirst=""
+_error_checking_notfirst=""
+with_error_checking_extents=""
enable_error_checking_extents=""
+with_error_checking_types=""
enable_error_checking_types=""
+with_error_checking_text=""
enable_error_checking_text=""
+with_error_checking_gc=""
enable_error_checking_gc=""
+with_error_checking_malloc=""
enable_error_checking_malloc=""
+with_error_checking_byte_code=""
enable_error_checking_byte_code=""
+with_error_checking_glyphs=""
enable_error_checking_glyphs=""
+with_error_checking_display=""
enable_error_checking_display=""
+with_error_checking_structures=""
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"
+_error_checking_types="extents types text gc malloc byte_code glyphs display structures"
+_error_checking_default="extents,types,text,gc,malloc,byte_code,glyphs,display,structures"
-# Check whether --enable-error-checking or --disable-error-checking was given.
+# If --with-error-checking or --without-error-checking were given then copy the value to the
+# equivalent enable_error-checking variable.
+if test "${with_error_checking+set}" = set; then
+ echo error-checking Setting enable to "$with_error_checking"
+ enable_error_checking="$with_error_checking"
+fi;
+# If -enable-error-checking or --disable-error-checking were given then copy the value to the
+# equivalent with_error-checking variable.
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=""
+ echo error-checking Setting with to "$enable_error_checking"
+ with_error_checking="$enable_error_checking"
+fi;
+# Check whether --with-error-checking or --without-error-checking was given.
+if test "${with_error_checking+set}" = set; then
+ enableval="$with_error_checking"
+ withval="$with_error_checking"
+ for x in `echo "$with_error_checking" | sed -e 's/,/ /g'` ; do
+ _error_checking_all_default=""
+ _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 ) _error_checking_all_default=no ;;
+ a | al | all | both ) _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 "$_error_checking_all_default"; then
+ for y in $_error_checking_types; do
if test "$x" = "$y"; then
- _enable_error_checking_found=yes
- eval "enable_error_checking_$y=yes"
+ _error_checking_found=yes
+ eval "with_error_checking_$y=yes"
+ eval "enable_error_checking_$y=yes"
elif test "$x" = "no$y"; then
- _enable_error_checking_found=yes
- eval "enable_error_checking_$y=no"
+ _error_checking_found=yes
+ eval "with_error_checking_$y=no"
+ eval "enable_error_checking_$y=no"
fi
done
- test -z "$_enable_error_checking_found" && _enable_error_checking_bogus=yes
+ test -z "$_error_checking_found" && _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 "$_error_checking_bogus" = "yes" -o \
+ \( -n "$_error_checking_all_default" -a -n "$_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.
+echo " " "Valid values for the --with-error-checking option are:
+$_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: $_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 "$_error_checking_all_default" ; then
+ for y in $_error_checking_types; do
+ eval "error_checking_$y=$_error_checking_all_default"
done
fi
- _enable_error_checking_notfirst=yes
+ _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 _error_checking_bogus _error_checking_found _error_checking_notfirst _error_checking_types
+unset _error_checking_default _error_checking_all_default x y
fi;
-# Check whether --enable-menubars or --disable-menubars was given.
+# If --with-menubars or --without-menubars were given then copy the value to the
+# equivalent enable_menubars variable.
+if test "${with_menubars+set}" = set; then
+ echo menubars Setting enable to "$with_menubars"
+ enable_menubars="$with_menubars"
+fi;
+# If -enable-menubars or --disable-menubars were given then copy the value to the
+# equivalent with_menubars variable.
if test "${enable_menubars+set}" = set; then
- enableval="$enable_menubars"
- _enable_menubars_bogus=yes
+ echo menubars Setting with to "$enable_menubars"
+ with_menubars="$enable_menubars"
+fi;
+# Check whether --with-menubars or --without-menubars was given.
+if test "${with_menubars+set}" = set; then
+ enableval="$with_menubars"
+ withval="$with_menubars"
+ _menubars_bogus=yes
for x in yes no lucid motif athena gtk msw ; do
- if test $x = $enable_menubars ; then
- _enable_menubars_bogus=no
+ if test $x = $with_menubars ; then
+ _menubars_bogus=no
fi
done
- if test "$_enable_menubars_bogus" = "yes" ; then
+ if test "$_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 " " "The --with-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 _menubars_bogus
fi;
-# Check whether --enable-scrollbars or --disable-scrollbars was given.
+# If --with-scrollbars or --without-scrollbars were given then copy the value to the
+# equivalent enable_scrollbars variable.
+if test "${with_scrollbars+set}" = set; then
+ echo scrollbars Setting enable to "$with_scrollbars"
+ enable_scrollbars="$with_scrollbars"
+fi;
+# If -enable-scrollbars or --disable-scrollbars were given then copy the value to the
+# equivalent with_scrollbars variable.
if test "${enable_scrollbars+set}" = set; then
- enableval="$enable_scrollbars"
- _enable_scrollbars_bogus=yes
+ echo scrollbars Setting with to "$enable_scrollbars"
+ with_scrollbars="$enable_scrollbars"
+fi;
+# Check whether --with-scrollbars or --without-scrollbars was given.
+if test "${with_scrollbars+set}" = set; then
+ enableval="$with_scrollbars"
+ withval="$with_scrollbars"
+ _scrollbars_bogus=yes
for x in yes no lucid motif athena gtk msw ; do
- if test $x = $enable_scrollbars ; then
- _enable_scrollbars_bogus=no
+ if test $x = $with_scrollbars ; then
+ _scrollbars_bogus=no
fi
done
- if test "$_enable_scrollbars_bogus" = "yes" ; then
+ if test "$_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 " " "The --with-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 _scrollbars_bogus
fi;
-# Check whether --enable-dialogs or --disable-dialogs was given.
+# If --with-dialogs or --without-dialogs were given then copy the value to the
+# equivalent enable_dialogs variable.
+if test "${with_dialogs+set}" = set; then
+ echo dialogs Setting enable to "$with_dialogs"
+ enable_dialogs="$with_dialogs"
+fi;
+# If -enable-dialogs or --disable-dialogs were given then copy the value to the
+# equivalent with_dialogs variable.
if test "${enable_dialogs+set}" = set; then
- enableval="$enable_dialogs"
- _enable_dialogs_bogus=yes
+ echo dialogs Setting with to "$enable_dialogs"
+ with_dialogs="$enable_dialogs"
+fi;
+# Check whether --with-dialogs or --without-dialogs was given.
+if test "${with_dialogs+set}" = set; then
+ enableval="$with_dialogs"
+ withval="$with_dialogs"
+ _dialogs_bogus=yes
for x in yes no lucid motif athena gtk msw ; do
- if test $x = $enable_dialogs ; then
- _enable_dialogs_bogus=no
+ if test $x = $with_dialogs ; then
+ _dialogs_bogus=no
fi
done
- if test "$_enable_dialogs_bogus" = "yes" ; then
+ if test "$_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 " " "The --with-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 _dialogs_bogus
fi;
-# Check whether --enable-widgets or --disable-widgets was given.
+# If --with-widgets or --without-widgets were given then copy the value to the
+# equivalent enable_widgets variable.
+if test "${with_widgets+set}" = set; then
+ echo widgets Setting enable to "$with_widgets"
+ enable_widgets="$with_widgets"
+fi;
+# If -enable-widgets or --disable-widgets were given then copy the value to the
+# equivalent with_widgets variable.
if test "${enable_widgets+set}" = set; then
- enableval="$enable_widgets"
- _enable_widgets_bogus=yes
+ echo widgets Setting with to "$enable_widgets"
+ with_widgets="$enable_widgets"
+fi;
+# Check whether --with-widgets or --without-widgets was given.
+if test "${with_widgets+set}" = set; then
+ enableval="$with_widgets"
+ withval="$with_widgets"
+ _widgets_bogus=yes
for x in yes no lucid motif athena gtk msw ; do
- if test $x = $enable_widgets ; then
- _enable_widgets_bogus=no
+ if test $x = $with_widgets ; then
+ _widgets_bogus=no
fi
done
- if test "$_enable_widgets_bogus" = "yes" ; then
+ if test "$_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 " " "The --with-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 _widgets_bogus
＠＠ -7748,7 +8865,15 ＠＠ fi
if test -z "$with_optimization"; then
- if test -z "$emacs_is_beta" -o "$cflags_optimization_specified" = "yes"; then
+ # If user set --with-cflags-optimization, use it to unilaterally
+ # determine whether optimization should be enabled.
+ if test "$cflags_optimization_specified" = "yes" ; then
+ if -z "$with_cflags_optimization" ; then
+ with_optimization=no
+ else
+ with_optimization=yes
+ fi
+ elif test -z "$emacs_is_beta" ; then
with_optimization=yes
else
with_optimization=no
1.16 +200 -197 XEmacs/xemacs/configure.ac
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- configure.ac 2005/10/14 01:00:45 1.15
+++ configure.ac 2005/10/20 12:37:49 1.16
＠＠ -15,13 +15,17 ＠＠ ac_compile='$CC -c $CFLAGS '"$xe_cppflag
ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&AS_MESSAGE_LOG_FD'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
])
-
+dnl
dnl -------------------------------------------------------------------------
dnl Autoconf startup.
-
+dnl
+dnl Due to a dependence on the implementation of certain internal autoconf
+dnl macros, die if any version other than 2.59 is used.
AC_PREREQ(2.59)dnl
+m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2.59]), 1,
+ [m4_fatal([This script can only be generated with autoconf 2.59])], [])dnl
AC_INIT(src/lisp.h)dnl
-
+dnl
dnl -------------------------------------------------------------------------
dnl Local copyright notices.
＠＠ -85,39 +89,39 ＠＠ dnl
dnl If there's reason to prefer $0 over this, make sure you fix all the
dnl uses in this script!!
progname="`echo $0 | sed 's:^\./\./:\./:'`"
-
+dnl
dnl -------------------------------------------------------------------------
dnl Local macros
-
+dnl
define([USAGE_ERROR],
[(echo "$progname: Usage error:"
echo " " $1
-echo " Use \`$progname --help' to show usage.") >&2 && exit 1])
-
+echo " Use \`$progname --help' to show usage.") >&2 && exit 1])dnl
+dnl
dnl PRINT_VAR(var var ...) prints values of shell variables
define([PRINT_VAR],[for var in patsubst([$1],[[
-]+],[ ]); do eval "echo \"$var = '\$$var'\""; done])
-
+]+],[ ]); do eval "echo \"$var = '\$$var'\""; done])dnl
+dnl
dnl XE_ADD_OBJS(foo.o)
define([XE_ADD_OBJS],
[extra_objs="$extra_objs [$1]" && dnl
if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"[$1]\""
fi])dnl XE_ADD_OBJS
-
+dnl
dnl XE_APPEND(value, varname)
define([XE_APPEND],
[[$2]="$[$2] [$1]" && dnl
- if test "$verbose" = "yes"; then echo " Appending \"[$1]\" to \$[$2]"; fi])
-
+ if test "$verbose" = "yes"; then echo " Appending \"[$1]\" to \$[$2]"; fi])dnl
+dnl
dnl XE_PREPEND(value, varname)
define([XE_PREPEND],
[[$2]="[$1] $[$2]" && dnl
- if test "$verbose" = "yes"; then echo " Prepending \"[$1]\" to \$[$2]"; fi])
-
+ if test "$verbose" = "yes"; then echo " Prepending \"[$1]\" to \$[$2]"; fi])dnl
+dnl
dnl XE_DIE(message)
-define([XE_DIE], [{ echo "Error:" $1 >&2; exit 1; }])
-
+define([XE_DIE], [{ echo "Error:" $1 >&2; exit 1; }])dnl
+dnl
dnl XE_CHECK_FEATURE_DEPENDENCY(feature1, feature2)
define([XE_CHECK_FEATURE_DEPENDENCY],
[if test "$with_[$1] $with_[$2]" = "yes no"; then
＠＠ -125,13 +129,13 ＠＠ define([XE_CHECK_FEATURE_DEPENDENCY],
elif test "$with_[$2]" = "no" ; then with_[$1]=no
elif test "$with_[$1]" = "yes"; then with_[$2]=yes
fi
-])
-
+])dnl
+dnl
dnl XE_STRIP_4TH_COMPONENT(var)
dnl Changes i986-pc-linux-gnu to i986-pc-linux, as God (not RMS) intended.
define([XE_STRIP_4TH_COMPONENT],
-[$1=`echo "$$1" | sed '[s/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/]'`])
-
+[$1=`echo "$$1" | sed '[s/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/]'`])dnl
+dnl
dnl Do our best to deal with automounter brokenness
dnl CANONICALIZE_PATH(varname)
define([CANONICALIZE_PATH],
＠＠ -140,7 +144,7 ＠＠ define([CANONICALIZE_PATH],
$1=`echo "[$]$1" | \
sed -e "s|^${tdir}/|/net/|" -e "s|^/a/|/net/|" -e "s|^/amd/|/net/|"`
fi])dnl
-
+dnl
dnl XE_PROTECT_LINKER_FLAGS(shell_var)
define([XE_PROTECT_LINKER_FLAGS], [
if test "$GCC" = "yes"; then
＠＠ -155,11 +159,11 ＠＠ if test "$GCC" = "yes"; then
shift
done
fi])dnl
-
+dnl
dnl Allow use of either ":" or spaces for lists of directories
define(COLON_TO_SPACE,
[case "$[$1]" in *:* [)] [$1]="`echo '' $[$1] | sed -e 's/^ //' -e 's/:/ /g'`";; esac])dnl
-
+dnl
dnl XE_ADD_RUNPATH_DIR(directory)
define([XE_ADD_RUNPATH_DIR],[{
xe_runpath_dir=$1
＠＠ -169,7 +173,7 ＠＠ dnl PRINT_VAR(ld_switch_site ld_switch_x
-n "`ls ${xe_runpath_dir}/*.s[[ol]] 2>/dev/null`" && \
eval "$xe_add_unique_runpath_dir"
}])dnl
-
+dnl
dnl XE_COMPUTE_RUNPATH()
define([XE_COMPUTE_RUNPATH],[
if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then
＠＠ -217,7 +221,7 ＠＠ if test "$add_runtime_path" = "yes" -a -
fi
fi
])dnl
-
+dnl
dnl The construct foo=`echo $w1 $w2 $w3` fails on some systems if $w1 = -e or -n
dnl So we use the following instead.
dnl XE_SPACE(var, words)
＠＠ -226,7 +230,44 ＠＠ T=""
for W in $2; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
$1="$T"
])dnl XE_SPACE
-
+dnl
+dnl XE_MERGED_ARG(FEATURE, HELP-STRING, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+dnl ------------------------------------------------------------------------
+dnl
+dnl Arguments that can be specified with either --enable or --with. The
+dnl majority of XEmacs arguments do not fit neatly into the division between
+dnl --enable and --with, so allow those to be specified by either argument.
+dnl The value is stored in both enable_FEATURE and with_FEATURE.
+AC_DEFUN([XE_MERGED_ARG],
+[m4_divert_once([HELP_ENABLE], [[
+Optional Features:
+ --with-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-FEATURE[=ARG] alias for --with-FEATURE
+ --without-FEATURE do not use FEATURE (same as --with-FEATURE=no)
+ --disable-FEATURE alias for --without-FEATURE]])dnl
+m4_divert_once([HELP_ENABLE], m4_bpatsubst([[$2]],[--enable\([^ ]+\) ],[--with\1 ]))dnl
+# If --with-$1 or --without-$1 were given then copy the value to the
+# equivalent enable_$1 variable.
+if test "[${with_]m4_bpatsubst([$1], -, _)+set}" = set; then
+ echo $1 Setting enable to "[$with_]m4_bpatsubst([$1], -, _)"
+ [enable_]m4_bpatsubst([$1], -, _)="[$with_]m4_bpatsubst([$1], -, _)"
+fi;
+# If -enable-$1 or --disable-$1 were given then copy the value to the
+# equivalent with_$1 variable.
+if test "[${enable_]m4_bpatsubst([$1], -, _)+set}" = set; then
+ echo $1 Setting with to "[$enable_]m4_bpatsubst([$1], -, _)"
+ [with_]m4_bpatsubst([$1], -, _)="[$enable_]m4_bpatsubst([$1], -, _)"
+fi;
+# Check whether --with-$1 or --without-$1 was given.
+if test "[${with_]m4_bpatsubst([$1], -, _)+set}" = set; then
+ enableval="[$with_]m4_bpatsubst([$1], -, _)"
+ withval="[$with_]m4_bpatsubst([$1], -, _)"
+ $3
+m4_ifvaln([$4], [else
+ $4])dnl
+fi; dnl
+])dnl XE_MERGED_ARG
+dnl
dnl XEmacs keyword option support
dnl =============================
dnl
＠＠ -249,7 +290,7 ＠＠ dnl
define([XE_PARSE_KEYWORD_OPTION],
[_[$1]_bogus=yes
for x in XE_KEYWORD_LIST ; do
- if test $x = $[$1] ; then
+ if test $x = $with_[$1] ; then
_[$1]_bogus=no
fi
done
＠＠ -258,7 +299,7 ＠＠ define([XE_PARSE_KEYWORD_OPTION],
fi
unset _[$1]_bogus
undefine([XE_KEYWORD_LIST])dnl
-undefine([XE_KEYWORD_VALUES])])
+undefine([XE_KEYWORD_VALUES])])dnl
dnl
dnl XE_KEYWORD(keyword)
dnl --------------------------------
＠＠ -269,35 +310,21 ＠＠ define([XE_KEYWORD],
dnl Separate with a ':' instead of a ',' (see the parsing code above) to avoid
dnl confusion with marco parameter lists.
m4_append([XE_KEYWORD_VALUES],[\`$1'],[:])dnl
-])
-dnl
-dnl XE_KEYWORD_ARG_WITH(PACKAGE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE,
-dnl [XE_KEYWORD(keyword), ....])
-dnl --------------------------------------------------------------------------
-dnl
-dnl Expanded version of AC_ARG_WITH for keyword options. All the parameters
-dnl are required.
-dnl
-define([XE_KEYWORD_ARG_WITH],
-[m4_map([XE_KEYWORD],m4_shiftn(4, $＠))
-AC_ARG_WITH([$1],[$2],
-[XE_PARSE_KEYWORD_OPTION([with_]patsubst([$1], -, _), [--with-$1])
-$3
-],[$4])])
+])dnl
dnl
-dnl XE_KEYWORD_ARG_ENABLE(FEATURE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE,
+dnl XE_KEYWORD_ARG(PACKAGE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE,
dnl [XE_KEYWORD(keyword), ....])
dnl --------------------------------------------------------------------------
dnl
-dnl Expanded version of AC_ARG_ENABLE for keyword options. All the parameters
+dnl Expanded version of XE_MERGED_ARG for keyword options. All the parameters
dnl are required.
dnl
-define([XE_KEYWORD_ARG_ENABLE],
+define([XE_KEYWORD_ARG],
[m4_map([XE_KEYWORD],m4_shiftn(4, $＠))
-AC_ARG_ENABLE([$1],[$2],
-[XE_PARSE_KEYWORD_OPTION([enable_]patsubst([$1], -, _), [--enable-$1])
+XE_MERGED_ARG([$1],[$2],
+[XE_PARSE_KEYWORD_OPTION(patsubst([$1], -, _), [--with-$1])
$3
-],[$4])])
+],[$4])])dnl
dnl
dnl XEmacs complex option support
dnl =============================
＠＠ -320,7 +347,8 ＠＠ dnl Internal macro create the option's s
dnl value and to note the values in an option list.
dnl
define([XE_EXPAND_COMPLEX_OPTION],
-[[$1]_[$2]=[$3]
+[with_[$1]_[$2]=[$3]
+enable_[$1]_[$2]=[$3]
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.
＠＠ -335,7 +363,7 ＠＠ dnl
define([XE_EXPAND_COMPLEX_OPTIONS],
[m4_if([$2], [[]], [],
[XE_EXPAND_COMPLEX_OPTION([$1], m4_fst($2))[]dnl
-XE_EXPAND_COMPLEX_OPTIONS([$1], m4_cdr($2))])])
+XE_EXPAND_COMPLEX_OPTIONS([$1], m4_cdr($2))])])dnl
dnl
dnl XE_INIT_COMPLEX_OPTION(prefix, option_list)
dnl -------------------------------------------
＠＠ -347,7 +375,7 ＠＠ dnl and <prefix>_default contains a comm
dnl values.
dnl
define([XE_INIT_COMPLEX_OPTION],
-[[$1]_notfirst=""
+[_[$1]_notfirst=""
dnl
XE_EXPAND_COMPLEX_OPTIONS($＠)
_[$1]_types="XE_COMPONENT_LIST"
＠＠ -356,8 +384,8 ＠＠ dnl Undefine these macros so that they c
dnl options.
undefine([XE_COMPONENT_LIST])
undefine([XE_COMPONENT_DEFAULT])
-])
-
+])dnl
+dnl
dnl XE_PARSE_COMPLEX_OPTION(prefix, cmdline-flag)
dnl ---------------------------------------------
dnl
＠＠ -365,7 +393,7 ＠＠ dnl Internal macro to parse the option v
dnl found then an error is generated.
dnl
define([XE_PARSE_COMPLEX_OPTION],
-[for x in `echo "$[$1]" | sed -e 's/,/ /g'` ; do
+[for x in `echo "$with_[$1]" | sed -e 's/,/ /g'` ; do
_[$1]_all_default=""
_[$1]_found=""
case "$x" in
＠＠ -380,12 +408,14 ＠＠ define([XE_PARSE_COMPLEX_OPTION],
dnl echo "$x" = "$y"
_[$1]_found=yes
dnl echo eval `echo "[$1]_$y=yes"`
- eval "[$1]_$y=yes"
+ eval "with_[$1]_$y=yes"
+ eval "enable_[$1]_$y=yes"
elif test "$x" = "no$y"; then
dnl echo "$x" = "no$y"
_[$1]_found=yes
dnl echo eval `echo "[$1]_$y=no"`
- eval "[$1]_$y=no"
+ eval "with_[$1]_$y=no"
+ eval "enable_[$1]_$y=no"
fi
done
test -z "$_[$1]_found" && _[$1]_bogus=yes
＠＠ -405,8 +435,8 ＠＠ Hardcoded default is: $_[$1]_default."])
done
unset _[$1]_bogus _[$1]_found _[$1]_notfirst _[$1]_types
unset _[$1]_default _[$1]_all_default x y
-])
-
+])dnl
+dnl
dnl XE_COMPLEX_OPTION(option, yesno)
dnl --------------------------------
dnl
＠＠ -423,36 +453,22 ＠＠ dnl
define([XE_COMPLEX_OPTION_HELP_STRING],
[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.])])
+$5 support. Default is $6.])])dnl
dnl
-dnl XE_COMPLEX_ARG_WITH(PACKAGE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE,
+dnl XE_COMPLEX_ARG(PACKAGE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE,
dnl [XE_COMPLEX_OPTION(a,yes), ....])
dnl --------------------------------------------------------------------------
dnl
-dnl Expanded version of AC_ARG_WITH for complex options. All the parameters
+dnl Expanded version of XE_MERGED_ARG for complex options. All the parameters
dnl are required.
dnl
-define([XE_COMPLEX_ARG_WITH],
-[XE_INIT_COMPLEX_OPTION([with_]patsubst([$1], -, _), m4_shiftn(4, $＠))
-AC_ARG_WITH([$1],[$2],
-[XE_PARSE_COMPLEX_OPTION([with_]patsubst([$1], -, _), [--with-$1])
+define([XE_COMPLEX_ARG],
+[XE_INIT_COMPLEX_OPTION(patsubst([$1], -, _), m4_shiftn(4, $＠))
+XE_MERGED_ARG([$1],[$2],
+[XE_PARSE_COMPLEX_OPTION(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 --------------------------------------------------------------------------
+],[$4])])dnl
dnl
-dnl Expanded version of AC_ARG_ENABLE for complex options. All the parameters
-dnl are required.
-dnl
-define([XE_COMPLEX_ARG_ENABLE],
-[XE_INIT_COMPLEX_OPTION([enable_]patsubst([$1], -, _), m4_shiftn(4, $＠))
-AC_ARG_ENABLE([$1],[$2],
-[XE_PARSE_COMPLEX_OPTION([enable_]patsubst([$1], -, _), [--enable-$1])
-$3
-],[$4])])
-dnl
dnl -------------------------------------------------------------------------
XE_APPEND(lib-src, MAKE_SUBDIR)
XE_APPEND(lib-src, INSTALL_ARCH_DEP_SUBDIR)
＠＠ -462,19 +478,6 ＠＠ 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])],[])
-AC_ARG_WITH([scrollbars],[],[XE_DIE([--enable-scrollbars, NOT --with-scrollbars])],[])
-AC_ARG_WITH([dialogs],[],[XE_DIE([--enable-dialogs, NOT --with-dialogs])],[])
-AC_ARG_WITH([widgets],[],[XE_DIE([--enable-widgets, NOT --with-widgets])],[])
-AC_ARG_WITH([sound],[],[XE_DIE([--enable-sound, NOT --with-sound])],[])
-AC_ARG_WITH([default-eol-detection],[],[XE_DIE([--enable-default-eol-detection, NOT --with-default-eol-detection])],[])
-AC_ARG_WITH([clash-detection],[],[XE_DIE([--enable-clash-detection, NOT --with-clash-detection])],[])
-AC_ARG_WITH([database],[],[XE_DIE([--enable-database, NOT --with-database])],[])
-AC_ARG_WITH([modules],[],[XE_DIE([--enable-modules, NOT --with-modules])],[])
-AC_ARG_WITH([toolbars],[],[XE_DIE([--enable-toolbars, NOT --with-toolbars])],[])
-
dnl I think these will be caught by autoconf internal checks,
dnl only --with-* are unchecked
dnl --external-widget --enable-external-widget
＠＠ -489,52 +492,52 ＠＠ dnl --quick-build --enable-q
dnl --use-union-type --enable-union-type
dnl --pdump --enable-pdump
dnl --use-kkcc --enable-kkcc
-
+dnl
dnl parse flags
-AC_ARG_WITH([prefix],
+XE_MERGED_ARG([prefix],
AC_HELP_STRING([--with-prefix=no],[Don't compile the value for `prefix' into the executable.]),
[true], [with_prefix=yes])
-AC_ARG_WITH([site-lisp],
+XE_MERGED_ARG([site-lisp],
AC_HELP_STRING([--with-site-lisp=no],[Allow for a site-lisp directory in the XEmacs hierarchy searched before the installation packages.]),
[true], [with_site_lisp=no])
-AC_ARG_WITH([site-modules],
+XE_MERGED_ARG([site-modules],
AC_HELP_STRING([--with-site-modules],[Disable site-modules directory in the XEmacs hierarchy, which is searched before the installation modules.]),
[], [])
-AC_ARG_WITH([gtk],
+XE_MERGED_ARG([gtk],
AC_HELP_STRING([--with-gtk],[Support GTK on the X Window System. (EXPERIMENTAL)]),
[true], [with_gtk=no])
-AC_ARG_WITH([gnome],
+XE_MERGED_ARG([gnome],
AC_HELP_STRING([--with-gnome],[Support GNOME on the X Window System. (EXPERIMENTAL)]),
[true], [with_gnome=no])
-AC_ARG_WITH([msw],
+XE_MERGED_ARG([msw],
AC_HELP_STRING([--with-msw],[Support MS Windows as a window system (only under Cygwin and MinGW). `--with-msw=no' may be needed on *nix systems with Wine installed.]),
[], [])
-AC_ARG_WITH([gcc],
+XE_MERGED_ARG([gcc],
AC_HELP_STRING([--with-gcc],[Use GCC to compile XEmacs.]),
[], [])
-AC_ARG_WITH([dynamic],
+XE_MERGED_ARG([dynamic],
AC_HELP_STRING([--with-dynamic],[Link dynamically if supported by system. 'No' forces static linking.]),
[], [])
-AC_ARG_WITH([ncurses],
+XE_MERGED_ARG([ncurses],
AC_HELP_STRING([--with-ncurses],[Use the ncurses library for tty support.]),
[], [])
-AC_ARG_WITH([dnet],
+XE_MERGED_ARG([dnet],
AC_HELP_STRING([--with-dnet],[Compile with support for DECnet.]),
[], [])
-AC_ARG_WITH([socks],
+XE_MERGED_ARG([socks],
AC_HELP_STRING([--with-socks],[Compile with support for SOCKS (an Internet proxy).]),
[], [])
-AC_ARG_WITH([dragndrop],
+XE_MERGED_ARG([dragndrop],
AC_HELP_STRING([--with-dragndrop],[Compile in the generic drag and drop API. This is automatically added if one of the drag and drop
protocols is found (currently CDE, OffiX, MSWindows,
and GTK).
*WARNING* The Drag'n'drop support is under development
and is considered experimental.]),
[], [])
-AC_ARG_WITH([cde],
+XE_MERGED_ARG([cde],
AC_HELP_STRING([--with-cde],[Compile in support for CDE drag and drop.]),
[], [])
-AC_ARG_WITH([offix],
+XE_MERGED_ARG([offix],
AC_HELP_STRING([--with-offix],[Compile in support for OffiX drag and drop.
*WARNING* If you compile in OffiX, you may not be
able to use multiple X displays success-
＠＠ -542,204 +545,204 ＠＠ AC_ARG_WITH([offix],
different vendors, the results may be
unpredictable.]),
[], [])
-AC_ARG_WITH([gpm],
+XE_MERGED_ARG([gpm],
AC_HELP_STRING([--with-gpm],[Compile in GPM mouse support for ttys.]),
[], [])
-AC_ARG_WITH([xpm],
+XE_MERGED_ARG([xpm],
AC_HELP_STRING([--with-xpm],[Compile with support for XPM images. PRACTICALLY
REQUIRED. Although this library is nonstandard and
a real hassle to build, many basic things (e.g.
toolbars) depend on it, and you will run into
many problems without it.]),
[], [])
-AC_ARG_WITH([xface],
+XE_MERGED_ARG([xface],
AC_HELP_STRING([--with-xface],[Compile with support for X-Face mail headers.
Requires the compface package.]),
[], [])
-AC_ARG_WITH([gif],
+XE_MERGED_ARG([gif],
AC_HELP_STRING([--with-gif],[Compile without the (builtin) support for GIF images.]),
[], [])
-AC_ARG_WITH([jpeg],
+XE_MERGED_ARG([jpeg],
AC_HELP_STRING([--with-jpeg],[Compile with support for JPEG images. Useful if
you are using a mail, news reader, or web browser
in XEmacs, so that JPEG images can be displayed.]),
[], [])
-AC_ARG_WITH([png],
+XE_MERGED_ARG([png],
AC_HELP_STRING([--with-png],[Compile with support for PNG images. Recommended
because the images on the About page are not viewable
without it.]),
[], [])
-AC_ARG_WITH([tiff],
+XE_MERGED_ARG([tiff],
AC_HELP_STRING([--with-tiff],[Compile with support for TIFF images. Possibly
useful, for the same reason as JPEG images.]),
[], [])
-AC_ARG_WITH([zlib],
+XE_MERGED_ARG([zlib],
AC_HELP_STRING([--with-zlib],[Support inflate (de)compression internally.]),
[], [])
-AC_ARG_WITH([wmcommand],
+XE_MERGED_ARG([wmcommand],
AC_HELP_STRING([--with-wmcommand],[Compile without realized leader window which will
keep the WM_COMMAND property.]),
[], [])
-AC_ARG_WITH([xmu],
+XE_MERGED_ARG([xmu],
AC_HELP_STRING([--with-xmu],[Use Xmu utilities. Default: yes.]),
[], [])
-AC_ARG_WITH([purify],
+XE_MERGED_ARG([purify],
AC_HELP_STRING([--with-purify],[Support memory debugging using Purify.]),
[], [])
-AC_ARG_WITH([quantify],
+XE_MERGED_ARG([quantify],
AC_HELP_STRING([--with-quantify],[Support performance debugging using Quantify.]),
[], [])
-AC_ARG_ENABLE([toolbars],
- AC_HELP_STRING([--with-toolbars],[Enable toolbar support. Default: yes.]),
+XE_MERGED_ARG([toolbars],
+ AC_HELP_STRING([--enable-toolbars],[Enable toolbar support. Default: yes.]),
[], [])
-AC_ARG_WITH([tty],
+XE_MERGED_ARG([tty],
AC_HELP_STRING([--with-tty],[Enable TTY support. Default: yes.]),
[], [])
-AC_ARG_WITH([xfs],
+XE_MERGED_ARG([xfs],
AC_HELP_STRING([--with-xfs],[Enable XFontSet support for internationalized
menubar. Incompatible with `--with-xim=motif'.
`--enable-menubars=lucid' (the default) is desirable.]),
[], [])
-AC_ARG_ENABLE([mule],
- AC_HELP_STRING([--enable-mule],[Compile with Mule (MUlti-Lingual Emacs) support,
+XE_MERGED_ARG([mule],
+ AC_HELP_STRING([--enable-mule],[Compile with Mule (Multi-Lingual Emacs) support,
needed to support non-Latin-1 (including Asian)
languages.]),
[], [])
-AC_ARG_ENABLE([default-eol-detection],
+XE_MERGED_ARG([default-eol-detection],
AC_HELP_STRING([--enable-default-eol-detection],[Turns on by default auto-detection of end-of-line type
when reading a file. Applies to those platforms where
auto-detection is off by default (non-Mule Unix). Has
no effect otherwise.]),
[], [])
-AC_ARG_WITH([canna],
+XE_MERGED_ARG([canna],
AC_HELP_STRING([--with-canna],[Support the Canna Japanese input method. Requires Mule.]),
[], [])
-AC_ARG_WITH([wnn],
+XE_MERGED_ARG([wnn],
AC_HELP_STRING([--with-wnn],[Support the Wnn Asian language input
method. Requires Mule.]),
[], [])
-AC_ARG_WITH([wnn6],
+XE_MERGED_ARG([wnn6],
AC_HELP_STRING([--with-wnn6],[Support the Wnn6 Asian language input
method (proprietary). Requires Mule.]),
[], [])
-AC_ARG_WITH([workshop],
+XE_MERGED_ARG([workshop],
AC_HELP_STRING([--with-workshop],[Support the Sun WorkShop (formerly Sparcworks)
development environment.]),
[], [])
-AC_ARG_WITH([sparcworks],
+XE_MERGED_ARG([sparcworks],
AC_HELP_STRING([--with-sparcworks],[Alias for --with-workshop]),
[], [])
-AC_ARG_WITH([tooltalk],
+XE_MERGED_ARG([tooltalk],
AC_HELP_STRING([--with-tooltalk],[Support the ToolTalk IPC protocol.]),
[], [])
-AC_ARG_WITH([ldap],
+XE_MERGED_ARG([ldap],
AC_HELP_STRING([--with-ldap],[Support the LDAP protocol.]),
[], [])
-AC_ARG_WITH([postgresql],
+XE_MERGED_ARG([postgresql],
AC_HELP_STRING([--with-postgresql],[Support the PostgreSQL RDBMS.]),
[], [])
-AC_ARG_WITH([pop],
+XE_MERGED_ARG([pop],
AC_HELP_STRING([--with-pop],[Support POP for mail retrieval.]),
[], [])
-AC_ARG_WITH([kerberos],
+XE_MERGED_ARG([kerberos],
AC_HELP_STRING([--with-kerberos],[Support Kerberos-authenticated POP.]),
[], [])
-AC_ARG_WITH([hesiod],
+XE_MERGED_ARG([hesiod],
AC_HELP_STRING([--with-hesiod],[Support Hesiod to get the POP server host.]),
[], [])
-AC_ARG_WITH([infodock],
+XE_MERGED_ARG([infodock],
AC_HELP_STRING([--with-infodock],[Support the Infodock version of XEmacs. Infodock is a SourceForge project).]),
[], [])
-AC_ARG_WITH([native-sound-lib],
+XE_MERGED_ARG([native-sound-lib],
AC_HELP_STRING([--with-native-sound-lib],[Path to sound library (for systems with name conflicts).]),
[], [])
-AC_ARG_WITH([netinstall],
+XE_MERGED_ARG([netinstall],
AC_HELP_STRING([--with-netinstall],[Support for installation over the internet.
Only functional on the MS Windows platforms.]),
[], [with_netinstall="no"])
-AC_ARG_WITH([optimization],
+XE_MERGED_ARG([optimization],
AC_HELP_STRING([--with-optimization],[Control whether compilation is optimized. By default, optimization is on in release versions and off in beta versions, since it can interfere with proper stack backtraces.]),
[], [])
-AC_ARG_WITH([ipv6-cname],
+XE_MERGED_ARG([ipv6-cname],
AC_HELP_STRING([--with-ipv6-cname],[Try IPv6 information first when canonicalizing host names. This option has no effect unless system supports getaddrinfo(3) and getnameinfo(3).]),
[], [with_ipv6_cname="no"])
-AC_ARG_WITH([site-includes],
+XE_MERGED_ARG([site-includes],
AC_HELP_STRING([--with-site-includes],[Prepend to include search path.]),
[], [])
-AC_ARG_WITH([site-libraries],
+XE_MERGED_ARG([site-libraries],
AC_HELP_STRING([--with-site-libraries],[Prepend to library search path.]),
[], [])
-AC_ARG_WITH([site-prefixes],
+XE_MERGED_ARG([site-prefixes],
AC_HELP_STRING([--with-site-prefixes],[Prepend to include and library search paths, with /include and /lib added. Comes after site-includes and site-libraries, if any.]),
[], [])
-AC_ARG_WITH([statedir],
+XE_MERGED_ARG([statedir],
AC_HELP_STRING([--with-statedir],[]),
[], [with_statedir='${prefix}/lib'])
-AC_ARG_WITH([lispdir],
+XE_MERGED_ARG([lispdir],
AC_HELP_STRING([--with-lispdir],[]),
[AC_DEFINE(LISPDIR_USER_DEFINED)], [with_lispdir='${datadir}/${instvardir}/lisp'])
-AC_ARG_WITH([archlibdir],
+XE_MERGED_ARG([archlibdir],
AC_HELP_STRING([--with-archlibdir],[]),
[AC_DEFINE(ARCHLIBDIR_USER_DEFINED)], [with_archlibdir='${libdir}/${instvardir}/${configuration}'])
-AC_ARG_WITH([moduledir],
+XE_MERGED_ARG([moduledir],
AC_HELP_STRING([--with-moduledir],[]),
[AC_DEFINE(MODULEDIR_USER_DEFINED)], [with_moduledir='${libdir}/${instvardir}/${configuration}/modules'])
-AC_ARG_WITH([etcdir],
+XE_MERGED_ARG([etcdir],
AC_HELP_STRING([--with-etcdir],[]),
[AC_DEFINE(ETCDIR_USER_DEFINED)], [with_etcdir='${datadir}/${instvardir}/etc'])
-AC_ARG_WITH([infopath],
+XE_MERGED_ARG([infopath],
AC_HELP_STRING([--with-infopath],[]),
[AC_DEFINE(INFOPATH_USER_DEFINED)], [])
-AC_ARG_WITH([docdir],
+XE_MERGED_ARG([docdir],
AC_HELP_STRING([--with-docdir],[]),
[AC_DEFINE(DOCDIR_USER_DEFINED)], [with_docdir='${archlibdir}'])
-AC_ARG_WITH([site-runtime-libraries],
+XE_MERGED_ARG([site-runtime-libraries],
AC_HELP_STRING([--with-site-runtime-libraries],[]),
[], [])
-AC_ARG_WITH([package-prefix],
+XE_MERGED_ARG([package-prefix],
AC_HELP_STRING([--with-package-prefix],[Specify packages root.]),
[AC_DEFINE(PACKAGE_PATH_USER_DEFINED)], [])
-AC_ARG_WITH([package-path],
+XE_MERGED_ARG([package-path],
AC_HELP_STRING([--with-package-path],[Search path for package hierarchies.]),
[AC_DEFINE(PACKAGE_PATH_USER_DEFINED)], [])
-AC_ARG_ENABLE([external-widget],
+XE_MERGED_ARG([external-widget],
AC_HELP_STRING([--enable-external-widget],[Support XEmacs server for text widgets in other applications.]),
[], [])
-AC_ARG_ENABLE([kkcc],
+XE_MERGED_ARG([kkcc],
AC_HELP_STRING([--enable-kkcc],[Enable new GC algorithms.]),
- [], [])
-AC_ARG_ENABLE([mc-alloc],
+ [], [enable_kkcc=yes])
+XE_MERGED_ARG([mc-alloc],
AC_HELP_STRING([--enable-mc-alloc],[Enable new allocator.]),
- [], [])
-AC_ARG_ENABLE([union-type],
+ [], [enable_mc_alloc=yes])
+XE_MERGED_ARG([union-type],
AC_HELP_STRING([--enable-union-type],[Use union definition of Lisp_Object type. Known to trigger bugs in some compilers.]),
[], [])
-AC_ARG_ENABLE([pdump],
+XE_MERGED_ARG([pdump],
AC_HELP_STRING([--enable-pdump],[Enable portable LISP preloader.]),
[], [])
-AC_ARG_ENABLE([dump-in-exec],
+XE_MERGED_ARG([dump-in-exec],
AC_HELP_STRING([--enable-dump-in-exec],[Enable dumping into executable (enabled by default
for `pdump', not enabled by default in combination
with `mc-alloc').]),
[], [])
-AC_ARG_ENABLE([debug],
+XE_MERGED_ARG([debug],
AC_HELP_STRING([--enable-debug],[Enable additional debugging information. No time cost.]),
[], [])
-AC_ARG_ENABLE([assertions],
+XE_MERGED_ARG([assertions],
AC_HELP_STRING([--enable-assertions],[]),
[], [])
-AC_ARG_ENABLE([memory-usage-stats],
+XE_MERGED_ARG([memory-usage-stats],
AC_HELP_STRING([--enable-memory-usage-stats],[Enable LISP memory usage API.]),
[], [])
-AC_ARG_ENABLE([clash-detection],
+XE_MERGED_ARG([clash-detection],
AC_HELP_STRING([--enable-clash-detection],[Disable use of lock files to detect multiple edits
of the same file.]),
[], [])
-AC_ARG_ENABLE([modules],
+XE_MERGED_ARG([modules],
AC_HELP_STRING([--enable-modules],[Compile in experimental support for dynamically
loaded libraries (Dynamic Shared Objects).]),
[], [])
-AC_ARG_ENABLE([quick-build],
+XE_MERGED_ARG([quick-build],
AC_HELP_STRING([--enable-quick-build],[Speed up the build cycle by leaving out steps where
XEmacs will still work (more or less) without them.
Potentially dangerous if you don't know what you're
＠＠ -752,11 +755,11 ＠＠ AC_ARG_ENABLE([quick-build],
to be rebuilt.]),
[], [])
-AC_ARG_WITH([compiler],
+XE_MERGED_ARG([compiler],
AC_HELP_STRING([--with-compiler],[C compiler to use]),
[], [])
-AC_ARG_WITH([xemacs-compiler],
+XE_MERGED_ARG([xemacs-compiler],
AC_HELP_STRING([--with-xemacs-compiler],
[compiler to use to compile just the xemacs executable and C modules.
If you want to compile XEmacs as C++, use e.g.
＠＠ -764,69 +767,69 ＠＠ AC_ARG_WITH([xemacs-compiler],
additional error-checking.]),
[], [])
-AC_ARG_WITH([cflags],
+XE_MERGED_ARG([cflags],
AC_HELP_STRING([--with-cflags],
[Compiler flags. These flags will be placed after any flags inserted for warnings, debugging or optimization; setting this does not disable the insertion of those flags. Use configure settings such as `--with-optimization=no' or `enable-debug=no' to turn them off, or override them with `--with-cflags-optimization', `--with-cflags-debugging', or `with-cflags-warning'.]),
[], [])
-AC_ARG_WITH([cflags-warning],
+XE_MERGED_ARG([cflags-warning],
AC_HELP_STRING([--with-cflags-warning],[Override compiler flags used to control warnings.
Normally, don't set this, as XEmacs already turns on
the maximum safe warning level.]),
[], [])
-AC_ARG_WITH([cflags-optimization],
+XE_MERGED_ARG([cflags-optimization],
AC_HELP_STRING([--with-cflags-optimization=FLAGS],
[Override compiler flags used to control optimization. If blank, forces no optimization; if non-blank, forces optimization. Normally, don't set this; XEmacs automatically sets the maximum safe optimization flags appropriate for the compiler being invoked. If you just want to turn optimization on or off, use `with-optimization' instead.]),
[], [])
-AC_ARG_WITH([cflags-debugging],
+XE_MERGED_ARG([cflags-debugging],
AC_HELP_STRING([--with-cflags-debugging=FLAGS],
[Override compiler flags used to add debugging information to the executable. Normally, debugging information is added whenever possible (i.e. unless optimization is turned on and the compiler does not permit debugging and optimization simultaneously).]),
[], [])
-AC_ARG_WITH([cpp],
+XE_MERGED_ARG([cpp],
AC_HELP_STRING([--with-cpp],[C preprocessor to use (e.g. /usr/ccs/lib/cpp or cc -E)]),
[CPP="$with_cpp"], [])
-AC_ARG_WITH([cppflags],
+XE_MERGED_ARG([cppflags],
AC_HELP_STRING([--with-cppflags],[C preprocessor flags (e.g. -I/foo or -Dfoo=bar)]),
[CPPFLAGS="$with_cppflags"], [])
-AC_ARG_WITH([libs],
+XE_MERGED_ARG([libs],
AC_HELP_STRING([--with-libs],[Additional libraries (e.g. -lfoo)]),
[LIBS="$with_libs"], [])
-AC_ARG_WITH([ldflags],
+XE_MERGED_ARG([ldflags],
AC_HELP_STRING([--with-ldflags],[Additional linker flags (e.g. -L/foo)]),
[LDFLAGS="$with_ldflags"], [])
-AC_ARG_WITH([rel-alloc],
+XE_MERGED_ARG([rel-alloc],
AC_HELP_STRING([--with-rel-alloc],[Enable the relocating allocator.]),
[], [with_rel_alloc='default'])
-AC_ARG_WITH([dlmalloc],
+XE_MERGED_ARG([dlmalloc],
AC_HELP_STRING([--with-dlmalloc],[Use Doug Lea's malloc implementation.]),
[], [with_dlmalloc='default'])
-AC_ARG_WITH([debug-malloc],
+XE_MERGED_ARG([debug-malloc],
AC_HELP_STRING([--with-debug-malloc],[Use a debugging malloc.]),
[], [])
-AC_ARG_WITH([system-malloc],
+XE_MERGED_ARG([system-malloc],
AC_HELP_STRING([--with-system-malloc],[Use the system malloc, not the one distributed with XEmacs.]),
[], [with_system_malloc='default'])
#Enable code.
-XE_COMPLEX_ARG_ENABLE([database],
+XE_COMPLEX_ARG([database],
AC_HELP_STRING([--enable-database],[Compile with database support. Valid types are
`no' or a comma-separated list of one or more
of `berkdb' and either `dbm' or `gnudbm'.]),
[
if test "$enable_database_dbm" = "yes" -a "$enable_database_gdbm" = "yes"; then
USAGE_ERROR("Only one of \`dbm' and \`gnudbm' may be specified
-with the \`--enable-database' option.")
+with the \`--with-database' option.")
fi
],
[],
＠＠ -834,7 +837,7 ＠＠ fi
XE_COMPLEX_OPTION([dbm],[""]),
XE_COMPLEX_OPTION([gdbm],[""])])
-XE_COMPLEX_ARG_ENABLE([sound],
+XE_COMPLEX_ARG([sound],
AC_HELP_STRING([--enable-sound],[Compile with sound support.
Valid types are `native', `nas' and `esd'.
Prefix a type with 'no' to disable.
＠＠ -849,26 +852,26 ＠＠ XE_COMPLEX_ARG_ENABLE([sound],
XE_COMPLEX_OPTION([nas],[""]),
XE_COMPLEX_OPTION([esd],[no])])
-XE_KEYWORD_ARG_WITH([athena],
+XE_KEYWORD_ARG([athena],
AC_HELP_STRING([--with-athena],[Use TYPE Athena widgets (xaw, 3d, next, 95, or xpm).]),
[],[],[xaw,3d,next,95,xpm])dnl
-XE_KEYWORD_ARG_WITH([xim],[],[],[],[yes,no,xlib,motif])dnl
+XE_KEYWORD_ARG([xim],[],[],[],[yes,no,xlib,motif])dnl
-XE_KEYWORD_ARG_WITH([mail-locking],
+XE_KEYWORD_ARG([mail-locking],
AC_HELP_STRING([--with-mail-locking],[Specify the locking to be used by movemail to prevent
concurrent updates of mail spool files. Valid types
are `lockf', `flock', `dot', `locking' or `mmdf'.]),
[],[],[lockf,flock,file,locking,mmdf,pop])dnl
-XE_KEYWORD_ARG_ENABLE([bignum],
+XE_KEYWORD_ARG([bignum],
AC_HELP_STRING([--enable-bignum=TYPE],[Compile in support for bignums, ratios, or bigfloats
using library support. TYPE must be one of "gmp"
(for GNU MP), "mp" (for BSD MP), or "no" (disabled).]),
[], [enable_bignum="no"],[no,gmp,mp])
-XE_COMPLEX_ARG_ENABLE([error-checking],
+XE_COMPLEX_ARG([error-checking],
AC_HELP_STRING([--enable-error-checking],[Compile with internal error-checking added.
Causes noticeable loss of speed. Valid types
are extents, bufpos, malloc, gc, types, text, byte_code, glyphs, display, structures.]),
＠＠ -883,25 +886,25 ＠＠ XE_COMPLEX_ARG_ENABLE([error-checking],
XE_COMPLEX_OPTION([display],[""]),
XE_COMPLEX_OPTION([structures],[""])])
-XE_KEYWORD_ARG_ENABLE([menubars],
+XE_KEYWORD_ARG([menubars],
AC_HELP_STRING([--enable-menubars=TYPE],[Use TYPE menubars (lucid, motif, or no). The Lucid
widgets emulate Motif (mostly) but are faster.
*WARNING* The Motif menubar is currently broken.
Lucid menubars are the default.]),
[], [],[yes,no,lucid,motif,athena,gtk,msw])
-XE_KEYWORD_ARG_ENABLE([scrollbars],
+XE_KEYWORD_ARG([scrollbars],
AC_HELP_STRING([--enable-scrollbars=TYPE],[Use TYPE scrollbars (lucid, motif, athena, or no).
Lucid scrollbars are the default.]),
[], [],[yes,no,lucid,motif,athena,gtk,msw])
-XE_KEYWORD_ARG_ENABLE([dialogs],
+XE_KEYWORD_ARG([dialogs],
AC_HELP_STRING([--enable-dialogs=TYPE],[Use TYPE dialog boxes (lucid, motif, athena, or no).
There are no true Lucid dialogs; Motif dialogs will be
used if Motif can be found, else Athena is used.]),
[], [],[yes,no,lucid,motif,athena,gtk,msw])
-XE_KEYWORD_ARG_ENABLE([widgets],
+XE_KEYWORD_ARG([widgets],
AC_HELP_STRING([--enable-widgets],[Use TYPE native widgets (lucid, motif, athena, or no).
Other widget types are currently unsupported.
There are no true Lucid widgets; Motif widgets will be
1.317 +7 -0 XEmacs/xemacs/man/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -p -r1.316 -r1.317
--- ChangeLog 2005/10/14 02:11:49 1.316
+++ ChangeLog 2005/10/20 12:38:02 1.317
＠＠ -1,3 +1,10 ＠＠
+2005-10-15 Malcolm Purvis <malcolmp(a)xemacs.org>
+
+ * internals/internals.texi: "API's" -> "APIs". This fixes
+ problems generating dvi and pdf versions.
+ * internals/internals.texi (The configure Script):
+ Describe the use of XE_MERGED_ARG.
+
2005-10-13 Ben Wing <ben(a)xemacs.org>
* xemacs-faq.texi (Top):
1.69 +75 -59 XEmacs/xemacs/man/internals/internals.texi
Index: internals.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/internals/internals.texi,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- internals.texi 2005/09/26 22:19:02 1.68
+++ internals.texi 2005/10/20 12:38:04 1.69
＠＠ -470,7 +470,7 ＠＠ Multilingual Support
* Encodings::
* Internal Mule Encodings::
* Byte/Character Types; Buffer Positions; Other Typedefs::
-* Internal Text API's::
+* Internal Text APIs::
* Coding for Mule::
* CCL::
* Microsoft Windows-Related Multilingual Issues::
＠＠ -495,9 +495,9 ＠＠ Byte/Character Types; Buffer Positions;
* Usage of the Various Representations::
* Working With the Various Representations::
-Internal Text API's
+Internal Text APIs
-* Basic internal-format API's::
+* Basic internal-format APIs::
* The DFC API::
* The Eistring API::
＠＠ -4499,6 +4499,8 ＠＠ some of the important features:
＠item
Selectively enabling debugging, error checking, and tracing.
＠item
+Specifying options by either ＠code{--with} or ＠code{--enable}.
+＠item
Complex options, which are set-valued (＠i{i.e.}, unordered; ordered
lists of options, for example ``take the first available from the
list,'' are neither used currently nor given special support).
＠＠ -4572,6 +4574,29 ＠＠ Generate the appropriate shared library
implemented in the file ＠file{aclocal.m4}.
＠end table
+＠heading XEmacs merged option support
+
+Autoconf 2.59 divides the ＠file{configure} options into those that
+specify features (＠samp{--enable}) and those that specify external
+libraries (＠samp{--with}). Many XEmacs options to not fall neatly into
+either of these catagories and so as a matter of policy all options can
+be specified by either method.
+
+These merged options are declared with the ＠code{XE_MERGED_ARG} macro.
+The arguments to the option are the same as ＠code{AC_ARG_WITH} and
+＠code{AC_ARG_ENABLE} and code that worked with either of these macros
+will worked unchanged with ＠code{XE_MERGED_ARG}. The option value is
+stored in both ＠code{with_FEATURE} and ＠code{enable_FEATURE} shell
+variables.
+
+＠table ＠code
+＠item XE_MERGED_ARG(package, help-string, action-if-true, action-if-false)
+Declare an option that can be selected by either ＠samp{--enable} or
+＠samp{--with}. The value of the option is stored in both
+＠code{with_FEATURE} and ＠code{enable_FEATURE}.
+
+＠end table
+
＠heading XEmacs keyword option support
A ＠dfn{keyword} option is one that accepts one of a number of
＠＠ -4579,19 +4604,19 ＠＠ pre-defined values (if support for sets
``complex options'' below). For example,
＠samp{--with-mail-locking=flock}.
-Keyword options are defined with expanded forms of
-＠samp{AC_ARG_[WITH|ENABLE]} called ＠samp{XE_KEYWORD_ARG_[WITH|ENABLE]},
-both taking 5 parameters. The first 4 parameters of these macros are
-the same as original macros with the exception that all four parameters
-are ＠strong{required}. The ＠var{action-if-true} code is run after the
-argument list has been parsed.
+Keyword options are defined with an expanded form of
+＠samp{XE_MERGED_ARG} called ＠samp{XE_KEYWORD_ARG}, which taks 5
+parameters. The first 4 parameters are the same as original macro with
+the exception that all of these four parameters are ＠strong{required}.
+The ＠var{action-if-true} code is run after the argument list has been
+parsed.
The 5th parameter is a list of supported keywords. The whole list must
be quoted but the individual keywords should not. Here is how the
＠samp{mail-locking} flag is defined:
＠example
-XE_KEYWORD_ARG_WITH([mail-locking],
+XE_KEYWORD_ARG([mail-locking],
AC_HELP_STRING([--with-mail-locking],[Specify the locking to be
used by movemail to prevent concurrent updates
of mail spool files. Valid types are `lockf',
＠＠ -4615,13 +4640,8 ＠＠ Macros labeled ＠dfn{internal} are not ex
higher-level features.
＠table ＠code
-＠item XE_KEYWORD_ARG_WITH(package, help-string, action-if-true, action-if-false, [keyword1, keyword2, ....])
-Expanded version of ＠code{AC_ARG_WITH} for keyword options. All the
-parameters are required. The last argument is a comma-separated list of
-supported keywords, ＠file{m4}-quoted with ＠samp{[]}.
-
-＠item XE_KEYWORD_ARG_ENABLE(feature, help-string, action-if-true, action-if-false, [keyword1, keyword2, ....])
-Expanded version of ＠code{AC_ARG_ENABLE} for keyword options. All the
+＠item XE_KEYWORD_ARG(package, help-string, action-if-true, action-if-false, [keyword1, keyword2, ....])
+Expanded version of ＠code{XE_MERGED_ARG} for keyword options. All the
parameters are required. The last argument is a comma-separated list of
supported keywords, ＠file{m4}-quoted with ＠samp{[]}.
＠＠ -4641,12 +4661,12 ＠＠ A ＠dfn{complex option} is one that takes
a set. For example, we might use ＠code{--with-sound=native,nas} to play
sounds using the native libraries and via NAS.
-Complex options are defined with expanded forms of
-＠samp{AC_ARG_[WITH|ENABLE]} called ＠samp{XE_COMPLEX_ARG_[WITH|ENABLE]},
-both taking 5 parameters. The first 4 parameters of these macros are
-the same as original macros with the exception that all four parameters
-are ＠strong{required}. The ＠var{action-if-true} code is run after the
-argument list has been parsed.
+Complex options are defined with an expanded form of
+＠samp{XE_MERGED_ARG} called ＠samp{XE_COMPLEX_ARG}, taking 5 parameters.
+The first 4 parameters are the same as original macro with the exception
+that all four parameters are ＠strong{required}. The
+＠var{action-if-true} code is run after the argument list has been
+parsed.
The 5th parameter is a list of ＠code{XE_COMPLEX_OPTION} macro calls that
define the valid components and their default values. The list must be
＠＠ -4654,7 +4674,7 ＠＠ quoted but the individual macro calls sh
＠samp{sound} flag is defined:
＠example
-XE_COMPLEX_ARG_ENABLE([sound],
+XE_COMPLEX_ARG([sound],
AC_HELP_STRING([--enable-sound],[Compile with sound support.
Valid types are `native', `nas' and `esd'.
Prefix a type with 'no' to disable.
＠＠ -4722,13 +4742,9 ＠＠ Format a boilerplate help string for com
This was originally written for the Xft option, and doesn't read so well
for options based on alternative libraries like sound. Hackers beware:
the API may be enhanced to deal with this in the future.
-
-＠item XE_COMPLEX_ARG_WITH(PACKAGE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE, [XE_COMPLEX_OPTION(a,yes), ....])
-Extended version of ＠code{AC_ARG_WITH} for complex options. All the
-parameters are required.
-＠item XE_COMPLEX_ARG_ENABLE(FEATURE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE, [XE_COMPLEX_OPTION(a,yes), ....])
-Expanded version of ＠code{AC_ARG_ENABLE} for complex options. All the
+＠item XE_COMPLEX_ARG(PACKAGE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE, [XE_COMPLEX_OPTION(a,yes), ....])
+Extended version of ＠code{XE_MERGED_ARG} for complex options. All the
parameters are required.
＠item XE_EXPAND_COMPLEX_OPTION(prefix, component, yesno)
＠＠ -5816,7 +5832,7 ＠＠ regular quantity of any sort. The only
When there's a reasonable possibility you will actually need all 32 or
64 bits to store the quantity.
＠item
-When calling existing API's that require unsigned types. In this case,
+When calling existing APIs that require unsigned types. In this case,
you should still do all manipulation using signed types, and do the
conversion at the very threshold of the API call.
＠item
＠＠ -10168,7 +10184,7 ＠＠ integrated.
＠emph{NOTE}: The information at the top of the source file
＠file{text.c} is more complete than the following, and there is also a
list of all other places to look for text/I18N-related info. Also look in
-(a)file{text.h} for info about the DFC and Eistring API's.
+(a)file{text.h} for info about the DFC and Eistring APIs.
Recall that there are two primary ways that text is represented in
XEmacs. The ＠dfn{buffer} representation sees the text as a series of
＠＠ -10191,7 +10207,7 ＠＠ representation is that it's compact and
* Encodings::
* Internal Mule Encodings::
* Byte/Character Types; Buffer Positions; Other Typedefs::
-* Internal Text API's::
+* Internal Text APIs::
* Coding for Mule::
* CCL::
* Microsoft Windows-Related Multilingual Issues::
＠＠ -11161,7 +11177,7 ＠＠ always corresponds to the last byte in t
character. (This is important because the Boyer-Moore algorithm works by
looking at the last byte of the search string and &&#### finish this.
-＠node Byte/Character Types; Buffer Positions; Other Typedefs, Internal Text API's, Internal Mule Encodings, Multilingual Support
+＠node Byte/Character Types; Buffer Positions; Other Typedefs, Internal Text APIs, Internal Mule Encodings, Multilingual Support
＠section Byte/Character Types; Buffer Positions; Other Typedefs
＠cindex byte/character types; buffer positions; other typedefs
＠cindex byte/character types
＠＠ -11211,7 +11227,7 ＠＠ h) [Chbyte] null-semantics ＠code{char *}
Types (b), (c), (f) and (h) are defined as ＠code{char}, while the others are
＠code{unsigned char}. This is for maximum safety (signed characters are
dangerous to work with) while maintaining as much compatibility with
-external API's and string constants as possible.
+external APIs and string constants as possible.
We also provide versions of the above types defined with different
underlying C types, for API compatibility. These use the following
＠＠ -11226,7 +11242,7 ＠＠ S = signed
(Formerly I had a comment saying that type (e) "should be replaced with
void *". However, there are in fact many places where an unsigned char
* might be used -- e.g. for ease in pointer computation, since void *
-doesn't allow this, and for compatibility with external API's.)
+doesn't allow this, and for compatibility with external APIs.)
Note that these typedefs are purely for documentation purposes; from
the C code's perspective, they are exactly equivalent to ＠code{char *},
＠＠ -11532,27 +11548,27 ＠＠ MAX_BYTEBPOS_GAP_SIZE_3 is a multiple of
65535 is a multiple of 3, but this may not always be the
case. #### unfinished
-＠node Internal Text API's, Coding for Mule, Byte/Character Types; Buffer Positions; Other Typedefs, Multilingual Support
-＠section Internal Text API's
-＠cindex internal text API's
-＠cindex text API's, internal
-＠cindex API's, text, internal
+＠node Internal Text APIs, Coding for Mule, Byte/Character Types; Buffer Positions; Other Typedefs, Multilingual Support
+＠section Internal Text APIs
+＠cindex internal text APIs
+＠cindex text APIs, internal
+＠cindex APIs, text, internal
-＠strong{NOTE}: The most current documentation for these API's is in
+＠strong{NOTE}: The most current documentation for these APIs is in
＠file{text.h}. In case of error, assume that file is correct and this
one wrong.
＠menu
-* Basic internal-format API's::
+* Basic internal-format APIs::
* The DFC API::
* The Eistring API::
＠end menu
-＠node Basic internal-format API's, The DFC API, Internal Text API's, Internal Text API's
-＠subsection Basic internal-format API's
-＠cindex basic internal-format API's
-＠cindex internal-format API's, basic
-＠cindex API's, basic internal-format
+＠node Basic internal-format APIs, The DFC API, Internal Text APIs, Internal Text APIs
+＠subsection Basic internal-format APIs
+＠cindex basic internal-format APIs
+＠cindex internal-format APIs, basic
+＠cindex APIs, basic internal-format
These are simple functions and macros to convert between text
representation and characters, move forward and back in text, etc.
＠＠ -11581,7 +11597,7 ＠＠ a Lisp character. Stuff working with Li
"char", so we consistently use "Ichar" when that's what we're working
with.
-＠node The DFC API, The Eistring API, Basic internal-format API's, Internal Text API's
+＠node The DFC API, The Eistring API, Basic internal-format APIs, Internal Text APIs
＠subsection The DFC API
＠cindex DFC API
＠cindex API, DFC
＠＠ -11804,13 +11820,13 ＠＠ this appears to cause no problems -- so
switching, and feel no compunctions about writing further such function-
like ＠code{alloca()} routines in lieu of statement-like ones. --ben
-＠node The Eistring API, , The DFC API, Internal Text API's
+＠node The Eistring API, , The DFC API, Internal Text APIs
＠subsection The Eistring API
＠cindex Eistring API
＠cindex API, Eistring
(This API is currently under-used) When doing simple things with
-internal text, the basic internal-format API's are enough. But to do
+internal text, the basic internal-format APIs are enough. But to do
things like delete or replace a substring, concatenate various strings,
etc. is difficult to do cleanly because of the allocation issues.
The Eistring API is designed to deal with this, and provides a clean
＠＠ -12268,7 +12284,7 ＠＠ void eiupr (Eistring *eistr);
Convert all characters in the Eistring to uppercase.
＠end example
-＠node Coding for Mule, CCL, Internal Text API's, Multilingual Support
+＠node Coding for Mule, CCL, Internal Text APIs, Multilingual Support
＠section Coding for Mule
＠cindex coding for Mule
＠cindex Mule, coding for
＠＠ -12665,7 +12681,7 ＠＠ input or output is a Lisp_Object of type
A source type of ＠code{C_STRING} or a sink type of
＠code{C_STRING_ALLOCA} or ＠code{C_STRING_MALLOC} is appropriate where
the external API is not '\0'-byte-clean -- i.e. it expects strings to be
-terminated with a null byte. For external API's that are in fact
+terminated with a null byte. For external APIs that are in fact
'\0'-byte-clean, we should of course not use these.
The sinks to be specified must be lvalues, unless they are the lisp
＠＠ -13373,7 +13389,7 ＠＠ Qmswindows_tstr as the external conversi
qxe...() Unicode-split version of library functions, and doing other things
in certain cases, e.g. when a qxe() function is not present.
-Unicode support also requires that the various Windows API's be
+Unicode support also requires that the various Windows APIs be
"Unicode-encapsulated", so that they automatically call the ANSI or
Unicode version of the API call appropriately and handle the size
differences in structures. What this means is:
＠＠ -13381,7 +13397,7 ＠＠ differences in structures. What this me
＠itemize ＠bullet
＠item
first, note that Windows already provides a sort of encapsulation
-of all API's that deal with text. All such API's are underlyingly
+of all APIs that deal with text. All such APIs are underlyingly
provided in two versions, with an A or W suffix (ANSI or "wide"
i.e. Unicode), and the compile-time constant UNICODE controls which is
selected by the unsuffixed API. Same thing happens with structures, and
＠＠ -13611,7 +13627,7 ＠＠ NOTE:
＠item
wsetargv.obj uses routines that were buggily left out of MSVCRT; anyway,
from looking at the source, it does NOT correctly work under Win 9x as
-it blindly calls the Unicode version of Unicode-split API's such as
+it blindly calls the Unicode version of Unicode-split APIs such as
FindFirstFile)
＠item
＠＠ -18955,7 +18971,7 ＠＠ started and I'll be doing more work to m
IV. GUTTER ETC.
This stuff needs to be "stable" and generally free from bugs. Any
-API's we create need to be well-reviewed or marked clearly as
+APIs we create need to be well-reviewed or marked clearly as
experimental.
V. PORTABLE DUMPER
＠＠ -19510,7 +19526,7 ＠＠ Author: ＠uref{mailto:ben＠＠xemacs.org,Ben
NOTE: These changes are partly motivated by the various user-interface
changes elsewhere in this document, and partly for Mule support. In
-general the various API's in this document would benefit greatly from
+general the various APIs in this document would benefit greatly from
built-in keywords.
I would like to make keyword parameters an integral part of Elisp. The
＠＠ -21909,7 +21925,7 ＠＠ API is set-unicode-mapping:
each byte. (Most common values are 128, for codepoints given with
the high bit set, or -32, for codepoints given as 1-94 or 0-95.)
-Other API's:
+Other APIs:
＠example
(write-unicode-mapping file charset)
- 1 participants
- 0 comments
CVS update by viteno xemacs ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/10/19 23:51:06
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1317 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1316
retrieving revision 1.1317
diff -u -p -r1.1316 -r1.1317
--- version.sh 2005/10/18 21:50:57 1.1316
+++ version.sh 2005/10/19 21:51:05 1.1317
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20051018)"
+xemacs_extra_name="(+CVS-20051019)"
xemacs_release_date="2005-02-18"
- 1 participants
- 0 comments