# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: ../mainline/
# testament_sha1: 17c53cb32b2ada427e1473f89ea6ffa5ab86d61d
# timestamp: 2010-04-06 14:39:32 +0530
# base_revision_id: address@hidden
#   b0p34f2l1in9kjhn
# 
# Begin patch
=== modified file 'conf/common.rmk'
--- conf/common.rmk	2010-03-28 20:20:32 +0000
+++ conf/common.rmk	2010-04-06 09:09:11 +0000
@@ -653,7 +653,7 @@
 # For sh.mod.
 sh_mod_SOURCES = script/main.c script/script.c script/execute.c \
 	script/function.c script/lexer.c grub_script.tab.c grub_script.yy.c
-sh_mod_CFLAGS = $(COMMON_CFLAGS) $(POSIX_CFLAGS)
+sh_mod_CFLAGS = $(COMMON_CFLAGS) $(POSIX_CFLAGS) -Wno-error
 sh_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 ifneq (, $(FONT_SOURCE))

=== modified file 'configure.ac'
--- configure.ac	2010-03-14 16:50:55 +0000
+++ configure.ac	2010-04-06 09:09:11 +0000
@@ -170,11 +170,6 @@
   AC_MSG_ERROR([cmp is not found])
 fi
 
-AC_CHECK_PROGS([LEX], [flex])
-if test "x$LEX" = x; then
-  AC_MSG_ERROR([flex is not found])
-fi
-
 AC_CHECK_PROGS([YACC], [bison])
 if test "x$YACC" = x; then
   AC_MSG_ERROR([bison is not found])
@@ -188,10 +183,23 @@
 done
 
 AC_PROG_INSTALL
+AC_PROG_SED
 AC_PROG_AWK
+AC_PROG_LEX
 AC_PROG_MAKE_SET
 AC_PROG_MKDIR_P
 
+if test "x$LEX" = x; then
+  AC_MSG_ERROR([flex is not found])
+else
+  version=`$LEX --version 2>/dev/null | $SED -e 's/flex//' -e 's/version//' | $AWK -F "." '{ printf "%d", $1 * 10000 + $2 * 100 + $3;}'`
+  if test -n "$version" -a "$version" -ge 20535; then
+    :
+  else
+    AC_MSG_ERROR([flex is too old. GRUB requires 2.5.35 or above])
+  fi
+fi
+
 # These are not a "must".
 AC_PATH_PROG(RUBY, ruby)
 AC_PATH_PROG(MAKEINFO, makeinfo)

=== modified file 'script/yylex.l'
--- script/yylex.l	2010-03-28 20:20:32 +0000
+++ script/yylex.l	2010-04-06 09:09:11 +0000
@@ -86,12 +86,6 @@
 #define exit(...)
 #endif
 
-#pragma GCC diagnostic warning "-Wunused-variable"
-#pragma GCC diagnostic warning "-Wunused-function"
-#pragma GCC diagnostic warning "-Wunused-parameter"
-#pragma GCC diagnostic warning "-Wstrict-prototypes"
-#pragma GCC diagnostic warning "-Wmissing-prototypes"
-
 }
 
 %option ecs

# Begin bundle
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
3FuNyU5KExgYR4r3F3JFOFCQ1JdUEQ==