diff options
| -rw-r--r-- | meta/packages/gettext/gettext-0.14.1/linklib_from_0.17.patch | 1131 |
1 files changed, 1131 insertions, 0 deletions
diff --git a/meta/packages/gettext/gettext-0.14.1/linklib_from_0.17.patch b/meta/packages/gettext/gettext-0.14.1/linklib_from_0.17.patch new file mode 100644 index 0000000000..b979b5db06 --- /dev/null +++ b/meta/packages/gettext/gettext-0.14.1/linklib_from_0.17.patch | |||
| @@ -0,0 +1,1131 @@ | |||
| 1 | Index: gettext-0.14.1/autoconf-lib-link/m4/lib-ld.m4 | ||
| 2 | =================================================================== | ||
| 3 | --- gettext-0.14.1.orig/autoconf-lib-link/m4/lib-ld.m4 2008-04-15 14:32:45.000000000 +0100 | ||
| 4 | +++ gettext-0.14.1/autoconf-lib-link/m4/lib-ld.m4 2008-04-15 14:32:47.000000000 +0100 | ||
| 5 | @@ -1,10 +1,8 @@ | ||
| 6 | # lib-ld.m4 serial 3 (gettext-0.13) | ||
| 7 | dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. | ||
| 8 | -dnl This file is free software, distributed under the terms of the GNU | ||
| 9 | -dnl General Public License. As a special exception to the GNU General | ||
| 10 | -dnl Public License, this file may be distributed as part of a program | ||
| 11 | -dnl that contains a configuration script generated by Autoconf, under | ||
| 12 | -dnl the same distribution terms as the rest of that program. | ||
| 13 | +dnl This file is free software; the Free Software Foundation | ||
| 14 | +dnl gives unlimited permission to copy and/or distribute it, | ||
| 15 | +dnl with or without modifications, as long as this notice is preserved. | ||
| 16 | |||
| 17 | dnl Subroutines of libtool.m4, | ||
| 18 | dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision | ||
| 19 | Index: gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4 | ||
| 20 | =================================================================== | ||
| 21 | --- gettext-0.14.1.orig/autoconf-lib-link/m4/lib-link.m4 2008-04-15 14:32:45.000000000 +0100 | ||
| 22 | +++ gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4 2008-04-15 14:32:47.000000000 +0100 | ||
| 23 | @@ -1,17 +1,19 @@ | ||
| 24 | -# lib-link.m4 serial 4 (gettext-0.12) | ||
| 25 | -dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. | ||
| 26 | -dnl This file is free software, distributed under the terms of the GNU | ||
| 27 | -dnl General Public License. As a special exception to the GNU General | ||
| 28 | -dnl Public License, this file may be distributed as part of a program | ||
| 29 | -dnl that contains a configuration script generated by Autoconf, under | ||
| 30 | -dnl the same distribution terms as the rest of that program. | ||
| 31 | +# lib-link.m4 serial 13 (gettext-0.17) | ||
| 32 | +dnl Copyright (C) 2001-2007 Free Software Foundation, Inc. | ||
| 33 | +dnl This file is free software; the Free Software Foundation | ||
| 34 | +dnl gives unlimited permission to copy and/or distribute it, | ||
| 35 | +dnl with or without modifications, as long as this notice is preserved. | ||
| 36 | |||
| 37 | dnl From Bruno Haible. | ||
| 38 | |||
| 39 | +AC_PREREQ(2.54) | ||
| 40 | + | ||
| 41 | dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and | ||
| 42 | dnl the libraries corresponding to explicit and implicit dependencies. | ||
| 43 | dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and | ||
| 44 | dnl augments the CPPFLAGS variable. | ||
| 45 | +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname | ||
| 46 | +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. | ||
| 47 | AC_DEFUN([AC_LIB_LINKFLAGS], | ||
| 48 | [ | ||
| 49 | AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | ||
| 50 | @@ -24,13 +26,16 @@ | ||
| 51 | ac_cv_lib[]Name[]_libs="$LIB[]NAME" | ||
| 52 | ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" | ||
| 53 | ac_cv_lib[]Name[]_cppflags="$INC[]NAME" | ||
| 54 | + ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" | ||
| 55 | ]) | ||
| 56 | LIB[]NAME="$ac_cv_lib[]Name[]_libs" | ||
| 57 | LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" | ||
| 58 | INC[]NAME="$ac_cv_lib[]Name[]_cppflags" | ||
| 59 | + LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" | ||
| 60 | AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) | ||
| 61 | AC_SUBST([LIB]NAME) | ||
| 62 | AC_SUBST([LTLIB]NAME) | ||
| 63 | + AC_SUBST([LIB]NAME[_PREFIX]) | ||
| 64 | dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the | ||
| 65 | dnl results of this search when this library appears as a dependency. | ||
| 66 | HAVE_LIB[]NAME=yes | ||
| 67 | @@ -46,6 +51,8 @@ | ||
| 68 | dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and | ||
| 69 | dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs | ||
| 70 | dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. | ||
| 71 | +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname | ||
| 72 | +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. | ||
| 73 | AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], | ||
| 74 | [ | ||
| 75 | AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | ||
| 76 | @@ -82,19 +89,27 @@ | ||
| 77 | CPPFLAGS="$ac_save_CPPFLAGS" | ||
| 78 | LIB[]NAME= | ||
| 79 | LTLIB[]NAME= | ||
| 80 | + LIB[]NAME[]_PREFIX= | ||
| 81 | fi | ||
| 82 | AC_SUBST([HAVE_LIB]NAME) | ||
| 83 | AC_SUBST([LIB]NAME) | ||
| 84 | AC_SUBST([LTLIB]NAME) | ||
| 85 | + AC_SUBST([LIB]NAME[_PREFIX]) | ||
| 86 | undefine([Name]) | ||
| 87 | undefine([NAME]) | ||
| 88 | ]) | ||
| 89 | |||
| 90 | dnl Determine the platform dependent parameters needed to use rpath: | ||
| 91 | -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, | ||
| 92 | -dnl hardcode_direct, hardcode_minus_L. | ||
| 93 | +dnl acl_libext, | ||
| 94 | +dnl acl_shlibext, | ||
| 95 | +dnl acl_hardcode_libdir_flag_spec, | ||
| 96 | +dnl acl_hardcode_libdir_separator, | ||
| 97 | +dnl acl_hardcode_direct, | ||
| 98 | +dnl acl_hardcode_minus_L. | ||
| 99 | AC_DEFUN([AC_LIB_RPATH], | ||
| 100 | [ | ||
| 101 | + dnl Tell automake >= 1.10 to complain if config.rpath is missing. | ||
| 102 | + m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) | ||
| 103 | AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS | ||
| 104 | AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld | ||
| 105 | AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host | ||
| 106 | @@ -107,12 +122,14 @@ | ||
| 107 | acl_cv_rpath=done | ||
| 108 | ]) | ||
| 109 | wl="$acl_cv_wl" | ||
| 110 | - libext="$acl_cv_libext" | ||
| 111 | - shlibext="$acl_cv_shlibext" | ||
| 112 | - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" | ||
| 113 | - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" | ||
| 114 | - hardcode_direct="$acl_cv_hardcode_direct" | ||
| 115 | - hardcode_minus_L="$acl_cv_hardcode_minus_L" | ||
| 116 | + acl_libext="$acl_cv_libext" | ||
| 117 | + acl_shlibext="$acl_cv_shlibext" | ||
| 118 | + acl_libname_spec="$acl_cv_libname_spec" | ||
| 119 | + acl_library_names_spec="$acl_cv_library_names_spec" | ||
| 120 | + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" | ||
| 121 | + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" | ||
| 122 | + acl_hardcode_direct="$acl_cv_hardcode_direct" | ||
| 123 | + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" | ||
| 124 | dnl Determine whether the user wants rpath handling at all. | ||
| 125 | AC_ARG_ENABLE(rpath, | ||
| 126 | [ --disable-rpath do not hardcode runtime library paths], | ||
| 127 | @@ -122,19 +139,24 @@ | ||
| 128 | dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and | ||
| 129 | dnl the libraries corresponding to explicit and implicit dependencies. | ||
| 130 | dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. | ||
| 131 | +dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found | ||
| 132 | +dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. | ||
| 133 | AC_DEFUN([AC_LIB_LINKFLAGS_BODY], | ||
| 134 | [ | ||
| 135 | + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) | ||
| 136 | define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], | ||
| 137 | [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | ||
| 138 | + dnl Autoconf >= 2.61 supports dots in --with options. | ||
| 139 | + define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])]) | ||
| 140 | dnl By default, look in $includedir and $libdir. | ||
| 141 | use_additional=yes | ||
| 142 | AC_LIB_WITH_FINAL_PREFIX([ | ||
| 143 | eval additional_includedir=\"$includedir\" | ||
| 144 | eval additional_libdir=\"$libdir\" | ||
| 145 | ]) | ||
| 146 | - AC_LIB_ARG_WITH([lib$1-prefix], | ||
| 147 | -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib | ||
| 148 | - --without-lib$1-prefix don't search for lib$1 in includedir and libdir], | ||
| 149 | + AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix], | ||
| 150 | +[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib | ||
| 151 | + --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir], | ||
| 152 | [ | ||
| 153 | if test "X$withval" = "Xno"; then | ||
| 154 | use_additional=no | ||
| 155 | @@ -146,7 +168,7 @@ | ||
| 156 | ]) | ||
| 157 | else | ||
| 158 | additional_includedir="$withval/include" | ||
| 159 | - additional_libdir="$withval/lib" | ||
| 160 | + additional_libdir="$withval/$acl_libdirstem" | ||
| 161 | fi | ||
| 162 | fi | ||
| 163 | ]) | ||
| 164 | @@ -155,6 +177,7 @@ | ||
| 165 | LIB[]NAME= | ||
| 166 | LTLIB[]NAME= | ||
| 167 | INC[]NAME= | ||
| 168 | + LIB[]NAME[]_PREFIX= | ||
| 169 | rpathdirs= | ||
| 170 | ltrpathdirs= | ||
| 171 | names_already_handled= | ||
| 172 | @@ -194,22 +217,55 @@ | ||
| 173 | found_la= | ||
| 174 | found_so= | ||
| 175 | found_a= | ||
| 176 | + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name | ||
| 177 | + if test -n "$acl_shlibext"; then | ||
| 178 | + shrext=".$acl_shlibext" # typically: shrext=.so | ||
| 179 | + else | ||
| 180 | + shrext= | ||
| 181 | + fi | ||
| 182 | if test $use_additional = yes; then | ||
| 183 | - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then | ||
| 184 | - found_dir="$additional_libdir" | ||
| 185 | - found_so="$additional_libdir/lib$name.$shlibext" | ||
| 186 | - if test -f "$additional_libdir/lib$name.la"; then | ||
| 187 | - found_la="$additional_libdir/lib$name.la" | ||
| 188 | - fi | ||
| 189 | - else | ||
| 190 | - if test -f "$additional_libdir/lib$name.$libext"; then | ||
| 191 | - found_dir="$additional_libdir" | ||
| 192 | - found_a="$additional_libdir/lib$name.$libext" | ||
| 193 | - if test -f "$additional_libdir/lib$name.la"; then | ||
| 194 | - found_la="$additional_libdir/lib$name.la" | ||
| 195 | + dir="$additional_libdir" | ||
| 196 | + dnl The same code as in the loop below: | ||
| 197 | + dnl First look for a shared library. | ||
| 198 | + if test -n "$acl_shlibext"; then | ||
| 199 | + if test -f "$dir/$libname$shrext"; then | ||
| 200 | + found_dir="$dir" | ||
| 201 | + found_so="$dir/$libname$shrext" | ||
| 202 | + else | ||
| 203 | + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then | ||
| 204 | + ver=`(cd "$dir" && \ | ||
| 205 | + for f in "$libname$shrext".*; do echo "$f"; done \ | ||
| 206 | + | sed -e "s,^$libname$shrext\\\\.,," \ | ||
| 207 | + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ | ||
| 208 | + | sed 1q ) 2>/dev/null` | ||
| 209 | + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then | ||
| 210 | + found_dir="$dir" | ||
| 211 | + found_so="$dir/$libname$shrext.$ver" | ||
| 212 | + fi | ||
| 213 | + else | ||
| 214 | + eval library_names=\"$acl_library_names_spec\" | ||
| 215 | + for f in $library_names; do | ||
| 216 | + if test -f "$dir/$f"; then | ||
| 217 | + found_dir="$dir" | ||
| 218 | + found_so="$dir/$f" | ||
| 219 | + break | ||
| 220 | + fi | ||
| 221 | + done | ||
| 222 | fi | ||
| 223 | fi | ||
| 224 | fi | ||
| 225 | + dnl Then look for a static library. | ||
| 226 | + if test "X$found_dir" = "X"; then | ||
| 227 | + if test -f "$dir/$libname.$acl_libext"; then | ||
| 228 | + found_dir="$dir" | ||
| 229 | + found_a="$dir/$libname.$acl_libext" | ||
| 230 | + fi | ||
| 231 | + fi | ||
| 232 | + if test "X$found_dir" != "X"; then | ||
| 233 | + if test -f "$dir/$libname.la"; then | ||
| 234 | + found_la="$dir/$libname.la" | ||
| 235 | + fi | ||
| 236 | + fi | ||
| 237 | fi | ||
| 238 | if test "X$found_dir" = "X"; then | ||
| 239 | for x in $LDFLAGS $LTLIB[]NAME; do | ||
| 240 | @@ -217,21 +273,46 @@ | ||
| 241 | case "$x" in | ||
| 242 | -L*) | ||
| 243 | dir=`echo "X$x" | sed -e 's/^X-L//'` | ||
| 244 | - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then | ||
| 245 | - found_dir="$dir" | ||
| 246 | - found_so="$dir/lib$name.$shlibext" | ||
| 247 | - if test -f "$dir/lib$name.la"; then | ||
| 248 | - found_la="$dir/lib$name.la" | ||
| 249 | - fi | ||
| 250 | - else | ||
| 251 | - if test -f "$dir/lib$name.$libext"; then | ||
| 252 | + dnl First look for a shared library. | ||
| 253 | + if test -n "$acl_shlibext"; then | ||
| 254 | + if test -f "$dir/$libname$shrext"; then | ||
| 255 | found_dir="$dir" | ||
| 256 | - found_a="$dir/lib$name.$libext" | ||
| 257 | - if test -f "$dir/lib$name.la"; then | ||
| 258 | - found_la="$dir/lib$name.la" | ||
| 259 | + found_so="$dir/$libname$shrext" | ||
| 260 | + else | ||
| 261 | + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then | ||
| 262 | + ver=`(cd "$dir" && \ | ||
| 263 | + for f in "$libname$shrext".*; do echo "$f"; done \ | ||
| 264 | + | sed -e "s,^$libname$shrext\\\\.,," \ | ||
| 265 | + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ | ||
| 266 | + | sed 1q ) 2>/dev/null` | ||
| 267 | + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then | ||
| 268 | + found_dir="$dir" | ||
| 269 | + found_so="$dir/$libname$shrext.$ver" | ||
| 270 | + fi | ||
| 271 | + else | ||
| 272 | + eval library_names=\"$acl_library_names_spec\" | ||
| 273 | + for f in $library_names; do | ||
| 274 | + if test -f "$dir/$f"; then | ||
| 275 | + found_dir="$dir" | ||
| 276 | + found_so="$dir/$f" | ||
| 277 | + break | ||
| 278 | + fi | ||
| 279 | + done | ||
| 280 | fi | ||
| 281 | fi | ||
| 282 | fi | ||
| 283 | + dnl Then look for a static library. | ||
| 284 | + if test "X$found_dir" = "X"; then | ||
| 285 | + if test -f "$dir/$libname.$acl_libext"; then | ||
| 286 | + found_dir="$dir" | ||
| 287 | + found_a="$dir/$libname.$acl_libext" | ||
| 288 | + fi | ||
| 289 | + fi | ||
| 290 | + if test "X$found_dir" != "X"; then | ||
| 291 | + if test -f "$dir/$libname.la"; then | ||
| 292 | + found_la="$dir/$libname.la" | ||
| 293 | + fi | ||
| 294 | + fi | ||
| 295 | ;; | ||
| 296 | esac | ||
| 297 | if test "X$found_dir" != "X"; then | ||
| 298 | @@ -246,7 +327,7 @@ | ||
| 299 | dnl Linking with a shared library. We attempt to hardcode its | ||
| 300 | dnl directory into the executable's runpath, unless it's the | ||
| 301 | dnl standard /usr/lib. | ||
| 302 | - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then | ||
| 303 | + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then | ||
| 304 | dnl No hardcoding is needed. | ||
| 305 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
| 306 | else | ||
| 307 | @@ -265,12 +346,12 @@ | ||
| 308 | ltrpathdirs="$ltrpathdirs $found_dir" | ||
| 309 | fi | ||
| 310 | dnl The hardcoding into $LIBNAME is system dependent. | ||
| 311 | - if test "$hardcode_direct" = yes; then | ||
| 312 | + if test "$acl_hardcode_direct" = yes; then | ||
| 313 | dnl Using DIR/libNAME.so during linking hardcodes DIR into the | ||
| 314 | dnl resulting binary. | ||
| 315 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
| 316 | else | ||
| 317 | - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then | ||
| 318 | + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then | ||
| 319 | dnl Use an explicit option to hardcode DIR into the resulting | ||
| 320 | dnl binary. | ||
| 321 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
| 322 | @@ -301,13 +382,13 @@ | ||
| 323 | if test -z "$haveit"; then | ||
| 324 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" | ||
| 325 | fi | ||
| 326 | - if test "$hardcode_minus_L" != no; then | ||
| 327 | + if test "$acl_hardcode_minus_L" != no; then | ||
| 328 | dnl FIXME: Not sure whether we should use | ||
| 329 | dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" | ||
| 330 | dnl here. | ||
| 331 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" | ||
| 332 | else | ||
| 333 | - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH | ||
| 334 | + dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH | ||
| 335 | dnl here, because this doesn't fit in flags passed to the | ||
| 336 | dnl compiler. So give up. No hardcoding. This affects only | ||
| 337 | dnl very old systems. | ||
| 338 | @@ -332,8 +413,9 @@ | ||
| 339 | dnl Assume the include files are nearby. | ||
| 340 | additional_includedir= | ||
| 341 | case "$found_dir" in | ||
| 342 | - */lib | */lib/) | ||
| 343 | - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` | ||
| 344 | + */$acl_libdirstem | */$acl_libdirstem/) | ||
| 345 | + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` | ||
| 346 | + LIB[]NAME[]_PREFIX="$basedir" | ||
| 347 | additional_includedir="$basedir/include" | ||
| 348 | ;; | ||
| 349 | esac | ||
| 350 | @@ -350,7 +432,7 @@ | ||
| 351 | if test "X$additional_includedir" = "X/usr/local/include"; then | ||
| 352 | if test -n "$GCC"; then | ||
| 353 | case $host_os in | ||
| 354 | - linux*) haveit=yes;; | ||
| 355 | + linux* | gnu* | k*bsd*-gnu) haveit=yes;; | ||
| 356 | esac | ||
| 357 | fi | ||
| 358 | fi | ||
| 359 | @@ -394,12 +476,12 @@ | ||
| 360 | dnl 3. if it's already present in $LDFLAGS or the already | ||
| 361 | dnl constructed $LIBNAME, | ||
| 362 | dnl 4. if it doesn't exist as a directory. | ||
| 363 | - if test "X$additional_libdir" != "X/usr/lib"; then | ||
| 364 | + if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then | ||
| 365 | haveit= | ||
| 366 | - if test "X$additional_libdir" = "X/usr/local/lib"; then | ||
| 367 | + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then | ||
| 368 | if test -n "$GCC"; then | ||
| 369 | case $host_os in | ||
| 370 | - linux*) haveit=yes;; | ||
| 371 | + linux* | gnu* | k*bsd*-gnu) haveit=yes;; | ||
| 372 | esac | ||
| 373 | fi | ||
| 374 | fi | ||
| 375 | @@ -495,18 +577,18 @@ | ||
| 376 | done | ||
| 377 | done | ||
| 378 | if test "X$rpathdirs" != "X"; then | ||
| 379 | - if test -n "$hardcode_libdir_separator"; then | ||
| 380 | + if test -n "$acl_hardcode_libdir_separator"; then | ||
| 381 | dnl Weird platform: only the last -rpath option counts, the user must | ||
| 382 | dnl pass all path elements in one option. We can arrange that for a | ||
| 383 | dnl single library, but not when more than one $LIBNAMEs are used. | ||
| 384 | alldirs= | ||
| 385 | for found_dir in $rpathdirs; do | ||
| 386 | - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" | ||
| 387 | + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" | ||
| 388 | done | ||
| 389 | - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. | ||
| 390 | + dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. | ||
| 391 | acl_save_libdir="$libdir" | ||
| 392 | libdir="$alldirs" | ||
| 393 | - eval flag=\"$hardcode_libdir_flag_spec\" | ||
| 394 | + eval flag=\"$acl_hardcode_libdir_flag_spec\" | ||
| 395 | libdir="$acl_save_libdir" | ||
| 396 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" | ||
| 397 | else | ||
| 398 | @@ -514,7 +596,7 @@ | ||
| 399 | for found_dir in $rpathdirs; do | ||
| 400 | acl_save_libdir="$libdir" | ||
| 401 | libdir="$found_dir" | ||
| 402 | - eval flag=\"$hardcode_libdir_flag_spec\" | ||
| 403 | + eval flag=\"$acl_hardcode_libdir_flag_spec\" | ||
| 404 | libdir="$acl_save_libdir" | ||
| 405 | LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" | ||
| 406 | done | ||
| 407 | @@ -549,3 +631,79 @@ | ||
| 408 | fi | ||
| 409 | done | ||
| 410 | ]) | ||
| 411 | + | ||
| 412 | +dnl For those cases where a variable contains several -L and -l options | ||
| 413 | +dnl referring to unknown libraries and directories, this macro determines the | ||
| 414 | +dnl necessary additional linker options for the runtime path. | ||
| 415 | +dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL]) | ||
| 416 | +dnl sets LDADDVAR to linker options needed together with LIBSVALUE. | ||
| 417 | +dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed, | ||
| 418 | +dnl otherwise linking without libtool is assumed. | ||
| 419 | +AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], | ||
| 420 | +[ | ||
| 421 | + AC_REQUIRE([AC_LIB_RPATH]) | ||
| 422 | + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) | ||
| 423 | + $1= | ||
| 424 | + if test "$enable_rpath" != no; then | ||
| 425 | + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then | ||
| 426 | + dnl Use an explicit option to hardcode directories into the resulting | ||
| 427 | + dnl binary. | ||
| 428 | + rpathdirs= | ||
| 429 | + next= | ||
| 430 | + for opt in $2; do | ||
| 431 | + if test -n "$next"; then | ||
| 432 | + dir="$next" | ||
| 433 | + dnl No need to hardcode the standard /usr/lib. | ||
| 434 | + if test "X$dir" != "X/usr/$acl_libdirstem"; then | ||
| 435 | + rpathdirs="$rpathdirs $dir" | ||
| 436 | + fi | ||
| 437 | + next= | ||
| 438 | + else | ||
| 439 | + case $opt in | ||
| 440 | + -L) next=yes ;; | ||
| 441 | + -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` | ||
| 442 | + dnl No need to hardcode the standard /usr/lib. | ||
| 443 | + if test "X$dir" != "X/usr/$acl_libdirstem"; then | ||
| 444 | + rpathdirs="$rpathdirs $dir" | ||
| 445 | + fi | ||
| 446 | + next= ;; | ||
| 447 | + *) next= ;; | ||
| 448 | + esac | ||
| 449 | + fi | ||
| 450 | + done | ||
| 451 | + if test "X$rpathdirs" != "X"; then | ||
| 452 | + if test -n ""$3""; then | ||
| 453 | + dnl libtool is used for linking. Use -R options. | ||
| 454 | + for dir in $rpathdirs; do | ||
| 455 | + $1="${$1}${$1:+ }-R$dir" | ||
| 456 | + done | ||
| 457 | + else | ||
| 458 | + dnl The linker is used for linking directly. | ||
| 459 | + if test -n "$acl_hardcode_libdir_separator"; then | ||
| 460 | + dnl Weird platform: only the last -rpath option counts, the user | ||
| 461 | + dnl must pass all path elements in one option. | ||
| 462 | + alldirs= | ||
| 463 | + for dir in $rpathdirs; do | ||
| 464 | + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" | ||
| 465 | + done | ||
| 466 | + acl_save_libdir="$libdir" | ||
| 467 | + libdir="$alldirs" | ||
| 468 | + eval flag=\"$acl_hardcode_libdir_flag_spec\" | ||
| 469 | + libdir="$acl_save_libdir" | ||
| 470 | + $1="$flag" | ||
| 471 | + else | ||
| 472 | + dnl The -rpath options are cumulative. | ||
| 473 | + for dir in $rpathdirs; do | ||
| 474 | + acl_save_libdir="$libdir" | ||
| 475 | + libdir="$dir" | ||
| 476 | + eval flag=\"$acl_hardcode_libdir_flag_spec\" | ||
| 477 | + libdir="$acl_save_libdir" | ||
| 478 | + $1="${$1}${$1:+ }$flag" | ||
| 479 | + done | ||
| 480 | + fi | ||
| 481 | + fi | ||
| 482 | + fi | ||
| 483 | + fi | ||
| 484 | + fi | ||
| 485 | + AC_SUBST([$1]) | ||
| 486 | +]) | ||
| 487 | Index: gettext-0.14.1/autoconf-lib-link/m4/lib-prefix.m4 | ||
| 488 | =================================================================== | ||
| 489 | --- gettext-0.14.1.orig/autoconf-lib-link/m4/lib-prefix.m4 2008-04-15 14:32:45.000000000 +0100 | ||
| 490 | +++ gettext-0.14.1/autoconf-lib-link/m4/lib-prefix.m4 2008-04-15 14:32:47.000000000 +0100 | ||
| 491 | @@ -1,10 +1,8 @@ | ||
| 492 | -# lib-prefix.m4 serial 3 (gettext-0.13) | ||
| 493 | -dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. | ||
| 494 | -dnl This file is free software, distributed under the terms of the GNU | ||
| 495 | -dnl General Public License. As a special exception to the GNU General | ||
| 496 | -dnl Public License, this file may be distributed as part of a program | ||
| 497 | -dnl that contains a configuration script generated by Autoconf, under | ||
| 498 | -dnl the same distribution terms as the rest of that program. | ||
| 499 | +# lib-prefix.m4 serial 5 (gettext-0.15) | ||
| 500 | +dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. | ||
| 501 | +dnl This file is free software; the Free Software Foundation | ||
| 502 | +dnl gives unlimited permission to copy and/or distribute it, | ||
| 503 | +dnl with or without modifications, as long as this notice is preserved. | ||
| 504 | |||
| 505 | dnl From Bruno Haible. | ||
| 506 | |||
| 507 | @@ -26,6 +24,7 @@ | ||
| 508 | AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) | ||
| 509 | AC_REQUIRE([AC_PROG_CC]) | ||
| 510 | AC_REQUIRE([AC_CANONICAL_HOST]) | ||
| 511 | + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) | ||
| 512 | AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | ||
| 513 | dnl By default, look in $includedir and $libdir. | ||
| 514 | use_additional=yes | ||
| 515 | @@ -47,7 +46,7 @@ | ||
| 516 | ]) | ||
| 517 | else | ||
| 518 | additional_includedir="$withval/include" | ||
| 519 | - additional_libdir="$withval/lib" | ||
| 520 | + additional_libdir="$withval/$acl_libdirstem" | ||
| 521 | fi | ||
| 522 | fi | ||
| 523 | ]) | ||
| 524 | @@ -71,7 +70,7 @@ | ||
| 525 | if test "X$additional_includedir" = "X/usr/local/include"; then | ||
| 526 | if test -n "$GCC"; then | ||
| 527 | case $host_os in | ||
| 528 | - linux*) haveit=yes;; | ||
| 529 | + linux* | gnu* | k*bsd*-gnu) haveit=yes;; | ||
| 530 | esac | ||
| 531 | fi | ||
| 532 | fi | ||
| 533 | @@ -89,7 +88,7 @@ | ||
| 534 | dnl 2. if it's already present in $LDFLAGS, | ||
| 535 | dnl 3. if it's /usr/local/lib and we are using GCC on Linux, | ||
| 536 | dnl 4. if it doesn't exist as a directory. | ||
| 537 | - if test "X$additional_libdir" != "X/usr/lib"; then | ||
| 538 | + if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then | ||
| 539 | haveit= | ||
| 540 | for x in $LDFLAGS; do | ||
| 541 | AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) | ||
| 542 | @@ -99,7 +98,7 @@ | ||
| 543 | fi | ||
| 544 | done | ||
| 545 | if test -z "$haveit"; then | ||
| 546 | - if test "X$additional_libdir" = "X/usr/local/lib"; then | ||
| 547 | + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then | ||
| 548 | if test -n "$GCC"; then | ||
| 549 | case $host_os in | ||
| 550 | linux*) haveit=yes;; | ||
| 551 | @@ -153,3 +152,34 @@ | ||
| 552 | exec_prefix="$acl_save_exec_prefix" | ||
| 553 | prefix="$acl_save_prefix" | ||
| 554 | ]) | ||
| 555 | + | ||
| 556 | +dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing | ||
| 557 | +dnl the basename of the libdir, either "lib" or "lib64". | ||
| 558 | +AC_DEFUN([AC_LIB_PREPARE_MULTILIB], | ||
| 559 | +[ | ||
| 560 | + dnl There is no formal standard regarding lib and lib64. The current | ||
| 561 | + dnl practice is that on a system supporting 32-bit and 64-bit instruction | ||
| 562 | + dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit | ||
| 563 | + dnl libraries go under $prefix/lib. We determine the compiler's default | ||
| 564 | + dnl mode by looking at the compiler's library search path. If at least | ||
| 565 | + dnl of its elements ends in /lib64 or points to a directory whose absolute | ||
| 566 | + dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the | ||
| 567 | + dnl default, namely "lib". | ||
| 568 | + acl_libdirstem=lib | ||
| 569 | + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` | ||
| 570 | + if test -n "$searchpath"; then | ||
| 571 | + acl_save_IFS="${IFS= }"; IFS=":" | ||
| 572 | + for searchdir in $searchpath; do | ||
| 573 | + if test -d "$searchdir"; then | ||
| 574 | + case "$searchdir" in | ||
| 575 | + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; | ||
| 576 | + *) searchdir=`cd "$searchdir" && pwd` | ||
| 577 | + case "$searchdir" in | ||
| 578 | + */lib64 ) acl_libdirstem=lib64 ;; | ||
| 579 | + esac ;; | ||
| 580 | + esac | ||
| 581 | + fi | ||
| 582 | + done | ||
| 583 | + IFS="$acl_save_IFS" | ||
| 584 | + fi | ||
| 585 | +]) | ||
| 586 | Index: gettext-0.14.1/autoconf-lib-link/config.rpath | ||
| 587 | =================================================================== | ||
| 588 | --- gettext-0.14.1.orig/autoconf-lib-link/config.rpath 2008-04-15 14:32:51.000000000 +0100 | ||
| 589 | +++ gettext-0.14.1/autoconf-lib-link/config.rpath 2007-06-28 00:01:49.000000000 +0100 | ||
| 590 | @@ -2,28 +2,13 @@ | ||
| 591 | # Output a system dependent set of variables, describing how to set the | ||
| 592 | # run time search path of shared libraries in an executable. | ||
| 593 | # | ||
| 594 | -# Copyright 1996-2003 Free Software Foundation, Inc. | ||
| 595 | +# Copyright 1996-2007 Free Software Foundation, Inc. | ||
| 596 | # Taken from GNU libtool, 2001 | ||
| 597 | # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 | ||
| 598 | # | ||
| 599 | -# This program is free software; you can redistribute it and/or modify | ||
| 600 | -# it under the terms of the GNU General Public License as published by | ||
| 601 | -# the Free Software Foundation; either version 2 of the License, or | ||
| 602 | -# (at your option) any later version. | ||
| 603 | -# | ||
| 604 | -# This program is distributed in the hope that it will be useful, but | ||
| 605 | -# WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 606 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 607 | -# General Public License for more details. | ||
| 608 | -# | ||
| 609 | -# You should have received a copy of the GNU General Public License | ||
| 610 | -# along with this program; if not, write to the Free Software | ||
| 611 | -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
| 612 | -# | ||
| 613 | -# As a special exception to the GNU General Public License, if you | ||
| 614 | -# distribute this file as part of a program that contains a | ||
| 615 | -# configuration script generated by Autoconf, you may include it under | ||
| 616 | -# the same distribution terms that you use for the rest of that program. | ||
| 617 | +# This file is free software; the Free Software Foundation gives | ||
| 618 | +# unlimited permission to copy and/or distribute it, with or without | ||
| 619 | +# modifications, as long as this notice is preserved. | ||
| 620 | # | ||
| 621 | # The first argument passed to this file is the canonical host specification, | ||
| 622 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM | ||
| 623 | @@ -40,7 +25,7 @@ | ||
| 624 | # known workaround is to choose shorter directory names for the build | ||
| 625 | # directory and/or the installation directory. | ||
| 626 | |||
| 627 | -# All known linkers require a `.a' archive for static linking (except M$VC, | ||
| 628 | +# All known linkers require a `.a' archive for static linking (except MSVC, | ||
| 629 | # which needs '.lib'). | ||
| 630 | libext=a | ||
| 631 | shrext=.so | ||
| 632 | @@ -50,6 +35,18 @@ | ||
| 633 | host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` | ||
| 634 | host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | ||
| 635 | |||
| 636 | +# Code taken from libtool.m4's _LT_CC_BASENAME. | ||
| 637 | + | ||
| 638 | +for cc_temp in $CC""; do | ||
| 639 | + case $cc_temp in | ||
| 640 | + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; | ||
| 641 | + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; | ||
| 642 | + \-*) ;; | ||
| 643 | + *) break;; | ||
| 644 | + esac | ||
| 645 | +done | ||
| 646 | +cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` | ||
| 647 | + | ||
| 648 | # Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. | ||
| 649 | |||
| 650 | wl= | ||
| 651 | @@ -60,7 +57,14 @@ | ||
| 652 | aix*) | ||
| 653 | wl='-Wl,' | ||
| 654 | ;; | ||
| 655 | - mingw* | pw32* | os2*) | ||
| 656 | + darwin*) | ||
| 657 | + case $cc_basename in | ||
| 658 | + xlc*) | ||
| 659 | + wl='-Wl,' | ||
| 660 | + ;; | ||
| 661 | + esac | ||
| 662 | + ;; | ||
| 663 | + mingw* | cygwin* | pw32* | os2*) | ||
| 664 | ;; | ||
| 665 | hpux9* | hpux10* | hpux11*) | ||
| 666 | wl='-Wl,' | ||
| 667 | @@ -70,20 +74,33 @@ | ||
| 668 | ;; | ||
| 669 | newsos6) | ||
| 670 | ;; | ||
| 671 | - linux*) | ||
| 672 | - case $CC in | ||
| 673 | - icc|ecc) | ||
| 674 | + linux* | k*bsd*-gnu) | ||
| 675 | + case $cc_basename in | ||
| 676 | + icc* | ecc*) | ||
| 677 | + wl='-Wl,' | ||
| 678 | + ;; | ||
| 679 | + pgcc | pgf77 | pgf90) | ||
| 680 | wl='-Wl,' | ||
| 681 | ;; | ||
| 682 | - ccc) | ||
| 683 | + ccc*) | ||
| 684 | wl='-Wl,' | ||
| 685 | ;; | ||
| 686 | + como) | ||
| 687 | + wl='-lopt=' | ||
| 688 | + ;; | ||
| 689 | + *) | ||
| 690 | + case `$CC -V 2>&1 | sed 5q` in | ||
| 691 | + *Sun\ C*) | ||
| 692 | + wl='-Wl,' | ||
| 693 | + ;; | ||
| 694 | + esac | ||
| 695 | + ;; | ||
| 696 | esac | ||
| 697 | ;; | ||
| 698 | osf3* | osf4* | osf5*) | ||
| 699 | wl='-Wl,' | ||
| 700 | ;; | ||
| 701 | - sco3.2v5*) | ||
| 702 | + rdos*) | ||
| 703 | ;; | ||
| 704 | solaris*) | ||
| 705 | wl='-Wl,' | ||
| 706 | @@ -91,11 +108,17 @@ | ||
| 707 | sunos4*) | ||
| 708 | wl='-Qoption ld ' | ||
| 709 | ;; | ||
| 710 | - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) | ||
| 711 | + sysv4 | sysv4.2uw2* | sysv4.3*) | ||
| 712 | wl='-Wl,' | ||
| 713 | ;; | ||
| 714 | sysv4*MP*) | ||
| 715 | ;; | ||
| 716 | + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) | ||
| 717 | + wl='-Wl,' | ||
| 718 | + ;; | ||
| 719 | + unicos*) | ||
| 720 | + wl='-Wl,' | ||
| 721 | + ;; | ||
| 722 | uts4*) | ||
| 723 | ;; | ||
| 724 | esac | ||
| 725 | @@ -117,6 +140,10 @@ | ||
| 726 | with_gnu_ld=no | ||
| 727 | fi | ||
| 728 | ;; | ||
| 729 | + interix*) | ||
| 730 | + # we just hope/assume this is gcc and not c89 (= MSVC++) | ||
| 731 | + with_gnu_ld=yes | ||
| 732 | + ;; | ||
| 733 | openbsd*) | ||
| 734 | with_gnu_ld=no | ||
| 735 | ;; | ||
| 736 | @@ -124,6 +151,12 @@ | ||
| 737 | |||
| 738 | ld_shlibs=yes | ||
| 739 | if test "$with_gnu_ld" = yes; then | ||
| 740 | + # Set some defaults for GNU ld with shared library support. These | ||
| 741 | + # are reset later if shared libraries are not supported. Putting them | ||
| 742 | + # here allows them to be overridden if necessary. | ||
| 743 | + # Unlike libtool, we use -rpath here, not --rpath, since the documented | ||
| 744 | + # option of GNU ld is called -rpath, not --rpath. | ||
| 745 | + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||
| 746 | case "$host_os" in | ||
| 747 | aix3* | aix4* | aix5*) | ||
| 748 | # On AIX/PPC, the GNU linker is very broken | ||
| 749 | @@ -138,7 +171,7 @@ | ||
| 750 | # that the semantics of dynamic libraries on AmigaOS, at least up | ||
| 751 | # to version 4, is to share data among multiple programs linked | ||
| 752 | # with the same dynamic library. Since this doesn't match the | ||
| 753 | - # behavior of shared libraries on other platforms, we can use | ||
| 754 | + # behavior of shared libraries on other platforms, we cannot use | ||
| 755 | # them. | ||
| 756 | ld_shlibs=no | ||
| 757 | ;; | ||
| 758 | @@ -159,9 +192,20 @@ | ||
| 759 | ld_shlibs=no | ||
| 760 | fi | ||
| 761 | ;; | ||
| 762 | + interix[3-9]*) | ||
| 763 | + hardcode_direct=no | ||
| 764 | + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||
| 765 | + ;; | ||
| 766 | + gnu* | linux* | k*bsd*-gnu) | ||
| 767 | + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | ||
| 768 | + : | ||
| 769 | + else | ||
| 770 | + ld_shlibs=no | ||
| 771 | + fi | ||
| 772 | + ;; | ||
| 773 | netbsd*) | ||
| 774 | ;; | ||
| 775 | - solaris* | sysv5*) | ||
| 776 | + solaris*) | ||
| 777 | if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then | ||
| 778 | ld_shlibs=no | ||
| 779 | elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | ||
| 780 | @@ -170,6 +214,20 @@ | ||
| 781 | ld_shlibs=no | ||
| 782 | fi | ||
| 783 | ;; | ||
| 784 | + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) | ||
| 785 | + case `$LD -v 2>&1` in | ||
| 786 | + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) | ||
| 787 | + ld_shlibs=no | ||
| 788 | + ;; | ||
| 789 | + *) | ||
| 790 | + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | ||
| 791 | + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' | ||
| 792 | + else | ||
| 793 | + ld_shlibs=no | ||
| 794 | + fi | ||
| 795 | + ;; | ||
| 796 | + esac | ||
| 797 | + ;; | ||
| 798 | sunos4*) | ||
| 799 | hardcode_direct=yes | ||
| 800 | ;; | ||
| 801 | @@ -181,10 +239,8 @@ | ||
| 802 | fi | ||
| 803 | ;; | ||
| 804 | esac | ||
| 805 | - if test "$ld_shlibs" = yes; then | ||
| 806 | - # Unlike libtool, we use -rpath here, not --rpath, since the documented | ||
| 807 | - # option of GNU ld is called -rpath, not --rpath. | ||
| 808 | - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | ||
| 809 | + if test "$ld_shlibs" = no; then | ||
| 810 | + hardcode_libdir_flag_spec= | ||
| 811 | fi | ||
| 812 | else | ||
| 813 | case "$host_os" in | ||
| 814 | @@ -215,6 +271,7 @@ | ||
| 815 | break | ||
| 816 | fi | ||
| 817 | done | ||
| 818 | + ;; | ||
| 819 | esac | ||
| 820 | fi | ||
| 821 | hardcode_direct=yes | ||
| 822 | @@ -226,7 +283,7 @@ | ||
| 823 | strings "$collect2name" | grep resolve_lib_name >/dev/null | ||
| 824 | then | ||
| 825 | # We have reworked collect2 | ||
| 826 | - hardcode_direct=yes | ||
| 827 | + : | ||
| 828 | else | ||
| 829 | # We have old collect2 | ||
| 830 | hardcode_direct=unsupported | ||
| 831 | @@ -234,6 +291,7 @@ | ||
| 832 | hardcode_libdir_flag_spec='-L$libdir' | ||
| 833 | hardcode_libdir_separator= | ||
| 834 | fi | ||
| 835 | + ;; | ||
| 836 | esac | ||
| 837 | fi | ||
| 838 | # Begin _LT_AC_SYS_LIBPATH_AIX. | ||
| 839 | @@ -266,7 +324,7 @@ | ||
| 840 | # see comment about different semantics on the GNU ld section | ||
| 841 | ld_shlibs=no | ||
| 842 | ;; | ||
| 843 | - bsdi4*) | ||
| 844 | + bsdi[45]*) | ||
| 845 | ;; | ||
| 846 | cygwin* | mingw* | pw32*) | ||
| 847 | # When not using gcc, we currently assume that we are using | ||
| 848 | @@ -277,8 +335,17 @@ | ||
| 849 | libext=lib | ||
| 850 | ;; | ||
| 851 | darwin* | rhapsody*) | ||
| 852 | - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then | ||
| 853 | - hardcode_direct=no | ||
| 854 | + hardcode_direct=no | ||
| 855 | + if test "$GCC" = yes ; then | ||
| 856 | + : | ||
| 857 | + else | ||
| 858 | + case $cc_basename in | ||
| 859 | + xlc*) | ||
| 860 | + ;; | ||
| 861 | + *) | ||
| 862 | + ld_shlibs=no | ||
| 863 | + ;; | ||
| 864 | + esac | ||
| 865 | fi | ||
| 866 | ;; | ||
| 867 | dgux*) | ||
| 868 | @@ -295,7 +362,7 @@ | ||
| 869 | hardcode_direct=yes | ||
| 870 | hardcode_minus_L=yes | ||
| 871 | ;; | ||
| 872 | - freebsd*) | ||
| 873 | + freebsd* | dragonfly*) | ||
| 874 | hardcode_libdir_flag_spec='-R$libdir' | ||
| 875 | hardcode_direct=yes | ||
| 876 | ;; | ||
| 877 | @@ -307,24 +374,25 @@ | ||
| 878 | # but as the default location of the library. | ||
| 879 | hardcode_minus_L=yes | ||
| 880 | ;; | ||
| 881 | - hpux10* | hpux11*) | ||
| 882 | + hpux10*) | ||
| 883 | if test "$with_gnu_ld" = no; then | ||
| 884 | - case "$host_cpu" in | ||
| 885 | - hppa*64*) | ||
| 886 | - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' | ||
| 887 | - hardcode_libdir_separator=: | ||
| 888 | - hardcode_direct=no | ||
| 889 | - ;; | ||
| 890 | - ia64*) | ||
| 891 | - hardcode_libdir_flag_spec='-L$libdir' | ||
| 892 | + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' | ||
| 893 | + hardcode_libdir_separator=: | ||
| 894 | + hardcode_direct=yes | ||
| 895 | + # hardcode_minus_L: Not really in the search PATH, | ||
| 896 | + # but as the default location of the library. | ||
| 897 | + hardcode_minus_L=yes | ||
| 898 | + fi | ||
| 899 | + ;; | ||
| 900 | + hpux11*) | ||
| 901 | + if test "$with_gnu_ld" = no; then | ||
| 902 | + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' | ||
| 903 | + hardcode_libdir_separator=: | ||
| 904 | + case $host_cpu in | ||
| 905 | + hppa*64*|ia64*) | ||
| 906 | hardcode_direct=no | ||
| 907 | - # hardcode_minus_L: Not really in the search PATH, | ||
| 908 | - # but as the default location of the library. | ||
| 909 | - hardcode_minus_L=yes | ||
| 910 | ;; | ||
| 911 | *) | ||
| 912 | - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' | ||
| 913 | - hardcode_libdir_separator=: | ||
| 914 | hardcode_direct=yes | ||
| 915 | # hardcode_minus_L: Not really in the search PATH, | ||
| 916 | # but as the default location of the library. | ||
| 917 | @@ -347,18 +415,22 @@ | ||
| 918 | hardcode_libdir_separator=: | ||
| 919 | ;; | ||
| 920 | openbsd*) | ||
| 921 | - hardcode_direct=yes | ||
| 922 | - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | ||
| 923 | - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||
| 924 | + if test -f /usr/libexec/ld.so; then | ||
| 925 | + hardcode_direct=yes | ||
| 926 | + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | ||
| 927 | + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||
| 928 | + else | ||
| 929 | + case "$host_os" in | ||
| 930 | + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) | ||
| 931 | + hardcode_libdir_flag_spec='-R$libdir' | ||
| 932 | + ;; | ||
| 933 | + *) | ||
| 934 | + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||
| 935 | + ;; | ||
| 936 | + esac | ||
| 937 | + fi | ||
| 938 | else | ||
| 939 | - case "$host_os" in | ||
| 940 | - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) | ||
| 941 | - hardcode_libdir_flag_spec='-R$libdir' | ||
| 942 | - ;; | ||
| 943 | - *) | ||
| 944 | - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | ||
| 945 | - ;; | ||
| 946 | - esac | ||
| 947 | + ld_shlibs=no | ||
| 948 | fi | ||
| 949 | ;; | ||
| 950 | os2*) | ||
| 951 | @@ -378,8 +450,6 @@ | ||
| 952 | fi | ||
| 953 | hardcode_libdir_separator=: | ||
| 954 | ;; | ||
| 955 | - sco3.2v5*) | ||
| 956 | - ;; | ||
| 957 | solaris*) | ||
| 958 | hardcode_libdir_flag_spec='-R$libdir' | ||
| 959 | ;; | ||
| 960 | @@ -408,14 +478,11 @@ | ||
| 961 | ld_shlibs=yes | ||
| 962 | fi | ||
| 963 | ;; | ||
| 964 | - sysv4.2uw2*) | ||
| 965 | - hardcode_direct=yes | ||
| 966 | - hardcode_minus_L=no | ||
| 967 | - ;; | ||
| 968 | - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) | ||
| 969 | + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) | ||
| 970 | ;; | ||
| 971 | - sysv5*) | ||
| 972 | - hardcode_libdir_flag_spec= | ||
| 973 | + sysv5* | sco3.2v5* | sco5v6*) | ||
| 974 | + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' | ||
| 975 | + hardcode_libdir_separator=':' | ||
| 976 | ;; | ||
| 977 | uts4*) | ||
| 978 | hardcode_libdir_flag_spec='-L$libdir' | ||
| 979 | @@ -428,34 +495,54 @@ | ||
| 980 | |||
| 981 | # Check dynamic linker characteristics | ||
| 982 | # Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. | ||
| 983 | +# Unlike libtool.m4, here we don't care about _all_ names of the library, but | ||
| 984 | +# only about the one the linker finds when passed -lNAME. This is the last | ||
| 985 | +# element of library_names_spec in libtool.m4, or possibly two of them if the | ||
| 986 | +# linker has special search rules. | ||
| 987 | +library_names_spec= # the last element of library_names_spec in libtool.m4 | ||
| 988 | libname_spec='lib$name' | ||
| 989 | case "$host_os" in | ||
| 990 | aix3*) | ||
| 991 | + library_names_spec='$libname.a' | ||
| 992 | ;; | ||
| 993 | aix4* | aix5*) | ||
| 994 | + library_names_spec='$libname$shrext' | ||
| 995 | ;; | ||
| 996 | amigaos*) | ||
| 997 | + library_names_spec='$libname.a' | ||
| 998 | ;; | ||
| 999 | beos*) | ||
| 1000 | + library_names_spec='$libname$shrext' | ||
| 1001 | ;; | ||
| 1002 | - bsdi4*) | ||
| 1003 | + bsdi[45]*) | ||
| 1004 | + library_names_spec='$libname$shrext' | ||
| 1005 | ;; | ||
| 1006 | cygwin* | mingw* | pw32*) | ||
| 1007 | shrext=.dll | ||
| 1008 | + library_names_spec='$libname.dll.a $libname.lib' | ||
| 1009 | ;; | ||
| 1010 | darwin* | rhapsody*) | ||
| 1011 | shrext=.dylib | ||
| 1012 | + library_names_spec='$libname$shrext' | ||
| 1013 | ;; | ||
| 1014 | dgux*) | ||
| 1015 | + library_names_spec='$libname$shrext' | ||
| 1016 | ;; | ||
| 1017 | freebsd1*) | ||
| 1018 | ;; | ||
| 1019 | - freebsd*) | ||
| 1020 | + freebsd* | dragonfly*) | ||
| 1021 | + case "$host_os" in | ||
| 1022 | + freebsd[123]*) | ||
| 1023 | + library_names_spec='$libname$shrext$versuffix' ;; | ||
| 1024 | + *) | ||
| 1025 | + library_names_spec='$libname$shrext' ;; | ||
| 1026 | + esac | ||
| 1027 | ;; | ||
| 1028 | gnu*) | ||
| 1029 | + library_names_spec='$libname$shrext' | ||
| 1030 | ;; | ||
| 1031 | hpux9* | hpux10* | hpux11*) | ||
| 1032 | - case "$host_cpu" in | ||
| 1033 | + case $host_cpu in | ||
| 1034 | ia64*) | ||
| 1035 | shrext=.so | ||
| 1036 | ;; | ||
| 1037 | @@ -466,8 +553,13 @@ | ||
| 1038 | shrext=.sl | ||
| 1039 | ;; | ||
| 1040 | esac | ||
| 1041 | + library_names_spec='$libname$shrext' | ||
| 1042 | + ;; | ||
| 1043 | + interix[3-9]*) | ||
| 1044 | + library_names_spec='$libname$shrext' | ||
| 1045 | ;; | ||
| 1046 | irix5* | irix6* | nonstopux*) | ||
| 1047 | + library_names_spec='$libname$shrext' | ||
| 1048 | case "$host_os" in | ||
| 1049 | irix5* | nonstopux*) | ||
| 1050 | libsuff= shlibsuff= | ||
| 1051 | @@ -484,42 +576,62 @@ | ||
| 1052 | ;; | ||
| 1053 | linux*oldld* | linux*aout* | linux*coff*) | ||
| 1054 | ;; | ||
| 1055 | - linux*) | ||
| 1056 | + linux* | k*bsd*-gnu) | ||
| 1057 | + library_names_spec='$libname$shrext' | ||
| 1058 | + ;; | ||
| 1059 | + knetbsd*-gnu) | ||
| 1060 | + library_names_spec='$libname$shrext' | ||
| 1061 | ;; | ||
| 1062 | netbsd*) | ||
| 1063 | + library_names_spec='$libname$shrext' | ||
| 1064 | ;; | ||
| 1065 | newsos6) | ||
| 1066 | + library_names_spec='$libname$shrext' | ||
| 1067 | ;; | ||
| 1068 | - nto-qnx) | ||
| 1069 | + nto-qnx*) | ||
| 1070 | + library_names_spec='$libname$shrext' | ||
| 1071 | ;; | ||
| 1072 | openbsd*) | ||
| 1073 | + library_names_spec='$libname$shrext$versuffix' | ||
| 1074 | ;; | ||
| 1075 | os2*) | ||
| 1076 | libname_spec='$name' | ||
| 1077 | shrext=.dll | ||
| 1078 | + library_names_spec='$libname.a' | ||
| 1079 | ;; | ||
| 1080 | osf3* | osf4* | osf5*) | ||
| 1081 | + library_names_spec='$libname$shrext' | ||
| 1082 | ;; | ||
| 1083 | - sco3.2v5*) | ||
| 1084 | + rdos*) | ||
| 1085 | ;; | ||
| 1086 | solaris*) | ||
| 1087 | + library_names_spec='$libname$shrext' | ||
| 1088 | ;; | ||
| 1089 | sunos4*) | ||
| 1090 | + library_names_spec='$libname$shrext$versuffix' | ||
| 1091 | ;; | ||
| 1092 | - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) | ||
| 1093 | + sysv4 | sysv4.3*) | ||
| 1094 | + library_names_spec='$libname$shrext' | ||
| 1095 | ;; | ||
| 1096 | sysv4*MP*) | ||
| 1097 | + library_names_spec='$libname$shrext' | ||
| 1098 | + ;; | ||
| 1099 | + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) | ||
| 1100 | + library_names_spec='$libname$shrext' | ||
| 1101 | ;; | ||
| 1102 | uts4*) | ||
| 1103 | + library_names_spec='$libname$shrext' | ||
| 1104 | ;; | ||
| 1105 | esac | ||
| 1106 | |||
| 1107 | sed_quote_subst='s/\(["`$\\]\)/\\\1/g' | ||
| 1108 | escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` | ||
| 1109 | shlibext=`echo "$shrext" | sed -e 's,^\.,,'` | ||
| 1110 | +escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` | ||
| 1111 | +escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` | ||
| 1112 | escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` | ||
| 1113 | |||
| 1114 | -sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF | ||
| 1115 | +LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF | ||
| 1116 | |||
| 1117 | # How to pass a linker flag through the compiler. | ||
| 1118 | wl="$escaped_wl" | ||
| 1119 | @@ -530,6 +642,12 @@ | ||
| 1120 | # Shared library suffix (normally "so"). | ||
| 1121 | shlibext="$shlibext" | ||
| 1122 | |||
| 1123 | +# Format of library name prefix. | ||
| 1124 | +libname_spec="$escaped_libname_spec" | ||
| 1125 | + | ||
| 1126 | +# Library names that the linker finds when passed -lNAME. | ||
| 1127 | +library_names_spec="$escaped_library_names_spec" | ||
| 1128 | + | ||
| 1129 | # Flag to hardcode \$libdir into a binary during linking. | ||
| 1130 | # This must work even if \$libdir does not exist. | ||
| 1131 | hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec" | ||
