2 +++ libs/configure 2007-02-07 12:21:24.000000000 +0000
3 @@ -2976,11 +2976,11 @@
8 + OLD_CPPFLAGS=$CPPFLAGS
11 LDFLAGS="$LDFLAGS $EXTRA_ICU_LIBDIR"
12 - CPP="$CPP $EXTRA_ICU_INCLUDE"
13 + CPPFLAGS="$CPPFLAGS $EXTRA_ICU_INCLUDE -include urename.h"
15 if test "$with_system_icu" = yes; then
16 echo $ac_n "checking for ubidi_open in -licuuc""... $ac_c" 1>&6
22 + CPPFLAGS=$OLD_CPPFLAGS
25 if test "$with_system_icu" != yes; then
26 --- libs/icu-xetex/icu-xetex.ac
27 +++ libs/icu-xetex/icu-xetex.ac 2007-02-07 12:21:39.000000000 +0000
33 + OLD_CPPFLAGS=$CPPFLAGS
36 LDFLAGS="$LDFLAGS $EXTRA_ICU_LIBDIR"
37 - CPP="$CPP $EXTRA_ICU_INCLUDE"
38 + CPPFLAGS="$CPPFLAGS $EXTRA_ICU_INCLUDE -include urename.h"
40 if test "$with_system_icu" = yes; then
41 AC_CHECK_LIB(icuuc, ubidi_open,,
47 + CPPFLAGS=$OLD_CPPFLAGS
50 if test "$with_system_icu" != yes; then
51 --- texk/web2c/configure
52 +++ texk/web2c/configure 2007-02-07 12:21:55.000000000 +0000
53 @@ -3018,11 +3018,11 @@
58 + OLD_CPPFLAGS=$CPPFLAGS
61 LDFLAGS="$LDFLAGS $EXTRA_ICU_LIBDIR"
62 - CPP="$CPP $EXTRA_ICU_INCLUDE"
63 + CPPFLAGS="$CPPFLAGS $EXTRA_ICU_INCLUDE -include urename.h"
65 if test "$with_system_icu" = yes; then
66 echo $ac_n "checking for ubidi_open in -licuuc""... $ac_c" 1>&6
72 + CPPFLAGS=$OLD_CPPFLAGS
75 if test "$with_system_icu" != yes; then
77 +++ configure 2007-02-07 12:22:06.000000000 +0000
78 @@ -4662,11 +4662,11 @@
83 + OLD_CPPFLAGS=$CPPFLAGS
86 LDFLAGS="$LDFLAGS $EXTRA_ICU_LIBDIR"
87 - CPP="$CPP $EXTRA_ICU_INCLUDE"
88 + CPPFLAGS="$CPPFLAGS $EXTRA_ICU_INCLUDE -include urename.h"
90 if test "$with_system_icu" = yes; then
91 echo $ac_n "checking for ubidi_open in -licuuc""... $ac_c" 1>&6
97 + CPPFLAGS=$OLD_CPPFLAGS
100 if test "$with_system_icu" != yes; then