# HG changeset patch
# User malcolmp
# Date 1167308637 0
# Node ID 995ea1223b4d4bfab224b815c35f9d19b3d331db
# Parent  142260edb7b5f420bac00f117501446a7a8dd635
[xemacs-hg @ 2006-12-28 12:23:57 by malcolmp]
configure.ac: Register --enable and --with forms with the option checking
list.

diff -r 142260edb7b5 -r 995ea1223b4d ChangeLog
--- a/ChangeLog	Thu Dec 28 12:15:38 2006 +0000
+++ b/ChangeLog	Thu Dec 28 12:23:57 2006 +0000
@@ -1,3 +1,8 @@
+2006-12-27  Malcolm Purvis  <malcolmp@xemacs.org>
+
+	* configure.ac (XE_MERGED_ARG): Register --enable and --with forms
+	with the option checking list.
+
 2006-12-19  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* Makefile.in.in (${srcdir}/configure): Generated from configure.ac.
diff -r 142260edb7b5 -r 995ea1223b4d configure.ac
--- a/configure.ac	Thu Dec 28 12:15:38 2006 +0000
+++ b/configure.ac	Thu Dec 28 12:23:57 2006 +0000
@@ -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