[PATCH] Support autoconf option checking.

[Malcolm Purvis]

Poking around with the CVS version of autoconf I've discovered that a future
release will support option checking and it will generate errors if it
encounters an option it doesn't know about.  Unfortunately we use
XE_MERGED_ARG instead of the standard API, so all of our options will fail.

This patch expands XE_MERGED_ARG to register the --with and --enable forms of
our options with the option checking list so that they are processed properly.
This change is ignored by autoconf 2.60 and earlier and using those versions
produces an copy of configure that's identical to what's currently in CVS.

Malcolm


ChangeLog addition:

2006-12-27  Malcolm Purvis  <malcolmp at xemacs.org>

	* configure.ac (XE_MERGED_ARG): Register --enable and --with forms
	with the option checking list.


xemacs-autoconf-2.5 source patch:
Diff command:   cvs -q diff -u
Files affected: configure.ac
===================================================================
RCS

Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.52
diff -u -r1.52 configure.ac
--- configure.ac	2006/12/11 19:44:11	1.52
+++ configure.ac	2006/12/27 12:09:13
@@ -252,6 +252,10 @@
   --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
+dnl Register both forms with the option checking list.
+dnl Options are only checked with autoconf > 2.61.
+m4_append_uniq([_AC_USER_OPTS], [enable_]m4_bpatsubst([$1], -, _), [:])dnl
+m4_append_uniq([_AC_USER_OPTS], [with_]m4_bpatsubst([$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

-- 
		     Malcolm Purvis <malcolmp at xemacs.org>