Added back an enhanced hack to configure.ac to try to diagnose

the flex 2.5.36/.36 bug workaround.  Changed test-dist a bit
to help isolate where it just failed.  (My last commit message
was incorrect:  it was test-dist that failed, not test-comp-format.)

diff --git a/configure.ac b/configure.ac
index fac9b91bd590fc61cbc40834c7aad47ebd619e59..9176d3c41ae5e9dcd8c4d31a3b71ae1b98eb9ccc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -235,7 +235,7 @@ AC_PATH_PROG([sendmailpath], [sendmail], [/usr/sbin/sendmail], [$pathtmp])
 dnl Cygwin FAT filesystems do not support hard links.  So default to
 dnl cp instead, even if running on an NTFS or other filesystem.
 AS_CASE(["$host_os"],
-  [cygwin*],[LN=cp],
+  [cygwin*], [LN=cp],
   [LN=ln])
 AC_SUBST([LN])
 
@@ -556,6 +556,18 @@ dnl Now put the libraries back to what it was before we
 dnl starting checking the termcap library.
 LIBS="$nmh_save_LIBS"
 
+dnl ----------------
+dnl CHECK FLEX FIXUP
+dnl ----------------
+dnl Use LFLAGS make variable setting to work around bug in flex
+dnl 2.5.36 and .37 that causes signed/unsigned mismatch,
+dnl http://sourceforge.net/p/flex/bugs/140/
+AS_IF([test "$LEX" = flex],
+      [AS_CASE([`$LEX -V`],
+               [flex\ 2.5.3@<:@67@:>@], [[LFLAGS=\
+'; flex -V; cp -p $@ $@.ORIGINAL; printf "%s\n" '\''1,$$s/\(   \)int i;/\1yy_size_t i;/'\'' w q | ed -s $@; diff $@ $@.ORIGINAL || true']])
+       AC_SUBST([LFLAGS])])
+
 dnl --------------
 dnl CHECK TYPEDEFS
 dnl --------------

diff --git a/test/dist/test-dist b/test/dist/test-dist
index ca6a70b1e2b665df749f1ffd37418bc2601d8cc2..c5182afaf8b55c72b19aa095cdbe17bbd53265e4 100755 (executable)
--- a/test/dist/test-dist
+++ b/test/dist/test-dist
@@ -247,21 +247,21 @@ EOF
 
   # check -inplace
   # Hard link the message and verify that the new one does get annotated.
-  ln "${MH_TEST_DIR}/Mail/inbox/8" "${MH_TEST_DIR}/Mail/inbox/8.link"
+  ln "${MH_TEST_DIR}/Mail/inbox/9" "${MH_TEST_DIR}/Mail/inbox/9.link"
   cat >"$expected" <<EOF
-From: Test8 <test8@example.com>
+From: Test9 <test9@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
-Message-Id: 8@test.nmh
-Subject: Testing message 8
+Message-Id: 9@test.nmh
+Subject: Testing message 9
 Resent-From: ${localmbox}
 Resent-To: somebody@example.com
 Resent-Date:
 
-This is message number 8
+This is message number 9
 EOF
-  test_dist 8 -noedit -to somebody@example.com -annotate -noinplace -inplace
-  check "${MH_TEST_DIR}/Mail/inbox/8" "${MH_TEST_DIR}/Mail/inbox/8.link"
+  test_dist 9 -noedit -to somebody@example.com -annotate -noinplace -inplace
+  check "${MH_TEST_DIR}/Mail/inbox/9" "${MH_TEST_DIR}/Mail/inbox/9.link"
 fi
 
 # check -draftfolder