Hrvoje> Malcolm Purvis <malcolmp(a)xemacs.org&gt; writes: Hrvoje> I believe the actual proposition was to make --with and Hrvoje> --enable one and the same. If we're not following the Hrvoje> Autoconf recommendation on how to distinguish them, then Hrvoje> they IMHO *should* be aliases. I think that's sensible, too. Not a big deal, but also if somebody wants to rationalize the usage in accordance with the Autoconf recommendation (or something else coherent), the two-way alias makes it safe to make the changes a little at a time, and have all the pain come at one time if and when we decide/are forced to go back to distinguishing the two. -- School of Systems and Information Engineering http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Ask not how you can "do" free software business; ask what your business can "do for" free software.

21.5 SUPERSEDES <m2wtkpfos3.fsf(a)silver.local&gt; This is the revised patch dealing with configure options. It makes the following changes: 1. All local options can be specified by either --with or --enable (see the macro XE_MERGED_ARG below). 2. The keyword and complex options have been altered accordingly. 3. Requires that only autoconf 2.59 be used to generate the configure script. 4. Replaces numerous blank lines with the proper m4 'blank line' macro. This prevents stray blank lines appearing at the wrong places in the configure script. 5. Fixes the configure script section of internals.texi to reflect the above changes. 6. Changes "API's" to "APIs" in internal.texi. It's incorrect grammar and prevented TeX from generating dvi and pdf versions of the document. --with-x cannot be specified via --enable-x because it is declared by autoconf itself and not by our configure.ac. Malcolm ChangeLog addition: 2005-10-15 Malcolm Purvis <malcolmp(a)xemacs.org&gt; * configure.ac: Added XE_MERGED_ARG to alias all local --enable and --with options. Configure can only be built with autoconf 2.59. Prevent many unwanted blank lines from appearing in configure. man/ChangeLog addition: 2005-10-15 Malcolm Purvis <malcolmp(a)xemacs.org&gt; * internals/internals.texi: "API's" -> "APIs". This fixes problems generating dvi and pdf versions. * internals/internals.texi (The configure Script): Describe the use of XE_MERGED_ARG. xemacs-autoconf-2.5 source patch: Diff command: cvs -q diff -u Files affected: man/internals/internals.texi configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.15 diff -u -r1.15 configure.ac --- configure.ac 2005/10/14 01:00:45 1.15 +++ configure.ac 2005/10/15 12:24:54 ＠＠ -15,13 +15,17 ＠＠ ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&AS_MESSAGE_LOG_FD' ac_compiler_gnu=$ac_cv_c_compiler_gnu ]) - +dnl dnl ------------------------------------------------------------------------- dnl Autoconf startup. - +dnl +dnl Due to a dependence on the implementation of certain internal autoconf +dnl macros, die if any version other than 2.59 is used. AC_PREREQ(2.59)dnl +m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2.59]), 1, + [m4_fatal([This script can only be generated with autoconf 2.59])], [])dnl AC_INIT(src/lisp.h)dnl - +dnl dnl ------------------------------------------------------------------------- dnl Local copyright notices. ＠＠ -85,39 +89,39 ＠＠ dnl If there's reason to prefer $0 over this, make sure you fix all the dnl uses in this script!! progname="`echo $0 | sed 's:^\./\./:\./:'`" - +dnl dnl ------------------------------------------------------------------------- dnl Local macros - +dnl define([USAGE_ERROR], [(echo "$progname: Usage error:" echo " " $1 -echo " Use \`$progname --help' to show usage.") >&2 && exit 1]) - +echo " Use \`$progname --help' to show usage.") >&2 && exit 1])dnl +dnl dnl PRINT_VAR(var var ...) prints values of shell variables define([PRINT_VAR],[for var in patsubst([$1],[[ -]+],[ ]); do eval "echo \"$var = '\$$var'\""; done]) - +]+],[ ]); do eval "echo \"$var = '\$$var'\""; done])dnl +dnl dnl XE_ADD_OBJS(foo.o) define([XE_ADD_OBJS], [extra_objs="$extra_objs [$1]" && dnl if test "$verbose" = "yes"; then echo " xemacs will be linked with \"[$1]\"" fi])dnl XE_ADD_OBJS - +dnl dnl XE_APPEND(value, varname) define([XE_APPEND], [[$2]="$[$2] [$1]" && dnl - if test "$verbose" = "yes"; then echo " Appending \"[$1]\" to \$[$2]"; fi]) - + if test "$verbose" = "yes"; then echo " Appending \"[$1]\" to \$[$2]"; fi])dnl +dnl dnl XE_PREPEND(value, varname) define([XE_PREPEND], [[$2]="[$1] $[$2]" && dnl - if test "$verbose" = "yes"; then echo " Prepending \"[$1]\" to \$[$2]"; fi]) - + if test "$verbose" = "yes"; then echo " Prepending \"[$1]\" to \$[$2]"; fi])dnl +dnl dnl XE_DIE(message) -define([XE_DIE], [{ echo "Error:" $1 >&2; exit 1; }]) - +define([XE_DIE], [{ echo "Error:" $1 >&2; exit 1; }])dnl +dnl dnl XE_CHECK_FEATURE_DEPENDENCY(feature1, feature2) define([XE_CHECK_FEATURE_DEPENDENCY], [if test "$with_[$1] $with_[$2]" = "yes no"; then ＠＠ -125,13 +129,13 ＠＠ elif test "$with_[$2]" = "no" ; then with_[$1]=no elif test "$with_[$1]" = "yes"; then with_[$2]=yes fi -]) - +])dnl +dnl dnl XE_STRIP_4TH_COMPONENT(var) dnl Changes i986-pc-linux-gnu to i986-pc-linux, as God (not RMS) intended. define([XE_STRIP_4TH_COMPONENT], -[$1=`echo "$$1" | sed '[s/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/]'`]) - +[$1=`echo "$$1" | sed '[s/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/]'`])dnl +dnl dnl Do our best to deal with automounter brokenness dnl CANONICALIZE_PATH(varname) define([CANONICALIZE_PATH], ＠＠ -140,7 +144,7 ＠＠ $1=`echo "[$]$1" | \ sed -e "s|^${tdir}/|/net/|" -e "s|^/a/|/net/|" -e "s|^/amd/|/net/|"` fi])dnl - +dnl dnl XE_PROTECT_LINKER_FLAGS(shell_var) define([XE_PROTECT_LINKER_FLAGS], [ if test "$GCC" = "yes"; then ＠＠ -155,11 +159,11 ＠＠ shift done fi])dnl - +dnl dnl Allow use of either ":" or spaces for lists of directories define(COLON_TO_SPACE, [case "$[$1]" in *:* [)] [$1]="`echo '' $[$1] | sed -e 's/^ //' -e 's/:/ /g'`";; esac])dnl - +dnl dnl XE_ADD_RUNPATH_DIR(directory) define([XE_ADD_RUNPATH_DIR],[{ xe_runpath_dir=$1 ＠＠ -169,7 +173,7 ＠＠ -n "`ls ${xe_runpath_dir}/*.s[[ol]] 2>/dev/null`" && \ eval "$xe_add_unique_runpath_dir" }])dnl - +dnl dnl XE_COMPUTE_RUNPATH() define([XE_COMPUTE_RUNPATH],[ if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then ＠＠ -217,7 +221,7 ＠＠ fi fi ])dnl - +dnl dnl The construct foo=`echo $w1 $w2 $w3` fails on some systems if $w1 = -e or -n dnl So we use the following instead. dnl XE_SPACE(var, words) ＠＠ -226,7 +230,44 ＠＠ for W in $2; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done $1="$T" ])dnl XE_SPACE - +dnl +dnl XE_MERGED_ARG(FEATURE, HELP-STRING, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +dnl ------------------------------------------------------------------------ +dnl +dnl Arguments that can be specified with either --enable or --with. The +dnl majority of XEmacs arguments do not fit neatly into the division between +dnl --enable and --with, so allow those to be specified by either argument. +dnl The value is stored in both enable_FEATURE and with_FEATURE. +AC_DEFUN([XE_MERGED_ARG], +[m4_divert_once([HELP_ENABLE], [[ +Optional Features: + --with-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-FEATURE[=ARG] alias for --with-FEATURE + --without-FEATURE do not use FEATURE (same as --with-FEATURE=no) + --disable-FEATURE alias for --without-FEATURE]])dnl +m4_divert_once([HELP_ENABLE], m4_bpatsubst([[$2]],[--enable\([^ ]+\) ],[--with\1 ]))dnl +# If --with-$1 or --without-$1 were given then copy the value to the +# equivalent enable_$1 variable. +if test "[${with_]m4_bpatsubst([$1], -, _)+set}" = set; then + echo $1 Setting enable to "[$with_]m4_bpatsubst([$1], -, _)" + [enable_]m4_bpatsubst([$1], -, _)="[$with_]m4_bpatsubst([$1], -, _)" +fi; +# If -enable-$1 or --disable-$1 were given then copy the value to the +# equivalent with_$1 variable. +if test "[${enable_]m4_bpatsubst([$1], -, _)+set}" = set; then + echo $1 Setting with to "[$enable_]m4_bpatsubst([$1], -, _)" + [with_]m4_bpatsubst([$1], -, _)="[$enable_]m4_bpatsubst([$1], -, _)" +fi; +# Check whether --with-$1 or --without-$1 was given. +if test "[${with_]m4_bpatsubst([$1], -, _)+set}" = set; then + enableval="[$with_]m4_bpatsubst([$1], -, _)" + withval="[$with_]m4_bpatsubst([$1], -, _)" + $3 +m4_ifvaln([$4], [else + $4])dnl +fi; dnl +])dnl XE_MERGED_ARG +dnl dnl XEmacs keyword option support dnl ============================= dnl ＠＠ -249,7 +290,7 ＠＠ define([XE_PARSE_KEYWORD_OPTION], [_[$1]_bogus=yes for x in XE_KEYWORD_LIST ; do - if test $x = $[$1] ; then + if test $x = $with_[$1] ; then _[$1]_bogus=no fi done ＠＠ -258,7 +299,7 ＠＠ fi unset _[$1]_bogus undefine([XE_KEYWORD_LIST])dnl -undefine([XE_KEYWORD_VALUES])]) +undefine([XE_KEYWORD_VALUES])])dnl dnl dnl XE_KEYWORD(keyword) dnl -------------------------------- ＠＠ -269,35 +310,21 ＠＠ dnl Separate with a ':' instead of a ',' (see the parsing code above) to avoid dnl confusion with marco parameter lists. m4_append([XE_KEYWORD_VALUES],[\`$1'],[:])dnl -]) -dnl -dnl XE_KEYWORD_ARG_WITH(PACKAGE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE, -dnl [XE_KEYWORD(keyword), ....]) -dnl -------------------------------------------------------------------------- -dnl -dnl Expanded version of AC_ARG_WITH for keyword options. All the parameters -dnl are required. -dnl -define([XE_KEYWORD_ARG_WITH], -[m4_map([XE_KEYWORD],m4_shiftn(4, $＠)) -AC_ARG_WITH([$1],[$2], -[XE_PARSE_KEYWORD_OPTION([with_]patsubst([$1], -, _), [--with-$1]) -$3 -],[$4])]) +])dnl dnl -dnl XE_KEYWORD_ARG_ENABLE(FEATURE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE, +dnl XE_KEYWORD_ARG(PACKAGE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE, dnl [XE_KEYWORD(keyword), ....]) dnl -------------------------------------------------------------------------- dnl -dnl Expanded version of AC_ARG_ENABLE for keyword options. All the parameters +dnl Expanded version of XE_MERGED_ARG for keyword options. All the parameters dnl are required. dnl -define([XE_KEYWORD_ARG_ENABLE], +define([XE_KEYWORD_ARG], [m4_map([XE_KEYWORD],m4_shiftn(4, $＠)) -AC_ARG_ENABLE([$1],[$2], -[XE_PARSE_KEYWORD_OPTION([enable_]patsubst([$1], -, _), [--enable-$1]) +XE_MERGED_ARG([$1],[$2], +[XE_PARSE_KEYWORD_OPTION(patsubst([$1], -, _), [--with-$1]) $3 -],[$4])]) +],[$4])])dnl dnl dnl XEmacs complex option support dnl ============================= ＠＠ -320,7 +347,8 ＠＠ dnl value and to note the values in an option list. dnl define([XE_EXPAND_COMPLEX_OPTION], -[[$1]_[$2]=[$3] +[with_[$1]_[$2]=[$3] +enable_[$1]_[$2]=[$3] m4_append([XE_COMPONENT_LIST],[$2],[ ])dnl dnl Separate with a ':' instead of a ',' (see <prefix>_default below) to avoid dnl confusion with marco parameter lists. ＠＠ -335,7 +363,7 ＠＠ define([XE_EXPAND_COMPLEX_OPTIONS], [m4_if([$2], [[]], [], [XE_EXPAND_COMPLEX_OPTION([$1], m4_fst($2))[]dnl -XE_EXPAND_COMPLEX_OPTIONS([$1], m4_cdr($2))])]) +XE_EXPAND_COMPLEX_OPTIONS([$1], m4_cdr($2))])])dnl dnl dnl XE_INIT_COMPLEX_OPTION(prefix, option_list) dnl ------------------------------------------- ＠＠ -347,7 +375,7 ＠＠ dnl values. dnl define([XE_INIT_COMPLEX_OPTION], -[[$1]_notfirst="" +[_[$1]_notfirst="" dnl XE_EXPAND_COMPLEX_OPTIONS($＠) _[$1]_types="XE_COMPONENT_LIST" ＠＠ -356,8 +384,8 ＠＠ dnl options. undefine([XE_COMPONENT_LIST]) undefine([XE_COMPONENT_DEFAULT]) -]) - +])dnl +dnl dnl XE_PARSE_COMPLEX_OPTION(prefix, cmdline-flag) dnl --------------------------------------------- dnl ＠＠ -365,7 +393,7 ＠＠ dnl found then an error is generated. dnl define([XE_PARSE_COMPLEX_OPTION], -[for x in `echo "$[$1]" | sed -e 's/,/ /g'` ; do +[for x in `echo "$with_[$1]" | sed -e 's/,/ /g'` ; do _[$1]_all_default="" _[$1]_found="" case "$x" in ＠＠ -380,12 +408,14 ＠＠ dnl echo "$x" = "$y" _[$1]_found=yes dnl echo eval `echo "[$1]_$y=yes"` - eval "[$1]_$y=yes" + eval "with_[$1]_$y=yes" + eval "enable_[$1]_$y=yes" elif test "$x" = "no$y"; then dnl echo "$x" = "no$y" _[$1]_found=yes dnl echo eval `echo "[$1]_$y=no"` - eval "[$1]_$y=no" + eval "with_[$1]_$y=no" + eval "enable_[$1]_$y=no" fi done test -z "$_[$1]_found" && _[$1]_bogus=yes ＠＠ -405,8 +435,8 ＠＠ done unset _[$1]_bogus _[$1]_found _[$1]_notfirst _[$1]_types unset _[$1]_default _[$1]_all_default x y -]) - +])dnl +dnl dnl XE_COMPLEX_OPTION(option, yesno) dnl -------------------------------- dnl ＠＠ -423,36 +453,22 ＠＠ define([XE_COMPLEX_OPTION_HELP_STRING], [AC_HELP_STRING([$1],[Compile with support for $2. Components that can use $3 are $4. Prefix component with `no' to disable its use of $3. Requires -$5 support. Default is $6.])]) +$5 support. Default is $6.])])dnl dnl -dnl XE_COMPLEX_ARG_WITH(PACKAGE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE, +dnl XE_COMPLEX_ARG(PACKAGE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE, dnl [XE_COMPLEX_OPTION(a,yes), ....]) dnl -------------------------------------------------------------------------- dnl -dnl Expanded version of AC_ARG_WITH for complex options. All the parameters +dnl Expanded version of XE_MERGED_ARG for complex options. All the parameters dnl are required. dnl -define([XE_COMPLEX_ARG_WITH], -[XE_INIT_COMPLEX_OPTION([with_]patsubst([$1], -, _), m4_shiftn(4, $＠)) -AC_ARG_WITH([$1],[$2], -[XE_PARSE_COMPLEX_OPTION([with_]patsubst([$1], -, _), [--with-$1]) +define([XE_COMPLEX_ARG], +[XE_INIT_COMPLEX_OPTION(patsubst([$1], -, _), m4_shiftn(4, $＠)) +XE_MERGED_ARG([$1],[$2], +[XE_PARSE_COMPLEX_OPTION(patsubst([$1], -, _), [--with-$1]) $3 -],[$4])]) -dnl -dnl XE_COMPLEX_ARG_ENABLE(FEATURE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE, -dnl [XE_COMPLEX_OPTION, ....]) -dnl -------------------------------------------------------------------------- +],[$4])])dnl dnl -dnl Expanded version of AC_ARG_ENABLE for complex options. All the parameters -dnl are required. -dnl -define([XE_COMPLEX_ARG_ENABLE], -[XE_INIT_COMPLEX_OPTION([enable_]patsubst([$1], -, _), m4_shiftn(4, $＠)) -AC_ARG_ENABLE([$1],[$2], -[XE_PARSE_COMPLEX_OPTION([enable_]patsubst([$1], -, _), [--enable-$1]) -$3 -],[$4])]) -dnl dnl ------------------------------------------------------------------------- XE_APPEND(lib-src, MAKE_SUBDIR) XE_APPEND(lib-src, INSTALL_ARCH_DEP_SUBDIR) ＠＠ -462,19 +478,6 ＠＠ dnl Note that AC_HELP_STRING compresses whitespace, wraps, and indents the dnl string to fit the --help display; there's no need to preformat. dnl -dnl Error-checking on old-style flags -AC_ARG_WITH([mule],[],[XE_DIE([--enable-mule, NOT --with-mule])],[]) -AC_ARG_WITH([menubars],[],[XE_DIE([--enable-menubars, NOT --with-menubars])],[]) -AC_ARG_WITH([scrollbars],[],[XE_DIE([--enable-scrollbars, NOT --with-scrollbars])],[]) -AC_ARG_WITH([dialogs],[],[XE_DIE([--enable-dialogs, NOT --with-dialogs])],[]) -AC_ARG_WITH([widgets],[],[XE_DIE([--enable-widgets, NOT --with-widgets])],[]) -AC_ARG_WITH([sound],[],[XE_DIE([--enable-sound, NOT --with-sound])],[]) -AC_ARG_WITH([default-eol-detection],[],[XE_DIE([--enable-default-eol-detection, NOT --with-default-eol-detection])],[]) -AC_ARG_WITH([clash-detection],[],[XE_DIE([--enable-clash-detection, NOT --with-clash-detection])],[]) -AC_ARG_WITH([database],[],[XE_DIE([--enable-database, NOT --with-database])],[]) -AC_ARG_WITH([modules],[],[XE_DIE([--enable-modules, NOT --with-modules])],[]) -AC_ARG_WITH([toolbars],[],[XE_DIE([--enable-toolbars, NOT --with-toolbars])],[]) - dnl I think these will be caught by autoconf internal checks, dnl only --with-* are unchecked dnl --external-widget --enable-external-widget ＠＠ -489,52 +492,52 ＠＠ dnl --use-union-type --enable-union-type dnl --pdump --enable-pdump dnl --use-kkcc --enable-kkcc - +dnl dnl parse flags -AC_ARG_WITH([prefix], +XE_MERGED_ARG([prefix], AC_HELP_STRING([--with-prefix=no],[Don't compile the value for `prefix' into the executable.]), [true], [with_prefix=yes]) -AC_ARG_WITH([site-lisp], +XE_MERGED_ARG([site-lisp], AC_HELP_STRING([--with-site-lisp=no],[Allow for a site-lisp directory in the XEmacs hierarchy searched before the installation packages.]), [true], [with_site_lisp=no]) -AC_ARG_WITH([site-modules], +XE_MERGED_ARG([site-modules], AC_HELP_STRING([--with-site-modules],[Disable site-modules directory in the XEmacs hierarchy, which is searched before the installation modules.]), [], []) -AC_ARG_WITH([gtk], +XE_MERGED_ARG([gtk], AC_HELP_STRING([--with-gtk],[Support GTK on the X Window System. (EXPERIMENTAL)]), [true], [with_gtk=no]) -AC_ARG_WITH([gnome], +XE_MERGED_ARG([gnome], AC_HELP_STRING([--with-gnome],[Support GNOME on the X Window System. (EXPERIMENTAL)]), [true], [with_gnome=no]) -AC_ARG_WITH([msw], +XE_MERGED_ARG([msw], AC_HELP_STRING([--with-msw],[Support MS Windows as a window system (only under Cygwin and MinGW). `--with-msw=no' may be needed on *nix systems with Wine installed.]), [], []) -AC_ARG_WITH([gcc], +XE_MERGED_ARG([gcc], AC_HELP_STRING([--with-gcc],[Use GCC to compile XEmacs.]), [], []) -AC_ARG_WITH([dynamic], +XE_MERGED_ARG([dynamic], AC_HELP_STRING([--with-dynamic],[Link dynamically if supported by system. 'No' forces static linking.]), [], []) -AC_ARG_WITH([ncurses], +XE_MERGED_ARG([ncurses], AC_HELP_STRING([--with-ncurses],[Use the ncurses library for tty support.]), [], []) -AC_ARG_WITH([dnet], +XE_MERGED_ARG([dnet], AC_HELP_STRING([--with-dnet],[Compile with support for DECnet.]), [], []) -AC_ARG_WITH([socks], +XE_MERGED_ARG([socks], AC_HELP_STRING([--with-socks],[Compile with support for SOCKS (an Internet proxy).]), [], []) -AC_ARG_WITH([dragndrop], +XE_MERGED_ARG([dragndrop], AC_HELP_STRING([--with-dragndrop],[Compile in the generic drag and drop API. This is automatically added if one of the drag and drop protocols is found (currently CDE, OffiX, MSWindows, and GTK). *WARNING* The Drag'n'drop support is under development and is considered experimental.]), [], []) -AC_ARG_WITH([cde], +XE_MERGED_ARG([cde], AC_HELP_STRING([--with-cde],[Compile in support for CDE drag and drop.]), [], []) -AC_ARG_WITH([offix], +XE_MERGED_ARG([offix], AC_HELP_STRING([--with-offix],[Compile in support for OffiX drag and drop. *WARNING* If you compile in OffiX, you may not be able to use multiple X displays success- ＠＠ -542,204 +545,204 ＠＠ different vendors, the results may be unpredictable.]), [], []) -AC_ARG_WITH([gpm], +XE_MERGED_ARG([gpm], AC_HELP_STRING([--with-gpm],[Compile in GPM mouse support for ttys.]), [], []) -AC_ARG_WITH([xpm], +XE_MERGED_ARG([xpm], AC_HELP_STRING([--with-xpm],[Compile with support for XPM images. PRACTICALLY REQUIRED. Although this library is nonstandard and a real hassle to build, many basic things (e.g. toolbars) depend on it, and you will run into many problems without it.]), [], []) -AC_ARG_WITH([xface], +XE_MERGED_ARG([xface], AC_HELP_STRING([--with-xface],[Compile with support for X-Face mail headers. Requires the compface package.]), [], []) -AC_ARG_WITH([gif], +XE_MERGED_ARG([gif], AC_HELP_STRING([--with-gif],[Compile without the (builtin) support for GIF images.]), [], []) -AC_ARG_WITH([jpeg], +XE_MERGED_ARG([jpeg], AC_HELP_STRING([--with-jpeg],[Compile with support for JPEG images. Useful if you are using a mail, news reader, or web browser in XEmacs, so that JPEG images can be displayed.]), [], []) -AC_ARG_WITH([png], +XE_MERGED_ARG([png], AC_HELP_STRING([--with-png],[Compile with support for PNG images. Recommended because the images on the About page are not viewable without it.]), [], []) -AC_ARG_WITH([tiff], +XE_MERGED_ARG([tiff], AC_HELP_STRING([--with-tiff],[Compile with support for TIFF images. Possibly useful, for the same reason as JPEG images.]), [], []) -AC_ARG_WITH([zlib], +XE_MERGED_ARG([zlib], AC_HELP_STRING([--with-zlib],[Support inflate (de)compression internally.]), [], []) -AC_ARG_WITH([wmcommand], +XE_MERGED_ARG([wmcommand], AC_HELP_STRING([--with-wmcommand],[Compile without realized leader window which will keep the WM_COMMAND property.]), [], []) -AC_ARG_WITH([xmu], +XE_MERGED_ARG([xmu], AC_HELP_STRING([--with-xmu],[Use Xmu utilities. Default: yes.]), [], []) -AC_ARG_WITH([purify], +XE_MERGED_ARG([purify], AC_HELP_STRING([--with-purify],[Support memory debugging using Purify.]), [], []) -AC_ARG_WITH([quantify], +XE_MERGED_ARG([quantify], AC_HELP_STRING([--with-quantify],[Support performance debugging using Quantify.]), [], []) -AC_ARG_ENABLE([toolbars], - AC_HELP_STRING([--with-toolbars],[Enable toolbar support. Default: yes.]), +XE_MERGED_ARG([toolbars], + AC_HELP_STRING([--enable-toolbars],[Enable toolbar support. Default: yes.]), [], []) -AC_ARG_WITH([tty], +XE_MERGED_ARG([tty], AC_HELP_STRING([--with-tty],[Enable TTY support. Default: yes.]), [], []) -AC_ARG_WITH([xfs], +XE_MERGED_ARG([xfs], AC_HELP_STRING([--with-xfs],[Enable XFontSet support for internationalized menubar. Incompatible with `--with-xim=motif'. `--enable-menubars=lucid' (the default) is desirable.]), [], []) -AC_ARG_ENABLE([mule], - AC_HELP_STRING([--enable-mule],[Compile with Mule (MUlti-Lingual Emacs) support, +XE_MERGED_ARG([mule], + AC_HELP_STRING([--enable-mule],[Compile with Mule (Multi-Lingual Emacs) support, needed to support non-Latin-1 (including Asian) languages.]), [], []) -AC_ARG_ENABLE([default-eol-detection], +XE_MERGED_ARG([default-eol-detection], AC_HELP_STRING([--enable-default-eol-detection],[Turns on by default auto-detection of end-of-line type when reading a file. Applies to those platforms where auto-detection is off by default (non-Mule Unix). Has no effect otherwise.]), [], []) -AC_ARG_WITH([canna], +XE_MERGED_ARG([canna], AC_HELP_STRING([--with-canna],[Support the Canna Japanese input method. Requires Mule.]), [], []) -AC_ARG_WITH([wnn], +XE_MERGED_ARG([wnn], AC_HELP_STRING([--with-wnn],[Support the Wnn Asian language input method. Requires Mule.]), [], []) -AC_ARG_WITH([wnn6], +XE_MERGED_ARG([wnn6], AC_HELP_STRING([--with-wnn6],[Support the Wnn6 Asian language input method (proprietary). Requires Mule.]), [], []) -AC_ARG_WITH([workshop], +XE_MERGED_ARG([workshop], AC_HELP_STRING([--with-workshop],[Support the Sun WorkShop (formerly Sparcworks) development environment.]), [], []) -AC_ARG_WITH([sparcworks], +XE_MERGED_ARG([sparcworks], AC_HELP_STRING([--with-sparcworks],[Alias for --with-workshop]), [], []) -AC_ARG_WITH([tooltalk], +XE_MERGED_ARG([tooltalk], AC_HELP_STRING([--with-tooltalk],[Support the ToolTalk IPC protocol.]), [], []) -AC_ARG_WITH([ldap], +XE_MERGED_ARG([ldap], AC_HELP_STRING([--with-ldap],[Support the LDAP protocol.]), [], []) -AC_ARG_WITH([postgresql], +XE_MERGED_ARG([postgresql], AC_HELP_STRING([--with-postgresql],[Support the PostgreSQL RDBMS.]), [], []) -AC_ARG_WITH([pop], +XE_MERGED_ARG([pop], AC_HELP_STRING([--with-pop],[Support POP for mail retrieval.]), [], []) -AC_ARG_WITH([kerberos], +XE_MERGED_ARG([kerberos], AC_HELP_STRING([--with-kerberos],[Support Kerberos-authenticated POP.]), [], []) -AC_ARG_WITH([hesiod], +XE_MERGED_ARG([hesiod], AC_HELP_STRING([--with-hesiod],[Support Hesiod to get the POP server host.]), [], []) -AC_ARG_WITH([infodock], +XE_MERGED_ARG([infodock], AC_HELP_STRING([--with-infodock],[Support the Infodock version of XEmacs. Infodock is a SourceForge project).]), [], []) -AC_ARG_WITH([native-sound-lib], +XE_MERGED_ARG([native-sound-lib], AC_HELP_STRING([--with-native-sound-lib],[Path to sound library (for systems with name conflicts).]), [], []) -AC_ARG_WITH([netinstall], +XE_MERGED_ARG([netinstall], AC_HELP_STRING([--with-netinstall],[Support for installation over the internet. Only functional on the MS Windows platforms.]), [], [with_netinstall="no"]) -AC_ARG_WITH([optimization], +XE_MERGED_ARG([optimization], AC_HELP_STRING([--with-optimization],[Control whether compilation is optimized. By default, optimization is on in release versions and off in beta versions, since it can interfere with proper stack backtraces.]), [], []) -AC_ARG_WITH([ipv6-cname], +XE_MERGED_ARG([ipv6-cname], AC_HELP_STRING([--with-ipv6-cname],[Try IPv6 information first when canonicalizing host names. This option has no effect unless system supports getaddrinfo(3) and getnameinfo(3).]), [], [with_ipv6_cname="no"]) -AC_ARG_WITH([site-includes], +XE_MERGED_ARG([site-includes], AC_HELP_STRING([--with-site-includes],[Prepend to include search path.]), [], []) -AC_ARG_WITH([site-libraries], +XE_MERGED_ARG([site-libraries], AC_HELP_STRING([--with-site-libraries],[Prepend to library search path.]), [], []) -AC_ARG_WITH([site-prefixes], +XE_MERGED_ARG([site-prefixes], AC_HELP_STRING([--with-site-prefixes],[Prepend to include and library search paths, with /include and /lib added. Comes after site-includes and site-libraries, if any.]), [], []) -AC_ARG_WITH([statedir], +XE_MERGED_ARG([statedir], AC_HELP_STRING([--with-statedir],[]), [], [with_statedir='${prefix}/lib']) -AC_ARG_WITH([lispdir], +XE_MERGED_ARG([lispdir], AC_HELP_STRING([--with-lispdir],[]), [AC_DEFINE(LISPDIR_USER_DEFINED)], [with_lispdir='${datadir}/${instvardir}/lisp']) -AC_ARG_WITH([archlibdir], +XE_MERGED_ARG([archlibdir], AC_HELP_STRING([--with-archlibdir],[]), [AC_DEFINE(ARCHLIBDIR_USER_DEFINED)], [with_archlibdir='${libdir}/${instvardir}/${configuration}']) -AC_ARG_WITH([moduledir], +XE_MERGED_ARG([moduledir], AC_HELP_STRING([--with-moduledir],[]), [AC_DEFINE(MODULEDIR_USER_DEFINED)], [with_moduledir='${libdir}/${instvardir}/${configuration}/modules']) -AC_ARG_WITH([etcdir], +XE_MERGED_ARG([etcdir], AC_HELP_STRING([--with-etcdir],[]), [AC_DEFINE(ETCDIR_USER_DEFINED)], [with_etcdir='${datadir}/${instvardir}/etc']) -AC_ARG_WITH([infopath], +XE_MERGED_ARG([infopath], AC_HELP_STRING([--with-infopath],[]), [AC_DEFINE(INFOPATH_USER_DEFINED)], []) -AC_ARG_WITH([docdir], +XE_MERGED_ARG([docdir], AC_HELP_STRING([--with-docdir],[]), [AC_DEFINE(DOCDIR_USER_DEFINED)], [with_docdir='${archlibdir}']) -AC_ARG_WITH([site-runtime-libraries], +XE_MERGED_ARG([site-runtime-libraries], AC_HELP_STRING([--with-site-runtime-libraries],[]), [], []) -AC_ARG_WITH([package-prefix], +XE_MERGED_ARG([package-prefix], AC_HELP_STRING([--with-package-prefix],[Specify packages root.]), [AC_DEFINE(PACKAGE_PATH_USER_DEFINED)], []) -AC_ARG_WITH([package-path], +XE_MERGED_ARG([package-path], AC_HELP_STRING([--with-package-path],[Search path for package hierarchies.]), [AC_DEFINE(PACKAGE_PATH_USER_DEFINED)], []) -AC_ARG_ENABLE([external-widget], +XE_MERGED_ARG([external-widget], AC_HELP_STRING([--enable-external-widget],[Support XEmacs server for text widgets in other applications.]), [], []) -AC_ARG_ENABLE([kkcc], +XE_MERGED_ARG([kkcc], AC_HELP_STRING([--enable-kkcc],[Enable new GC algorithms.]), - [], []) -AC_ARG_ENABLE([mc-alloc], + [], [enable_kkcc=yes]) +XE_MERGED_ARG([mc-alloc], AC_HELP_STRING([--enable-mc-alloc],[Enable new allocator.]), - [], []) -AC_ARG_ENABLE([union-type], + [], [enable_mc_alloc=yes]) +XE_MERGED_ARG([union-type], AC_HELP_STRING([--enable-union-type],[Use union definition of Lisp_Object type. Known to trigger bugs in some compilers.]), [], []) -AC_ARG_ENABLE([pdump], +XE_MERGED_ARG([pdump], AC_HELP_STRING([--enable-pdump],[Enable portable LISP preloader.]), [], []) -AC_ARG_ENABLE([dump-in-exec], +XE_MERGED_ARG([dump-in-exec], AC_HELP_STRING([--enable-dump-in-exec],[Enable dumping into executable (enabled by default for `pdump', not enabled by default in combination with `mc-alloc').]), [], []) -AC_ARG_ENABLE([debug], +XE_MERGED_ARG([debug], AC_HELP_STRING([--enable-debug],[Enable additional debugging information. No time cost.]), [], []) -AC_ARG_ENABLE([assertions], +XE_MERGED_ARG([assertions], AC_HELP_STRING([--enable-assertions],[]), [], []) -AC_ARG_ENABLE([memory-usage-stats], +XE_MERGED_ARG([memory-usage-stats], AC_HELP_STRING([--enable-memory-usage-stats],[Enable LISP memory usage API.]), [], []) -AC_ARG_ENABLE([clash-detection], +XE_MERGED_ARG([clash-detection], AC_HELP_STRING([--enable-clash-detection],[Disable use of lock files to detect multiple edits of the same file.]), [], []) -AC_ARG_ENABLE([modules], +XE_MERGED_ARG([modules], AC_HELP_STRING([--enable-modules],[Compile in experimental support for dynamically loaded libraries (Dynamic Shared Objects).]), [], []) -AC_ARG_ENABLE([quick-build], +XE_MERGED_ARG([quick-build], AC_HELP_STRING([--enable-quick-build],[Speed up the build cycle by leaving out steps where XEmacs will still work (more or less) without them. Potentially dangerous if you don't know what you're ＠＠ -752,11 +755,11 ＠＠ to be rebuilt.]), [], []) -AC_ARG_WITH([compiler], +XE_MERGED_ARG([compiler], AC_HELP_STRING([--with-compiler],[C compiler to use]), [], []) -AC_ARG_WITH([xemacs-compiler], +XE_MERGED_ARG([xemacs-compiler], AC_HELP_STRING([--with-xemacs-compiler], [compiler to use to compile just the xemacs executable and C modules. If you want to compile XEmacs as C++, use e.g. ＠＠ -764,69 +767,69 ＠＠ additional error-checking.]), [], []) -AC_ARG_WITH([cflags], +XE_MERGED_ARG([cflags], AC_HELP_STRING([--with-cflags], [Compiler flags. These flags will be placed after any flags inserted for warnings, debugging or optimization; setting this does not disable the insertion of those flags. Use configure settings such as `--with-optimization=no' or `enable-debug=no' to turn them off, or override them with `--with-cflags-optimization', `--with-cflags-debugging', or `with-cflags-warning'.]), [], []) -AC_ARG_WITH([cflags-warning], +XE_MERGED_ARG([cflags-warning], AC_HELP_STRING([--with-cflags-warning],[Override compiler flags used to control warnings. Normally, don't set this, as XEmacs already turns on the maximum safe warning level.]), [], []) -AC_ARG_WITH([cflags-optimization], +XE_MERGED_ARG([cflags-optimization], AC_HELP_STRING([--with-cflags-optimization=FLAGS], [Override compiler flags used to control optimization. If blank, forces no optimization; if non-blank, forces optimization. Normally, don't set this; XEmacs automatically sets the maximum safe optimization flags appropriate for the compiler being invoked. If you just want to turn optimization on or off, use `with-optimization' instead.]), [], []) -AC_ARG_WITH([cflags-debugging], +XE_MERGED_ARG([cflags-debugging], AC_HELP_STRING([--with-cflags-debugging=FLAGS], [Override compiler flags used to add debugging information to the executable. Normally, debugging information is added whenever possible (i.e. unless optimization is turned on and the compiler does not permit debugging and optimization simultaneously).]), [], []) -AC_ARG_WITH([cpp], +XE_MERGED_ARG([cpp], AC_HELP_STRING([--with-cpp],[C preprocessor to use (e.g. /usr/ccs/lib/cpp or cc -E)]), [CPP="$with_cpp"], []) -AC_ARG_WITH([cppflags], +XE_MERGED_ARG([cppflags], AC_HELP_STRING([--with-cppflags],[C preprocessor flags (e.g. -I/foo or -Dfoo=bar)]), [CPPFLAGS="$with_cppflags"], []) -AC_ARG_WITH([libs], +XE_MERGED_ARG([libs], AC_HELP_STRING([--with-libs],[Additional libraries (e.g. -lfoo)]), [LIBS="$with_libs"], []) -AC_ARG_WITH([ldflags], +XE_MERGED_ARG([ldflags], AC_HELP_STRING([--with-ldflags],[Additional linker flags (e.g. -L/foo)]), [LDFLAGS="$with_ldflags"], []) -AC_ARG_WITH([rel-alloc], +XE_MERGED_ARG([rel-alloc], AC_HELP_STRING([--with-rel-alloc],[Enable the relocating allocator.]), [], [with_rel_alloc='default']) -AC_ARG_WITH([dlmalloc], +XE_MERGED_ARG([dlmalloc], AC_HELP_STRING([--with-dlmalloc],[Use Doug Lea's malloc implementation.]), [], [with_dlmalloc='default']) -AC_ARG_WITH([debug-malloc], +XE_MERGED_ARG([debug-malloc], AC_HELP_STRING([--with-debug-malloc],[Use a debugging malloc.]), [], []) -AC_ARG_WITH([system-malloc], +XE_MERGED_ARG([system-malloc], AC_HELP_STRING([--with-system-malloc],[Use the system malloc, not the one distributed with XEmacs.]), [], [with_system_malloc='default']) #Enable code. -XE_COMPLEX_ARG_ENABLE([database], +XE_COMPLEX_ARG([database], AC_HELP_STRING([--enable-database],[Compile with database support. Valid types are `no' or a comma-separated list of one or more of `berkdb' and either `dbm' or `gnudbm'.]), [ if test "$enable_database_dbm" = "yes" -a "$enable_database_gdbm" = "yes"; then USAGE_ERROR("Only one of \`dbm' and \`gnudbm' may be specified -with the \`--enable-database' option.") +with the \`--with-database' option.") fi ], [], ＠＠ -834,7 +837,7 ＠＠ XE_COMPLEX_OPTION([dbm],[""]), XE_COMPLEX_OPTION([gdbm],[""])]) -XE_COMPLEX_ARG_ENABLE([sound], +XE_COMPLEX_ARG([sound], AC_HELP_STRING([--enable-sound],[Compile with sound support. Valid types are `native', `nas' and `esd'. Prefix a type with 'no' to disable. ＠＠ -849,26 +852,26 ＠＠ XE_COMPLEX_OPTION([nas],[""]), XE_COMPLEX_OPTION([esd],[no])]) -XE_KEYWORD_ARG_WITH([athena], +XE_KEYWORD_ARG([athena], AC_HELP_STRING([--with-athena],[Use TYPE Athena widgets (xaw, 3d, next, 95, or xpm).]), [],[],[xaw,3d,next,95,xpm])dnl -XE_KEYWORD_ARG_WITH([xim],[],[],[],[yes,no,xlib,motif])dnl +XE_KEYWORD_ARG([xim],[],[],[],[yes,no,xlib,motif])dnl -XE_KEYWORD_ARG_WITH([mail-locking], +XE_KEYWORD_ARG([mail-locking], AC_HELP_STRING([--with-mail-locking],[Specify the locking to be used by movemail to prevent concurrent updates of mail spool files. Valid types are `lockf', `flock', `dot', `locking' or `mmdf'.]), [],[],[lockf,flock,file,locking,mmdf,pop])dnl -XE_KEYWORD_ARG_ENABLE([bignum], +XE_KEYWORD_ARG([bignum], AC_HELP_STRING([--enable-bignum=TYPE],[Compile in support for bignums, ratios, or bigfloats using library support. TYPE must be one of "gmp" (for GNU MP), "mp" (for BSD MP), or "no" (disabled).]), [], [enable_bignum="no"],[no,gmp,mp]) -XE_COMPLEX_ARG_ENABLE([error-checking], +XE_COMPLEX_ARG([error-checking], AC_HELP_STRING([--enable-error-checking],[Compile with internal error-checking added. Causes noticeable loss of speed. Valid types are extents, bufpos, malloc, gc, types, text, byte_code, glyphs, display, structures.]), ＠＠ -883,25 +886,25 ＠＠ XE_COMPLEX_OPTION([display],[""]), XE_COMPLEX_OPTION([structures],[""])]) -XE_KEYWORD_ARG_ENABLE([menubars], +XE_KEYWORD_ARG([menubars], AC_HELP_STRING([--enable-menubars=TYPE],[Use TYPE menubars (lucid, motif, or no). The Lucid widgets emulate Motif (mostly) but are faster. *WARNING* The Motif menubar is currently broken. Lucid menubars are the default.]), [], [],[yes,no,lucid,motif,athena,gtk,msw]) -XE_KEYWORD_ARG_ENABLE([scrollbars], +XE_KEYWORD_ARG([scrollbars], AC_HELP_STRING([--enable-scrollbars=TYPE],[Use TYPE scrollbars (lucid, motif, athena, or no). Lucid scrollbars are the default.]), [], [],[yes,no,lucid,motif,athena,gtk,msw]) -XE_KEYWORD_ARG_ENABLE([dialogs], +XE_KEYWORD_ARG([dialogs], AC_HELP_STRING([--enable-dialogs=TYPE],[Use TYPE dialog boxes (lucid, motif, athena, or no). There are no true Lucid dialogs; Motif dialogs will be used if Motif can be found, else Athena is used.]), [], [],[yes,no,lucid,motif,athena,gtk,msw]) -XE_KEYWORD_ARG_ENABLE([widgets], +XE_KEYWORD_ARG([widgets], AC_HELP_STRING([--enable-widgets],[Use TYPE native widgets (lucid, motif, athena, or no). Other widget types are currently unsupported. There are no true Lucid widgets; Motif widgets will be Index: man/internals/internals.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/internals/internals.texi,v retrieving revision 1.68 diff -u -r1.68 internals.texi --- man/internals/internals.texi 2005/09/26 22:19:02 1.68 +++ man/internals/internals.texi 2005/10/15 12:27:02 ＠＠ -470,7 +470,7 ＠＠ * Encodings:: * Internal Mule Encodings:: * Byte/Character Types; Buffer Positions; Other Typedefs:: -* Internal Text API's:: +* Internal Text APIs:: * Coding for Mule:: * CCL:: * Microsoft Windows-Related Multilingual Issues:: ＠＠ -495,9 +495,9 ＠＠ * Usage of the Various Representations:: * Working With the Various Representations:: -Internal Text API's +Internal Text APIs -* Basic internal-format API's:: +* Basic internal-format APIs:: * The DFC API:: * The Eistring API:: ＠＠ -4499,6 +4499,8 ＠＠ ＠item Selectively enabling debugging, error checking, and tracing. ＠item +Specifying options by either ＠code{--with} or ＠code{--enable}. +＠item Complex options, which are set-valued (＠i{i.e.}, unordered; ordered lists of options, for example ``take the first available from the list,'' are neither used currently nor given special support). ＠＠ -4572,6 +4574,29 ＠＠ implemented in the file ＠file{aclocal.m4}. ＠end table +＠heading XEmacs merged option support + +Autoconf 2.59 divides the ＠file{configure} options into those that +specify features (＠samp{--enable}) and those that specify external +libraries (＠samp{--with}). Many XEmacs options to not fall neatly into +either of these catagories and so as a matter of policy all options can +be specified by either method. + +These merged options are declared with the ＠code{XE_MERGED_ARG} macro. +The arguments to the option are the same as ＠code{AC_ARG_WITH} and +＠code{AC_ARG_ENABLE} and code that worked with either of these macros +will worked unchanged with ＠code{XE_MERGED_ARG}. The option value is +stored in both ＠code{with_FEATURE} and ＠code{enable_FEATURE} shell +variables. + +＠table ＠code +＠item XE_MERGED_ARG(package, help-string, action-if-true, action-if-false) +Declare an option that can be selected by either ＠samp{--enable} or +＠samp{--with}. The value of the option is stored in both +＠code{with_FEATURE} and ＠code{enable_FEATURE}. + +＠end table + ＠heading XEmacs keyword option support A ＠dfn{keyword} option is one that accepts one of a number of ＠＠ -4579,19 +4604,19 ＠＠ ``complex options'' below). For example, ＠samp{--with-mail-locking=flock}. -Keyword options are defined with expanded forms of -＠samp{AC_ARG_[WITH|ENABLE]} called ＠samp{XE_KEYWORD_ARG_[WITH|ENABLE]}, -both taking 5 parameters. The first 4 parameters of these macros are -the same as original macros with the exception that all four parameters -are ＠strong{required}. The ＠var{action-if-true} code is run after the -argument list has been parsed. +Keyword options are defined with an expanded form of +＠samp{XE_MERGED_ARG} called ＠samp{XE_KEYWORD_ARG}, which taks 5 +parameters. The first 4 parameters are the same as original macro with +the exception that all of these four parameters are ＠strong{required}. +The ＠var{action-if-true} code is run after the argument list has been +parsed. The 5th parameter is a list of supported keywords. The whole list must be quoted but the individual keywords should not. Here is how the ＠samp{mail-locking} flag is defined: ＠example -XE_KEYWORD_ARG_WITH([mail-locking], +XE_KEYWORD_ARG([mail-locking], AC_HELP_STRING([--with-mail-locking],[Specify the locking to be used by movemail to prevent concurrent updates of mail spool files. Valid types are `lockf', ＠＠ -4615,13 +4640,8 ＠＠ higher-level features. ＠table ＠code -＠item XE_KEYWORD_ARG_WITH(package, help-string, action-if-true, action-if-false, [keyword1, keyword2, ....]) -Expanded version of ＠code{AC_ARG_WITH} for keyword options. All the -parameters are required. The last argument is a comma-separated list of -supported keywords, ＠file{m4}-quoted with ＠samp{[]}. - -＠item XE_KEYWORD_ARG_ENABLE(feature, help-string, action-if-true, action-if-false, [keyword1, keyword2, ....]) -Expanded version of ＠code{AC_ARG_ENABLE} for keyword options. All the +＠item XE_KEYWORD_ARG(package, help-string, action-if-true, action-if-false, [keyword1, keyword2, ....]) +Expanded version of ＠code{XE_MERGED_ARG} for keyword options. All the parameters are required. The last argument is a comma-separated list of supported keywords, ＠file{m4}-quoted with ＠samp{[]}. ＠＠ -4641,12 +4661,12 ＠＠ a set. For example, we might use ＠code{--with-sound=native,nas} to play sounds using the native libraries and via NAS. -Complex options are defined with expanded forms of -＠samp{AC_ARG_[WITH|ENABLE]} called ＠samp{XE_COMPLEX_ARG_[WITH|ENABLE]}, -both taking 5 parameters. The first 4 parameters of these macros are -the same as original macros with the exception that all four parameters -are ＠strong{required}. The ＠var{action-if-true} code is run after the -argument list has been parsed. +Complex options are defined with an expanded form of +＠samp{XE_MERGED_ARG} called ＠samp{XE_COMPLEX_ARG}, taking 5 parameters. +The first 4 parameters are the same as original macro with the exception +that all four parameters are ＠strong{required}. The +＠var{action-if-true} code is run after the argument list has been +parsed. The 5th parameter is a list of ＠code{XE_COMPLEX_OPTION} macro calls that define the valid components and their default values. The list must be ＠＠ -4654,7 +4674,7 ＠＠ ＠samp{sound} flag is defined: ＠example -XE_COMPLEX_ARG_ENABLE([sound], +XE_COMPLEX_ARG([sound], AC_HELP_STRING([--enable-sound],[Compile with sound support. Valid types are `native', `nas' and `esd'. Prefix a type with 'no' to disable. ＠＠ -4722,13 +4742,9 ＠＠ This was originally written for the Xft option, and doesn't read so well for options based on alternative libraries like sound. Hackers beware: the API may be enhanced to deal with this in the future. - -＠item XE_COMPLEX_ARG_WITH(PACKAGE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE, [XE_COMPLEX_OPTION(a,yes), ....]) -Extended version of ＠code{AC_ARG_WITH} for complex options. All the -parameters are required. -＠item XE_COMPLEX_ARG_ENABLE(FEATURE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE, [XE_COMPLEX_OPTION(a,yes), ....]) -Expanded version of ＠code{AC_ARG_ENABLE} for complex options. All the +＠item XE_COMPLEX_ARG(PACKAGE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE, [XE_COMPLEX_OPTION(a,yes), ....]) +Extended version of ＠code{XE_MERGED_ARG} for complex options. All the parameters are required. ＠item XE_EXPAND_COMPLEX_OPTION(prefix, component, yesno) ＠＠ -5816,7 +5832,7 ＠＠ When there's a reasonable possibility you will actually need all 32 or 64 bits to store the quantity. ＠item -When calling existing API's that require unsigned types. In this case, +When calling existing APIs that require unsigned types. In this case, you should still do all manipulation using signed types, and do the conversion at the very threshold of the API call. ＠item ＠＠ -10168,7 +10184,7 ＠＠ ＠emph{NOTE}: The information at the top of the source file ＠file{text.c} is more complete than the following, and there is also a list of all other places to look for text/I18N-related info. Also look in -(a)file{text.h} for info about the DFC and Eistring API's. +(a)file{text.h} for info about the DFC and Eistring APIs. Recall that there are two primary ways that text is represented in XEmacs. The ＠dfn{buffer} representation sees the text as a series of ＠＠ -10191,7 +10207,7 ＠＠ * Encodings:: * Internal Mule Encodings:: * Byte/Character Types; Buffer Positions; Other Typedefs:: -* Internal Text API's:: +* Internal Text APIs:: * Coding for Mule:: * CCL:: * Microsoft Windows-Related Multilingual Issues:: ＠＠ -11161,7 +11177,7 ＠＠ character. (This is important because the Boyer-Moore algorithm works by looking at the last byte of the search string and &&#### finish this. -＠node Byte/Character Types; Buffer Positions; Other Typedefs, Internal Text API's, Internal Mule Encodings, Multilingual Support +＠node Byte/Character Types; Buffer Positions; Other Typedefs, Internal Text APIs, Internal Mule Encodings, Multilingual Support ＠section Byte/Character Types; Buffer Positions; Other Typedefs ＠cindex byte/character types; buffer positions; other typedefs ＠cindex byte/character types ＠＠ -11211,7 +11227,7 ＠＠ Types (b), (c), (f) and (h) are defined as ＠code{char}, while the others are ＠code{unsigned char}. This is for maximum safety (signed characters are dangerous to work with) while maintaining as much compatibility with -external API's and string constants as possible. +external APIs and string constants as possible. We also provide versions of the above types defined with different underlying C types, for API compatibility. These use the following ＠＠ -11226,7 +11242,7 ＠＠ (Formerly I had a comment saying that type (e) "should be replaced with void *". However, there are in fact many places where an unsigned char * might be used -- e.g. for ease in pointer computation, since void * -doesn't allow this, and for compatibility with external API's.) +doesn't allow this, and for compatibility with external APIs.) Note that these typedefs are purely for documentation purposes; from the C code's perspective, they are exactly equivalent to ＠code{char *}, ＠＠ -11532,27 +11548,27 ＠＠ 65535 is a multiple of 3, but this may not always be the case. #### unfinished -＠node Internal Text API's, Coding for Mule, Byte/Character Types; Buffer Positions; Other Typedefs, Multilingual Support -＠section Internal Text API's -＠cindex internal text API's -＠cindex text API's, internal -＠cindex API's, text, internal +＠node Internal Text APIs, Coding for Mule, Byte/Character Types; Buffer Positions; Other Typedefs, Multilingual Support +＠section Internal Text APIs +＠cindex internal text APIs +＠cindex text APIs, internal +＠cindex APIs, text, internal -＠strong{NOTE}: The most current documentation for these API's is in +＠strong{NOTE}: The most current documentation for these APIs is in ＠file{text.h}. In case of error, assume that file is correct and this one wrong. ＠menu -* Basic internal-format API's:: +* Basic internal-format APIs:: * The DFC API:: * The Eistring API:: ＠end menu -＠node Basic internal-format API's, The DFC API, Internal Text API's, Internal Text API's -＠subsection Basic internal-format API's -＠cindex basic internal-format API's -＠cindex internal-format API's, basic -＠cindex API's, basic internal-format +＠node Basic internal-format APIs, The DFC API, Internal Text APIs, Internal Text APIs +＠subsection Basic internal-format APIs +＠cindex basic internal-format APIs +＠cindex internal-format APIs, basic +＠cindex APIs, basic internal-format These are simple functions and macros to convert between text representation and characters, move forward and back in text, etc. ＠＠ -11581,7 +11597,7 ＠＠ "char", so we consistently use "Ichar" when that's what we're working with. -＠node The DFC API, The Eistring API, Basic internal-format API's, Internal Text API's +＠node The DFC API, The Eistring API, Basic internal-format APIs, Internal Text APIs ＠subsection The DFC API ＠cindex DFC API ＠cindex API, DFC ＠＠ -11804,13 +11820,13 ＠＠ switching, and feel no compunctions about writing further such function- like ＠code{alloca()} routines in lieu of statement-like ones. --ben -＠node The Eistring API, , The DFC API, Internal Text API's +＠node The Eistring API, , The DFC API, Internal Text APIs ＠subsection The Eistring API ＠cindex Eistring API ＠cindex API, Eistring (This API is currently under-used) When doing simple things with -internal text, the basic internal-format API's are enough. But to do +internal text, the basic internal-format APIs are enough. But to do things like delete or replace a substring, concatenate various strings, etc. is difficult to do cleanly because of the allocation issues. The Eistring API is designed to deal with this, and provides a clean ＠＠ -12268,7 +12284,7 ＠＠ Convert all characters in the Eistring to uppercase. ＠end example -＠node Coding for Mule, CCL, Internal Text API's, Multilingual Support +＠node Coding for Mule, CCL, Internal Text APIs, Multilingual Support ＠section Coding for Mule ＠cindex coding for Mule ＠cindex Mule, coding for ＠＠ -12665,7 +12681,7 ＠＠ A source type of ＠code{C_STRING} or a sink type of ＠code{C_STRING_ALLOCA} or ＠code{C_STRING_MALLOC} is appropriate where the external API is not '\0'-byte-clean -- i.e. it expects strings to be -terminated with a null byte. For external API's that are in fact +terminated with a null byte. For external APIs that are in fact '\0'-byte-clean, we should of course not use these. The sinks to be specified must be lvalues, unless they are the lisp ＠＠ -13373,7 +13389,7 ＠＠ qxe...() Unicode-split version of library functions, and doing other things in certain cases, e.g. when a qxe() function is not present. -Unicode support also requires that the various Windows API's be +Unicode support also requires that the various Windows APIs be "Unicode-encapsulated", so that they automatically call the ANSI or Unicode version of the API call appropriately and handle the size differences in structures. What this means is: ＠＠ -13381,7 +13397,7 ＠＠ ＠itemize ＠bullet ＠item first, note that Windows already provides a sort of encapsulation -of all API's that deal with text. All such API's are underlyingly +of all APIs that deal with text. All such APIs are underlyingly provided in two versions, with an A or W suffix (ANSI or "wide" i.e. Unicode), and the compile-time constant UNICODE controls which is selected by the unsuffixed API. Same thing happens with structures, and ＠＠ -13611,7 +13627,7 ＠＠ ＠item wsetargv.obj uses routines that were buggily left out of MSVCRT; anyway, from looking at the source, it does NOT correctly work under Win 9x as -it blindly calls the Unicode version of Unicode-split API's such as +it blindly calls the Unicode version of Unicode-split APIs such as FindFirstFile) ＠item ＠＠ -18955,7 +18971,7 ＠＠ IV. GUTTER ETC. This stuff needs to be "stable" and generally free from bugs. Any -API's we create need to be well-reviewed or marked clearly as +APIs we create need to be well-reviewed or marked clearly as experimental. V. PORTABLE DUMPER ＠＠ -19510,7 +19526,7 ＠＠ NOTE: These changes are partly motivated by the various user-interface changes elsewhere in this document, and partly for Mule support. In -general the various API's in this document would benefit greatly from +general the various APIs in this document would benefit greatly from built-in keywords. I would like to make keyword parameters an integral part of Elisp. The ＠＠ -21909,7 +21925,7 ＠＠ each byte. (Most common values are 128, for codepoints given with the high bit set, or -32, for codepoints given as 1-94 or 0-95.) -Other API's: +Other APIs: ＠example (write-unicode-mapping file charset) -- Malcolm Purvis <malcolmp(a)xemacs.org&gt;