main: diagnose unsupported --word-regexp

The long option for -W (--word-regexp) was accepted without
ENABLE_CHANGEWORD defined.

* src/m4.c (long_options): Don't allow long option if short option
is rejected.
* THANKS: Add attribution.

Signed-off-by: Eric Blake <eblake@redhat.com>

3 files changed, 9 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index a6399177..9b865cfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-05  Vitezslav Crhonek  <vcrhonek@redhat.com>  (tiny change)
+
+	main: diagnose unsupported --word-regexp
+	* src/m4.c (long_options): Don't allow long option if short option
+	is rejected.
+
 2014-01-01  Eric Blake  <eblake@redhat.com>
 
 	maint: bump copyright year
diff --git a/THANKS b/THANKS
index eaefbbab..5e4b3ee9 100644
--- a/THANKS
+++ b/THANKS
@@ -129,6 +129,7 @@ Tom Tromey              tromey@cns.caltech.edu
 Ulrich Drepper          drepper@gnu.org
 Vern Paxson             vern@ee.lbl.gov
 Vincent Lonngren        Vincent.lonngren.759@student.lu.se
+Vitezslav Crhonek       vcrhonek@redhat.com
 Vivek P. Singhal        singhal@cs.utexas.edu
 Walter Wong             wcw+@cmu.edu
 
diff --git a/src/m4.c b/src/m4.c
index db772881..9907f0b7 100644
--- a/src/m4.c
+++ b/src/m4.c
@@ -307,7 +307,9 @@ static const struct option long_options[] =
   {"trace", required_argument, NULL, 't'},
   {"traditional", no_argument, NULL, 'G'},
   {"undefine", required_argument, NULL, 'U'},
+#ifdef ENABLE_CHANGEWORD
   {"word-regexp", required_argument, NULL, 'W'},
+#endif
 
   {"debugfile", optional_argument, NULL, DEBUGFILE_OPTION},
   {"diversions", required_argument, NULL, DIVERSIONS_OPTION},