File source-icu.dif of Package texlive

--- libs/configure
+++ libs/configure	2008-09-24 14:20:14.000000000 +0000
@@ -7037,11 +7037,11 @@ else
   fi
 
   OLD_LDFLAGS=$LDFLAGS
-  OLD_CPP=$CPP
+  OLD_CPPFLAGS=$CPPFLAGS
   OLD_LIBS=$LIBS
 
   LDFLAGS="$LDFLAGS $EXTRA_ICU_LIBDIR"
-  CPP="$CPP $EXTRA_ICU_INCLUDE"
+  CPPFLAGS="$CPPFLAGS $EXTRA_ICU_INCLUDE -include urename.h"
 
   if test x"$with_system_icu" = xyes; then
 
@@ -7279,7 +7279,7 @@ $as_echo "$as_me: WARNING: ubidi.h not f
   fi
 
   LDFLAGS=$OLD_LDFLAGS
-  CPP=$OLD_CPP
+  CPPFLAGS=$OLD_CPPFLAGS
   LIBS=$OLD_LIBS
 
   if test x"$with_system_icu" != xyes; then
--- libs/icu-xetex/icu-xetex.ac
+++ libs/icu-xetex/icu-xetex.ac	2008-09-24 14:20:14.000000000 +0000
@@ -16,11 +16,11 @@ else
   fi
 
   OLD_LDFLAGS=$LDFLAGS
-  OLD_CPP=$CPP
+  OLD_CPPFLAGS=$CPPFLAGS
   OLD_LIBS=$LIBS
 
   LDFLAGS="$LDFLAGS $EXTRA_ICU_LIBDIR"
-  CPP="$CPP $EXTRA_ICU_INCLUDE"
+  CPPFLAGS="$CPPFLAGS $EXTRA_ICU_INCLUDE -include urename.h"
 
   if test x"$with_system_icu" = xyes; then
     AC_CHECK_LIB(icuuc, ubidi_open,,
@@ -37,7 +37,7 @@ else
   fi
 
   LDFLAGS=$OLD_LDFLAGS
-  CPP=$OLD_CPP
+  CPPFLAGS=$OLD_CPPFLAGS
   LIBS=$OLD_LIBS
 
   if test x"$with_system_icu" != xyes; then
--- texk/web2c/configure
+++ texk/web2c/configure	2008-09-24 14:20:14.000000000 +0000
@@ -6930,11 +6930,11 @@ else
   fi
 
   OLD_LDFLAGS=$LDFLAGS
-  OLD_CPP=$CPP
+  OLD_CPPFLAGS=$CPPFLAGS
   OLD_LIBS=$LIBS
 
   LDFLAGS="$LDFLAGS $EXTRA_ICU_LIBDIR"
-  CPP="$CPP $EXTRA_ICU_INCLUDE"
+  CPPFLAGS="$CPPFLAGS $EXTRA_ICU_INCLUDE -include urename.h"
 
   if test x"$with_system_icu" = xyes; then
 
@@ -7172,7 +7172,7 @@ $as_echo "$as_me: WARNING: ubidi.h not f
   fi
 
   LDFLAGS=$OLD_LDFLAGS
-  CPP=$OLD_CPP
+  CPPFLAGS=$OLD_CPPFLAGS
   LIBS=$OLD_LIBS
 
   if test x"$with_system_icu" != xyes; then
--- configure
+++ configure	2008-09-24 14:20:14.000000000 +0000
@@ -9307,11 +9307,11 @@ else
   fi
 
   OLD_LDFLAGS=$LDFLAGS
-  OLD_CPP=$CPP
+  OLD_CPPFLAGS=$CPPFLAGS
   OLD_LIBS=$LIBS
 
   LDFLAGS="$LDFLAGS $EXTRA_ICU_LIBDIR"
-  CPP="$CPP $EXTRA_ICU_INCLUDE"
+  CPPFLAGS="$CPPFLAGS $EXTRA_ICU_INCLUDE -include urename.h"
 
   if test x"$with_system_icu" = xyes; then
 
@@ -9549,7 +9549,7 @@ $as_echo "$as_me: WARNING: ubidi.h not f
   fi
 
   LDFLAGS=$OLD_LDFLAGS
-  CPP=$OLD_CPP
+  CPPFLAGS=$OLD_CPPFLAGS
   LIBS=$OLD_LIBS
 
   if test x"$with_system_icu" != xyes; then