Since we're depending on %option noyywrap in the main scanner now,

we may as well use it in all our flex files.  Make all the flex files
have a consistent set of options.

contrib/cube/cubescan.l

@@ -10,8 +10,6 @@
 #include "cubeparse.h"
 #include "buffer.h"
 
-#define YY_NO_UNPUT 1
-#undef  yywrap
 
 /* flex screws a couple symbols when used with the -P otion; fix those */
 #define YY_DECL int cube_yylex YY_PROTO(( void )); \
@@ -28,6 +26,12 @@ int cube_yylex YY_PROTO(( void ))
 void cube_flush_scanner_buffer(void); 
 %}
 
+%option 8bit
+%option never-interactive
+%option nounput
+%option noyywrap
+
+
 n            [0-9]+
 integer      [+-]?{n}
 real         [+-]?({n}\.{n}?)|(\.{n})

contrib/seg/segscan.l

@@ -8,8 +8,6 @@
 #include "segparse.h"
 #include "buffer.h"
 
-#define YY_NO_UNPUT 1
-#undef  yywrap
 
 /* flex screws a couple symbols when used with the -P otion; fix those */
 #define YY_DECL int seg_yylex YY_PROTO(( void )); \
@@ -27,6 +25,12 @@ int seg_yylex YY_PROTO(( void ))
 void seg_flush_scanner_buffer(void); 
 %}
 
+%option 8bit
+%option never-interactive
+%option nounput
+%option noyywrap
+
+
 range        (\.\.)(\.)?
 plumin       (\'\+\-\')|(\(\+\-)\)
 integer      [+-]?[0-9]+

contrib/tsearch/parser.l

@@ -50,9 +50,14 @@ int bytestoread = 0;	/* for limiting read from filehandle */
 		} \
 	}
 
-#define YY_NO_UNPUT
 %}
 
+%option 8bit
+%option never-interactive
+%option nounput
+%option noyywrap
+
+
 /* parser's state for parsing defis-word */
 %x DELIM  
 /* parser's state for parsing URL*/
@@ -289,10 +294,6 @@ ftp"://"        {
 
 %%
 
-int tsearch_yywrap(void) {
-	return 1;
-}
-
 /* clearing after parsing from string */
 void end_parse() {
 	if (s) { free(s); s=NULL; }