we're using m4 so have configure test for it

diff --git a/Makefile.am b/Makefile.am
index f8f9f5c3e9ecadd03a90dfda883587197cf7c940..b4abd8953d840147a5df4c9f7578c2d27e8ac858 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,6 +36,7 @@
 YFLAGS = -d
 ACLOCAL_AMFLAGS = -I m4
 help2man = @HELP2MAN@
+m4 = @M4@
 
 AUTOMAKE_OPTIONS = \
        readme-alpha \
@@ -123,7 +124,7 @@ INCLUDES = -DLOCALEDIR=\"$(localedir)\" -I@includedir@
 LIBS = @LIBINTL@ @LIBS@
 
 skel.c: flex.skl mkskel.sh
-       m4 -P $(srcdir)/flex.skl | $(SHELL) $(srcdir)/mkskel.sh  >skel.c
+       $(m4) -P $(srcdir)/flex.skl | $(SHELL) $(srcdir)/mkskel.sh  >skel.c
 
 $(man_MANS): $(srcdir)/main.c
        for i in $(man_MANS) ; do \

diff --git a/NEWS b/NEWS
index 3dcd4d344a3c45dc696d3289b5c83eda392f7eb3..377f56e963cea8d7f579dd0941e043ea9d0e3a19 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ See the file COPYING for copying conditions.
 
 * after version 2.5.14
 
+** skeleton now processed by m4 before mkskel.sh; (this only matters
+   if you want to change the skeleton or if you're doing flex development)
+
 ** zh_cn translation added from translation project
 
 ** a bug that caused a segfault has now been fixed

diff --git a/configure.in b/configure.in
index 66f3fa6cacbc58680d9a54bd80c34d0d62aa51c6..d8cc7a7127c31bb93eb22873735ba57eb00d4911 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -37,6 +37,7 @@ AC_PROG_CC
 
 AC_PROG_RANLIB
 AC_PATH_PROG(HELP2MAN, help2man, $srcdir/missing)
+AC_PATH_PROG(M4, m4, $srcdir/missing)
 
 AC_C_CONST
 AC_TYPE_SIZE_T