Do not use yywrap (ticket #42)

Our scanners do not really use yywrap.  Explicitly disable yywrap
so that no references to yywrap will be generated and no LEXLIB
would be needed.

* conf/pam_conv1/Makefile.am (pam_conv1_LDADD): Remove.
* conf/pam_conv1/pam_conv_l.l: Enable noyywrap option.
* doc/specs/Makefile.am (padout_LDADD): Remove.
* doc/specs/parse_l.l: Enable noyywrap option.

diff --git a/conf/pam_conv1/Makefile.am b/conf/pam_conv1/Makefile.am
index b9e6153f791ec79545ccd1b4d3aa0e6f40081870..ce50b68634fd4cac1bef4bdf74b65d4b34e876d7 100644 (file)
--- a/conf/pam_conv1/Makefile.am
+++ b/conf/pam_conv1/Makefile.am
@@ -13,5 +13,3 @@ BUILT_SOURCES = pam_conv_y.h
 noinst_PROGRAMS = pam_conv1
 
 pam_conv1_SOURCES = pam_conv_l.l pam_conv_y.y
-
-pam_conv1_LDADD = @LEXLIB@

diff --git a/conf/pam_conv1/pam_conv_l.l b/conf/pam_conv1/pam_conv_l.l
index 25b67108501b3223dacfd503c32121991dc1fc18..f563eeed712c65838fbaec25c2cbef5674c90a2d 100644 (file)
--- a/conf/pam_conv1/pam_conv_l.l
+++ b/conf/pam_conv1/pam_conv_l.l
@@ -24,6 +24,7 @@
     extern int current_line;
 %}
 
+%option noyywrap
 %%
 
 "#"[^\n]*         ; /* skip comments (sorry) */

diff --git a/doc/specs/Makefile.am b/doc/specs/Makefile.am
index 26882207664a7aee91e9548961ffc79cd55cf17b..36d53baf3d4e60862f62b1a89efa07bdb68c82ce 100644 (file)
--- a/doc/specs/Makefile.am
+++ b/doc/specs/Makefile.am
@@ -21,6 +21,4 @@ noinst_PROGRAMS = padout
 
 padout_SOURCES = parse_l.l parse_y.y
 
-padout_LDADD = @LEXLIB@
-
 doc_DATA = draft-morgan-pam-current.txt rfc86.0.txt

diff --git a/doc/specs/parse_l.l b/doc/specs/parse_l.l
index 7cab424c3e4e53c98542daaf661920669a214dab..d8400a072cd1182c0e7ca36b6738ead7505e8ec5 100644 (file)
--- a/doc/specs/parse_l.l
+++ b/doc/specs/parse_l.l
@@ -8,6 +8,7 @@
 #include "parse_y.h"
 %}
 
+%option noyywrap
 %%
 
 \#[\$]+[a-zA-Z]*(\=[0-9]+)?          return NEW_COUNTER;