Index: config/gen/icu.pl
--- config/gen/icu.pl.orig	2005-05-13 22:49:11 +0200
+++ config/gen/icu.pl	2005-07-03 20:13:35 +0200
@@ -67,7 +67,7 @@
       if (defined $icuheaders) {
         chomp $icuheaders;
         $without = 1 unless -d $icuheaders;
-        $icuheaders .= "${slash}include";
+        $icuheaders .= "${slash}include/icu";
         $without = 1 unless -d $icuheaders;
       }
 
Index: config/gen/makefiles/CFLAGS.in
--- config/gen/makefiles/CFLAGS.in.orig	2005-06-15 10:00:09 +0200
+++ config/gen/makefiles/CFLAGS.in	2005-07-03 20:13:35 +0200
@@ -5,6 +5,8 @@
 #
 # Note, empty regex/options are just ignored.
 #
+ops/core_ops_switch.c -{-O2} # workaround GCC 3.4.3 optimizer problems
+ops/core_ops_cgp.c    -{-O2} # workaround GCC 3.4.3 optimizer problems
 src/spf_render.c -{-Wformat-nonliteral}   # noisy
 src/tsq.c        -{${optimize}}           # never optimize tsq.c!
 ops/core_ops_cg.c   -{${optimize}}       # takes too long
Index: imcc/imcc.l
--- imcc/imcc.l.orig	2005-06-15 21:43:08 +0200
+++ imcc/imcc.l	2005-07-03 20:16:46 +0200
@@ -80,6 +80,7 @@
 
 %option never-interactive
 %option stack
+%option array
 
 LETTER          [a-zA-Z_@]
 DIGIT           [0-9]