* Makefile.in (.l.c): Modify rule for compatibility with recent

versions of flex, and remove most command-line options.
* ada-lex.l: Add %options line in place of -I -i and -s command-line
options.

gdb/ChangeLog

@@ -1,3 +1,10 @@
+2004-10-03  Paul Hilfinger  <hilfingr@nile.gnat.com>
+
+	* Makefile.in (.l.c): Modify rule for compatibility with recent
+	versions of flex, and remove most command-line options.
+	* ada-lex.l: Add %options line in place of -I -i and -s command-line
+	options.
+
 2004-10-02  Paul N. Hilfinger  <Hilfinger@gnat.com>
 
         Turn on initial Ada support (mainly expression evaluation).

gdb/Makefile.in

@@ -1583,8 +1583,8 @@ po/$(PACKAGE).pot: force
 	mv $@.new ./$*.c
 .l.c:
 	@if [ "$(FLEX)" ] && $(FLEX) --version >/dev/null 2>&1; then \
-	    echo $(FLEX) -Isit $< ">" $@; \
-	    $(FLEX) -Isit $< > $@; \
+	    echo $(FLEX) -o$@ $<; \
+	    $(FLEX) -o$@ $<; \
 	elif [ ! -f $@ -a ! -f $< ]; then \
 	    echo "$< missing and flex not available."; \
 	    false; \

gdb/ada-lex.l

@@ -26,9 +26,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* each successive token and places a semantic value into yylval */
 /* (ada-lval), defined by the parser.   */
 
-/* Run flex with (at least) the -i option (case-insensitive), and the -I */
-/* option (interactive---no unnecessary lookahead).  */
-
 DIG	[0-9]
 NUM10	({DIG}({DIG}|_)*)
 HEXDIG	[0-9a-f]
@@ -89,6 +86,8 @@ static int find_dot_all (const char *);
 
 %}
 
+%option case-insensitive interactive nodefault
+
 %s IN_STRING BEFORE_QUAL_QUOTE
 
 %%