From: David Levine <levinedl@acm.org>
Date: Wed, 23 Oct 2013 03:54:08 +0000 (-0500)
Subject: Reverted commit 9caa7da143644ed93c6ba6351f48fa1327ad4392
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/ec12e432ab4d26e9fe77e7317be7fd7e364d0997?ds=sidebyside;hp=--cc

Reverted commit 9caa7da143644ed93c6ba6351f48fa1327ad4392
because it didn't solve the problem on Solaris, and
apparently broke test-comp-format, though I don't see how.
---

ec12e432ab4d26e9fe77e7317be7fd7e364d0997
diff --git a/configure.ac b/configure.ac
index f1142f92..fac9b91b 100644
--- 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,18 +556,6 @@ 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=\
-'; printf "%s\n" '\''1,$$s/\(	\)int i;/\1yy_size_t i;/'\'' w q | ed -s $@']])
-       AC_SUBST([LFLAGS])])
-
 dnl --------------
 dnl CHECK TYPEDEFS
 dnl --------------
diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh
index adc6e1cb..ef399f86 100755
--- a/docs/contrib/build_nmh
+++ b/docs/contrib/build_nmh
@@ -307,14 +307,15 @@ if [ $status -eq 0 ]; then
   fi
 fi
 
-grep Error "$logfile"
-grep warn "$logfile"
-
-if [ $status -eq 0 ]; then
-  [ $verbose -ge 1 ]  &&  echo build completed successfully
-else
+grep 'Error' "$logfile"
+#### Ignore the warning when sbr/dtimep.c is built with flex 2.5.36
+#### or 2.5.37.
+grep 'warn' "$logfile" | \
+  grep -v 'sbr/dtimep.c:.*comparison between signed and unsigned'
+if [ $status -ne 0 ]; then
   echo build failed!
   echo build log is in "$logfile"
 fi
+[ $status -eq 0  -a  $verbose -ge 1 ]  &&  echo build completed successfully
 
 exit $status