Commit | Line | Data |
---|---|---|
d8b5a597 VM |
1 | diff -ruN a/config/Makefile.inc.in b/config/Makefile.inc.in |
2 | --- a/config/Makefile.inc.in 2016-09-09 23:28:18.000000000 +0200 | |
3 | +++ b/config/Makefile.inc.in 2016-11-05 19:43:07.688466668 +0100 | |
4 | @@ -124,12 +124,6 @@ | |
5 | # with usually. Many applications will want to add $(ICULIBS_I18N) as well. | |
6 | ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA) | |
7 | ||
8 | -# Proper echo newline handling is needed in icu-config | |
9 | -ECHO_N=@ICU_ECHO_N@ | |
10 | -ECHO_C=@ICU_ECHO_C@ | |
11 | -# Not currently being used but good to have for proper tab handling | |
12 | -ECHO_T=@ICU_ECHO_T@ | |
13 | - | |
14 | ################################################################## | |
15 | ################################################################## | |
16 | # | |
17 | diff -ruN a/config/icu-config-bottom b/config/icu-config-bottom | |
18 | --- a/config/icu-config-bottom 2016-09-09 23:28:18.000000000 +0200 | |
19 | +++ b/config/icu-config-bottom 2016-11-05 19:49:00.854481361 +0100 | |
20 | @@ -218,65 +218,65 @@ | |
21 | ;; | |
22 | ||
23 | --cflags) | |
24 | - echo $ECHO_N "${CFLAGS} ${ECHO_C}" | |
25 | + printf "%s" "${CFLAGS} " | |
26 | ;; | |
27 | ||
28 | --cc) | |
29 | - echo $ECHO_N "${CC} ${ECHO_C}" | |
30 | + printf "%s" "${CC} " | |
31 | ;; | |
32 | ||
33 | --cxx) | |
34 | - echo $ECHO_N "${CXX} ${ECHO_C}" | |
35 | + printf "%s" "${CXX} " | |
36 | ;; | |
37 | ||
38 | --cxxflags) | |
39 | - echo $ECHO_N "${CXXFLAGS} ${ECHO_C}" | |
40 | + printf "%s" "${CXXFLAGS} " | |
41 | ;; | |
42 | ||
43 | --cppflags) | |
44 | # Don't echo the -I. - it's unneeded. | |
45 | - echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" | sed -e 's/-I. //' | |
46 | + printf "%s" "${CPPFLAGS} " | sed -e 's/-I. //' | |
47 | ;; | |
48 | ||
49 | --cppflags-searchpath) | |
50 | - echo $ECHO_N "-I${prefix}/include ${ECHO_C}" | |
51 | + printf "%s" "-I${prefix}/include " | |
52 | ;; | |
53 | ||
54 | --cppflags-dynamic) | |
55 | - echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}" | |
56 | + printf "%s" "${SHAREDLIBCPPFLAGS} " | |
57 | ;; | |
58 | ||
59 | --cxxflags-dynamic) | |
60 | - echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}" | |
61 | + printf "%s" "${SHAREDLIBCXXFLAGS} " | |
62 | ;; | |
63 | ||
64 | --cflags-dynamic) | |
65 | - echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}" | |
66 | + printf "%s" "${SHAREDLIBCFLAGS} " | |
67 | ;; | |
68 | ||
69 | --ldflags-system) | |
70 | - echo $ECHO_N "${LIBS} ${ECHO_C}" | |
71 | + printf "%s" "${LIBS} " | |
72 | ;; | |
73 | ||
74 | --ldflags) | |
75 | - echo $ECHO_N "${LDFLAGS} ${ICULIBS} ${ECHO_C}" | |
76 | + printf "%s" "${LDFLAGS} ${ICULIBS} " | |
77 | # $RPATH_LDFLAGS | |
78 | ;; | |
79 | ||
80 | --ldflags-libsonly) | |
81 | - echo $ECHO_N "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} ${ECHO_C}" | |
82 | + printf "%s" "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} " | |
83 | ;; | |
84 | ||
85 | --ldflags-icuio) | |
86 | - echo $ECHO_N " ${ICULIBS_ICUIO} ${ECHO_C}" | |
87 | + printf "%s" " ${ICULIBS_ICUIO} " | |
88 | ;; | |
89 | ||
90 | --ldflags-obsolete) | |
91 | - echo $ECHO_N "${ICULIBS_OBSOLETE} ${ECHO_C}" | |
92 | + printf "%s" "${ICULIBS_OBSOLETE} " | |
93 | ;; | |
94 | ||
95 | --ldflags-toolutil) | |
96 | - echo $ECHO_N " ${ICULIBS_TOOLUTIL} ${ECHO_C}" | |
97 | + printf "%s" " ${ICULIBS_TOOLUTIL} " | |
98 | ;; | |
99 | ||
100 | --ldflags-layout) | |
101 | @@ -285,7 +285,7 @@ | |
102 | ;; | |
103 | ||
104 | --ldflags-searchpath) | |
105 | - echo $ECHO_N "-L${libdir} ${ECHO_C}" | |
106 | + printf "%s" "-L${libdir} " | |
107 | ;; | |
108 | ||
109 | --detect-prefix) | |
110 | @@ -321,47 +321,47 @@ | |
111 | ;; | |
112 | ||
113 | --shared-datadir) | |
114 | - echo $ECHO_N "${datadir} ${ECHO_C}" | |
115 | + printf "%s" "${datadir} " | |
116 | ;; | |
117 | ||
118 | --incfile) | |
119 | - echo $ECHO_N "${pkglibdir}/Makefile.inc ${ECHO_C}" | |
120 | + printf "%s" "${pkglibdir}/Makefile.inc " | |
121 | ;; | |
122 | ||
123 | --incpkgdatafile) | |
124 | - echo $ECHO_N "${pkglibdir}/pkgdata.inc ${ECHO_C}" | |
125 | + printf "%s" "${pkglibdir}/pkgdata.inc " | |
126 | ;; | |
127 | ||
128 | --icudata) | |
129 | - echo $ECHO_N "${ICUDATA_NAME} ${ECHO_C}" | |
130 | + printf "%s" "${ICUDATA_NAME} " | |
131 | ;; | |
132 | ||
133 | --icudata-mode) | |
134 | - echo $ECHO_N "${PKGDATA_MODE} ${ECHO_C}" | |
135 | + printf "%s" "${PKGDATA_MODE} " | |
136 | ;; | |
137 | ||
138 | --icudata-install-dir) | |
139 | - echo $ECHO_N "${ICUPKGDATA_DIR} ${ECHO_C}" | |
140 | + printf "%s" "${ICUPKGDATA_DIR} " | |
141 | ;; | |
142 | ||
143 | --icudatadir) | |
144 | - echo $ECHO_N "${ICUDATA_DIR} ${ECHO_C}" | |
145 | + printf "%s" "${ICUDATA_DIR} " | |
146 | ;; | |
147 | ||
148 | --shlib-c) | |
149 | - echo $ECHO_N "${SHLIB_c} ${ECHO_C}" | |
150 | + printf "%s" "${SHLIB_c} " | |
151 | ;; | |
152 | ||
153 | --shlib-cc) | |
154 | - echo $ECHO_N "${SHLIB_cc} ${ECHO_C}" | |
155 | + printf "%s" "${SHLIB_cc} " | |
156 | ;; | |
157 | ||
158 | --version) | |
159 | - echo $ECHO_N $VERSION | |
160 | + printf "%s" "$VERSION" | |
161 | ;; | |
162 | ||
163 | --unicode-version) | |
164 | - echo $ECHO_N $UNICODE_VERSION | |
165 | + printf "%s" "$UNICODE_VERSION" | |
166 | ;; | |
167 | ||
168 | --host) | |
169 | diff -ruN a/configure.ac b/configure.ac | |
170 | --- a/configure.ac 2016-10-04 21:30:20.000000000 +0200 | |
171 | +++ b/configure.ac 2016-11-05 19:43:07.688466668 +0100 | |
172 | @@ -22,24 +22,6 @@ | |
173 | PACKAGE="icu" | |
174 | AC_SUBST(PACKAGE) | |
175 | ||
176 | -# Use custom echo test for newline option | |
177 | -# Current autoconf (2.65) gives incorrect echo newline option | |
178 | -# for icu-config | |
179 | -# This may be removed later - mow (June 17, 2010) | |
180 | -ICU_ECHO_C= ICU_ECHO_N= ICU_ECHO_T= | |
181 | -case `/bin/sh -c "echo -n x"` in | |
182 | --n*) | |
183 | - case `/bin/sh -c "echo 'x\c'"` in | |
184 | - *c*) ICU_ECHO_T=' ';; # ECHO_T is single tab character. | |
185 | - *) ICU_ECHO_C='\c';; | |
186 | - esac;; | |
187 | -*) | |
188 | - ICU_ECHO_N='-n';; | |
189 | -esac | |
190 | -AC_SUBST(ICU_ECHO_N) | |
191 | -AC_SUBST(ICU_ECHO_C) | |
192 | -AC_SUBST(ICU_ECHO_T) | |
193 | - | |
194 | AC_MSG_CHECKING(for ICU version numbers) | |
195 | ||
196 | # Get the ICU version from uversion.h or other headers | |
197 | diff -ruN a/icudefs.mk.in b/icudefs.mk.in | |
198 | --- a/icudefs.mk.in 2016-09-09 23:28:18.000000000 +0200 | |
199 | +++ b/icudefs.mk.in 2016-11-05 19:43:07.688466668 +0100 | |
200 | @@ -157,11 +157,6 @@ | |
201 | ENABLE_STATIC = @ENABLE_STATIC@ | |
202 | ENABLE_SHARED = @ENABLE_SHARED@ | |
203 | ||
204 | -# Echo w/o newline | |
205 | - | |
206 | -#ECHO_N = @ICU_ECHO_N@ | |
207 | -#ECHO_C = @ICU_ECHO_C@ | |
208 | - | |
209 | # Commands to compile | |
210 | COMPILE.c= $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c | |
211 | COMPILE.cc= $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c | |
212 | diff -ruN a/test/hdrtst/Makefile.in b/test/hdrtst/Makefile.in | |
213 | --- a/test/hdrtst/Makefile.in 2016-09-28 06:17:24.000000000 +0200 | |
214 | +++ b/test/hdrtst/Makefile.in 2016-11-05 19:43:07.688466668 +0100 | |
215 | @@ -35,9 +35,6 @@ | |
216 | include $(shell icu-config --incfile) | |
217 | DIRS=$(prefix)/include/unicode | |
218 | LDIRS=$(prefix)/include/layout | |
219 | -ECHO_T=@ECHO_T@ | |
220 | -ECHO_C=@ECHO_C@ | |
221 | -ECHO_N=@ECHO_N@ | |
222 | ||
223 | all: | |
224 | @echo Please read this Makefile for more information. |