]>
Commit | Line | Data |
---|---|---|
768e5264 AM |
1 | --- libs/configure |
2 | +++ libs/configure 2007-02-07 12:21:24.000000000 +0000 | |
3 | @@ -2976,11 +2976,11 @@ | |
4 | fi | |
5 | ||
6 | OLD_LDFLAGS=$LDFLAGS | |
7 | - OLD_CPP=$CPP | |
8 | + OLD_CPPFLAGS=$CPPFLAGS | |
9 | OLD_LIBS=$LIBS | |
10 | ||
11 | LDFLAGS="$LDFLAGS $EXTRA_ICU_LIBDIR" | |
12 | - CPP="$CPP $EXTRA_ICU_INCLUDE" | |
13 | + CPPFLAGS="$CPPFLAGS $EXTRA_ICU_INCLUDE -include urename.h" | |
14 | ||
15 | if test "$with_system_icu" = yes; then | |
16 | echo $ac_n "checking for ubidi_open in -licuuc""... $ac_c" 1>&6 | |
17 | @@ -3082,7 +3082,7 @@ | |
18 | fi | |
19 | ||
20 | LDFLAGS=$OLD_LDFLAGS | |
21 | - CPP=$OLD_CPP | |
22 | + CPPFLAGS=$OLD_CPPFLAGS | |
23 | LIBS=$OLD_LIBS | |
24 | ||
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 | |
28 | @@ -16,11 +16,11 @@ | |
29 | fi | |
30 | ||
31 | OLD_LDFLAGS=$LDFLAGS | |
32 | - OLD_CPP=$CPP | |
33 | + OLD_CPPFLAGS=$CPPFLAGS | |
34 | OLD_LIBS=$LIBS | |
35 | ||
36 | LDFLAGS="$LDFLAGS $EXTRA_ICU_LIBDIR" | |
37 | - CPP="$CPP $EXTRA_ICU_INCLUDE" | |
38 | + CPPFLAGS="$CPPFLAGS $EXTRA_ICU_INCLUDE -include urename.h" | |
39 | ||
40 | if test "$with_system_icu" = yes; then | |
41 | AC_CHECK_LIB(icuuc, ubidi_open,, | |
42 | @@ -37,7 +37,7 @@ | |
43 | fi | |
44 | ||
45 | LDFLAGS=$OLD_LDFLAGS | |
46 | - CPP=$OLD_CPP | |
47 | + CPPFLAGS=$OLD_CPPFLAGS | |
48 | LIBS=$OLD_LIBS | |
49 | ||
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 @@ | |
54 | fi | |
55 | ||
56 | OLD_LDFLAGS=$LDFLAGS | |
57 | - OLD_CPP=$CPP | |
58 | + OLD_CPPFLAGS=$CPPFLAGS | |
59 | OLD_LIBS=$LIBS | |
60 | ||
61 | LDFLAGS="$LDFLAGS $EXTRA_ICU_LIBDIR" | |
62 | - CPP="$CPP $EXTRA_ICU_INCLUDE" | |
63 | + CPPFLAGS="$CPPFLAGS $EXTRA_ICU_INCLUDE -include urename.h" | |
64 | ||
65 | if test "$with_system_icu" = yes; then | |
66 | echo $ac_n "checking for ubidi_open in -licuuc""... $ac_c" 1>&6 | |
67 | @@ -3124,7 +3124,7 @@ | |
68 | fi | |
69 | ||
70 | LDFLAGS=$OLD_LDFLAGS | |
71 | - CPP=$OLD_CPP | |
72 | + CPPFLAGS=$OLD_CPPFLAGS | |
73 | LIBS=$OLD_LIBS | |
74 | ||
75 | if test "$with_system_icu" != yes; then | |
76 | --- configure | |
77 | +++ configure 2007-02-07 12:22:06.000000000 +0000 | |
78 | @@ -4662,11 +4662,11 @@ | |
79 | fi | |
80 | ||
81 | OLD_LDFLAGS=$LDFLAGS | |
82 | - OLD_CPP=$CPP | |
83 | + OLD_CPPFLAGS=$CPPFLAGS | |
84 | OLD_LIBS=$LIBS | |
85 | ||
86 | LDFLAGS="$LDFLAGS $EXTRA_ICU_LIBDIR" | |
87 | - CPP="$CPP $EXTRA_ICU_INCLUDE" | |
88 | + CPPFLAGS="$CPPFLAGS $EXTRA_ICU_INCLUDE -include urename.h" | |
89 | ||
90 | if test "$with_system_icu" = yes; then | |
91 | echo $ac_n "checking for ubidi_open in -licuuc""... $ac_c" 1>&6 | |
92 | @@ -4768,7 +4768,7 @@ | |
93 | fi | |
94 | ||
95 | LDFLAGS=$OLD_LDFLAGS | |
96 | - CPP=$OLD_CPP | |
97 | + CPPFLAGS=$OLD_CPPFLAGS | |
98 | LIBS=$OLD_LIBS | |
99 | ||
100 | if test "$with_system_icu" != yes; then |