Import from OpenBSD a patch which eliminates the link with -ly or -ly

patch by ibara@

Obtained from:	OpenBSD

diff --git a/usr.bin/m4/Makefile b/usr.bin/m4/Makefile
index a25995cb9fd634821d4f1430622824aa86fbd345..e722d014eebf834648d7bb74487abe4bbd7bd1c7 100644 (file)
--- a/usr.bin/m4/Makefile
+++ b/usr.bin/m4/Makefile
@@ -8,7 +8,7 @@
 
 PROG=  m4
 CFLAGS+=-DEXTENDED -I${.CURDIR} -I${SRCTOP}/lib/libopenbsd
-LIBADD=        y l m openbsd
+LIBADD=        m openbsd
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 

diff --git a/usr.bin/m4/tokenizer.l b/usr.bin/m4/tokenizer.l
index 593b57de7133c033cc223994a26a037aa92916b4..1ce8201e849a091531860abb98ab423c7a83b1b8 100644 (file)
--- a/usr.bin/m4/tokenizer.l
+++ b/usr.bin/m4/tokenizer.l
@@ -43,6 +43,8 @@ oct   0[0-7]*
 dec    [1-9][0-9]*
 radix  0[rR][0-9]+:[0-9a-zA-Z]+
 
+%option noyywrap
+
 %%
 {ws}                   {/* just skip it */}
 {hex}|{oct}|{dec}      { yylval = number(); return(NUMBER); }