diff options
Diffstat (limited to 'recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch')
-rw-r--r-- | recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch | 720 |
1 files changed, 720 insertions, 0 deletions
diff --git a/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch b/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch new file mode 100644 index 0000000..d921069 --- /dev/null +++ b/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch | |||
@@ -0,0 +1,720 @@ | |||
1 | |||
2 | # Pulled from OpenEmbedded | ||
3 | # | ||
4 | # Commented by: Saul Wold <saul.wold@intel.com> | ||
5 | |||
6 | Upstream-Status: Inappropriate [licensing] | ||
7 | |||
8 | Index: gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4 | ||
9 | =================================================================== | ||
10 | --- gettext-0.16.1.orig/autoconf-lib-link/m4/lib-link.m4 2006-11-27 09:01:58.000000000 -0800 | ||
11 | +++ gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4 2011-03-17 00:36:08.710836720 -0700 | ||
12 | @@ -6,12 +6,14 @@ | ||
13 | |||
14 | dnl From Bruno Haible. | ||
15 | |||
16 | -AC_PREREQ(2.50) | ||
17 | +AC_PREREQ(2.54) | ||
18 | |||
19 | dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and | ||
20 | dnl the libraries corresponding to explicit and implicit dependencies. | ||
21 | dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and | ||
22 | dnl augments the CPPFLAGS variable. | ||
23 | +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname | ||
24 | +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. | ||
25 | AC_DEFUN([AC_LIB_LINKFLAGS], | ||
26 | [ | ||
27 | AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | ||
28 | @@ -24,13 +26,16 @@ | ||
29 | ac_cv_lib[]Name[]_libs="$LIB[]NAME" | ||
30 | ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" | ||
31 | ac_cv_lib[]Name[]_cppflags="$INC[]NAME" | ||
32 | + ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" | ||
33 | ]) | ||
34 | LIB[]NAME="$ac_cv_lib[]Name[]_libs" | ||
35 | LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" | ||
36 | INC[]NAME="$ac_cv_lib[]Name[]_cppflags" | ||
37 | + LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" | ||
38 | AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) | ||
39 | AC_SUBST([LIB]NAME) | ||
40 | AC_SUBST([LTLIB]NAME) | ||
41 | + AC_SUBST([LIB]NAME[_PREFIX]) | ||
42 | dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the | ||
43 | dnl results of this search when this library appears as a dependency. | ||
44 | HAVE_LIB[]NAME=yes | ||
45 | @@ -46,6 +51,8 @@ | ||
46 | dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and | ||
47 | dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs | ||
48 | dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. | ||
49 | +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname | ||
50 | +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. | ||
51 | AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], | ||
52 | [ | ||
53 | AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | ||
54 | @@ -82,17 +89,24 @@ | ||
55 | CPPFLAGS="$ac_save_CPPFLAGS" | ||
56 | LIB[]NAME= | ||
57 | LTLIB[]NAME= | ||
58 | + LIB[]NAME[]_PREFIX= | ||
59 | + | ||
60 | fi | ||
61 | AC_SUBST([HAVE_LIB]NAME) | ||
62 | AC_SUBST([LIB]NAME) | ||
63 | AC_SUBST([LTLIB]NAME) | ||
64 | + AC_SUBST([LIB]NAME[_PREFIX]) | ||
65 | undefine([Name]) | ||
66 | undefine([NAME]) | ||
67 | ]) | ||
68 | |||
69 | dnl Determine the platform dependent parameters needed to use rpath: | ||
70 | -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, | ||
71 | -dnl hardcode_direct, hardcode_minus_L. | ||
72 | +dnl acl_libext, | ||
73 | +dnl acl_shlibext, | ||
74 | +dnl acl_hardcode_libdir_flag_spec, | ||
75 | +dnl acl_hardcode_libdir_separator, | ||
76 | +dnl acl_hardcode_direct, | ||
77 | +dnl acl_hardcode_minus_L. | ||
78 | AC_DEFUN([AC_LIB_RPATH], | ||
79 | [ | ||
80 | dnl Tell automake >= 1.10 to complain if config.rpath is missing. | ||
81 | @@ -109,12 +123,14 @@ | ||
82 | acl_cv_rpath=done | ||
83 | ]) | ||
84 | wl="$acl_cv_wl" | ||
85 | - libext="$acl_cv_libext" | ||
86 | - shlibext="$acl_cv_shlibext" | ||
87 | - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" | ||
88 | - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" | ||
89 | - hardcode_direct="$acl_cv_hardcode_direct" | ||
90 | - hardcode_minus_L="$acl_cv_hardcode_minus_L" | ||
91 | + acl_libext="$acl_cv_libext" | ||
92 | + acl_shlibext="$acl_cv_shlibext" | ||
93 | + acl_libname_spec="$acl_cv_libname_spec" | ||
94 | + acl_library_names_spec="$acl_cv_library_names_spec" | ||
95 | + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" | ||
96 | + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" | ||
97 | + acl_hardcode_direct="$acl_cv_hardcode_direct" | ||
98 | + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" | ||
99 | dnl Determine whether the user wants rpath handling at all. | ||
100 | AC_ARG_ENABLE(rpath, | ||
101 | [ --disable-rpath do not hardcode runtime library paths], | ||
102 | @@ -124,20 +140,24 @@ | ||
103 | dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and | ||
104 | dnl the libraries corresponding to explicit and implicit dependencies. | ||
105 | dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. | ||
106 | +dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found | ||
107 | +dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. | ||
108 | AC_DEFUN([AC_LIB_LINKFLAGS_BODY], | ||
109 | [ | ||
110 | AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) | ||
111 | define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], | ||
112 | [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | ||
113 | + dnl Autoconf >= 2.61 supports dots in --with options. | ||
114 | + define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])]) | ||
115 | dnl By default, look in $includedir and $libdir. | ||
116 | use_additional=yes | ||
117 | AC_LIB_WITH_FINAL_PREFIX([ | ||
118 | eval additional_includedir=\"$includedir\" | ||
119 | eval additional_libdir=\"$libdir\" | ||
120 | ]) | ||
121 | - AC_LIB_ARG_WITH([lib$1-prefix], | ||
122 | -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib | ||
123 | - --without-lib$1-prefix don't search for lib$1 in includedir and libdir], | ||
124 | + AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix], | ||
125 | +[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib | ||
126 | + --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir], | ||
127 | [ | ||
128 | if test "X$withval" = "Xno"; then | ||
129 | use_additional=no | ||
130 | @@ -158,6 +178,7 @@ | ||
131 | LIB[]NAME= | ||
132 | LTLIB[]NAME= | ||
133 | INC[]NAME= | ||
134 | + LIB[]NAME[]_PREFIX= | ||
135 | rpathdirs= | ||
136 | ltrpathdirs= | ||
137 | names_already_handled= | ||
138 | @@ -197,27 +218,53 @@ | ||
139 | found_la= | ||
140 | found_so= | ||
141 | found_a= | ||
142 | + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name | ||
143 | + if test -n "$acl_shlibext"; then | ||
144 | + shrext=".$acl_shlibext" # typically: shrext=.so | ||
145 | + else | ||
146 | + shrext= | ||
147 | + fi | ||
148 | if test $use_additional = yes; then | ||
149 | - if test -n "$shlibext" \ | ||
150 | - && { test -f "$additional_libdir/lib$name.$shlibext" \ | ||
151 | - || { test "$shlibext" = dll \ | ||
152 | - && test -f "$additional_libdir/lib$name.dll.a"; }; }; then | ||
153 | - found_dir="$additional_libdir" | ||
154 | - if test -f "$additional_libdir/lib$name.$shlibext"; then | ||
155 | - found_so="$additional_libdir/lib$name.$shlibext" | ||
156 | + dir="$additional_libdir" | ||
157 | + dnl The same code as in the loop below: | ||
158 | + dnl First look for a shared library. | ||
159 | + if test -n "$acl_shlibext"; then | ||
160 | + if test -f "$dir/$libname$shrext"; then | ||
161 | + found_dir="$dir" | ||
162 | + found_so="$dir/$libname$shrext" | ||
163 | else | ||
164 | - found_so="$additional_libdir/lib$name.dll.a" | ||
165 | + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then | ||
166 | + ver=`(cd "$dir" && \ | ||
167 | + for f in "$libname$shrext".*; do echo "$f"; done \ | ||
168 | + | sed -e "s,^$libname$shrext\\\\.,," \ | ||
169 | + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ | ||
170 | + | sed 1q ) 2>/dev/null` | ||
171 | + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then | ||
172 | + found_dir="$dir" | ||
173 | + found_so="$dir/$libname$shrext.$ver" | ||
174 | + fi | ||
175 | + else | ||
176 | + eval library_names=\"$acl_library_names_spec\" | ||
177 | + for f in $library_names; do | ||
178 | + if test -f "$dir/$f"; then | ||
179 | + found_dir="$dir" | ||
180 | + found_so="$dir/$f" | ||
181 | + break | ||
182 | + fi | ||
183 | + done | ||
184 | + fi | ||
185 | fi | ||
186 | - if test -f "$additional_libdir/lib$name.la"; then | ||
187 | - found_la="$additional_libdir/lib$name.la" | ||
188 | + fi | ||
189 | + dnl Then look for a static library. | ||
190 | + if test "X$found_dir" = "X"; then | ||
191 | + if test -f "$dir/$libname.$acl_libext"; then | ||
192 | + found_dir="$dir" | ||
193 | + found_a="$dir/$libname.$acl_libext" | ||
194 | fi | ||
195 | - else | ||
196 | - if test -f "$additional_libdir/lib$name.$libext"; then | ||
197 | - found_dir="$additional_libdir" | ||
198 | - found_a="$additional_libdir/lib$name.$libext" | ||
199 | - if test -f "$additional_libdir/lib$name.la"; then | ||
200 | - found_la="$additional_libdir/lib$name.la" | ||
201 | - fi | ||
202 | + fi | ||
203 | + if test "X$found_dir" != "X"; then | ||
204 | + if test -f "$dir/$libname.la"; then | ||
205 | + found_la="$dir/$libname.la" | ||
206 | fi | ||
207 | fi | ||
208 | fi | ||
209 | @@ -227,26 +274,44 @@ | ||
210 | case "$x" in | ||
211 | -L*) | ||
212 | dir=`echo "X$x" | sed -e 's/^X-L//'` | ||
213 | - if test -n "$shlibext" \ | ||
214 | - && { test -f "$dir/lib$name.$shlibext" \ | ||
215 | - || { test "$shlibext" = dll \ | ||
216 | - && test -f "$dir/lib$name.dll.a"; }; }; then | ||
217 | - found_dir="$dir" | ||
218 | - if test -f "$dir/lib$name.$shlibext"; then | ||
219 | - found_so="$dir/lib$name.$shlibext" | ||
220 | + dnl First look for a shared library. | ||
221 | + if test -n "$acl_shlibext"; then | ||
222 | + if test -f "$dir/$libname$shrext"; then | ||
223 | + found_dir="$dir" | ||
224 | + found_so="$dir/$libname$shrext" | ||
225 | else | ||
226 | - found_so="$dir/lib$name.dll.a" | ||
227 | - fi | ||
228 | - if test -f "$dir/lib$name.la"; then | ||
229 | - found_la="$dir/lib$name.la" | ||
230 | + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then | ||
231 | + ver=`(cd "$dir" && \ | ||
232 | + for f in "$libname$shrext".*; do echo "$f"; done \ | ||
233 | + | sed -e "s,^$libname$shrext\\\\.,," \ | ||
234 | + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ | ||
235 | + | sed 1q ) 2>/dev/null` | ||
236 | + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then | ||
237 | + found_dir="$dir" | ||
238 | + found_so="$dir/$libname$shrext.$ver" | ||
239 | + fi | ||
240 | + else | ||
241 | + eval library_names=\"$acl_library_names_spec\" | ||
242 | + for f in $library_names; do | ||
243 | + if test -f "$dir/$f"; then | ||
244 | + found_dir="$dir" | ||
245 | + found_so="$dir/$f" | ||
246 | + break | ||
247 | + fi | ||
248 | + done | ||
249 | + fi | ||
250 | fi | ||
251 | - else | ||
252 | - if test -f "$dir/lib$name.$libext"; then | ||
253 | + fi | ||
254 | + dnl Then look for a static library. | ||
255 | + if test "X$found_dir" = "X"; then | ||
256 | + if test -f "$dir/$libname.$acl_libext"; then | ||
257 | found_dir="$dir" | ||
258 | - found_a="$dir/lib$name.$libext" | ||
259 | - if test -f "$dir/lib$name.la"; then | ||
260 | - found_la="$dir/lib$name.la" | ||
261 | - fi | ||
262 | + found_a="$dir/$libname.$acl_libext" | ||
263 | + fi | ||
264 | + fi | ||
265 | + if test "X$found_dir" != "X"; then | ||
266 | + if test -f "$dir/$libname.la"; then | ||
267 | + found_la="$dir/$libname.la" | ||
268 | fi | ||
269 | fi | ||
270 | ;; | ||
271 | @@ -282,12 +347,12 @@ | ||
272 | ltrpathdirs="$ltrpathdirs $found_dir" | ||
273 | fi | ||
274 | dnl The hardcoding into $LIBNAME is system dependent. | ||
275 | - if test "$hardcode_direct" = yes; then | ||
276 | + if test "$acl_hardcode_direct" = yes; then | ||
277 | dnl Using DIR/libNAME.so during linking hardcodes DIR into the | ||
278 | dnl resulting binary. | ||
279 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
280 | else | ||
281 | - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then | ||
282 | + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then | ||
283 | dnl Use an explicit option to hardcode DIR into the resulting | ||
284 | dnl binary. | ||
285 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
286 | @@ -318,13 +383,13 @@ | ||
287 | if test -z "$haveit"; then | ||
288 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" | ||
289 | fi | ||
290 | - if test "$hardcode_minus_L" != no; then | ||
291 | + if test "$acl_hardcode_minus_L" != no; then | ||
292 | dnl FIXME: Not sure whether we should use | ||
293 | dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" | ||
294 | dnl here. | ||
295 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
296 | else | ||
297 | - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH | ||
298 | + dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH | ||
299 | dnl here, because this doesn't fit in flags passed to the | ||
300 | dnl compiler. So give up. No hardcoding. This affects only | ||
301 | dnl very old systems. | ||
302 | @@ -512,18 +577,18 @@ | ||
303 | done | ||
304 | done | ||
305 | if test "X$rpathdirs" != "X"; then | ||
306 | - if test -n "$hardcode_libdir_separator"; then | ||
307 | + if test -n "$acl_hardcode_libdir_separator"; then | ||
308 | dnl Weird platform: only the last -rpath option counts, the user must | ||
309 | dnl pass all path elements in one option. We can arrange that for a | ||
310 | dnl single library, but not when more than one $LIBNAMEs are used. | ||
311 | alldirs= | ||
312 | for found_dir in $rpathdirs; do | ||
313 | - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" | ||
314 | + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" | ||
315 | done | ||
316 | - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. | ||
317 | + dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. | ||
318 | acl_save_libdir="$libdir" | ||
319 | libdir="$alldirs" | ||
320 | - eval flag=\"$hardcode_libdir_flag_spec\" | ||
321 | + eval flag=\"$acl_hardcode_libdir_flag_spec\" | ||
322 | libdir="$acl_save_libdir" | ||
323 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" | ||
324 | else | ||
325 | @@ -531,7 +596,7 @@ | ||
326 | for found_dir in $rpathdirs; do | ||
327 | acl_save_libdir="$libdir" | ||
328 | libdir="$found_dir" | ||
329 | - eval flag=\"$hardcode_libdir_flag_spec\" | ||
330 | + eval flag=\"$acl_hardcode_libdir_flag_spec\" | ||
331 | libdir="$acl_save_libdir" | ||
332 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" | ||
333 | done | ||
334 | @@ -642,3 +707,79 @@ | ||
335 | fi | ||
336 | AC_SUBST([$1]) | ||
337 | ]) | ||
338 | + | ||
339 | +dnl For those cases where a variable contains several -L and -l options | ||
340 | +dnl referring to unknown libraries and directories, this macro determines the | ||
341 | +dnl necessary additional linker options for the runtime path. | ||
342 | +dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL]) | ||
343 | +dnl sets LDADDVAR to linker options needed together with LIBSVALUE. | ||
344 | +dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed, | ||
345 | +dnl otherwise linking without libtool is assumed. | ||
346 | +AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], | ||
347 | +[ | ||
348 | + AC_REQUIRE([AC_LIB_RPATH]) | ||
349 | + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) | ||
350 | + $1= | ||
351 | + if test "$enable_rpath" != no; then | ||
352 | + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then | ||
353 | + dnl Use an explicit option to hardcode directories into the resulting | ||
354 | + dnl binary. | ||
355 | + rpathdirs= | ||
356 | + next= | ||
357 | + for opt in $2; do | ||
358 | + if test -n "$next"; then | ||
359 | + dir="$next" | ||
360 | + dnl No need to hardcode the standard /usr/lib. | ||
361 | + if test "X$dir" != "X/usr/$acl_libdirstem"; then | ||
362 | + rpathdirs="$rpathdirs $dir" | ||
363 | + fi | ||
364 | + next= | ||
365 | + else | ||
366 | + case $opt in | ||
367 | + -L) next=yes ;; | ||
368 | + -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` | ||
369 | + dnl No need to hardcode the standard /usr/lib. | ||
370 | + if test "X$dir" != "X/usr/$acl_libdirstem"; then | ||
371 | + rpathdirs="$rpathdirs $dir" | ||
372 | + fi | ||
373 | + next= ;; | ||
374 | + *) next= ;; | ||
375 | + esac | ||
376 | + fi | ||
377 | + done | ||
378 | + if test "X$rpathdirs" != "X"; then | ||
379 | + if test -n ""$3""; then | ||
380 | + dnl libtool is used for linking. Use -R options. | ||
381 | + for dir in $rpathdirs; do | ||
382 | + $1="${$1}${$1:+ }-R$dir" | ||
383 | + done | ||
384 | + else | ||
385 | + dnl The linker is used for linking directly. | ||
386 | + if test -n "$acl_hardcode_libdir_separator"; then | ||
387 | + dnl Weird platform: only the last -rpath option counts, the user | ||
388 | + dnl must pass all path elements in one option. | ||
389 | + alldirs= | ||
390 | + for dir in $rpathdirs; do | ||
391 | + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" | ||
392 | + done | ||
393 | + acl_save_libdir="$libdir" | ||
394 | + libdir="$alldirs" | ||
395 | + eval flag=\"$acl_hardcode_libdir_flag_spec\" | ||
396 | + libdir="$acl_save_libdir" | ||
397 | + $1="$flag" | ||
398 | + else | ||
399 | + dnl The -rpath options are cumulative. | ||
400 | + for dir in $rpathdirs; do | ||
401 | + acl_save_libdir="$libdir" | ||
402 | + libdir="$dir" | ||
403 | + eval flag=\"$acl_hardcode_libdir_flag_spec\" | ||
404 | + libdir="$acl_save_libdir" | ||
405 | + $1="${$1}${$1:+ }$flag" | ||
406 | + done | ||
407 | + fi | ||
408 | + fi | ||
409 | + fi | ||
410 | + fi | ||
411 | + fi | ||
412 | + AC_SUBST([$1]) | ||
413 | +]) | ||
414 | Index: gettext-0.16.1/autoconf-lib-link/config.rpath | ||
415 | =================================================================== | ||
416 | --- gettext-0.16.1.orig/autoconf-lib-link/config.rpath 2006-11-27 09:01:58.000000000 -0800 | ||
417 | +++ gettext-0.16.1/autoconf-lib-link/config.rpath 2011-03-17 00:33:23.336539490 -0700 | ||
418 | @@ -2,7 +2,7 @@ | ||
419 | # Output a system dependent set of variables, describing how to set the | ||
420 | # run time search path of shared libraries in an executable. | ||
421 | # | ||
422 | -# Copyright 1996-2006 Free Software Foundation, Inc. | ||
423 | +# Copyright 1996-2007 Free Software Foundation, Inc. | ||
424 | # Taken from GNU libtool, 2001 | ||
425 | # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 | ||
426 | # | ||
427 | @@ -47,6 +47,18 @@ | ||
428 | done | ||
429 | cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` | ||
430 | |||
431 | +# Code taken from libtool.m4's _LT_CC_BASENAME. | ||
432 | + | ||
433 | +for cc_temp in $CC""; do | ||
434 | + case $cc_temp in | ||
435 | + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; | ||
436 | + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; | ||
437 | + \-*) ;; | ||
438 | + *) break;; | ||
439 | + esac | ||
440 | +done | ||
441 | +cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` | ||
442 | + | ||
443 | # Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. | ||
444 | |||
445 | wl= | ||
446 | @@ -64,7 +76,14 @@ | ||
447 | ;; | ||
448 | esac | ||
449 | ;; | ||
450 | - mingw* | pw32* | os2*) | ||
451 | + darwin*) | ||
452 | + case $cc_basename in | ||
453 | + xlc*) | ||
454 | + wl='-Wl,' | ||
455 | + ;; | ||
456 | + esac | ||
457 | + ;; | ||
458 | + mingw* | cygwin* | pw32* | os2*) | ||
459 | ;; | ||
460 | hpux9* | hpux10* | hpux11*) | ||
461 | wl='-Wl,' | ||
462 | @@ -74,7 +93,7 @@ | ||
463 | ;; | ||
464 | newsos6) | ||
465 | ;; | ||
466 | - linux*) | ||
467 | + linux* | k*bsd*-gnu) | ||
468 | case $cc_basename in | ||
469 | icc* | ecc*) | ||
470 | wl='-Wl,' | ||
471 | @@ -100,7 +119,7 @@ | ||
472 | osf3* | osf4* | osf5*) | ||
473 | wl='-Wl,' | ||
474 | ;; | ||
475 | - sco3.2v5*) | ||
476 | + rdos*) | ||
477 | ;; | ||
478 | solaris*) | ||
479 | wl='-Wl,' | ||
480 | @@ -108,11 +127,14 @@ | ||
481 | sunos4*) | ||
482 | wl='-Qoption ld ' | ||
483 | ;; | ||
484 | - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) | ||
485 | + sysv4 | sysv4.2uw2* | sysv4.3*) | ||
486 | wl='-Wl,' | ||
487 | ;; | ||
488 | sysv4*MP*) | ||
489 | ;; | ||
490 | + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) | ||
491 | + wl='-Wl,' | ||
492 | + ;; | ||
493 | unicos*) | ||
494 | wl='-Wl,' | ||
495 | ;; | ||
496 | @@ -141,6 +163,10 @@ | ||
497 | # we just hope/assume this is gcc and not c89 (= MSVC++) | ||
498 | with_gnu_ld=yes | ||
499 | ;; | ||
500 | + interix*) | ||
501 | + # we just hope/assume this is gcc and not c89 (= MSVC++) | ||
502 | + with_gnu_ld=yes | ||
503 | + ;; | ||
504 | openbsd*) | ||
505 | with_gnu_ld=no | ||
506 | ;; | ||
507 | @@ -189,11 +215,11 @@ | ||
508 | ld_shlibs=no | ||
509 | fi | ||
510 | ;; | ||
511 | - interix3*) | ||
512 | + interix[3-9]*) | ||
513 | hardcode_direct=no | ||
514 | hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||
515 | ;; | ||
516 | - linux*) | ||
517 | + gnu* | linux* | k*bsd*-gnu) | ||
518 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | ||
519 | : | ||
520 | else | ||
521 | @@ -280,7 +306,7 @@ | ||
522 | strings "$collect2name" | grep resolve_lib_name >/dev/null | ||
523 | then | ||
524 | # We have reworked collect2 | ||
525 | - hardcode_direct=yes | ||
526 | + : | ||
527 | else | ||
528 | # We have old collect2 | ||
529 | hardcode_direct=unsupported | ||
530 | @@ -359,7 +385,7 @@ | ||
531 | hardcode_direct=yes | ||
532 | hardcode_minus_L=yes | ||
533 | ;; | ||
534 | - freebsd* | kfreebsd*-gnu | dragonfly*) | ||
535 | + freebsd* | dragonfly*) | ||
536 | hardcode_libdir_flag_spec='-R$libdir' | ||
537 | hardcode_direct=yes | ||
538 | ;; | ||
539 | @@ -412,18 +438,22 @@ | ||
540 | hardcode_libdir_separator=: | ||
541 | ;; | ||
542 | openbsd*) | ||
543 | - hardcode_direct=yes | ||
544 | - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | ||
545 | - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||
546 | + if test -f /usr/libexec/ld.so; then | ||
547 | + hardcode_direct=yes | ||
548 | + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | ||
549 | + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||
550 | + else | ||
551 | + case "$host_os" in | ||
552 | + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) | ||
553 | + hardcode_libdir_flag_spec='-R$libdir' | ||
554 | + ;; | ||
555 | + *) | ||
556 | + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||
557 | + ;; | ||
558 | + esac | ||
559 | + fi | ||
560 | else | ||
561 | - case "$host_os" in | ||
562 | - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) | ||
563 | - hardcode_libdir_flag_spec='-R$libdir' | ||
564 | - ;; | ||
565 | - *) | ||
566 | - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||
567 | - ;; | ||
568 | - esac | ||
569 | + ld_shlibs=no | ||
570 | fi | ||
571 | ;; | ||
572 | os2*) | ||
573 | @@ -471,7 +501,7 @@ | ||
574 | ld_shlibs=yes | ||
575 | fi | ||
576 | ;; | ||
577 | - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) | ||
578 | + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* |sco3.2v5.0.[024]*) | ||
579 | ;; | ||
580 | sysv5* | sco3.2v5* | sco5v6*) | ||
581 | hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' | ||
582 | @@ -488,33 +518,51 @@ | ||
583 | |||
584 | # Check dynamic linker characteristics | ||
585 | # Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. | ||
586 | +# Unlike libtool.m4, here we don't care about _all_ names of the library, but | ||
587 | +# only about the one the linker finds when passed -lNAME. This is the last | ||
588 | +# element of library_names_spec in libtool.m4, or possibly two of them if the | ||
589 | +# linker has special search rules. | ||
590 | +library_names_spec= # the last element of library_names_spec in libtool.m4 | ||
591 | libname_spec='lib$name' | ||
592 | case "$host_os" in | ||
593 | aix3*) | ||
594 | + library_names_spec='$libname.a' | ||
595 | ;; | ||
596 | aix4* | aix5*) | ||
597 | + library_names_spec='$libname$shrext' | ||
598 | ;; | ||
599 | amigaos*) | ||
600 | + library_names_spec='$libname.a' | ||
601 | ;; | ||
602 | beos*) | ||
603 | + library_names_spec='$libname$shrext' | ||
604 | ;; | ||
605 | bsdi[45]*) | ||
606 | + library_names_spec='$libname$shrext' | ||
607 | ;; | ||
608 | cygwin* | mingw* | pw32*) | ||
609 | shrext=.dll | ||
610 | + library_names_spec='$libname.dll.a $libname.lib' | ||
611 | ;; | ||
612 | darwin* | rhapsody*) | ||
613 | shrext=.dylib | ||
614 | + library_names_spec='$libname$shrext' | ||
615 | ;; | ||
616 | dgux*) | ||
617 | + library_names_spec='$libname$shrext' | ||
618 | ;; | ||
619 | freebsd1*) | ||
620 | ;; | ||
621 | - kfreebsd*-gnu) | ||
622 | - ;; | ||
623 | freebsd* | dragonfly*) | ||
624 | + case "$host_os" in | ||
625 | + freebsd[123]*) | ||
626 | + library_names_spec='$libname$shrext$versuffix' ;; | ||
627 | + *) | ||
628 | + library_names_spec='$libname$shrext' ;; | ||
629 | + esac | ||
630 | ;; | ||
631 | gnu*) | ||
632 | + library_names_spec='$libname$shrext' | ||
633 | ;; | ||
634 | hpux9* | hpux10* | hpux11*) | ||
635 | case $host_cpu in | ||
636 | @@ -528,10 +576,13 @@ | ||
637 | shrext=.sl | ||
638 | ;; | ||
639 | esac | ||
640 | + library_names_spec='$libname$shrext' | ||
641 | ;; | ||
642 | - interix3*) | ||
643 | + interix[3-9]*) | ||
644 | + library_names_spec='$libname$shrext' | ||
645 | ;; | ||
646 | irix5* | irix6* | nonstopux*) | ||
647 | + library_names_spec='$libname$shrext' | ||
648 | case "$host_os" in | ||
649 | irix5* | nonstopux*) | ||
650 | libsuff= shlibsuff= | ||
651 | @@ -548,33 +599,46 @@ | ||
652 | ;; | ||
653 | linux*oldld* | linux*aout* | linux*coff*) | ||
654 | ;; | ||
655 | - linux*) | ||
656 | + linux* | k*bsd*-gnu) | ||
657 | + library_names_spec='$libname$shrext' | ||
658 | ;; | ||
659 | knetbsd*-gnu) | ||
660 | + library_names_spec='$libname$shrext' | ||
661 | ;; | ||
662 | netbsd*) | ||
663 | + library_names_spec='$libname$shrext' | ||
664 | ;; | ||
665 | newsos6) | ||
666 | + library_names_spec='$libname$shrext' | ||
667 | ;; | ||
668 | nto-qnx*) | ||
669 | + library_names_spec='$libname$shrext' | ||
670 | ;; | ||
671 | openbsd*) | ||
672 | + library_names_spec='$libname$shrext$versuffix' | ||
673 | ;; | ||
674 | os2*) | ||
675 | libname_spec='$name' | ||
676 | shrext=.dll | ||
677 | + library_names_spec='$libname.a' | ||
678 | ;; | ||
679 | osf3* | osf4* | osf5*) | ||
680 | + library_names_spec='$libname$shrext' | ||
681 | ;; | ||
682 | solaris*) | ||
683 | + library_names_spec='$libname$shrext' | ||
684 | ;; | ||
685 | sunos4*) | ||
686 | + library_names_spec='$libname$shrext$versuffix' | ||
687 | ;; | ||
688 | sysv4 | sysv4.3*) | ||
689 | + library_names_spec='$libname$shrext' | ||
690 | ;; | ||
691 | sysv4*MP*) | ||
692 | + library_names_spec='$libname$shrext' | ||
693 | ;; | ||
694 | sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) | ||
695 | + library_names_spec='$libname$shrext' | ||
696 | ;; | ||
697 | uts4*) | ||
698 | ;; | ||
699 | @@ -583,6 +647,8 @@ | ||
700 | sed_quote_subst='s/\(["`$\\]\)/\\\1/g' | ||
701 | escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` | ||
702 | shlibext=`echo "$shrext" | sed -e 's,^\.,,'` | ||
703 | +escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` | ||
704 | +escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` | ||
705 | escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` | ||
706 | |||
707 | LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF | ||
708 | @@ -596,6 +662,12 @@ | ||
709 | # Shared library suffix (normally "so"). | ||
710 | shlibext="$shlibext" | ||
711 | |||
712 | +# Format of library name prefix. | ||
713 | +libname_spec="$escaped_libname_spec" | ||
714 | + | ||
715 | +# Library names that the linker finds when passed -lNAME. | ||
716 | +library_names_spec="$escaped_library_names_spec" | ||
717 | + | ||
718 | # Flag to hardcode \$libdir into a binary during linking. | ||
719 | # This must work even if \$libdir does not exist. | ||
720 | hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec" | ||