Mercurial > hg > xemacs-beta
changeset 3073:0ae46b360391
[xemacs-hg @ 2005-11-16 11:53:47 by malcolmp]
Improve the help output of configure.
| author | malcolmp |
|---|---|
| date | Wed, 16 Nov 2005 11:54:10 +0000 |
| parents | 4c038e89d563 |
| children | 0f411920c8db |
| files | ChangeLog configure configure.ac man/ChangeLog man/internals/internals.texi |
| diffstat | 5 files changed, 2169 insertions(+), 2043 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Nov 16 07:22:46 2005 +0000 +++ b/ChangeLog Wed Nov 16 11:54:10 2005 +0000 @@ -1,3 +1,8 @@ +2005-11-08 Malcolm Purvis <malcolmp@xemacs.org> + + * configure.ac : Reorganised the option list so that the help + output looks like configure.usage from 21.4 + 2005-11-16 Stephen J. Turnbull <stephen@xemacs.org> * configure.ac (checks for typedefs): TODO comment.
--- a/configure Wed Nov 16 07:22:46 2005 +0000 +++ b/configure Wed Nov 16 11:54:10 2005 +0000 @@ -8,51 +8,52 @@ # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. # -# #### Configuration script for XEmacs. Largely divergent from FSF. -# #### Guess values for system-dependent variables and create Makefiles. -# #### Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. -# #### Copyright (C) 1997, 1998, 1999, 2001, 2002 Free Software Foundation, Inc. -# #### Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. -# #### Copyright (C) 1993, 1994, 1995 Board of Trustees, University of Illinois. -# #### Copyright (C) 1996, 1997 Sun Microsystems, Inc. -# #### Copyright (C) 1995, 1996, 2002, 2003, 2004 Ben Wing. -# #### Copyright (C) 2000, 2001 Martin Buchholz. -# #### Copyright (C) 1998, 1999 J. Kean Johnston. -# #### Copyright (C) 2005 Malcolm Purvis +# Configuration script for XEmacs. Largely divergent from FSF. +# Guess values for system-dependent variables and create Makefiles. # -# ### Don't edit this script! -# ### This script was automatically generated by the `autoconf' program -# ### from the file `./configure.in'. -# ### To rebuild it, execute the command -# ### autoconf -# ### in the this directory. You must have autoconf version 2.50 or later. -# ### Note: this script has been tested only with autoconf version 2.5x. +# Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. +# Copyright (C) 1997, 1998, 1999, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1993, 1994, 1995 Board of Trustees, University of Illinois. +# Copyright (C) 1996, 1997 Sun Microsystems, Inc. +# Copyright (C) 1995, 1996, 2002, 2003, 2004 Ben Wing. +# Copyright (C) 2000, 2001 Martin Buchholz. +# Copyright (C) 1998, 1999 J. Kean Johnston. +# Copyright (C) 2005 Malcolm Purvis # -# ### This file is part of XEmacs. +# Don't edit this script! +# This script was automatically generated by the `autoconf' program +# from the file `./configure.ac'. To rebuild it, execute the command: +# +# autoconf +# +# in the this directory. You must have autoconf version 2.59. +# +# This file is part of XEmacs. # -# ### XEmacs is free software; you can redistribute it and/or modify it -# ### under the terms of the GNU General Public License as published by -# ### the Free Software Foundation; either version 2, or (at your -# ### option) any later version. +# XEmacs is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your +# option) any later version. # -# ### XEmacs is distributed in the hope that it will be useful, but -# ### WITHOUT ANY WARRANTY; without even the implied warranty of -# ### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# ### General Public License for more details. +# XEmacs is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # -# ### You should have received a copy of the GNU General Public License -# ### along with XEmacs; see the file COPYING. If not, write to the Free -# ### Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# ### 02111-1307, USA. +# You should have received a copy of the GNU General Public License +# along with XEmacs; see the file COPYING. If not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. # -# ### For usage, run `./configure --help' -# ### For more detailed information on building and installing XEmacs, -# ### read the file `INSTALL'. -# ### -# ### If configure succeeds, it leaves its status in config.status. -# ### A log of configuration tests can be found in config.log. -# ### If configure fails after disturbing the status quo, -# ### config.status is removed. +# For usage, run `./configure --help' +# For more detailed information on building and installing XEmacs, +# read the file `INSTALL'. +# +# If configure succeeds, it leaves its status in config.status. +# A log of configuration tests can be found in config.log. +# If configure fails after disturbing the status quo, +# config.status is removed. # ## --------------------- ## ## M4sh Initialization. ## @@ -900,155 +901,18 @@ --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 - hierarchy searched before the installation packages. - --with-site-modules Disable site-modules directory in the XEmacs - hierarchy, which is searched before the installation - modules. - --with-gtk Support GTK on the X Window System. (EXPERIMENTAL) - --with-gnome Support GNOME on the X Window System. (EXPERIMENTAL) - --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. - --with-gcc Use GCC to compile XEmacs. - --with-dynamic Link dynamically if supported by system. 'No' forces - static linking. - --with-ncurses Use the ncurses library for tty support. - --with-dnet Compile with support for DECnet. - --with-socks Compile with support for SOCKS (an Internet proxy). - --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. - --with-cde Compile in support for CDE drag and drop. - --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- fully. If - the two servers are from different vendors, the - results may be unpredictable. - --with-gpm Compile in GPM mouse support for ttys. - --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. - --with-xface Compile with support for X-Face mail headers. - Requires the compface package. - --with-gif Compile without the (builtin) support for GIF - images. - --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. - --with-png Compile with support for PNG images. Recommended - because the images on the About page are not - viewable without it. - --with-tiff Compile with support for TIFF images. Possibly - useful, for the same reason as JPEG images. - --with-zlib Support inflate (de)compression internally. - --with-wmcommand Compile without realized leader window which will - keep the WM_COMMAND property. - --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'. - `--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. - Requires Mule. - --with-wnn6 Support the Wnn6 Asian language input method - (proprietary). Requires Mule. - --with-workshop Support the Sun WorkShop (formerly Sparcworks) - development environment. - --with-sparcworks Alias for --with-workshop - --with-tooltalk Support the ToolTalk IPC protocol. - --with-ldap Support the LDAP protocol. - --with-postgresql Support the PostgreSQL RDBMS. - --with-pop Support POP for mail retrieval. - --with-kerberos Support Kerberos-authenticated POP. - --with-hesiod Support Hesiod to get the POP server host. - --with-infodock Support the Infodock version of XEmacs. Infodock is - a SourceForge project). - --with-native-sound-lib Path to sound library (for systems with name - conflicts). - --with-netinstall Support for installation over the internet. Only - functional on the MS Windows platforms. - --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. - --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-site-includes Prepend to include search path. - --with-site-libraries Prepend to library search path. - --with-site-prefixes Prepend to include and library search paths, with - /include and /lib added. Comes after site-includes - and site-libraries, if any. - --with-statedir - --with-lispdir - --with-archlibdir - --with-moduledir - --with-etcdir - --with-infopath - --with-docdir - --with-site-runtime-libraries - - --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. + +Compilation options +------------------- + --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. These flags will be placed after any + --with-gcc Use GCC to compile XEmacs. + --with-cflags=FLAGS 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 @@ -1056,9 +920,14 @@ `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. + --with-cflags-warning=FLAGS + Override compiler flags used to control warnings. Normally, don't set this, as XEmacs already turns on the maximum safe warning level. + --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. --with-cflags-optimization=FLAGS Override compiler flags used to control optimization. If blank, forces no optimization; if @@ -1078,15 +947,126 @@ --with-cppflags C preprocessor flags (e.g. -I/foo or -Dfoo=bar) --with-libs Additional libraries (e.g. -lfoo) --with-ldflags Additional linker flags (e.g. -L/foo) - --with-rel-alloc Enable the relocating allocator. - --with-dlmalloc Use Doug Lea's malloc implementation. - --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 + --with-site-includes=PATHS + Prepend to include search path. + --with-site-libraries=PATHS + Prepend to library search path. + --with-site-prefixes=PATHS + Prepend to include and library search paths, with + /include and /lib added. Comes after site-includes + and site-libraries, if any. + --with-site-runtime-libraries=PATHS + Prepend to the runtime library search path + --with-dynamic Link dynamically if supported by system. 'No' forces + static linking. + +Installation options +-------------------- + + --with-prefix=no Don't compile the value for `prefix' into the + executable. + --with-netinstall Support for installation over the internet. Only + functional on the MS Windows platforms. + --with-statedir=DIR + --with-lispdir=DIR + --with-archlibdir=DIR + --with-moduledir=DIR + --with-etcdir=DIR + --with-docdir=DIR + +Run-time path-searching options +------------------------------- + + --with-site-lisp=no Allow for a site-lisp directory in the XEmacs + hierarchy searched before the installation packages. + --with-site-modules=no Disable site-modules directory in the XEmacs + hierarchy, which is searched before the installation + modules. + --with-package-prefix=DIR + Specify packages root. + --with-package-path=PATH + Search path for package hierarchies. + --with-infopath=PATH Location of info directories + +Window-system options +--------------------- + + --with-gtk Support GTK on the X Window System. (EXPERIMENTAL) + --with-gnome Support GNOME on the X Window System. (EXPERIMENTAL) + --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. + --with-toolbars Enable toolbar support. Default: yes. + --with-wmcommand Compile without realized leader window which will + keep the WM_COMMAND property. + --with-athena=TYPE Use TYPE Athena widgets (`xaw', `3d', `next', `95', + or `xpm'). + --with-menubars=TYPE Use TYPE menubars ('yes', '`no', `lucid', `motif', + `athena', `gtk', or `msw'). 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 'yes', '`no', `lucid', `motif', + `athena', `gtk', or `msw'). Lucid scrollbars are the + default. + --with-dialogs=TYPE Use TYPE dialog boxes 'yes', '`no', `lucid', + `motif', `athena', `gtk', or `msw'). There are no + true Lucid dialogs; Motif dialogs will be used if + Motif can be found, else Athena is used. + --with-widgets=TYPE Use TYPE native widgets ('yes', '`no', `lucid', + `motif', `athena', `gtk', or `msw'). 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. + --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. + --with-cde Compile in support for CDE drag and drop. + --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- fully. If + the two servers are from different vendors, the + results may be unpredictable. + --with-xmu Use Xmu utilities. Default: yes. + --with-external-widget + Support XEmacs server for text widgets in other + applications. + +TTY (character terminal) options +-------------------------------- + + --with-tty Enable TTY support. Default: yes. + --with-ncurses Use the ncurses library for tty support. + --with-gpm Compile in GPM mouse support for ttys. + +Image options +------------- + + --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. + --with-png Compile with support for PNG images. Recommended + because the images on the About page are not + viewable without it. + --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. + --with-tiff Compile with support for TIFF images. Possibly + useful, for the same reason as JPEG images. + --with-xface Compile with support for X-Face mail headers. + Requires the compface package. + --with-gif Compile without the (builtin) support for GIF + images. + +Sound options +------------- + + --with-sound=TYPE 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 @@ -1094,33 +1074,132 @@ 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 + --with-native-sound-lib Path to sound library (for systems with name + conflicts). + +Internationalization options +---------------------------- + + --with-mule Compile with Mule (Multi-Lingual Emacs) support, + needed to support non-Latin-1 (including Asian) + languages. + --with-xim==TYPE Enable XIM support. TYPE is `yes', `no', `xlib', or + `motif' + --with-canna Support the Canna Japanese input method. Requires + Mule. + --with-wnn Support the Wnn Asian language input method. + Requires Mule. + --with-wnn6 Support the Wnn6 Asian language input method + (proprietary). Requires Mule. + --with-xfs Enable XFontSet support for internationalized + menubar. Incompatible with `--with-xim=motif'. + `--with-menubars=lucid' (the default) is + desirable. + +File-related options +-------------------- + + --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-clash-detection + Disable use of lock files to detect multiple edits + of the same file. + --with-zlib Support inflate (de)compression internally. + +Database options +---------------- + + --with-database=TYPE 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-ldap Support the LDAP protocol. + --with-postgresql Support the PostgreSQL RDBMS. + +Mail options +------------ + + --with-mail-locking=TYPE + 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'. + Valid types are `lockf', `flock', `file', `locking', + `mmdf' or `pop'. + --with-pop Support POP for mail retrieval. + --with-kerberos Support Kerberos-authenticated POP. + --with-hesiod Support Hesiod to get the POP server host. + +Networking options +------------------ + + --with-tooltalk Support the ToolTalk IPC protocol. + --with-socks Compile with support for SOCKS (an Internet proxy). + --with-dnet Compile with support for DECnet. + --with-ipv6-cname Try IPv6 information first when canonicalizing host + names. This option has no effect unless system + supports getaddrinfo(3) and getnameinfo(3). + +Memory allocation options +------------------------- + + --with-rel-alloc Enable the relocating allocator. + --with-dlmalloc Use Doug Lea's malloc implementation. + --with-system-malloc Use the system malloc, not the one distributed with + XEmacs. + --with-debug-malloc Use a debugging malloc. + --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-kkcc Enable experimental new GC algorithms. + --with-mc-alloc Enable experimental new allocator. + +Emacs Lisp options +------------------ + + --with-modules Compile in experimental support for dynamically + loaded libraries (Dynamic Shared Objects). --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. + +Platform Specific options +------------------------- + + --with-workshop Support the Sun WorkShop (formerly Sparcworks) + development environment. + --with-sparcworks Alias for --with-workshop + --with-infodock Support the Infodock version of XEmacs. Infodock is + a SourceForge project). + +Debugging options +----------------- + + --with-debug Enable additional debugging information. No time + cost. + --with-error-checking=TESTS + Compile with internal error-checking added. Causes + noticeable loss of speed. Valid TESTS are `extents', + `bufpos', `malloc', `gc', `types', `text', + `byte_code', `glyphs', `display', `structures'. + --with-assertions Compile in runtime assertions. + --with-memory-usage-stats + Enable LISP memory usage API. + --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-union-type Use union definition of Lisp_Object type. Known to + trigger bugs in some compilers. + --with-quantify Support performance debugging using Quantify. + --with-purify Support memory debugging using Purify. Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1242,51 +1321,52 @@ This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -#### Configuration script for XEmacs. Largely divergent from FSF. -#### Guess values for system-dependent variables and create Makefiles. -#### Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. -#### Copyright (C) 1997, 1998, 1999, 2001, 2002 Free Software Foundation, Inc. -#### Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. -#### Copyright (C) 1993, 1994, 1995 Board of Trustees, University of Illinois. -#### Copyright (C) 1996, 1997 Sun Microsystems, Inc. -#### Copyright (C) 1995, 1996, 2002, 2003, 2004 Ben Wing. -#### Copyright (C) 2000, 2001 Martin Buchholz. -#### Copyright (C) 1998, 1999 J. Kean Johnston. -#### Copyright (C) 2005 Malcolm Purvis - -### Don't edit this script! -### This script was automatically generated by the `autoconf' program -### from the file `./configure.in'. -### To rebuild it, execute the command -### autoconf -### in the this directory. You must have autoconf version 2.50 or later. -### Note: this script has been tested only with autoconf version 2.5x. - -### This file is part of XEmacs. - -### XEmacs is free software; you can redistribute it and/or modify it -### under the terms of the GNU General Public License as published by -### the Free Software Foundation; either version 2, or (at your -### option) any later version. - -### XEmacs is distributed in the hope that it will be useful, but -### WITHOUT ANY WARRANTY; without even the implied warranty of -### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -### General Public License for more details. - -### You should have received a copy of the GNU General Public License -### along with XEmacs; see the file COPYING. If not, write to the Free -### Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -### 02111-1307, USA. - -### For usage, run `./configure --help' -### For more detailed information on building and installing XEmacs, -### read the file `INSTALL'. -### -### If configure succeeds, it leaves its status in config.status. -### A log of configuration tests can be found in config.log. -### If configure fails after disturbing the status quo, -### config.status is removed. +Configuration script for XEmacs. Largely divergent from FSF. +Guess values for system-dependent variables and create Makefiles. + +Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. +Copyright (C) 1997, 1998, 1999, 2001, 2002 Free Software Foundation, Inc. +Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +Copyright (C) 1993, 1994, 1995 Board of Trustees, University of Illinois. +Copyright (C) 1996, 1997 Sun Microsystems, Inc. +Copyright (C) 1995, 1996, 2002, 2003, 2004 Ben Wing. +Copyright (C) 2000, 2001 Martin Buchholz. +Copyright (C) 1998, 1999 J. Kean Johnston. +Copyright (C) 2005 Malcolm Purvis + +Don't edit this script! +This script was automatically generated by the `autoconf' program +from the file `./configure.ac'. To rebuild it, execute the command: + + autoconf + +in the this directory. You must have autoconf version 2.59. + +This file is part of XEmacs. + +XEmacs is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your +option) any later version. + +XEmacs is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with XEmacs; see the file COPYING. If not, write to the Free +Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. + +For usage, run `./configure --help' +For more detailed information on building and installing XEmacs, +read the file `INSTALL'. + +If configure succeeds, it leaves its status in config.status. +A log of configuration tests can be found in config.log. +If configure fails after disturbing the status quo, + config.status is removed. _ACEOF exit 0 @@ -1642,108 +1722,37 @@ 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" -# 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 - enable_prefix="$with_prefix" -fi; -# 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 - with_prefix="$enable_prefix" -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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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" + +# 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 + 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 + 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 + 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 + 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-gcc or --without-gcc were given then copy the value to the @@ -1762,615 +1771,37 @@ 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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; -# 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 - 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 - 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 - 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 - 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 - 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 - 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 - enable_mule="$with_mule" -fi; -# 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 - 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; -# 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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" +# 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 + 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 + 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 + 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 + 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-optimization or --without-optimization were given then copy the value to the # equivalent enable_optimization variable. @@ -2388,23 +1819,101 @@ 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 - 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 - 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" +# 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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=LIBS or --without-libs=LIBS were given then copy the value to the +# equivalent enable_libs=LIBS variable. +if test "${with_libs=LIBS+set}" = set; then + enable_libs=LIBS="$with_libs=LIBS" +fi; +# If -enable-libs=LIBS or --disable-libs=LIBS were given then copy the value to the +# equivalent with_libs=LIBS variable. +if test "${enable_libs=LIBS+set}" = set; then + with_libs=LIBS="$enable_libs=LIBS" +fi; +# Check whether --with-libs=LIBS or --without-libs=LIBS was given. +if test "${with_libs=LIBS+set}" = set; then + enableval="$with_libs=LIBS" + withval="$with_libs=LIBS" + LIBS="$with_libs" +fi; +# If --with-ldflags=FLAGS or --without-ldflags=FLAGS were given then copy the value to the +# equivalent enable_ldflags=FLAGS variable. +if test "${with_ldflags=FLAGS+set}" = set; then + enable_ldflags=FLAGS="$with_ldflags=FLAGS" +fi; +# If -enable-ldflags=FLAGS or --disable-ldflags=FLAGS were given then copy the value to the +# equivalent with_ldflags=FLAGS variable. +if test "${enable_ldflags=FLAGS+set}" = set; then + with_ldflags=FLAGS="$enable_ldflags=FLAGS" +fi; +# Check whether --with-ldflags=FLAGS or --without-ldflags=FLAGS was given. +if test "${with_ldflags=FLAGS+set}" = set; then + enableval="$with_ldflags=FLAGS" + withval="$with_ldflags=FLAGS" + LDFLAGS="$with_ldflags" fi; # If --with-site-includes or --without-site-includes were given then copy the value to the # equivalent enable_site-includes variable. @@ -2454,6 +1963,75 @@ withval="$with_site_prefixes" 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 + 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 + 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-dynamic or --without-dynamic were given then copy the value to the +# equivalent enable_dynamic variable. +if test "${with_dynamic+set}" = set; then + 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 + 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-prefix or --without-prefix were given then copy the value to the +# equivalent enable_prefix variable. +if test "${with_prefix+set}" = set; then + enable_prefix="$with_prefix" +fi; +# 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 + with_prefix="$enable_prefix" +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-netinstall or --without-netinstall were given then copy the value to the +# equivalent enable_netinstall variable. +if test "${with_netinstall+set}" = set; then + 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 + 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-statedir or --without-statedir were given then copy the value to the # equivalent enable_statedir variable. if test "${with_statedir+set}" = set; then @@ -2556,25 +2134,6 @@ 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 - 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 - 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 @@ -2596,20 +2155,39 @@ 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 - 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 - 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" + +# 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 + 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 + 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 + 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 + 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-package-prefix or --without-package-prefix were given then copy the value to the @@ -2650,6 +2228,328 @@ _ACEOF 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 + 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 + 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-gtk or --without-gtk were given then copy the value to the +# equivalent enable_gtk variable. +if test "${with_gtk+set}" = set; then + 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 + 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 + 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 + 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 + 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 + 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-toolbars or --without-toolbars were given then copy the value to the +# equivalent enable_toolbars variable. +if test "${with_toolbars+set}" = set; then + 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 + 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-wmcommand or --without-wmcommand were given then copy the value to the +# equivalent enable_wmcommand variable. +if test "${with_wmcommand+set}" = set; then + 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 + 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-athena or --without-athena were given then copy the value to the +# equivalent enable_athena variable. +if test "${with_athena+set}" = set; then + 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 + 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" + _athena_bogus=yes + for x in xaw 3d next 95 xpm ; do + if test $x = $with_athena ; then + _athena_bogus=no + fi + done + 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 _athena_bogus + + + +fi; +# 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 + 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 + 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 = $with_menubars ; then + _menubars_bogus=no + fi + done + if test "$_menubars_bogus" = "yes" ; then + (echo "$progname: Usage error:" +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 _menubars_bogus + + + +fi; + +# 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 + 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 + 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 = $with_scrollbars ; then + _scrollbars_bogus=no + fi + done + if test "$_scrollbars_bogus" = "yes" ; then + (echo "$progname: Usage error:" +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 _scrollbars_bogus + + + +fi; + +# 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 + 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 + 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 = $with_dialogs ; then + _dialogs_bogus=no + fi + done + if test "$_dialogs_bogus" = "yes" ; then + (echo "$progname: Usage error:" +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 _dialogs_bogus + + + +fi; + +# 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 + 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 + 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 = $with_widgets ; then + _widgets_bogus=no + fi + done + if test "$_widgets_bogus" = "yes" ; then + (echo "$progname: Usage error:" +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 _widgets_bogus + + + +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 + 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 + 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 + 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 + 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 + 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 + 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-xmu or --without-xmu were given then copy the value to the +# equivalent enable_xmu variable. +if test "${with_xmu+set}" = set; then + 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 + 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-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 @@ -2666,136 +2566,372 @@ 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 - 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 - 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 - enable_mc_alloc="$with_mc_alloc" -fi; -# 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 - 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; -# 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 - 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 - with_union_type="$enable_union_type" -fi; -# 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 - 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 - with_pdump="$enable_pdump" -fi; -# 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 - 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 - with_dump_in_exec="$enable_dump_in_exec" -fi; -# 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 - 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 - with_debug="$enable_debug" -fi; -# 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 - 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 - with_assertions="$enable_assertions" -fi; -# 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 - 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 - 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" + +# 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 + 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 + 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-ncurses or --without-ncurses were given then copy the value to the +# equivalent enable_ncurses variable. +if test "${with_ncurses+set}" = set; then + 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 + 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-gpm or --without-gpm were given then copy the value to the +# equivalent enable_gpm variable. +if test "${with_gpm+set}" = set; then + 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 + 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 + 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 + 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-png or --without-png were given then copy the value to the +# equivalent enable_png variable. +if test "${with_png+set}" = set; then + 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 + 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-jpeg or --without-jpeg were given then copy the value to the +# equivalent enable_jpeg variable. +if test "${with_jpeg+set}" = set; then + 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 + 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-tiff or --without-tiff were given then copy the value to the +# equivalent enable_tiff variable. +if test "${with_tiff+set}" = set; then + 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 + 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-xface or --without-xface were given then copy the value to the +# equivalent enable_xface variable. +if test "${with_xface+set}" = set; then + 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 + 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 + 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 + 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; + +_sound_notfirst="" +with_sound_native="" +enable_sound_native="" +with_sound_nas="" +enable_sound_nas="" +with_sound_esd=no +enable_sound_esd=no + +_sound_types="native nas esd" +_sound_default="native,nas,noesd" + + + +# 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 + 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 + 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 y in $_sound_types; do + eval "with_sound_$y=no" + eval "enable_sound_$y=no" +done +for x in `echo "$with_sound" | sed -e 's/,/ /g'` ; do + _sound_all_default="" + _sound_found="" + case "$x" in + n | no | non | none ) _sound_all_default=no ;; + a | al | all | both ) _sound_all_default=yes ;; + esac + + if test -z "$_sound_all_default"; then + for y in $_sound_types; do + if test "$x" = "$y"; then + _sound_found=yes + eval "with_sound_$y=yes" + eval "enable_sound_$y=yes" + elif test "$x" = "no$y"; then + _sound_found=yes + eval "with_sound_$y=no" + eval "enable_sound_$y=no" + fi + done + test -z "$_sound_found" && _sound_bogus=yes + fi + if test "$_sound_bogus" = "yes" -o \ + \( -n "$_sound_all_default" -a -n "$_sound_notfirst" \) ; then + (echo "$progname: Usage error:" +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: $_sound_default." +echo " Use \`$progname --help' to show usage.") >&2 && exit 1 + elif test -n "$_sound_all_default" ; then + for y in $_sound_types; do + eval "with_sound_$y=$_sound_all_default" + eval "enable_sound_$y=$_sound_all_default" + done + fi + _sound_notfirst=yes +done +unset _sound_bogus _sound_found _sound_notfirst _sound_types +unset _sound_default _sound_all_default x y + + + +else + enable_sound_nas="" +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 + 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 + 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-mule or --without-mule were given then copy the value to the +# equivalent enable_mule variable. +if test "${with_mule+set}" = set; then + enable_mule="$with_mule" +fi; +# 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 + 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; + +# 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 + 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 + 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" + _xim_bogus=yes + for x in yes no xlib motif ; do + if test $x = $with_xim ; then + _xim_bogus=no + fi + done + 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 _xim_bogus + + + +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 + 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 + 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 + 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 + 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 + 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 + 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-xfs or --without-xfs were given then copy the value to the +# equivalent enable_xfs variable. +if test "${with_xfs+set}" = set; then + 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 + 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-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 + 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 + 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-clash-detection or --without-clash-detection were given then copy the value to the @@ -2814,284 +2950,22 @@ 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 - enable_modules="$with_modules" -fi; -# 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 - 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; -# 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - with_system_malloc='default' -fi; - -#Enable code. +# 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 + 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 + 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; _database_notfirst="" with_database_berkdb="" @@ -3120,7 +2994,11 @@ if test "${with_database+set}" = set; then enableval="$with_database" withval="$with_database" - for x in `echo "$with_database" | sed -e 's/,/ /g'` ; do + for y in $_database_types; do + eval "with_database_$y=no" + eval "enable_database_$y=no" +done +for x in `echo "$with_database" | sed -e 's/,/ /g'` ; do _database_all_default="" _database_found="" case "$x" in @@ -3171,143 +3049,39 @@ fi; - -_sound_notfirst="" -with_sound_native="" -enable_sound_native="" -with_sound_nas="" -enable_sound_nas="" -with_sound_esd=no -enable_sound_esd=no - -_sound_types="native nas esd" -_sound_default="native,nas,noesd" - - - -# 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 - 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 - 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 ) _sound_all_default=no ;; - a | al | all | both ) _sound_all_default=yes ;; - esac - - if test -z "$_sound_all_default"; then - for y in $_sound_types; do - if test "$x" = "$y"; then - _sound_found=yes - eval "with_sound_$y=yes" - eval "enable_sound_$y=yes" - elif test "$x" = "no$y"; then - _sound_found=yes - eval "with_sound_$y=no" - eval "enable_sound_$y=no" - fi - done - test -z "$_sound_found" && _sound_bogus=yes - fi - if test "$_sound_bogus" = "yes" -o \ - \( -n "$_sound_all_default" -a -n "$_sound_notfirst" \) ; then - (echo "$progname: Usage error:" -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: $_sound_default." -echo " Use \`$progname --help' to show usage.") >&2 && exit 1 - elif test -n "$_sound_all_default" ; then - for y in $_sound_types; do - eval "with_sound_$y=$_sound_all_default" - eval "enable_sound_$y=$_sound_all_default" - done - fi - _sound_notfirst=yes -done -unset _sound_bogus _sound_found _sound_notfirst _sound_types -unset _sound_default _sound_all_default x y - - - -else - enable_sound_nas="" -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 - 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 - 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" - _athena_bogus=yes - for x in xaw 3d next 95 xpm ; do - if test $x = $with_athena ; then - _athena_bogus=no - fi - done - 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 _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 - 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 - 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" - _xim_bogus=yes - for x in yes no xlib motif ; do - if test $x = $with_xim ; then - _xim_bogus=no - fi - done - 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 _xim_bogus - - - -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 + 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 + 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 + 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 + 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-mail-locking or --without-mail-locking were given then copy the value to the # equivalent enable_mail-locking variable. @@ -3338,8 +3112,277 @@ -fi; - +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 + 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 + 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 + 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 + 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 + 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 + 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-tooltalk or --without-tooltalk were given then copy the value to the +# equivalent enable_tooltalk variable. +if test "${with_tooltalk+set}" = set; then + 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 + 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-socks or --without-socks were given then copy the value to the +# equivalent enable_socks variable. +if test "${with_socks+set}" = set; then + 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 + 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-dnet or --without-dnet were given then copy the value to the +# equivalent enable_dnet variable. +if test "${with_dnet+set}" = set; then + 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 + 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-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 + 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 + 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-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 + 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 + 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 + 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 + 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-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 + 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 + 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 + with_system_malloc='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 + 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 + 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-pdump or --without-pdump were given then copy the value to the +# equivalent enable_pdump variable. +if test "${with_pdump+set}" = set; then + 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 + with_pdump="$enable_pdump" +fi; +# 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 + 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 + with_dump_in_exec="$enable_dump_in_exec" +fi; +# 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-kkcc or --without-kkcc were given then copy the value to the +# equivalent enable_kkcc variable. +if test "${with_kkcc+set}" = set; then + 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 + 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 + enable_mc_alloc="$with_mc_alloc" +fi; +# 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 + 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; + +# 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 + enable_modules="$with_modules" +fi; +# 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 + 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; # If --with-bignum or --without-bignum were given then copy the value to the # equivalent enable_bignum variable. @@ -3374,6 +3417,71 @@ enable_bignum="no" 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 + 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 + 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 + 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 + 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-infodock or --without-infodock were given then copy the value to the +# equivalent enable_infodock variable. +if test "${with_infodock+set}" = set; then + 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 + 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-debug or --without-debug were given then copy the value to the +# equivalent enable_debug variable. +if test "${with_debug+set}" = set; then + 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 + with_debug="$enable_debug" +fi; +# Check whether --with-debug or --without-debug was given. +if test "${with_debug+set}" = set; then + enableval="$with_debug" + withval="$with_debug" + +fi; _error_checking_notfirst="" with_error_checking_extents="" enable_error_checking_extents="" @@ -3413,7 +3521,11 @@ 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 + for y in $_error_checking_types; do + eval "with_error_checking_$y=no" + eval "enable_error_checking_$y=no" +done +for x in `echo "$with_error_checking" | sed -e 's/,/ /g'` ; do _error_checking_all_default="" _error_checking_found="" case "$x" in @@ -3457,135 +3569,102 @@ fi; - - -# 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 - 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 - 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 = $with_menubars ; then - _menubars_bogus=no - fi - done - if test "$_menubars_bogus" = "yes" ; then - (echo "$progname: Usage error:" -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 _menubars_bogus - - - -fi; - - -# 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 - 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 - 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 = $with_scrollbars ; then - _scrollbars_bogus=no - fi - done - if test "$_scrollbars_bogus" = "yes" ; then - (echo "$progname: Usage error:" -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 _scrollbars_bogus - - - -fi; - - -# 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 - 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 - 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 = $with_dialogs ; then - _dialogs_bogus=no - fi - done - if test "$_dialogs_bogus" = "yes" ; then - (echo "$progname: Usage error:" -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 _dialogs_bogus - - - -fi; - - -# 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 - 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 - 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 = $with_widgets ; then - _widgets_bogus=no - fi - done - if test "$_widgets_bogus" = "yes" ; then - (echo "$progname: Usage error:" -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 _widgets_bogus - - - -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 + 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 + with_assertions="$enable_assertions" +fi; +# 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 + 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 + 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; +# 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 + 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 + 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-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 + 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 + with_union_type="$enable_union_type" +fi; +# 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-quantify or --without-quantify were given then copy the value to the +# equivalent enable_quantify variable. +if test "${with_quantify+set}" = set; then + 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 + 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; +# 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 + 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 + 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 test "$with_purify" = "yes" -o "$with_quantify" = "yes"; then test "$with_system_malloc" = "default" && with_system_malloc=yes @@ -33644,13 +33723,14 @@ fi if test -z "$sound_found"; then - if test "$with_msw" = "yes"; then + case "$opsys" in cygwin* | mingw* ) sound_found=yes with_native_sound_lib= extra_objs="$extra_objs ntplay.o" && if test "$verbose" = "yes"; then echo " xemacs will be linked with \"ntplay.o\"" fi - fi + ;; + esac fi if test -z "$sound_found"; then
--- a/configure.ac Wed Nov 16 07:22:46 2005 +0000 +++ b/configure.ac Wed Nov 16 11:54:10 2005 +0000 @@ -31,51 +31,52 @@ dnl Local copyright notices. AC_COPYRIGHT( -[#### Configuration script for XEmacs. Largely divergent from FSF. -#### Guess values for system-dependent variables and create Makefiles. -#### Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. -#### Copyright (C) 1997, 1998, 1999, 2001, 2002 Free Software Foundation, Inc. -#### Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. -#### Copyright (C) 1993, 1994, 1995 Board of Trustees, University of Illinois. -#### Copyright (C) 1996, 1997 Sun Microsystems, Inc. -#### Copyright (C) 1995, 1996, 2002, 2003, 2004 Ben Wing. -#### Copyright (C) 2000, 2001 Martin Buchholz. -#### Copyright (C) 1998, 1999 J. Kean Johnston. -#### Copyright (C) 2005 Malcolm Purvis - -### Don't edit this script! -### This script was automatically generated by the `autoconf' program -### from the file `./configure.in'. -### To rebuild it, execute the command -### autoconf -### in the this directory. You must have autoconf version 2.50 or later. -### Note: this script has been tested only with autoconf version 2.5x. - -### This file is part of XEmacs. - -### XEmacs is free software; you can redistribute it and/or modify it -### under the terms of the GNU General Public License as published by -### the Free Software Foundation; either version 2, or (at your -### option) any later version. - -### XEmacs is distributed in the hope that it will be useful, but -### WITHOUT ANY WARRANTY; without even the implied warranty of -### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -### General Public License for more details. - -### You should have received a copy of the GNU General Public License -### along with XEmacs; see the file COPYING. If not, write to the Free -### Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -### 02111-1307, USA. - -### For usage, run `./configure --help' -### For more detailed information on building and installing XEmacs, -### read the file `INSTALL'. -### -### If configure succeeds, it leaves its status in config.status. -### A log of configuration tests can be found in config.log. -### If configure fails after disturbing the status quo, -### config.status is removed. +[Configuration script for XEmacs. Largely divergent from FSF. +Guess values for system-dependent variables and create Makefiles. + +Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. +Copyright (C) 1997, 1998, 1999, 2001, 2002 Free Software Foundation, Inc. +Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +Copyright (C) 1993, 1994, 1995 Board of Trustees, University of Illinois. +Copyright (C) 1996, 1997 Sun Microsystems, Inc. +Copyright (C) 1995, 1996, 2002, 2003, 2004 Ben Wing. +Copyright (C) 2000, 2001 Martin Buchholz. +Copyright (C) 1998, 1999 J. Kean Johnston. +Copyright (C) 2005 Malcolm Purvis + +Don't edit this script! +This script was automatically generated by the `autoconf' program +from the file `./configure.ac'. To rebuild it, execute the command: + + autoconf + +in the this directory. You must have autoconf version 2.59. + +This file is part of XEmacs. + +XEmacs is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your +option) any later version. + +XEmacs is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with XEmacs; see the file COPYING. If not, write to the Free +Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. + +For usage, run `./configure --help' +For more detailed information on building and installing XEmacs, +read the file `INSTALL'. + +If configure succeeds, it leaves its status in config.status. +A log of configuration tests can be found in config.log. +If configure fails after disturbing the status quo, + config.status is removed. ]) dnl ------------------------------------------------------------------------- @@ -268,6 +269,26 @@ fi; dnl ])dnl XE_MERGED_ARG dnl +dnl XE_HELP_SUBSECTION(HEADING) +dnl -------------------------- +dnl +dnl Add subsection headings to the help text for XE_MERGED_ARG options. +dnl +AC_DEFUN([XE_HELP_SUBSECTION], +[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 +dnl NOTE: The next eol adds a blank line before the heading. +m4_divert_once([HELP_ENABLE], [[ +$1]])dnl +dnl Add an underscpne +dnl NOTE: The next eol adds a blank line after the underscore. +m4_divert_text([HELP_ENABLE], patsubst([$1], [.], [-]) +)])dnl +dnl dnl XEmacs keyword option support dnl ============================= dnl @@ -390,10 +411,17 @@ dnl --------------------------------------------- dnl dnl Internal macro to parse the option values. If an undeclared option is -dnl found then an error is generated. +dnl found then an error is generated. Because something has been supplied on +dnl the command line initialise all the complex options to 'no' rather than +dnl the default. In thius way --enable-complex=foo will give the expected +dnl value (no) for bar. dnl define([XE_PARSE_COMPLEX_OPTION], -[for x in `echo "$with_[$1]" | sed -e 's/,/ /g'` ; do +[for y in $_[$1]_types; do + eval "with_[$1]_$y=no" + eval "enable_[$1]_$y=no" +done +for x in `echo "$with_[$1]" | sed -e 's/,/ /g'` ; do _[$1]_all_default="" _[$1]_found="" case "$x" in @@ -495,15 +523,113 @@ dnl --use-kkcc --enable-kkcc dnl dnl parse flags +XE_HELP_SUBSECTION([Compilation options]) +XE_MERGED_ARG([compiler], + AC_HELP_STRING([--with-compiler],[C compiler to use]), + [], []) +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. + `--with-xemacs-compiler=g++'. This turns on a lot of + additional error-checking.]), + [], []) +XE_MERGED_ARG([gcc], + AC_HELP_STRING([--with-gcc],[Use GCC to compile XEmacs.]), + [], []) +XE_MERGED_ARG([cflags], + AC_HELP_STRING([--with-cflags=FLAGS], + [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'.]), + [], []) +XE_MERGED_ARG([cflags-warning], + AC_HELP_STRING([--with-cflags-warning=FLAGS],[Override compiler flags used to control warnings. + Normally, don't set this, as XEmacs already turns on + the maximum safe warning level.]), + [], []) +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.]), + [], []) +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.]), + [], []) +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).]), + [], []) +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"], []) +XE_MERGED_ARG([cppflags], + AC_HELP_STRING([--with-cppflags],[C preprocessor flags (e.g. -I/foo or -Dfoo=bar)]), + [CPPFLAGS="$with_cppflags"], []) +XE_MERGED_ARG([libs=LIBS], + AC_HELP_STRING([--with-libs],[Additional libraries (e.g. -lfoo)]), + [LIBS="$with_libs"], []) +XE_MERGED_ARG([ldflags=FLAGS], + AC_HELP_STRING([--with-ldflags],[Additional linker flags (e.g. -L/foo)]), + [LDFLAGS="$with_ldflags"], []) +XE_MERGED_ARG([site-includes], + AC_HELP_STRING([--with-site-includes=PATHS],[Prepend to include search path.]), + [], []) +XE_MERGED_ARG([site-libraries], + AC_HELP_STRING([--with-site-libraries=PATHS],[Prepend to library search path.]), + [], []) +XE_MERGED_ARG([site-prefixes], + AC_HELP_STRING([--with-site-prefixes=PATHS],[Prepend to include and library search paths, with /include and /lib added. Comes after site-includes and site-libraries, if any.]), + [], []) +XE_MERGED_ARG([site-runtime-libraries], + AC_HELP_STRING([--with-site-runtime-libraries=PATHS],[Prepend to the runtime library search path]), + [], []) +XE_MERGED_ARG([dynamic], + AC_HELP_STRING([--with-dynamic],[Link dynamically if supported by system. 'No' forces static linking.]), + [], []) +dnl +XE_HELP_SUBSECTION([Installation options]) XE_MERGED_ARG([prefix], AC_HELP_STRING([--with-prefix=no],[Don't compile the value for `prefix' into the executable.]), [true], [with_prefix=yes]) +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"]) +XE_MERGED_ARG([statedir], + AC_HELP_STRING([--with-statedir=DIR],[]), + [], [with_statedir='${prefix}/lib']) +XE_MERGED_ARG([lispdir], + AC_HELP_STRING([--with-lispdir=DIR],[]), + [AC_DEFINE(LISPDIR_USER_DEFINED)], [with_lispdir='${datadir}/${instvardir}/lisp']) +XE_MERGED_ARG([archlibdir], + AC_HELP_STRING([--with-archlibdir=DIR],[]), + [AC_DEFINE(ARCHLIBDIR_USER_DEFINED)], [with_archlibdir='${libdir}/${instvardir}/${configuration}']) +XE_MERGED_ARG([moduledir], + AC_HELP_STRING([--with-moduledir=DIR],[]), + [AC_DEFINE(MODULEDIR_USER_DEFINED)], [with_moduledir='${libdir}/${instvardir}/${configuration}/modules']) +XE_MERGED_ARG([etcdir], + AC_HELP_STRING([--with-etcdir=DIR],[]), + [AC_DEFINE(ETCDIR_USER_DEFINED)], [with_etcdir='${datadir}/${instvardir}/etc']) +XE_MERGED_ARG([docdir], + AC_HELP_STRING([--with-docdir=DIR],[]), + [AC_DEFINE(DOCDIR_USER_DEFINED)], [with_docdir='${archlibdir}']) +dnl +XE_HELP_SUBSECTION([Run-time path-searching options]) 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]) 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_HELP_STRING([--with-site-modules=no],[Disable site-modules directory in the XEmacs hierarchy, which is searched before the installation modules.]), [], []) +XE_MERGED_ARG([package-prefix], + AC_HELP_STRING([--with-package-prefix=DIR],[Specify packages root.]), + [AC_DEFINE(PACKAGE_PATH_USER_DEFINED)], []) +XE_MERGED_ARG([package-path], + AC_HELP_STRING([--with-package-path=PATH],[Search path for package hierarchies.]), + [AC_DEFINE(PACKAGE_PATH_USER_DEFINED)], []) +XE_MERGED_ARG([infopath], + AC_HELP_STRING([--with-infopath=PATH],[Location of info directories]), + [AC_DEFINE(INFOPATH_USER_DEFINED)], []) +dnl +XE_HELP_SUBSECTION([Window-system options]) XE_MERGED_ARG([gtk], AC_HELP_STRING([--with-gtk],[Support GTK on the X Window System. (EXPERIMENTAL)]), [true], [with_gtk=no]) @@ -513,21 +639,37 @@ 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.]), [], []) -XE_MERGED_ARG([gcc], - AC_HELP_STRING([--with-gcc],[Use GCC to compile XEmacs.]), +XE_MERGED_ARG([toolbars], + AC_HELP_STRING([--enable-toolbars],[Enable toolbar support. Default: yes.]), [], []) -XE_MERGED_ARG([dynamic], - AC_HELP_STRING([--with-dynamic],[Link dynamically if supported by system. 'No' forces static linking.]), +XE_MERGED_ARG([wmcommand], + AC_HELP_STRING([--with-wmcommand],[Compile without realized leader window which will + keep the WM_COMMAND property.]), [], []) -XE_MERGED_ARG([ncurses], - AC_HELP_STRING([--with-ncurses],[Use the ncurses library for tty support.]), - [], []) -XE_MERGED_ARG([dnet], - AC_HELP_STRING([--with-dnet],[Compile with support for DECnet.]), - [], []) -XE_MERGED_ARG([socks], - AC_HELP_STRING([--with-socks],[Compile with support for SOCKS (an Internet proxy).]), - [], []) +XE_KEYWORD_ARG([athena], + AC_HELP_STRING([--with-athena=TYPE],[Use TYPE Athena widgets (`xaw', `3d', `next', `95', or `xpm').]), +[],[],[xaw,3d,next,95,xpm])dnl +XE_KEYWORD_ARG([menubars], + AC_HELP_STRING([--enable-menubars=TYPE],[Use TYPE menubars ('yes', '`no', `lucid', `motif', `athena', `gtk', or `msw'). 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([scrollbars], + AC_HELP_STRING([--enable-scrollbars=TYPE],[Use TYPE scrollbars 'yes', '`no', `lucid', `motif', `athena', `gtk', or `msw'). + Lucid scrollbars are the default.]), + [], [],[yes,no,lucid,motif,athena,gtk,msw]) +XE_KEYWORD_ARG([dialogs], + AC_HELP_STRING([--enable-dialogs=TYPE],[Use TYPE dialog boxes 'yes', '`no', `lucid', `motif', `athena', `gtk', or `msw'). + 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([widgets], + AC_HELP_STRING([--enable-widgets=TYPE],[Use TYPE native widgets ('yes', '`no', `lucid', `motif', `athena', `gtk', or `msw'). + 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.]), + [], [],[yes,no,lucid,motif,athena,gtk,msw]) 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, @@ -546,9 +688,25 @@ different vendors, the results may be unpredictable.]), [], []) +XE_MERGED_ARG([xmu], + AC_HELP_STRING([--with-xmu],[Use Xmu utilities. Default: yes.]), + [], []) +XE_MERGED_ARG([external-widget], + AC_HELP_STRING([--enable-external-widget],[Support XEmacs server for text widgets in other applications.]), + [], []) +dnl +XE_HELP_SUBSECTION([TTY (character terminal) options]) +XE_MERGED_ARG([tty], + AC_HELP_STRING([--with-tty],[Enable TTY support. Default: yes.]), + [], []) +XE_MERGED_ARG([ncurses], + AC_HELP_STRING([--with-ncurses],[Use the ncurses library for tty support.]), + [], []) XE_MERGED_ARG([gpm], AC_HELP_STRING([--with-gpm],[Compile in GPM mouse support for ttys.]), [], []) +dnl +XE_HELP_SUBSECTION([Image options]) XE_MERGED_ARG([xpm], AC_HELP_STRING([--with-xpm],[Compile with support for XPM images. PRACTICALLY REQUIRED. Although this library is nonstandard and @@ -556,6 +714,20 @@ toolbars) depend on it, and you will run into many problems without it.]), [], []) +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.]), + [], []) +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.]), + [], []) +XE_MERGED_ARG([tiff], + AC_HELP_STRING([--with-tiff],[Compile with support for TIFF images. Possibly + useful, for the same reason as JPEG images.]), + [], []) XE_MERGED_ARG([xface], AC_HELP_STRING([--with-xface],[Compile with support for X-Face mail headers. Requires the compface package.]), @@ -563,58 +735,35 @@ XE_MERGED_ARG([gif], AC_HELP_STRING([--with-gif],[Compile without the (builtin) support for GIF images.]), [], []) -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.]), - [], []) -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.]), - [], []) -XE_MERGED_ARG([tiff], - AC_HELP_STRING([--with-tiff],[Compile with support for TIFF images. Possibly - useful, for the same reason as JPEG images.]), - [], []) -XE_MERGED_ARG([zlib], - AC_HELP_STRING([--with-zlib],[Support inflate (de)compression internally.]), - [], []) -XE_MERGED_ARG([wmcommand], - AC_HELP_STRING([--with-wmcommand],[Compile without realized leader window which will - keep the WM_COMMAND property.]), +dnl +XE_HELP_SUBSECTION([Sound options]) +XE_COMPLEX_ARG([sound], + AC_HELP_STRING([--enable-sound=TYPE],[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_sound_nas=""], + [XE_COMPLEX_OPTION([native],[""]), + XE_COMPLEX_OPTION([nas],[""]), + XE_COMPLEX_OPTION([esd],[no])]) +XE_MERGED_ARG([native-sound-lib], + AC_HELP_STRING([--with-native-sound-lib],[Path to sound library (for systems with name conflicts).]), [], []) -XE_MERGED_ARG([xmu], - AC_HELP_STRING([--with-xmu],[Use Xmu utilities. Default: yes.]), - [], []) -XE_MERGED_ARG([purify], - AC_HELP_STRING([--with-purify],[Support memory debugging using Purify.]), - [], []) -XE_MERGED_ARG([quantify], - AC_HELP_STRING([--with-quantify],[Support performance debugging using Quantify.]), - [], []) -XE_MERGED_ARG([toolbars], - AC_HELP_STRING([--enable-toolbars],[Enable toolbar support. Default: yes.]), - [], []) -XE_MERGED_ARG([tty], - AC_HELP_STRING([--with-tty],[Enable TTY support. Default: yes.]), - [], []) -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.]), - [], []) +dnl +XE_HELP_SUBSECTION([Internationalization options]) 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.]), [], []) -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.]), - [], []) +XE_KEYWORD_ARG([xim], + AC_HELP_STRING([--with-xim==TYPE],[Enable XIM support. TYPE is `yes', `no', `xlib', or `motif']), + [],[],[yes,no,xlib,motif])dnl XE_MERGED_ARG([canna], AC_HELP_STRING([--with-canna],[Support the Canna Japanese input method. Requires Mule.]), [], []) @@ -626,22 +775,55 @@ AC_HELP_STRING([--with-wnn6],[Support the Wnn6 Asian language input method (proprietary). Requires Mule.]), [], []) -XE_MERGED_ARG([workshop], - AC_HELP_STRING([--with-workshop],[Support the Sun WorkShop (formerly Sparcworks) - development environment.]), +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.]), + [], []) +dnl +XE_HELP_SUBSECTION([File-related options]) +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.]), + [], []) +XE_MERGED_ARG([clash-detection], + AC_HELP_STRING([--enable-clash-detection],[Disable use of lock files to detect multiple edits + of the same file.]), [], []) -XE_MERGED_ARG([sparcworks], - AC_HELP_STRING([--with-sparcworks],[Alias for --with-workshop]), +XE_MERGED_ARG([zlib], + AC_HELP_STRING([--with-zlib],[Support inflate (de)compression internally.]), [], []) -XE_MERGED_ARG([tooltalk], - AC_HELP_STRING([--with-tooltalk],[Support the ToolTalk IPC protocol.]), - [], []) +dnl +XE_HELP_SUBSECTION([Database options]) +XE_COMPLEX_ARG([database], + AC_HELP_STRING([--enable-database=TYPE],[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 \`--with-database' option.") +fi +], +[], +[XE_COMPLEX_OPTION([berkdb],[""]), + XE_COMPLEX_OPTION([dbm],[""]), + XE_COMPLEX_OPTION([gdbm],[""])]) XE_MERGED_ARG([ldap], AC_HELP_STRING([--with-ldap],[Support the LDAP protocol.]), [], []) XE_MERGED_ARG([postgresql], AC_HELP_STRING([--with-postgresql],[Support the PostgreSQL RDBMS.]), [], []) +dnl +XE_HELP_SUBSECTION([Mail options]) +XE_KEYWORD_ARG([mail-locking], + AC_HELP_STRING([--with-mail-locking=TYPE],[Specify the locking to be used by movemail to prevent + concurrent updates of mail spool files. Valid types + are `lockf', `flock', `file', `locking', `mmdf' or `pop'.]), +[],[],[lockf,flock,file,locking,mmdf,pop])dnl XE_MERGED_ARG([pop], AC_HELP_STRING([--with-pop],[Support POP for mail retrieval.]), [], []) @@ -651,72 +833,33 @@ XE_MERGED_ARG([hesiod], AC_HELP_STRING([--with-hesiod],[Support Hesiod to get the POP server host.]), [], []) -XE_MERGED_ARG([infodock], - AC_HELP_STRING([--with-infodock],[Support the Infodock version of XEmacs. Infodock is a SourceForge project).]), - [], []) -XE_MERGED_ARG([native-sound-lib], - AC_HELP_STRING([--with-native-sound-lib],[Path to sound library (for systems with name conflicts).]), +dnl +XE_HELP_SUBSECTION([Networking options]) +XE_MERGED_ARG([tooltalk], + AC_HELP_STRING([--with-tooltalk],[Support the ToolTalk IPC protocol.]), [], []) -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"]) -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.]), +XE_MERGED_ARG([socks], + AC_HELP_STRING([--with-socks],[Compile with support for SOCKS (an Internet proxy).]), + [], []) +XE_MERGED_ARG([dnet], + AC_HELP_STRING([--with-dnet],[Compile with support for DECnet.]), [], []) 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"]) -XE_MERGED_ARG([site-includes], - AC_HELP_STRING([--with-site-includes],[Prepend to include search path.]), - [], []) -XE_MERGED_ARG([site-libraries], - AC_HELP_STRING([--with-site-libraries],[Prepend to library search path.]), - [], []) -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.]), - [], []) -XE_MERGED_ARG([statedir], - AC_HELP_STRING([--with-statedir],[]), - [], [with_statedir='${prefix}/lib']) -XE_MERGED_ARG([lispdir], - AC_HELP_STRING([--with-lispdir],[]), - [AC_DEFINE(LISPDIR_USER_DEFINED)], [with_lispdir='${datadir}/${instvardir}/lisp']) -XE_MERGED_ARG([archlibdir], - AC_HELP_STRING([--with-archlibdir],[]), - [AC_DEFINE(ARCHLIBDIR_USER_DEFINED)], [with_archlibdir='${libdir}/${instvardir}/${configuration}']) -XE_MERGED_ARG([moduledir], - AC_HELP_STRING([--with-moduledir],[]), - [AC_DEFINE(MODULEDIR_USER_DEFINED)], [with_moduledir='${libdir}/${instvardir}/${configuration}/modules']) -XE_MERGED_ARG([etcdir], - AC_HELP_STRING([--with-etcdir],[]), - [AC_DEFINE(ETCDIR_USER_DEFINED)], [with_etcdir='${datadir}/${instvardir}/etc']) -XE_MERGED_ARG([infopath], - AC_HELP_STRING([--with-infopath],[]), - [AC_DEFINE(INFOPATH_USER_DEFINED)], []) -XE_MERGED_ARG([docdir], - AC_HELP_STRING([--with-docdir],[]), - [AC_DEFINE(DOCDIR_USER_DEFINED)], [with_docdir='${archlibdir}']) -XE_MERGED_ARG([site-runtime-libraries], - AC_HELP_STRING([--with-site-runtime-libraries],[]), - [], []) -XE_MERGED_ARG([package-prefix], - AC_HELP_STRING([--with-package-prefix],[Specify packages root.]), - [AC_DEFINE(PACKAGE_PATH_USER_DEFINED)], []) -XE_MERGED_ARG([package-path], - AC_HELP_STRING([--with-package-path],[Search path for package hierarchies.]), - [AC_DEFINE(PACKAGE_PATH_USER_DEFINED)], []) -XE_MERGED_ARG([external-widget], - AC_HELP_STRING([--enable-external-widget],[Support XEmacs server for text widgets in other applications.]), - [], []) -XE_MERGED_ARG([kkcc], - AC_HELP_STRING([--enable-kkcc],[Enable new GC algorithms.]), - [], [enable_kkcc=yes]) -XE_MERGED_ARG([mc-alloc], - AC_HELP_STRING([--enable-mc-alloc],[Enable new allocator.]), - [], [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.]), +dnl +XE_HELP_SUBSECTION([Memory allocation options]) +XE_MERGED_ARG([rel-alloc], + AC_HELP_STRING([--with-rel-alloc],[Enable the relocating allocator.]), + [], [with_rel_alloc='default']) +XE_MERGED_ARG([dlmalloc], + AC_HELP_STRING([--with-dlmalloc],[Use Doug Lea's malloc implementation.]), + [], [with_dlmalloc='default']) +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']) +XE_MERGED_ARG([debug-malloc], + AC_HELP_STRING([--with-debug-malloc],[Use a debugging malloc.]), [], []) XE_MERGED_ARG([pdump], AC_HELP_STRING([--enable-pdump],[Enable portable LISP preloader.]), @@ -726,23 +869,60 @@ for `pdump', not enabled by default in combination with `mc-alloc').]), [], []) +XE_MERGED_ARG([kkcc], + AC_HELP_STRING([--enable-kkcc],[Enable experimental new GC algorithms.]), + [], [enable_kkcc=yes]) +XE_MERGED_ARG([mc-alloc], + AC_HELP_STRING([--enable-mc-alloc],[Enable experimental new allocator.]), + [], [enable_mc_alloc=yes]) +dnl +XE_HELP_SUBSECTION([Emacs Lisp options]) +XE_MERGED_ARG([modules], + AC_HELP_STRING([--enable-modules],[Compile in experimental support for dynamically + loaded libraries (Dynamic Shared Objects).]), + [], []) +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]) +dnl +XE_HELP_SUBSECTION([Platform Specific options]) +XE_MERGED_ARG([workshop], + AC_HELP_STRING([--with-workshop],[Support the Sun WorkShop (formerly Sparcworks) + development environment.]), + [], []) +XE_MERGED_ARG([sparcworks], + AC_HELP_STRING([--with-sparcworks],[Alias for --with-workshop]), + [], []) +XE_MERGED_ARG([infodock], + AC_HELP_STRING([--with-infodock],[Support the Infodock version of XEmacs. Infodock is a SourceForge project).]), + [], []) +dnl +XE_HELP_SUBSECTION([Debugging options]) XE_MERGED_ARG([debug], AC_HELP_STRING([--enable-debug],[Enable additional debugging information. No time cost.]), [], []) +XE_COMPLEX_ARG([error-checking], + AC_HELP_STRING([--enable-error-checking=TESTS],[Compile with internal error-checking added. + Causes noticeable loss of speed. Valid TESTS + are `extents', `bufpos', `malloc', `gc', `types', `text', `byte_code', `glyphs', `display', `structures'.]), + [], [], +[XE_COMPLEX_OPTION([extents],[""]), + XE_COMPLEX_OPTION([types],[""]), + XE_COMPLEX_OPTION([text],[""]), + XE_COMPLEX_OPTION([gc],[""]), + XE_COMPLEX_OPTION([malloc],[""]), + XE_COMPLEX_OPTION([byte_code],[""]), + XE_COMPLEX_OPTION([glyphs],[""]), + XE_COMPLEX_OPTION([display],[""]), + XE_COMPLEX_OPTION([structures],[""])]) XE_MERGED_ARG([assertions], - AC_HELP_STRING([--enable-assertions],[]), + AC_HELP_STRING([--enable-assertions],[Compile in runtime assertions.]), [], []) XE_MERGED_ARG([memory-usage-stats], AC_HELP_STRING([--enable-memory-usage-stats],[Enable LISP memory usage API.]), [], []) -XE_MERGED_ARG([clash-detection], - AC_HELP_STRING([--enable-clash-detection],[Disable use of lock files to detect multiple edits - of the same file.]), - [], []) -XE_MERGED_ARG([modules], - AC_HELP_STRING([--enable-modules],[Compile in experimental support for dynamically - loaded libraries (Dynamic Shared Objects).]), - [], []) 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. @@ -755,163 +935,15 @@ to these files don't automatically cause all .c files to be rebuilt.]), [], []) - -XE_MERGED_ARG([compiler], - AC_HELP_STRING([--with-compiler],[C compiler to use]), - [], []) - -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. - `--with-xemacs-compiler=g++'. This turns on a lot of - additional error-checking.]), - [], []) - -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'.]), - [], []) - -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.]), - [], []) - -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.]), - [], []) - -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).]), - [], []) - -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"], []) - -XE_MERGED_ARG([cppflags], - AC_HELP_STRING([--with-cppflags],[C preprocessor flags (e.g. -I/foo or -Dfoo=bar)]), - [CPPFLAGS="$with_cppflags"], []) - -XE_MERGED_ARG([libs], - AC_HELP_STRING([--with-libs],[Additional libraries (e.g. -lfoo)]), - [LIBS="$with_libs"], []) - -XE_MERGED_ARG([ldflags], - AC_HELP_STRING([--with-ldflags],[Additional linker flags (e.g. -L/foo)]), - [LDFLAGS="$with_ldflags"], []) - -XE_MERGED_ARG([rel-alloc], - AC_HELP_STRING([--with-rel-alloc],[Enable the relocating allocator.]), - [], [with_rel_alloc='default']) - -XE_MERGED_ARG([dlmalloc], - AC_HELP_STRING([--with-dlmalloc],[Use Doug Lea's malloc implementation.]), - [], [with_dlmalloc='default']) - -XE_MERGED_ARG([debug-malloc], - AC_HELP_STRING([--with-debug-malloc],[Use a debugging malloc.]), +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.]), [], []) - -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([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 \`--with-database' option.") -fi -], -[], -[XE_COMPLEX_OPTION([berkdb],[""]), - XE_COMPLEX_OPTION([dbm],[""]), - XE_COMPLEX_OPTION([gdbm],[""])]) - -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. - 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_sound_nas=""], - [XE_COMPLEX_OPTION([native],[""]), - XE_COMPLEX_OPTION([nas],[""]), - XE_COMPLEX_OPTION([esd],[no])]) - -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([xim],[],[],[],[yes,no,xlib,motif])dnl - -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([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([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.]), - [], [], -[XE_COMPLEX_OPTION([extents],[""]), - XE_COMPLEX_OPTION([types],[""]), - XE_COMPLEX_OPTION([text],[""]), - XE_COMPLEX_OPTION([gc],[""]), - XE_COMPLEX_OPTION([malloc],[""]), - XE_COMPLEX_OPTION([byte_code],[""]), - XE_COMPLEX_OPTION([glyphs],[""]), - XE_COMPLEX_OPTION([display],[""]), - XE_COMPLEX_OPTION([structures],[""])]) - -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([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([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([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 - used if Motif can be found, else Athena is used.]), - [], [],[yes,no,lucid,motif,athena,gtk,msw]) - +XE_MERGED_ARG([quantify], + AC_HELP_STRING([--with-quantify],[Support performance debugging using Quantify.]), + [], []) +XE_MERGED_ARG([purify], + AC_HELP_STRING([--with-purify],[Support memory debugging using Purify.]), + [], []) dnl ------------------------------------------------------------------------- dnl Final command line argument checks.
--- a/man/ChangeLog Wed Nov 16 07:22:46 2005 +0000 +++ b/man/ChangeLog Wed Nov 16 11:54:10 2005 +0000 @@ -1,3 +1,8 @@ +2005-11-08 Malcolm Purvis <malcolmp@xemacs.org> + + * internals/internals.texi (The configure Script): Added the + definition of the new macro XE_HELP_SUBSECTION. + 2005-11-13 Ben Wing <ben@xemacs.org> * Makefile:
--- a/man/internals/internals.texi Wed Nov 16 07:22:46 2005 +0000 +++ b/man/internals/internals.texi Wed Nov 16 11:54:10 2005 +0000 @@ -4595,7 +4595,11 @@ 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 + +@table @code +@item XE_HELP_SUBSECTION(heading) +Add a subsection heading to the help output of merged arguments. @end table @heading XEmacs keyword option support