xemacs-beta: configure.ac comparison

comparison configure.ac @ 4842:1d775c6304d1

Use with-FOO consistently instead of enable-FOO INSTALL, PROBLEMS, configure, configure.ac: Rename all instances of enable-FOO to with-FOO. enable-FOO has long been aliased to with-FOO and we still preserve this, but formerly we randomly used enable-FOO but with-BAR.

author	Ben Wing <ben@xemacs.org>
date	Wed, 13 Jan 2010 02:28:37 -0600
parents	b3ea9c582280
children	bde90bc762f2

comparison

equal deleted inserted replaced

-:3465c3161fea
+:1d775c6304d1
 dnl Note that AS_HELP_STRING compresses whitespace, wraps, and indents the
 dnl string to fit the --help display; there's no need to preformat.
 dnl
 dnl I think these will be caught by autoconf internal checks,
 dnl only --with-* are unchecked
-dnl --external-widget         --enable-external-widget
+dnl --external-widget         --with-external-widget
 dnl --native-sound-lib=LIB    --with-native-sound-lib
 dnl --mail-locking=TYPE       --with-mail-locking
 dnl --rel-alloc               --with-rel-alloc
-dnl --use-number-lib          --enable-bignum
+dnl --use-number-lib          --with-bignum
-dnl --debug                   --enable-debug
+dnl --debug                   --with-debug
-dnl --error-checking          --enable-error-checking
+dnl --error-checking          --with-error-checking
-dnl --memory-usage-stats      --enable-memory-usage-stats
+dnl --memory-usage-stats      --with-memory-usage-stats
-dnl --quick-build             --enable-quick-build
+dnl --quick-build             --with-quick-build
-dnl --use-union-type          --enable-union-type
+dnl --use-union-type          --with-union-type
-dnl --pdump                   --enable-pdump
+dnl --pdump                   --with-pdump
-dnl --use-kkcc                --enable-kkcc
+dnl --use-kkcc                --with-kkcc
 dnl
 dnl parse flags
 XE_HELP_SUBSECTION([Compilation options])
 XE_MERGED_ARG([compiler],
 	AS_HELP_STRING([--with-compiler],[C compiler to use]),
 XE_MERGED_ARG([gcc],
 	AS_HELP_STRING([--with-gcc],[Use GCC to compile XEmacs.]),
 	[], [])
 XE_MERGED_ARG([cflags],
 	AS_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'.]),
+	[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 `with-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],
 	AS_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.]),
 	[true], [with_gnome=no])
 XE_MERGED_ARG([msw],
 	AS_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([toolbars],
-	AS_HELP_STRING([--enable-toolbars],[Enable toolbar support. Default: yes.]),
+	AS_HELP_STRING([--with-toolbars],[Enable toolbar support. Default: yes.]),
 	[], [])
 XE_MERGED_ARG([wmcommand],
 	AS_HELP_STRING([--with-wmcommand],[Compile without realized leader window which will
 keep the WM_COMMAND property.]),
 	[], [])
 XE_KEYWORD_ARG([athena],
 	AS_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],
-	AS_HELP_STRING([--enable-menubars=TYPE],[Use TYPE menubars ('yes', '`no', `lucid', `motif', `athena', `gtk', or `msw').  The Lucid
+	AS_HELP_STRING([--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.]),
 	[], [],[yes,no,lucid,motif,athena,gtk,msw])
 XE_KEYWORD_ARG([scrollbars],
-	AS_HELP_STRING([--enable-scrollbars=TYPE],[Use TYPE scrollbars 'yes', '`no', `lucid', `motif', `athena', `gtk', or `msw').
+	AS_HELP_STRING([--with-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],
-	AS_HELP_STRING([--enable-dialogs=TYPE],[Use TYPE dialog boxes 'yes', '`no', `lucid', `motif', `athena', `gtk', or `msw').
+	AS_HELP_STRING([--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.]),
 	[], [],[yes,no,lucid,motif,athena,gtk,msw])
 XE_KEYWORD_ARG([widgets],
-	AS_HELP_STRING([--enable-widgets=TYPE],[Use TYPE native widgets ('yes', '`no', `lucid', `motif', `athena', `gtk', or `msw').
+	AS_HELP_STRING([--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.]),
 	[], [],[yes,no,lucid,motif,athena,gtk,msw])
 XE_MERGED_ARG([dragndrop],
 	[], [])
 XE_MERGED_ARG([cde],
 	AS_HELP_STRING([--with-cde],[Compile in support for CDE drag and drop.]),
 	[], [])
 XE_MERGED_ARG([external-widget],
-	AS_HELP_STRING([--enable-external-widget],[Support XEmacs server for text widgets in other applications.]),
+	AS_HELP_STRING([--with-external-widget],[Support XEmacs server for text widgets in other applications.]),
 	[], [])
 dnl
 XE_HELP_SUBSECTION([TTY (character terminal) options])
 XE_MERGED_ARG([tty],
 	AS_HELP_STRING([--with-tty],[Enable TTY support. Default: yes.]),
 	AS_HELP_STRING([--with-gif],[Compile with support for GIF images.]),
 	[], [])
 dnl
 XE_HELP_SUBSECTION([Sound options])
 XE_COMPLEX_ARG([sound],
-	AS_HELP_STRING([--enable-sound=TYPE],[Compile with sound support.
+	AS_HELP_STRING([--with-sound=TYPE],[Compile with sound support.
 Valid types are `native', `alsa', `nas' and `esd'.
 Prefix a type with 'no' to disable.
 The first type can be `none' or `all'.  `none' means
 `nonative,noalsa,nonas,noesd'.  `all' means
 `native,alsa,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=""],
+	[with_sound_nas=""],
 	[XE_COMPLEX_OPTION([native],[""]),
 	 XE_COMPLEX_OPTION([alsa],[""]),
 	 XE_COMPLEX_OPTION([nas],[""]),
 	 XE_COMPLEX_OPTION([esd],[no])])
 XE_MERGED_ARG([native-sound-lib],
 	AS_HELP_STRING([--with-native-sound-lib],[Path to sound library (for systems with name conflicts).]),
 	[], [])
 dnl
 XE_HELP_SUBSECTION([Internationalization options])
 XE_MERGED_ARG([mule],
-	AS_HELP_STRING([--enable-mule],[Compile with Mule (Multi-Lingual Emacs) support,
+	AS_HELP_STRING([--with-mule],[Compile with Mule (Multi-Lingual Emacs) support,
 needed to support non-Latin-1 (including Asian)
 languages.]),
 	[], [])
 XE_KEYWORD_ARG([xim],
 	AS_HELP_STRING([--with-xim==TYPE],[Enable XIM support.  TYPE is `yes', `no', `xlib', or `motif']),
 method (proprietary). Requires Mule.]),
 	[], [])
 XE_MERGED_ARG([xfs],
 	AS_HELP_STRING([--with-xfs],[Enable XFontSet support for internationalized
 menubar.  Incompatible with `--with-xim=motif' and `--with-xft'.
-`--enable-menubars=lucid' (the default) is desirable.]),
+`--with-menubars=lucid' (the default) is desirable.]),
 	[], [])
 dnl
 XE_HELP_SUBSECTION([File-related options])
 XE_MERGED_ARG([default-eol-detection],
-	AS_HELP_STRING([--enable-default-eol-detection],[Turns on by default auto-detection of end-of-line type
+	AS_HELP_STRING([--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.]),
 	[], [])
 XE_MERGED_ARG([clash-detection],
-	AS_HELP_STRING([--enable-clash-detection],[Disable use of lock files to detect multiple edits
+	AS_HELP_STRING([--with-clash-detection],[Disable use of lock files to detect multiple edits
 			of the same file.]),
 	[], [])
 XE_MERGED_ARG([zlib],
 	AS_HELP_STRING([--with-zlib],[Support inflate (de)compression internally.]),
 	[], [])
 dnl
 XE_HELP_SUBSECTION([Database options])
 XE_COMPLEX_ARG([database],
-	AS_HELP_STRING([--enable-database=TYPE],[Compile with database support.  Valid types are
+	AS_HELP_STRING([--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 `gdbm'.]),
 	[
-if test "$enable_database_dbm"  = "yes" -a "$enable_database_gdbm" = "yes"; then
+if test "$with_database_dbm"  = "yes" -a "$with_database_gdbm" = "yes"; then
 	USAGE_ERROR("Only one of \`dbm' and \`gdbm' may be specified
 with the \`--with-database' option.")
 fi
 ],
 [],
 	[], [with_system_malloc='default'])
 XE_MERGED_ARG([debug-malloc],
 	AS_HELP_STRING([--with-debug-malloc],[Use a debugging malloc.]),
 	[], [])
 XE_MERGED_ARG([pdump],
-	AS_HELP_STRING([--enable-pdump],[Enable portable LISP preloader.]),
+	AS_HELP_STRING([--with-pdump],[Enable portable LISP preloader.]),
 	[], [])
 XE_MERGED_ARG([dump-in-exec],
-	AS_HELP_STRING([--enable-dump-in-exec],[Enable dumping into executable (enabled by default
+	AS_HELP_STRING([--with-dump-in-exec],[Enable dumping into executable (enabled by default
 			for `pdump', not enabled by default in combination
 			with `newgc').]),
 	[], [])
 XE_MERGED_ARG([kkcc],
-	AS_HELP_STRING([--enable-kkcc],[Enable experimental new GC mark algorithms.]),
+	AS_HELP_STRING([--with-kkcc],[Enable experimental new GC mark algorithms.]),
-	[], [enable_kkcc=yes])
+	[], [with_kkcc=yes])
 XE_MERGED_ARG([newgc],
-	AS_HELP_STRING([--enable-newgc],[Enable new incremental garbage collector and new allocator.]),
+	AS_HELP_STRING([--with-newgc],[Enable new incremental garbage collector and new allocator.]),
 	[], [])
 XE_COMPLEX_ARG([vdb],
-	AS_HELP_STRING([--enable-vdb=TYPE],[Override auto-detection of
+	AS_HELP_STRING([--with-vdb=TYPE],[Override auto-detection of
 			virtual-dirty-bit write-barrier implementation for the
 			new garbage collector. TYPE must be one of "auto" (for
 			auto-detection), "posix", "win32", "mach", or "fake"
 			(uses the new garbage collector but disables
 			incremental collections). The default is to
 			use auto-detection.]),
-	[], [enable_vdb="auto"],[auto,posix,win32,mach,fake,no])
+	[], [with_vdb="auto"],[auto,posix,win32,mach,fake,no])
 dnl
 XE_HELP_SUBSECTION([Emacs Lisp options])
 XE_MERGED_ARG([modules],
-	AS_HELP_STRING([--enable-modules],[Compile in experimental support for dynamically
+	AS_HELP_STRING([--with-modules],[Compile in experimental support for dynamically
 loaded libraries (Dynamic Shared Objects).]),
 	[], [])
 XE_KEYWORD_ARG([bignum],
-	AS_HELP_STRING([--enable-bignum=TYPE],[Compile in support for bignums, ratios, or bigfloats
+	AS_HELP_STRING([--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).]),
-	[], [enable_bignum="no"],[no,gmp,mp])
+	[], [with_bignum="no"],[no,gmp,mp])
 dnl
 XE_HELP_SUBSECTION([Platform Specific options])
 XE_MERGED_ARG([workshop],
 	AS_HELP_STRING([--with-workshop],[Support the Sun WorkShop (formerly Sparcworks)
 development environment.]),
 	AS_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],
-	AS_HELP_STRING([--enable-debug],[Enable additional debugging information.  No time cost.]),
+	AS_HELP_STRING([--with-debug],[Enable additional debugging information.  No time cost.]),
 	[], [])
 dnl Keep TESTS sorted to help with syncing doc to reality.
 XE_COMPLEX_ARG([error-checking],
-	AS_HELP_STRING([--enable-error-checking=TESTS],[Compile with internal error-checking added.
+	AS_HELP_STRING([--with-error-checking=TESTS],[Compile with internal error-checking added.
 Causes noticeable loss of speed.  Valid TESTS
 are `byte_code', `display', `extents', `gc', `glyphs', `malloc', `structures' `text', `types'.]),
 	[], [],
 [XE_COMPLEX_OPTION([byte_code],[""]),
 XE_COMPLEX_OPTION([display],[""]),
 XE_COMPLEX_OPTION([malloc],[""]),
 XE_COMPLEX_OPTION([structures],[""]),
 XE_COMPLEX_OPTION([text],[""]),
 XE_COMPLEX_OPTION([types],[""])])
 XE_MERGED_ARG([assertions],
-	AS_HELP_STRING([--enable-assertions],[Compile in runtime assertions.]),
+	AS_HELP_STRING([--with-assertions],[Compile in runtime assertions.]),
 	[], [])
 XE_MERGED_ARG([memory-usage-stats],
-	AS_HELP_STRING([--enable-memory-usage-stats],[Enable LISP memory usage API.]),
+	AS_HELP_STRING([--with-memory-usage-stats],[Enable LISP memory usage API.]),
 	[], [])
 XE_MERGED_ARG([quick-build],
-	AS_HELP_STRING([--enable-quick-build],[Speed up the build cycle by leaving out steps where
+	AS_HELP_STRING([--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
 associated files from the dependency lists, so changes
 to these files don't automatically cause all .c files
 to be rebuilt.]),
 	[], [])
 XE_MERGED_ARG([union-type],
-	AS_HELP_STRING([--enable-union-type],[Use union definition of Lisp_Object type.  Known to trigger bugs in some compilers.]),
+	AS_HELP_STRING([--with-union-type],[Use union definition of Lisp_Object type.  Known to trigger bugs in some compilers.]),
 	[], [])
 XE_MERGED_ARG([quantify],
 	AS_HELP_STRING([--with-quantify],[Support performance debugging using Quantify.]),
 	[], [])
 XE_MERGED_ARG([purify],
 dnl ----------------------------------
 dnl Error checking and debugging flags
 dnl ----------------------------------
 dnl Error checking default to "yes" in beta versions, to "no" in releases.
-dnl Same goes for --enable-debug and --extra-verbosity.
+dnl Same goes for --with-debug and --extra-verbosity.
 if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
-test "${enable_error_checking_extents:=$beta}"    = yes && AC_DEFINE(ERROR_CHECK_EXTENTS)
+test "${with_error_checking_extents:=$beta}"    = yes && AC_DEFINE(ERROR_CHECK_EXTENTS)
-test "${enable_error_checking_types:=$beta}"      = yes && AC_DEFINE(ERROR_CHECK_TYPES)
+test "${with_error_checking_types:=$beta}"      = yes && AC_DEFINE(ERROR_CHECK_TYPES)
-test "${enable_error_checking_text:=$beta}"       = yes && AC_DEFINE(ERROR_CHECK_TEXT)
+test "${with_error_checking_text:=$beta}"       = yes && AC_DEFINE(ERROR_CHECK_TEXT)
-test "${enable_error_checking_gc:=$beta}"         = yes && AC_DEFINE(ERROR_CHECK_GC)
+test "${with_error_checking_gc:=$beta}"         = yes && AC_DEFINE(ERROR_CHECK_GC)
-test "${enable_error_checking_malloc:=$beta}"     = yes && AC_DEFINE(ERROR_CHECK_MALLOC)
+test "${with_error_checking_malloc:=$beta}"     = yes && AC_DEFINE(ERROR_CHECK_MALLOC)
-test "${enable_error_checking_byte_code:=$beta}"  = yes && AC_DEFINE(ERROR_CHECK_BYTE_CODE)
+test "${with_error_checking_byte_code:=$beta}"  = yes && AC_DEFINE(ERROR_CHECK_BYTE_CODE)
-test "${enable_error_checking_glyphs:=$beta}"     = yes && AC_DEFINE(ERROR_CHECK_GLYPHS)
+test "${with_error_checking_glyphs:=$beta}"     = yes && AC_DEFINE(ERROR_CHECK_GLYPHS)
-test "${enable_error_checking_display:=$beta}"    = yes && AC_DEFINE(ERROR_CHECK_DISPLAY)
+test "${with_error_checking_display:=$beta}"    = yes && AC_DEFINE(ERROR_CHECK_DISPLAY)
-test "${enable_error_checking_structures:=$beta}" = yes && AC_DEFINE(ERROR_CHECK_STRUCTURES)
+test "${with_error_checking_structures:=$beta}" = yes && AC_DEFINE(ERROR_CHECK_STRUCTURES)
-dnl enable_debug=yes must be set when error checking is present.  This should be
+dnl with_debug=yes must be set when error checking is present.  This should be
 dnl fixed up.
-dnl enable_debug implies other options
+dnl with_debug implies other options
-if test "${enable_debug:=$beta}" = "yes"; then
+if test "${with_debug:=$beta}" = "yes"; then
-enable_assertions=yes
+with_assertions=yes
-enable_memory_usage_stats=yes
+with_memory_usage_stats=yes
 AC_DEFINE(DEBUG_XEMACS)
 fi
-test "$enable_assertions"         = "yes" && AC_DEFINE(USE_ASSERTIONS)
+test "$with_assertions"         = "yes" && AC_DEFINE(USE_ASSERTIONS)
-test "$enable_memory_usage_stats" = "yes" && AC_DEFINE(MEMORY_USAGE_STATS)
+test "$with_memory_usage_stats" = "yes" && AC_DEFINE(MEMORY_USAGE_STATS)
 dnl ------------------------------
 dnl Determine the s&m files to use
 dnl ------------------------------
 dnl Given the configuration name, set machfile and opsysfile to the
 dnl --------------------------------------------------------------
 dnl $opsys detection complete; defaults depending on $opsys follow
 dnl --------------------------------------------------------------
-if test -z "$enable_pdump"; then
+if test -z "$with_pdump"; then
 case "$opsys" in
-linux* )  enable_pdump=yes ;;          dnl glibc 2.3.1 seems to hose unexec
+linux* )  with_pdump=yes ;;          dnl glibc 2.3.1 seems to hose unexec
-darwin )  enable_pdump=yes ;;          dnl No "native" working dumper available
+darwin )  with_pdump=yes ;;          dnl No "native" working dumper available
-cygwin* ) enable_pdump=yes ;;          dnl unexec is broken
+cygwin* ) with_pdump=yes ;;          dnl unexec is broken
-* )       enable_pdump=no ;;
+* )       with_pdump=no ;;
 esac
 fi
-if test "$enable_newgc" = "yes"; then
+if test "$with_newgc" = "yes"; then
-if test "$enable_vdb" = "auto"; then
+if test "$with_vdb" = "auto"; then
 case "$opsys" in
 darwin )  case "$machine" in
 		  i[[3-9]]86 ) check_vdb_posix=yes ;;
 		  * ) AC_DEFINE(VDB_MACH)  have_vdb_mach=yes ;;
 		esac ;;
 freebsd ) check_vdb_posix=yes ;;
 dnl if not sure, try posix first, maybe we are lucky
 * )       check_vdb_posix=yes ;;
 esac
 else
-case "$enable_vdb" in
+case "$with_vdb" in
 mach )  AC_DEFINE(VDB_MACH)  have_vdb_mach=yes ;;
 win32 ) AC_DEFINE(VDB_WIN32) have_vdb_win32=yes ;;
 posix ) check_vdb_posix=yes ;;
 fake )  have_vdb_fake=yes ;;
 no )    have_vdb_fake=yes ;;
 XE_CHECK_FEATURE_DEPENDENCY(workshop, tooltalk)
 if test "$with_workshop" = "yes"; then
 AC_DEFINE(SUNPRO)
 fi
-if test "$enable_clash_detection" != "no"; then
+if test "$with_clash_detection" != "no"; then
 AC_DEFINE(CLASH_DETECTION)
 fi
 dnl Choose a compiler from (in order)
 dnl --with-compiler, env var CC, with_gcc=no && ${NON_GNU_CC:-cc}, AC_PROG_CC
 AC_DEFINE_UNQUOTED(SYSTEM_TYPE,"`uname -s | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`")
 dnl If the s&m files don't define a system-specific dumper, simply use pdump.
 dnl Sometime in the future, we'll remove all definitions of UNEXEC
 dnl from all the s&m files.
-test -z "$unexec" && enable_pdump=yes
+test -z "$unexec" && with_pdump=yes
-if test "$enable_pdump" = "yes"; then
+if test "$with_pdump" = "yes"; then
 ordinary_link="yes"
 ld="${ordinary_ld}"
 start_files=
 libs_standard=
 unexec=
 lib_gcc=
 fi
 dnl Enable KKCC by default
-test -z "$enable_kkcc" && enable_kkcc=yes
+test -z "$with_kkcc" && with_kkcc=yes
 dnl Dump into executable
-if test -z "$enable_dump_in_exec"; then
+if test -z "$with_dump_in_exec"; then
-if test "$enable_pdump" = "yes"; then
+if test "$with_pdump" = "yes"; then
-if test "$enable_newgc" = "yes"; then
+if test "$with_newgc" = "yes"; then
-enable_dump_in_exec=no
+with_dump_in_exec=no
 else
-enable_dump_in_exec=yes
+with_dump_in_exec=yes
 fi
 fi
 fi
 dnl New incremental garbage collector
-if test "$enable_newgc" = "yes"; then
+if test "$with_newgc" = "yes"; then
-enable_kkcc=yes
+with_kkcc=yes
 fi
 dnl For debugging...
 test "$verbose" = "yes" && \
 PRINT_VAR(libs_machine libs_system libs_termcap libs_standard
 dnl GNU ld now defaults to combreloc, which screws up unexec, but not pdump.
 dnl Note that it's OK if the GNU style long option causes non-GNU ld to barf
 dnl a usage message, that's often good enough.  Please report it, though.
 dnl #### Should make this Solaris-friendly.
 dnl Link with -z nocombreloc for now.
-if test "$enable_pdump" != "yes"; then
+if test "$with_pdump" != "yes"; then
 AC_MSG_CHECKING([for "-z nocombreloc" linker flag])
 case "`ld --help 2>&1`" in
 *-z\ nocombreloc* ) AC_MSG_RESULT(yes)
 XE_PREPEND(-z nocombreloc, ld_switch_site) ;;
 *) AC_MSG_RESULT(no) ;;
 XE_PROTECT_LINKER_FLAGS(ld_call_shared)
 dnl Add s&m-determined objects (including unexec) to link line
 test -n "$objects_machine" && XE_ADD_OBJS($objects_machine)
 test -n "$objects_system"  && XE_ADD_OBJS($objects_system)
-test -n "$unexec"          && test ! "$enable_pdump" = "yes" && XE_ADD_OBJS($unexec)
+test -n "$unexec"          && test ! "$with_pdump" = "yes" && XE_ADD_OBJS($unexec)
-test "$enable_pdump" = "yes" && XE_ADD_OBJS(dumper.o)
+test "$with_pdump" = "yes" && XE_ADD_OBJS(dumper.o)
 dnl Feed s&m crud to src/Makefile
 dnl Linux/powerpc needs the following magic for some reason
 dnl [Not needed with YellowDog 2.3 and causes link problems with YellowDog 3.0,
 dnl #### mcheck is broken in all versions of Linux libc and glibc.
 dnl Try this again when 2.1 hits the streets.
 dnl Avoid using free-hook.c if support exists for malloc debugging in libc
 dnl have_libmcheck=no
-dnl if test "$enable_error_checking_malloc" = "yes" -a \
+dnl if test "$with_error_checking_malloc" = "yes" -a \
 dnl    "$have_glibc" = "yes" -a \
 dnl    "$doug_lea_malloc" = "yes"; then
 dnl   AC_CHECK_HEADERS(mcheck.h)
 dnl   AC_CHECK_LIB(mcheck, mcheck, have_libmcheck=yes, have_libmcheck=no)
 dnl fi
 	with_x11=no
 fi
 for feature in scrollbars toolbars menubars dialogs widgets
 do
-eval "feature_value=\${enable_${feature}}"
+eval "feature_value=\${with_${feature}}"
 	case "${feature_value}" in
 	yes|no|gtk|"" )
 	    ;;
 	* )
 	  feature_conflict_with_gtk=yes
-	  AC_MSG_WARN([--enable-${feature}=${feature_value} is incompatible with --with-gtk]) ;;
+	  AC_MSG_WARN([--with-${feature}=${feature_value} is incompatible with --with-gtk]) ;;
 	esac
 done
 if test "${feature_conflict_with_gtk}" = "yes"; then
 	XE_DIE(["One or more GUI toolkit features conflict with GTK"])
 fi
-test "${enable_scrollbars}" != "no" && enable_scrollbars=gtk
+test "${with_scrollbars}" != "no" && with_scrollbars=gtk
-test "${enable_toolbars}" != "no" && enable_toolbars=gtk
+test "${with_toolbars}" != "no" && with_toolbars=gtk
-test "${enable_menubars}" != "no" && enable_menubars=gtk
+test "${with_menubars}" != "no" && with_menubars=gtk
-test "${enable_dialogs}" != "no" && enable_dialogs=gtk
+test "${with_dialogs}" != "no" && with_dialogs=gtk
-test "${enable_widgets}" != "no" && enable_widgets=gtk
+test "${with_widgets}" != "no" && with_widgets=gtk
 dnl Check for libglade support (it rocks)
 OLD_CFLAGS="${CFLAGS}"
 OLD_CPPFLAGS="${CPPFLAGS}"
 OLD_LDFLAGS="${LDFLAGS}"
 [./conftest foobar; x11_release=$?],[x11_release=4],[x11_release=4])
 AC_MSG_RESULT(R${x11_release})
 AC_DEFINE_UNQUOTED(THIS_IS_X11R${x11_release})
 if test "${x11_release}" = "4"; then
-case "$enable_widgets" in
+case "$with_widgets" in
-"" | "no") enable_widgets=no ;;
+"" | "no") with_widgets=no ;;
 *) XE_DIE("Widget support requires X11R5 or greater") ;;
 esac
 fi
 AC_CHECK_FUNCS(XConvertCase XtRegisterDrawable)
 XE_APPEND(msw, dragndrop_proto)
 with_dragndrop=yes
 fi
 if test "$window_system" != x11; then
 window_system=msw
-test "$enable_scrollbars" != "no" && enable_scrollbars=msw
+test "$with_scrollbars" != "no" && with_scrollbars=msw
-test "$enable_menubars"   != "no" && enable_menubars=msw
+test "$with_menubars"   != "no" && with_menubars=msw
-test "$enable_toolbars"   != "no" && enable_toolbars=msw
+test "$with_toolbars"   != "no" && with_toolbars=msw
-test "$enable_dialogs"    != "no" && enable_dialogs=msw
+test "$with_dialogs"    != "no" && with_dialogs=msw
-test "$enable_widgets"    != "no" && enable_widgets=msw
+test "$with_widgets"    != "no" && with_widgets=msw
 fi
 dnl check for our special version of select
 AC_RUN_IFELSE([AC_LANG_SOURCE([#include <fcntl.h>
 int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }])],
 [AC_DEFINE(HAVE_MSG_SELECT)])
 dnl Test for features that require a window system - ANY window system
 if test "$window_system" = "none"; then
 for feature in menubars scrollbars toolbars dialogs dragndrop xface
 do
-if eval "test -n \"\$enable_${feature}\" -a \"\$enable_${feature}\" != no" ; then
+if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
-AC_MSG_WARN([--enable-$feature ignored:  Not valid without window system support])
+AC_MSG_WARN([--with-$feature ignored:  Not valid without window system support])
 fi
-eval "enable_${feature}=no"
+eval "with_${feature}=no"
 done
 else
-test -z "$enable_toolbars" && enable_toolbars=yes
+test -z "$with_toolbars" && with_toolbars=yes
 fi
 dnl ### Test for features that require mswindows support - currently none
 dnl ### MS-Windows folks: add code here..... (martin)
 if test "$with_msw" != "yes"; then
 dnl It ought to be reasonable to have no output device at all, and only use
 dnl XEmacs in --batch mode.
 dnl if test "$with_tty" = "no" ; then
 dnl   AC_MSG_ERROR([No window system support and no TTY support - Unable to proceed.])
 dnl fi
-for feature in with_tooltalk with_cde with_wmcommand with_xim enable_sound_nas
+for feature in with_tooltalk with_cde with_wmcommand with_xim with_sound_nas
 do
 if eval "test -n \"\$${feature}\" -a \"\$${feature}\" != \"no\"" ; then
 AC_MSG_WARN([--$feature ignored:  Not valid without X support])
 fi
 eval "${feature}=no"
 LIBSTDCPP=
 fi
 AC_SUBST(LIBSTDCPP)
 dnl This must come before the detection code for anything that is in a module
-if test "$enable_modules" != "no"; then
+if test "$with_modules" != "no"; then
 AC_MSG_CHECKING([for module support])
 AC_MSG_RESULT()
 case "$opsys" in
 mingw* | cygwin* ) have_dl=yes ;;
 dnl For no-module builds, this is added *after* the module directories
 XE_APPEND(src, MAKE_SUBDIR)
 XE_APPEND(src, INSTALL_ARCH_DEP_SUBDIR)
 test -n "$libdl" && XE_PREPEND(-l${libdl}, LIBS)
 AC_CHECK_FUNCS(dlerror _dlerror)
-enable_modules=yes
+with_modules=yes
 MOD_CC="../../lib-src/ellcc"
 MODCFLAGS="\$(CFLAGS) --mode=compile --mod-output=\$@ -I../../src -I\$(srcdir)/../../src"
 INSTALLPATH="\$(moduledir)"
 MOD_INSTALL_PROGRAM=${INSTALL_PROGRAM}
 OBJECT_TO_BUILD="\$(MODNAME).ell"
 else
-if test "$enable_modules" = "yes"; then
+if test "$with_modules" = "yes"; then
 XE_DIE("Required module support cannot be provided.")
 else
 echo "    No module support."
 fi
-enable_modules=no
+with_modules=no
 fi
 fi
-if test "$enable_modules" != "yes"; then
+if test "$with_modules" != "yes"; then
 MOD_CC="$XEMACS_CC"
 MODCFLAGS="\$(XE_CFLAGS) -I../../src -I\$(srcdir)/../../src"
 INSTALLPATH=""
 MOD_INSTALL_PROGRAM="true"
 OBJECT_TO_BUILD="\$(MODNAME).o"
 fi
 MODARCHDIR=
 MAKE_DOCFILE="../../lib-src/make-docfile"
-AC_SUBST(with_modules, $enable_modules)
+AC_SUBST(with_modules, $with_modules)
 AC_SUBST(MOD_CC)
 AC_SUBST(MODARCHDIR)
 AC_SUBST(MAKE_DOCFILE)
 AC_SUBST(MODCFLAGS)
 AC_SUBST(INSTALLPATH)
 save_LIBS="$LIBS" LIBS="$LIBS $ldap_libs"
 AC_CHECK_FUNCS(ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result)
 LIBS="$save_LIBS"
 XE_APPEND(modules/ldap, MAKE_SUBDIR)
 need_modules_common=yes
-if test "$enable_modules" = "yes"; then
+if test "$with_modules" = "yes"; then
 XE_APPEND(modules/ldap, INSTALL_ARCH_DEP_SUBDIR)
 fi
 fi
 AC_SUBST(ldap_libs)
 AC_DEFINE(HAVE_POSTGRESQLV7)], [:], $extra_libs)
 AC_DEFINE_UNQUOTED(LIBPQ_FE_H_FILE, "$libpq_fe_h_file")
 XE_PREPEND([$pq_libs], postgresql_libs)
 XE_APPEND(modules/postgresql, MAKE_SUBDIR)
 need_modules_common=yes
-if test "$enable_modules" = "yes"; then
+if test "$with_modules" = "yes"; then
 XE_APPEND(modules/postgresql, INSTALL_ARCH_DEP_SUBDIR)
 fi
 elif test "$with_postgresql" = "yes"; then
 XE_DIE("Required PostgreSQL support cannot be provided.  Check --with-site-prefixes.")
 fi
 if test "$with_x11" = "yes"; then
 AC_MSG_CHECKING([for X11 graphics libraries])
 AC_MSG_RESULT()
 fi
-case "$enable_widgets" in
+case "$with_widgets" in
 "" | "yes" | "athena")	detect_athena=yes ;;
 *)				detect_athena=no ;;
 esac
-case "$enable_dialogs" in
+case "$with_dialogs" in
 "" | "yes" | "athena")	detect_athena=yes ;;
 esac
 if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then
 AC_MSG_CHECKING([for the Athena widgets])
 case "$opsys" in
 *linux* | *darwin* | *bsd* | *cygwin* )  lucid_prefers_motif="no"  ;;
 * )        lucid_prefers_motif="yes" ;;
 esac
-case "$enable_menubars" in "" | "yes" | "athena" )
+case "$with_menubars" in "" | "yes" | "athena" )
-enable_menubars="lucid" ;;
+with_menubars="lucid" ;;
 esac
 dnl this is not in xft reloaded #3
 if test "$with_xft_menubars" != "no" ; then
 if test "$with_xft_emacs" = "yes" -a "$with_menubars" != "no" ; then
 with_xft_menubars="yes"
 else
 with_xft_menubars="no"
 fi
 fi
-case "$enable_dialogs" in "" | "yes" | "lucid" )
+case "$with_dialogs" in "" | "yes" | "lucid" )
 if test "$lucid_prefers_motif" = "yes"; then
-if   test "$have_motif"     = "yes"; then enable_dialogs="motif"
+if   test "$have_motif"     = "yes"; then with_dialogs="motif"
-elif test "$have_xaw"       = "yes"; then enable_dialogs="athena"
+elif test "$have_xaw"       = "yes"; then with_dialogs="athena"
-elif test "$with_msw"       = "yes"; then enable_dialogs="msw"
+elif test "$with_msw"       = "yes"; then with_dialogs="msw"
-else enable_dialogs=no
+else with_dialogs=no
 fi
 else
-if   test "$have_xaw"       = "yes"; then enable_dialogs="athena"
+if   test "$have_xaw"       = "yes"; then with_dialogs="athena"
-elif test "$have_motif"     = "yes"; then enable_dialogs="motif"
+elif test "$have_motif"     = "yes"; then with_dialogs="motif"
-elif test "$with_msw"       = "yes"; then enable_dialogs="msw"
+elif test "$with_msw"       = "yes"; then with_dialogs="msw"
-else enable_dialogs=no
+else with_dialogs=no
 fi
 fi ;;
 esac
-case "$enable_scrollbars" in "" | "yes" )
+case "$with_scrollbars" in "" | "yes" )
-enable_scrollbars="lucid" ;;
+with_scrollbars="lucid" ;;
 esac
-case "$enable_widgets" in "" | "yes" | "lucid")
+case "$with_widgets" in "" | "yes" | "lucid")
 if test "$lucid_prefers_motif" = "yes"; then
-if   test "$have_motif" = "yes"; then enable_widgets="motif"
+if   test "$have_motif" = "yes"; then with_widgets="motif"
-elif test "$have_xaw"   = "yes"; then enable_widgets="athena"
+elif test "$have_xaw"   = "yes"; then with_widgets="athena"
-elif test "$with_msw"   = "yes"; then enable_widgets="msw"
+elif test "$with_msw"   = "yes"; then with_widgets="msw"
-else enable_widgets=no
+else with_widgets=no
 fi
 else
-if   test "$have_xaw"   = "yes"; then enable_widgets="athena"
+if   test "$have_xaw"   = "yes"; then with_widgets="athena"
-elif test "$have_motif" = "yes"; then enable_widgets="motif"
+elif test "$have_motif" = "yes"; then with_widgets="motif"
-elif test "$with_msw"   = "yes"; then enable_widgets="msw"
+elif test "$with_msw"   = "yes"; then with_widgets="msw"
-else enable_widgets=no
+else with_widgets=no
 fi
 fi ;;
 esac
 dnl this is not in xft reloaded #3
 if test "$with_xft_tabs" != "no" ; then
-if test "$with_xft_emacs" = "yes" -a "$enable_widgets" != "no" ; then
+if test "$with_xft_emacs" = "yes" -a "$with_widgets" != "no" ; then
 with_xft_tabs="yes"
 else
 with_xft_tabs="no"
 fi
 fi
 dnl this is not in xft reloaded #3
 if test "$with_xft_gauges" != "no" ; then
-if test "$with_xft_emacs" = "yes" -a "$enable_widgets" != "no" ; then
+if test "$with_xft_emacs" = "yes" -a "$with_widgets" != "no" ; then
 with_xft_gauges="yes"
 else
 with_xft_gauges="no"
 fi
 fi
-all_widgets="$enable_menubars $enable_scrollbars $enable_dialogs $enable_toolbars $enable_widgets"
+all_widgets="$with_menubars $with_scrollbars $with_dialogs $with_toolbars $with_widgets"
 case "$all_widgets" in
 *athena* )
 if test "$have_xaw" != "yes"; then
 XE_DIE("Could not find a suitable Athena library to build with.")
 AC_DEFINE(NEED_MOTIF)
 XE_APPEND(lwlib-Xm.o, lwlib_objs)
 need_motif=yes ;;
 esac
-test "$enable_menubars"   = "lucid" && XE_APPEND(xlwmenu.o, lwlib_objs)
+test "$with_menubars"   = "lucid" && XE_APPEND(xlwmenu.o, lwlib_objs)
-test "$enable_menubars"   = "motif" && XE_APPEND(xlwmenu.o, lwlib_objs)
+test "$with_menubars"   = "motif" && XE_APPEND(xlwmenu.o, lwlib_objs)
-test "$enable_scrollbars" = "lucid" && XE_APPEND(xlwscrollbar.o, lwlib_objs)
+test "$with_scrollbars" = "lucid" && XE_APPEND(xlwscrollbar.o, lwlib_objs)
-test "$enable_widgets"   != "no" && test "$enable_widgets" != "msw" && \
+test "$with_widgets"   != "no" && test "$with_widgets" != "msw" && \
 	XE_APPEND(xlwtabs.o xlwgcs.o, lwlib_objs)
-case "$enable_widgets" in athena* )
+case "$with_widgets" in athena* )
 	XE_APPEND(xlwradio.o xlwcheckbox.o xlwgauge.o, lwlib_objs);;
 esac
 case "$all_widgets" in *lucid* )
 AC_DEFINE(NEED_LUCID)
 XE_APPEND(lwlib-Xlw.o, lwlib_objs) ;;
 esac
 AC_SUBST(lwlib_objs)
-test "$enable_scrollbars" = "athena" && AC_DEFINE(LWLIB_SCROLLBARS_ATHENA)
+test "$with_scrollbars" = "athena" && AC_DEFINE(LWLIB_SCROLLBARS_ATHENA)
-test "$enable_dialogs"    = "athena" && AC_DEFINE(LWLIB_DIALOGS_ATHENA)
+test "$with_dialogs"    = "athena" && AC_DEFINE(LWLIB_DIALOGS_ATHENA)
 if test "$athena_3d" = "yes"; then
-test "$enable_scrollbars" = "athena" && AC_DEFINE(LWLIB_SCROLLBARS_ATHENA3D)
+test "$with_scrollbars" = "athena" && AC_DEFINE(LWLIB_SCROLLBARS_ATHENA3D)
-test "$enable_dialogs"    = "athena" && AC_DEFINE(LWLIB_DIALOGS_ATHENA3D)
+test "$with_dialogs"    = "athena" && AC_DEFINE(LWLIB_DIALOGS_ATHENA3D)
 fi
-case "$enable_widgets" in athena* ) AC_DEFINE(LWLIB_WIDGETS_ATHENA);; esac
+case "$with_widgets" in athena* ) AC_DEFINE(LWLIB_WIDGETS_ATHENA);; esac
-test "$enable_widgets" != "no" && test "$enable_widgets" != "msw" && \
+test "$with_widgets" != "no" && test "$with_widgets" != "msw" && \
 	AC_DEFINE(LWLIB_TABS_LUCID)
-test "$enable_menubars"   != "no"    && AC_DEFINE(HAVE_MENUBARS)
+test "$with_menubars"   != "no"    && AC_DEFINE(HAVE_MENUBARS)
-test "$enable_scrollbars" != "no"    && AC_DEFINE(HAVE_SCROLLBARS)
+test "$with_scrollbars" != "no"    && AC_DEFINE(HAVE_SCROLLBARS)
-test "$enable_dialogs"    != "no"    && AC_DEFINE(HAVE_DIALOGS)
+test "$with_dialogs"    != "no"    && AC_DEFINE(HAVE_DIALOGS)
-test "$enable_toolbars"   != "no"    && AC_DEFINE(HAVE_TOOLBARS)
+test "$with_toolbars"   != "no"    && AC_DEFINE(HAVE_TOOLBARS)
-test "$enable_widgets"    != "no"    && AC_DEFINE(HAVE_WIDGETS)
+test "$with_widgets"    != "no"    && AC_DEFINE(HAVE_WIDGETS)
-test "$enable_menubars"   = "lucid"  && AC_DEFINE(LWLIB_MENUBARS_LUCID)
+test "$with_menubars"   = "lucid"  && AC_DEFINE(LWLIB_MENUBARS_LUCID)
-test "$enable_scrollbars" = "lucid"  && AC_DEFINE(LWLIB_SCROLLBARS_LUCID)
+test "$with_scrollbars" = "lucid"  && AC_DEFINE(LWLIB_SCROLLBARS_LUCID)
-test "$enable_menubars"   = "motif"  && AC_DEFINE(LWLIB_MENUBARS_MOTIF)
+test "$with_menubars"   = "motif"  && AC_DEFINE(LWLIB_MENUBARS_MOTIF)
-test "$enable_scrollbars" = "motif"  && AC_DEFINE(LWLIB_SCROLLBARS_MOTIF)
+test "$with_scrollbars" = "motif"  && AC_DEFINE(LWLIB_SCROLLBARS_MOTIF)
-test "$enable_dialogs"    = "motif"  && AC_DEFINE(LWLIB_DIALOGS_MOTIF)
+test "$with_dialogs"    = "motif"  && AC_DEFINE(LWLIB_DIALOGS_MOTIF)
-test "$enable_widgets"    = "motif"  && AC_DEFINE(LWLIB_WIDGETS_MOTIF)
+test "$with_widgets"    = "motif"  && AC_DEFINE(LWLIB_WIDGETS_MOTIF)
 test "$with_xft_menubars" = "yes"  && AC_DEFINE(USE_XFT_MENUBARS)
 test "$with_xft_tabs" = "yes"  && AC_DEFINE(USE_XFT_TABS)
 test "$with_xft_gauges" = "yes"  && AC_DEFINE(USE_XFT_GAUGES)
 dnl ----------------------
 dnl Mule-dependent options
 dnl ----------------------
-test -z "$enable_mule" && enable_mule=no
+test -z "$with_mule" && with_mule=no
-dnl if test "$enable_mule" = "yes" && test ! -d "$srcdir/lisp/mule"; then
+dnl if test "$with_mule" = "yes" && test ! -d "$srcdir/lisp/mule"; then
 dnl	echo "Attempt to Build with Mule without Mule/Lisp"
 dnl	echo "Please install the XEmacs/Mule tarball or"
 dnl	echo "rerun configure with --with-mule=no"
 dnl	exit 1
 dnl fi
-if test "$enable_default_eol_detection" = "yes"; then
+if test "$with_default_eol_detection" = "yes"; then
 AC_DEFINE(HAVE_DEFAULT_EOL_DETECTION)
 fi
 dnl initialize _libs variables for possible modules at top level
 canna_libs=
 wnn_libs=
-if test "$enable_mule" = "yes" ; then
+if test "$with_mule" = "yes" ; then
 AC_MSG_CHECKING([for Mule-related features])
 AC_DEFINE(MULE)
 dnl Use -lintl to get internationalized strerror for Mule
 AC_CHECK_HEADERS(libintl.h)
 dnl "with_xfs" = "yes"
 if test "$with_xfs" = "yes" ; then
 AC_MSG_CHECKING([for XFontSet])
 AC_CHECK_LIB(X11, XmbDrawString, [:], with_xfs=no)
-if test "$with_xfs" = "yes" && test "$enable_menubars" = "lucid"; then
+if test "$with_xfs" = "yes" && test "$with_menubars" = "lucid"; then
 AC_DEFINE(USE_XFONTSET)
 if test "$with_xim" = "no" ; then
 XE_ADD_OBJS(input-method-xlib.o)
 fi
 fi
 AC_MSG_WARN([Canna configuration failed.  If you expected success,
 maybe you need --with-site-prefixes=/usr/local/canna?])
 fi
 AC_SUBST(canna_libs)
-else dnl "$enable_mule" = "no"
+else dnl "$with_mule" = "no"
 for feature in xim canna wnn; do
 if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
 AC_MSG_WARN([--with-${feature} ignored:  Not valid without Mule support])
 fi
 eval "with_${feature}=no"
 dnl Check for sound of various sorts.
 AC_MSG_CHECKING([for sound support])
 AC_MSG_RESULT()
 dnl Autodetect native sound
-test -n "$with_native_sound_lib" && enable_sound_native=yes
+test -n "$with_native_sound_lib" && with_sound_native=yes
-if test "$enable_sound_native" != "no"; then
+if test "$with_sound_native" != "no"; then
 dnl Maybe sound is already on include path...
 if test -n "$with_native_sound_lib"; then
 AC_CHECK_HEADER(multimedia/audio_device.h,
 [sound_found=yes sound_cflags=""
 XE_ADD_OBJS(sunplay.o)])
 AC_DEFINE_UNQUOTED(SOUNDCARD_H_FILE, ["${dir}/soundcard.h"])
 fi
 fi
 if test "$sound_found" = "yes"; then
-enable_sound_native=yes
+with_sound_native=yes
 else
-if test "$enable_sound_native" = "yes" ; then
+if test "$with_sound_native" = "yes" ; then
 AC_MSG_WARN([No native libraries found.  Disabling native sound support.])
 fi
-enable_sound_native=no
+with_sound_native=no
 fi
 fi
-if test "$enable_sound_native" = "yes"; then
+if test "$with_sound_native" = "yes"; then
 AC_DEFINE(HAVE_NATIVE_SOUND)
 test -n "$with_native_sound_lib" && XE_PREPEND($with_native_sound_lib, LIBS)
 fi
 dnl ALSA sound support
-if test "$enable_sound_alsa" != "no"; then
+if test "$with_sound_alsa" != "no"; then
 AC_CHECK_HEADER([alsa/input.h], [
 AC_CHECK_LIB(asound, snd_pcm_open, have_alsa_sound=yes)])
 if test "$have_alsa_sound" = "yes"; then
-enable_sound_alsa=yes
+with_sound_alsa=yes
 AC_DEFINE(HAVE_ALSA_SOUND)
 XE_ADD_OBJS(alsaplay.o)
 XE_PREPEND(-lasound, LIBS)
 else
-test "$enable_sound_alsa" = "yes" && \
+test "$with_sound_alsa" = "yes" && \
 XE_DIE("Required ALSA sound support cannot be provided.")
-enable_sound_alsa=no
+with_sound_alsa=no
 fi
 fi
 dnl NAS Sound support
-if test "$enable_sound_nas" != "no"; then
+if test "$with_sound_nas" != "no"; then
 AC_CHECK_HEADER(audio/audiolib.h, [
 AC_CHECK_LIB(audio, AuOpenServer, have_nas_sound=yes)])
 if test "$have_nas_sound" = "yes"; then
-enable_sound_nas=yes
+with_sound_nas=yes
 AC_DEFINE(HAVE_NAS_SOUND)
 XE_ADD_OBJS(nas.o)
 XE_PREPEND(-laudio, libs_x)
 dnl If the nas library does not contain the error jump point,
 dnl then we force safer behavior.
 AC_EGREP_HEADER(AuXtErrorJump,audio/Xtutil.h,,[old_nas=yes; AC_DEFINE(NAS_NO_ERROR_JUMP)])
 else
-test "$enable_sound_nas" = "yes" && \
+test "$with_sound_nas" = "yes" && \
 XE_DIE("Required NAS sound support cannot be provided.")
-enable_sound_nas=no
+with_sound_nas=no
 fi
 fi
 dnl ESD Sound support
-if test "$enable_sound_esd" != "no"; then
+if test "$with_sound_esd" != "no"; then
 AC_CHECK_PROG(have_esd_config, esd-config, yes, no)
 if test "$have_esd_config" = "yes"; then
 save_c_switch_site="$c_switch_site" save_LIBS="$LIBS"
 XE_APPEND(`esd-config --cflags`, c_switch_site)
 XE_PREPEND(`esd-config --libs`, LIBS)
 have_esd_sound=yes,
 c_switch_site="$save_c_switch_site" LIBS="$save_LIBS")
 fi
 if test "$have_esd_sound" = "yes"; then
-enable_sound_esd=yes
+with_sound_esd=yes
 need_miscplay=yes
 XE_ADD_OBJS(esd.o)
 AC_DEFINE(HAVE_ESD_SOUND)
 else
-test "$enable_sound_esd" = "yes" && \
+test "$with_sound_esd" = "yes" && \
 XE_DIE("Required ESD sound support cannot be provided.")
-enable_sound_esd=no
+with_sound_esd=no
 fi
 fi
 test "$need_miscplay" = "yes" && XE_ADD_OBJS(miscplay.o)
 dnl Database support
 dnl We do not necessarily have to have libdb/lib(g)dbm for DB/(G)DBM support.
 dnl On FreeBSD, both DB and DBM are part of libc.
 dnl By default, we check for DBM support in libgdbm, then libc, then libdbm.
-test "$enable_database_gdbm $enable_database_dbm $enable_database_berkdb" \
+test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
 != "no no no" && AC_MSG_CHECKING([for database support]) && \
 AC_MSG_RESULT()
 dnl Check for ndbm.h, required for either kind of DBM support.
 dnl #### Should we check for gdbm.h, too?  (Seen on MacPorts.)
-if test "$enable_database_gdbm $enable_database_dbm" != "no no"; then
+if test "$with_database_gdbm $with_database_dbm" != "no no"; then
 ndbm_h_file=""
 AC_CHECK_HEADERS([ndbm.h gdbm/ndbm.h],[ndbm_h_file=$ac_header; break;],[],[])
 if test "x$ndbm_h_file" = "x"; then
-test "$enable_database_gdbm" = "yes" -o \
+test "$with_database_gdbm" = "yes" -o \
-"$enable_database_dbm"  = "yes" && \
+"$with_database_dbm"  = "yes" && \
 XE_DIE("Required DBM support cannot be provided.")
-enable_database_gdbm=no enable_database_dbm=no]
+with_database_gdbm=no with_database_dbm=no]
 fi
 fi
 dnl Check for DBM support in libgdbm.
-if test "$enable_database_gdbm" != "no"; then
+if test "$with_database_gdbm" != "no"; then
 AC_CHECK_LIB(gdbm, dbm_open, [
-enable_database_gdbm=yes enable_database_dbm=no libdbm=-lgdbm], [
+with_database_gdbm=yes with_database_dbm=no libdbm=-lgdbm], [
 AC_CHECK_LIB(gdbm_compat, dbm_open, [
-enable_database_gdbm=yes enable_database_dbm=no libdbm="-lgdbm_compat -lgdbm"], [
+with_database_gdbm=yes with_database_dbm=no libdbm="-lgdbm_compat -lgdbm"], [
-if test "$enable_database_gdbm" = "yes"; then
+if test "$with_database_gdbm" = "yes"; then
 XE_DIE("Required GNU DBM support cannot be provided.")
 fi
-enable_database_gdbm=no], -lgdbm)
+with_database_gdbm=no], -lgdbm)
 ])
 fi
 dnl Check for DBM support in libc and libdbm.
-if test "$enable_database_dbm" != "no"; then
+if test "$with_database_dbm" != "no"; then
-AC_CHECK_FUNC(dbm_open, [enable_database_dbm=yes libdbm=], [
+AC_CHECK_FUNC(dbm_open, [with_database_dbm=yes libdbm=], [
-AC_CHECK_LIB(dbm, dbm_open, [enable_database_dbm=yes libdbm=-ldbm], [
+AC_CHECK_LIB(dbm, dbm_open, [with_database_dbm=yes libdbm=-ldbm], [
-test "$enable_database_dbm" = "yes" && \
+test "$with_database_dbm" = "yes" && \
 XE_DIE("Required DBM support cannot be provided.")
-enable_database_dbm=no])])
+with_database_dbm=no])])
 fi
 dnl Tell make about the DBM support we detected.
 test -n "$libdbm" && XE_PREPEND("$libdbm", LIBS)
-if test "$enable_database_gdbm" = "yes" -o \
+if test "$with_database_gdbm" = "yes" -o \
-"$enable_database_dbm"  = "yes"; then
+"$with_database_dbm"  = "yes"; then
 AC_DEFINE_UNQUOTED(NDBM_H_FILE,"$ndbm_h_file")
 AC_DEFINE(HAVE_DBM)
 $as_unset ndbm_h_file
 fi
 dnl Check for u_int*_t typedefs.
 AC_CHECK_TYPES([u_int8_t, u_int16_t, u_int32_t])
 dnl Check for Berkeley DB.
-if test "$enable_database_berkdb" != "no"; then
+if test "$with_database_berkdb" != "no"; then
 AC_MSG_CHECKING(for Berkeley db.h)
 for header in "db/db.h" "db.h"; do
 AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 #include <stdlib.h>
 #if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1)
 #endif
 #include <$header>
 ])], db_h_file="$header"; break)
 done
 if test -z "$db_h_file"
-then AC_MSG_RESULT(no); enable_database_berkdb=no
+then AC_MSG_RESULT(no); with_database_berkdb=no
 else AC_MSG_RESULT($db_h_file)
 fi
-if test "$enable_database_berkdb" != "no"; then
+if test "$with_database_berkdb" != "no"; then
 AC_MSG_CHECKING(for Berkeley DB version)
 AC_EGREP_CPP(yes,
 [#include <$db_h_file>
 #if DB_VERSION_MAJOR > 1
 yes
 #endif
 ], [AC_MSG_RESULT(4); dbfunc=db_create; dbver=4],[
 AC_MSG_RESULT(3); dbfunc=db_create; dbver=3])],[
 AC_MSG_RESULT(2); dbfunc=db_open; dbver=2])],[
 AC_MSG_RESULT(1); dbfunc=dbopen; dbver=1])
-AC_CHECK_FUNC($dbfunc,     enable_database_berkdb=yes need_libdb=no, [
+AC_CHECK_FUNC($dbfunc,     with_database_berkdb=yes need_libdb=no, [
-AC_CHECK_LIB(db, $dbfunc,  enable_database_berkdb=yes need_libdb=yes)])
+AC_CHECK_LIB(db, $dbfunc,  with_database_berkdb=yes need_libdb=yes)])
 fi
 dnl Berk db 4.1 decorates public functions with version information
-if test "$enable_database_berkdb" = "yes" -a "$dbver" = "4"; then
+if test "$with_database_berkdb" = "yes" -a "$dbver" = "4"; then
 rm -f $tempcname
 echo "#include <$db_h_file>" > $tempcname
 echo "configure___ dbfunc=db_create" >> $tempcname
 define(TAB, [	])dnl
 eval `$CPP -Isrc $tempcname \
 	| sed -n -e "s/[[ TAB]]*=[[ TAB\"]]*/='/" -e "s/[[ TAB\"]]*\$/'/" -e "s/^configure___//p"`
 rm -f $tempcname
 AC_MSG_WARN("db_create is really $dbfunc")
-AC_CHECK_LIB(db, $dbfunc,  enable_database_berkdb=yes need_libdb=yes)
+AC_CHECK_LIB(db, $dbfunc,  with_database_berkdb=yes need_libdb=yes)
 fi
-if test "$enable_database_berkdb" = "yes"; then
+if test "$with_database_berkdb" = "yes"; then
 AC_DEFINE_UNQUOTED(DB_H_FILE, "$db_h_file")
 AC_DEFINE(HAVE_BERKELEY_DB)
 test "$need_libdb" = "yes" && XE_PREPEND(-ldb, LIBS)
-else enable_database_berkdb=no
+else with_database_berkdb=no
 fi
 fi
-if test "$enable_database_gdbm $enable_database_dbm $enable_database_berkdb" \
+if test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
 != "no no no"; then
 AC_DEFINE(HAVE_DATABASE)
 fi
 dnl Socks support
 AC_DEFINE(USAGE_TRACKING)
 XE_PREPEND(-Bstatic -lut -Bdynamic, LIBS)
 fi
 dnl Enhanced number support
-if test "$enable_bignum" = "gmp"; then
+if test "$with_bignum" = "gmp"; then
 AC_CHECK_HEADER(gmp.h, [
 AC_CHECK_LIB(gmp, __gmpz_init, have_mpz_init=yes)])
 if test "$have_mpz_init" = "yes"; then
 AC_DEFINE(WITH_NUMBER_TYPES)
 AC_DEFINE(WITH_GMP)
 XE_PREPEND(-lgmp, LIBS)
 else
 XE_DIE("Required GMP numeric support cannot be provided.")
 fi
-elif test "$enable_bignum" = "mp"; then
+elif test "$with_bignum" = "mp"; then
 for library in "" "-lcrypto"; do
 AC_CHECK_HEADER(mp.h, [
 AC_CHECK_LIB(mp, mp_mfree, have_mp_mfree=yes; break, [
 	AC_CHECK_LIB(mp, mfree, have_mfree=yes; break, , $library)],
 	$library)])
 dnl Compute SUBST-itutable variables
 dnl --------------------------------
 dnl We ignore (C|LD)_SWITCH_X_(MACHINE|SYSTEM)
 dnl Use XE_SPACE instead of plain assignment statements to remove extraneous blanks
-if test "$enable_modules" = "yes"; then
+if test "$with_modules" = "yes"; then
 ld_libs_module=
 else
 XE_SPACE(ld_libs_module, $ldap_libs $postgresql_libs $canna_libs)
 fi
 XE_SPACE(ld_libs_general, $LIBS $libs_machine $libs_system $libs_standard)
 XE_SPACE(ld_libs_window_system, $X_EXTRA_LIBS $libs_x $libs_gtk $X_PRE_LIBS)
 XE_SPACE(ld_libs_all, $ld_libs_window_system $ld_libs_general $ld_libs_module)
 dnl For no-module builds, make the src dir last
-if test "$enable_modules" = "no"; then
+if test "$with_modules" = "no"; then
 XE_APPEND(src, MAKE_SUBDIR)
 fi
 dnl Compute lists of Makefiles and subdirs
 AC_SUBST(SRC_SUBDIR_DEPS)
 elif test "$with_debug_malloc"  = "yes"; then AC_DEFINE(USE_DEBUG_MALLOC)
 					      AC_DEFINE(USE_SYSTEM_MALLOC)
 fi
 test "$GCC"                = "yes" && AC_DEFINE(USE_GCC)
 test "$with_xemacs_compiler" = "g++" && AC_DEFINE(USE_GPLUSPLUS)
-test "$enable_external_widget" = "yes" && AC_DEFINE(EXTERNAL_WIDGET)
+test "$with_external_widget" = "yes" && AC_DEFINE(EXTERNAL_WIDGET)
-test "$enable_kkcc"        = "yes" && AC_DEFINE(USE_KKCC)
+test "$with_kkcc"        = "yes" && AC_DEFINE(USE_KKCC)
-test "$enable_newgc"       = "yes" && AC_DEFINE(NEW_GC)
+test "$with_newgc"       = "yes" && AC_DEFINE(NEW_GC)
 test "$have_vdb_posix"     = "yes" && AC_DEFINE(VDB_POSIX)
 test "$have_vdb_fake"      = "yes" && AC_DEFINE(VDB_FAKE)
-test "$enable_quick_build" = "yes" && AC_DEFINE(QUICK_BUILD)
+test "$with_quick_build" = "yes" && AC_DEFINE(QUICK_BUILD)
 test "$with_purify"        = "yes" && AC_DEFINE(PURIFY)
 test "$with_quantify"      = "yes" && AC_DEFINE(QUANTIFY)
 test "$with_valgrind"      = "yes" && AC_DEFINE(USE_VALGRIND)
 test "$with_pop"           = "yes" && AC_DEFINE(MAIL_USE_POP)
 test "$with_kerberos"      = "yes" && AC_DEFINE(KERBEROS)
 test "$with_hesiod"        = "yes" && AC_DEFINE(HESIOD)
-test "$enable_union_type"  = "yes" && AC_DEFINE(USE_UNION_TYPE)
+test "$with_union_type"  = "yes" && AC_DEFINE(USE_UNION_TYPE)
-test "$enable_pdump"       = "yes" && AC_DEFINE(PDUMP)
+test "$with_pdump"       = "yes" && AC_DEFINE(PDUMP)
-test "$enable_dump_in_exec" = "yes" && AC_DEFINE(DUMP_IN_EXEC)
+test "$with_dump_in_exec" = "yes" && AC_DEFINE(DUMP_IN_EXEC)
 test "$with_ipv6_cname"    = "yes" && AC_DEFINE(IPV6_CANONICALIZE)
 dnl -------------------------------------------------------------------------
 echo "  libc version:                      $libc_version"
 echo "  Relocating allocator for buffers:  $with_rel_alloc"
 echo "  GNU version of malloc:             ${GNU_MALLOC}${GNU_MALLOC_reason}"
 case "$ld_switch_site" in
 *nocombreloc*) echo "  Linking with \`-z nocombreloc'.
-- Consider configuring with --enable-pdump." ;;
+- Consider configuring with --with-pdump." ;;
 esac
 echo "
 Window System:"
 if test "$with_msw" = "yes"; then
 if test "$need_athena" = "yes"; then
 echo "  Compiling in support for the Athena widget set:"
 echo "    - Athena headers location:                    $athena_h_path"
 echo "    - Athena library to link:                     $athena_lib"
 fi
-case "$enable_menubars" in
+case "$with_menubars" in
 gtk   ) echo "  Using GTK menubars."   ;;
 lucid ) echo "  Using Lucid menubars." ;;
 motif ) echo "  Using Motif menubars."
 echo "  *WARNING*  The Motif menubar implementation is currently buggy."
 echo "             We recommend using the Lucid menubar instead."
-echo "             Re-run configure with --enable-menubars='lucid'." ;;
+echo "             Re-run configure with --with-menubars='lucid'." ;;
 msw ) echo "  Using MS-Windows menubars." ;;
 esac
 if test "$with_xft_menubars" = "yes"; then
 echo "    - Using Xft to render antialiased fonts in menubars."
 echo "      WARNING: This feature will be replaced with a face."
 fi
-case "$enable_scrollbars" in
+case "$with_scrollbars" in
 gtk    ) echo "  Using GTK scrollbars."        ;;
 lucid  ) echo "  Using Lucid scrollbars."      ;;
 motif  ) echo "  Using Motif scrollbars."      ;;
 athena ) echo "  Using Athena scrollbars."     ;;
 msw ) echo "  Using MS-Windows scrollbars." ;;
 esac
-case "$enable_dialogs" in
+case "$with_dialogs" in
 gtk    ) echo "  Using GTK dialog boxes." ;;
 motif  ) echo "  Using Motif dialog boxes."
 if test "$unexec" = "unexaix.o"; then if test "`uname -v`" = 4 -a "`uname -r`" -ge 3; then
 echo "  *WARNING*  The Motif dialog boxes cause problems on AIX 4.3 and higher."
 echo "             We recommend using the Athena dialog boxes instead."
-echo "             Install libXaw and re-run configure with --enable-dialogs='athena'."
+echo "             Install libXaw and re-run configure with --with-dialogs='athena'."
 echo "             Read the PROBLEMS file for more information."
 fi; fi ;;
 athena ) echo "  Using Athena dialog boxes."     ;;
 msw ) echo "  Using MS-Windows dialog boxes." ;;
 esac
-case "$enable_widgets" in
+case "$with_widgets" in
 gtk    ) echo "  Using GTK native widgets."        ;;
 motif  ) echo "  Using Motif native widgets."      ;;
 athena ) echo "  Using Athena native widgets."     ;;
 msw ) echo "  Using MS-Windows native widgets." ;;
 esac
 test "$with_tiff" = yes && echo "  Compiling in support for TIFF images."
 test "$with_xface" = yes && echo "  Compiling in support for X-Face message headers."
 echo "
 Sound:"
-test "$enable_sound_native" = yes && echo "  Compiling in support for sound (native)."
+test "$with_sound_native" = yes && echo "  Compiling in support for sound (native)."
-test "$enable_sound_alsa" = yes && echo "  Compiling in support for ALSA (Advanced Linux Sound Architecture)."
+test "$with_sound_alsa" = yes && echo "  Compiling in support for ALSA (Advanced Linux Sound Architecture)."
-test "$enable_sound_nas" = yes && echo "  Compiling in support for NAS (network audio system)."
+test "$with_sound_nas" = yes && echo "  Compiling in support for NAS (network audio system)."
 test "$old_nas" = yes && echo "    - NAS library lacks error trapping; will play synchronously."
-test "$enable_sound_esd" = yes && echo "  Compiling in support for ESD (Enlightened Sound Daemon)."
+test "$with_sound_esd" = yes && echo "  Compiling in support for ESD (Enlightened Sound Daemon)."
 echo "
 Databases:"
-test "$enable_database_berkdb" = yes && echo "  Compiling in support for Berkeley database."
+test "$with_database_berkdb" = yes && echo "  Compiling in support for Berkeley database."
-test "$enable_database_dbm"    = yes && echo "  Compiling in support for DBM."
+test "$with_database_dbm"    = yes && echo "  Compiling in support for DBM."
-test "$enable_database_gdbm"   = yes && echo "  Compiling in support for GNU DBM."
+test "$with_database_gdbm"   = yes && echo "  Compiling in support for GNU DBM."
 test "$with_ldap" = yes && echo "  Compiling in support for LDAP."
 if test "$with_postgresql" = yes; then
 echo "  Compiling in support for PostgreSQL."
 echo "    - Using PostgreSQL header file:  $libpq_fe_h_file"
 test "$with_postgresqlv7" = yes && echo "    - Using PostgreSQL V7 bindings."
 fi
 echo "
 Internationalization:"
-test "$enable_mule" = yes && echo "  Compiling in support for Mule (multi-lingual Emacs)."
+test "$with_mule" = yes && echo "  Compiling in support for Mule (multi-lingual Emacs)."
 test "$with_xim" != no && echo "  Compiling in support for XIM (X11R5+ I18N input method)."
 test "$with_xim" = motif && echo "    - Using Motif to provide XIM support."
 test "$with_xim" = xlib && echo "    - Using raw Xlib to provide XIM support."
 test "$with_xfs" = yes && echo "    - Using XFontSet to provide bilingual menubar."
 test "$have_canna" = yes && echo "  Compiling in support for Canna on Mule."
 test "$with_ipv6_cname" = no && echo "  Inhibiting IPv6 canonicalization at startup."
 test "$with_tooltalk" = yes && echo "  Compiling in support for ToolTalk."
 test "$with_workshop" = yes && echo "  Compiling in support for Sun WorkShop."
 test "$with_socks" = yes && echo "  Compiling in support for SOCKS."
 test "$with_dnet" = yes && echo "  Compiling in support for DNET."
-test "$enable_modules" = "yes" && echo "  Compiling in support for dynamic shared object modules."
+test "$with_modules" = "yes" && echo "  Compiling in support for dynamic shared object modules."
-test "$enable_bignum" = "gmp" && echo "  Compiling in support for more number types using the GNU MP library."
+test "$with_bignum" = "gmp" && echo "  Compiling in support for more number types using the GNU MP library."
-test "$enable_bignum" = "mp" && echo "  Compiling in support for more number types using the BSD MP library."
+test "$with_bignum" = "mp" && echo "  Compiling in support for more number types using the BSD MP library."
-if test "$enable_union_type" = yes ; then
+if test "$with_union_type" = yes ; then
 echo "  Using the union type for Lisp_Objects."
 echo "  WARNING: ---------------------------------------------------------"
 echo "  WARNING: This tends to trigger compiler bugs, especially when"
 echo "  WARNING: combined with MULE and ERROR_CHECKING.  Crashes have"
 echo "  WARNING: been seen with various versions of GCC (up to about 2.95),"
 echo "  WARNING: and recently with Visual C++ as well (mid-2003)."
 echo "  WARNING: More recent versions may be safer, or not."
 echo "  WARNING: ---------------------------------------------------------"
 fi
-if test "$enable_kkcc" = yes ; then
+if test "$with_kkcc" = yes ; then
 echo "  Using the new GC mark algorithms (KKCC)."
 echo "  WARNING: ---------------------------------------------------------"
 echo "  WARNING: The new algorithms are experimental. They are enabled by"
 echo "  WARNING: default for this release. Use \`--disable-kkcc' to"
 echo "  WARNING: turn it off."
 echo "  WARNING: ---------------------------------------------------------"
 fi
-test "$enable_newgc" = yes && echo "  Using the new incremental garbage collector and the new allocator."
+test "$with_newgc" = yes && echo "  Using the new incremental garbage collector and the new allocator."
 if test "$have_vdb_posix" = yes ; then
 if test "$have_vdb_sigaction" = yes ; then
 echo "  Using POSIX sigaction() to install fault handler."
 else
 echo "  Using POSIX signal() to install vdb fault handler."
 echo "  Using special WIN32 vdb fault handler."
 fi
 if test "$have_vdb_mach" = yes ; then
 echo "  Using mach exception mechanism as vdb fault handler."
 fi
-if test "$have_vdb_fake" = yes && test "$enable_vdb" == fake; then
+if test "$have_vdb_fake" = yes && test "$with_vdb" == fake; then
 echo "  Virtual dirty bit write barrier manually disabled."
 fi
-test "$enable_pdump" = yes && echo "  Using the new portable dumper."
+test "$with_pdump" = yes && echo "  Using the new portable dumper."
-test "$enable_dump_in_exec" = yes && echo "  Dumping into executable."
+test "$with_dump_in_exec" = yes && echo "  Dumping into executable."
-test "$enable_debug" = yes && echo "  Compiling in support for extra debugging code."
+test "$with_debug" = yes && echo "  Compiling in support for extra debugging code."
 test "$usage_tracking" = yes && echo "  Compiling in support for active usage tracking (Sun internal)."
-if test "$enable_error_checking_extents $enable_error_checking_types $enable_error_checking_text $enable_error_checking_gc $enable_error_checking_malloc $enable_error_checking_glyphs $enable_error_checking_byte_code $enable_error_checking_display $enable_error_checking_structures" \
+if test "$with_error_checking_extents $with_error_checking_types $with_error_checking_text $with_error_checking_gc $with_error_checking_malloc $with_error_checking_glyphs $with_error_checking_byte_code $with_error_checking_display $with_error_checking_structures" \
 != "no no no no no no no no no"; then
 echo "  Compiling in support for runtime error checking."
 echo "  WARNING: ---------------------------------------------------------"
 echo "  WARNING: XEmacs will run noticeably more slowly as a result."
 echo "  WARNING: Error checking is on by default for XEmacs beta releases."
 modules/* ) file="${file}:${file}.in:modules/common/Makefile.common" ;;
 esac
 AC_CONFIG_FILES($file)
 done
 AC_CONFIG_FILES(src/paths.h src/xemacs.def.in lib-src/config.values)
-test "$enable_modules" = "yes" && AC_CONFIG_FILES(lib-src/ellcc.h)
+test "$with_modules" = "yes" && AC_CONFIG_FILES(lib-src/ellcc.h)
 dnl Normally []'s are used for quoting but this will cause problems
 dnl since we use brackets in sed.  When not inside of a macro definition,
 dnl two brackets become one, but inside of a macro definition you need

Mercurial > hg > xemacs-beta

comparison configure.ac @ 4842:1d775c6304d1