Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From fad053cc59baa6277182b0fc90415a214060ba99 Mon Sep 17 00:00:00 2001 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 14 Feb 2016 17:04:07 +0000 |
| 4 | Subject: [PATCH 06/15] Use libtool 2.4 |
| 5 | |
| 6 | get libtool sysroot support |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | bfd/configure | 1318 +++++++++++++++++------ |
| 13 | bfd/configure.ac | 2 +- |
| 14 | binutils/configure | 1316 +++++++++++++++++------ |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 15 | gas/configure | 1314 +++++++++++++++++------ |
| 16 | gprof/configure | 1321 +++++++++++++++++------ |
| 17 | ld/configure | 1691 +++++++++++++++++++++-------- |
| 18 | libtool.m4 | 1080 +++++++++++++------ |
| 19 | ltmain.sh | 2925 +++++++++++++++++++++++++++++++++----------------- |
| 20 | ltoptions.m4 | 2 +- |
| 21 | ltversion.m4 | 12 +- |
| 22 | lt~obsolete.m4 | 2 +- |
| 23 | opcodes/configure | 1318 +++++++++++++++++------ |
| 24 | opcodes/configure.ac | 2 +- |
| 25 | zlib/configure | 1316 +++++++++++++++++------ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 26 | 14 files changed, 9926 insertions(+), 3693 deletions(-) |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 27 | |
| 28 | diff --git a/bfd/configure b/bfd/configure |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 29 | index 6c2b24ebe3..5fdd723b7f 100755 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 30 | --- a/bfd/configure |
| 31 | +++ b/bfd/configure |
| 32 | @@ -672,6 +672,9 @@ OTOOL |
| 33 | LIPO |
| 34 | NMEDIT |
| 35 | DSYMUTIL |
| 36 | +MANIFEST_TOOL |
| 37 | +ac_ct_AR |
| 38 | +DLLTOOL |
| 39 | OBJDUMP |
| 40 | LN_S |
| 41 | NM |
| 42 | @@ -785,6 +788,7 @@ enable_static |
| 43 | with_pic |
| 44 | enable_fast_install |
| 45 | with_gnu_ld |
| 46 | +with_libtool_sysroot |
| 47 | enable_libtool_lock |
| 48 | enable_plugins |
| 49 | enable_largefile |
| 50 | @@ -1461,6 +1465,8 @@ Optional Packages: |
| 51 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 52 | both] |
| 53 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 54 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 55 | + (or the compiler's sysroot if not specified). |
| 56 | --with-mmap try using mmap for BFD input files if available |
| 57 | --with-separate-debug-dir=DIR |
| 58 | Look for global separate debug info in DIR |
| 59 | @@ -5393,8 +5399,8 @@ esac |
| 60 | |
| 61 | |
| 62 | |
| 63 | -macro_version='2.2.7a' |
| 64 | -macro_revision='1.3134' |
| 65 | +macro_version='2.4' |
| 66 | +macro_revision='1.3293' |
| 67 | |
| 68 | |
| 69 | |
| 70 | @@ -5434,7 +5440,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 71 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 72 | $as_echo_n "checking how to print strings... " >&6; } |
| 73 | # Test print first, because it will be a builtin if present. |
| 74 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 75 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 76 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 77 | ECHO='print -r --' |
| 78 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 79 | @@ -6120,8 +6126,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 80 | # Try some XSI features |
| 81 | xsi_shell=no |
| 82 | ( _lt_dummy="a/b/c" |
| 83 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 84 | - = c,a/b,, \ |
| 85 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 86 | + = c,a/b,b/c, \ |
| 87 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 88 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 89 | && xsi_shell=yes |
| 90 | @@ -6170,6 +6176,80 @@ esac |
| 91 | |
| 92 | |
| 93 | |
| 94 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 95 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 96 | +if test "${lt_cv_to_host_file_cmd+set}" = set; then : |
| 97 | + $as_echo_n "(cached) " >&6 |
| 98 | +else |
| 99 | + case $host in |
| 100 | + *-*-mingw* ) |
| 101 | + case $build in |
| 102 | + *-*-mingw* ) # actually msys |
| 103 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 104 | + ;; |
| 105 | + *-*-cygwin* ) |
| 106 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 107 | + ;; |
| 108 | + * ) # otherwise, assume *nix |
| 109 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 110 | + ;; |
| 111 | + esac |
| 112 | + ;; |
| 113 | + *-*-cygwin* ) |
| 114 | + case $build in |
| 115 | + *-*-mingw* ) # actually msys |
| 116 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 117 | + ;; |
| 118 | + *-*-cygwin* ) |
| 119 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 120 | + ;; |
| 121 | + * ) # otherwise, assume *nix |
| 122 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 123 | + ;; |
| 124 | + esac |
| 125 | + ;; |
| 126 | + * ) # unhandled hosts (and "normal" native builds) |
| 127 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 128 | + ;; |
| 129 | +esac |
| 130 | + |
| 131 | +fi |
| 132 | + |
| 133 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 134 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 135 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 136 | + |
| 137 | + |
| 138 | + |
| 139 | + |
| 140 | + |
| 141 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 142 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 143 | +if test "${lt_cv_to_tool_file_cmd+set}" = set; then : |
| 144 | + $as_echo_n "(cached) " >&6 |
| 145 | +else |
| 146 | + #assume ordinary cross tools, or native build. |
| 147 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 148 | +case $host in |
| 149 | + *-*-mingw* ) |
| 150 | + case $build in |
| 151 | + *-*-mingw* ) # actually msys |
| 152 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 153 | + ;; |
| 154 | + esac |
| 155 | + ;; |
| 156 | +esac |
| 157 | + |
| 158 | +fi |
| 159 | + |
| 160 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 161 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 162 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 163 | + |
| 164 | + |
| 165 | + |
| 166 | + |
| 167 | + |
| 168 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 169 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 170 | if test "${lt_cv_ld_reload_flag+set}" = set; then : |
| 171 | @@ -6186,6 +6266,11 @@ case $reload_flag in |
| 172 | esac |
| 173 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 174 | case $host_os in |
| 175 | + cygwin* | mingw* | pw32* | cegcc*) |
| 176 | + if test "$GCC" != yes; then |
| 177 | + reload_cmds=false |
| 178 | + fi |
| 179 | + ;; |
| 180 | darwin*) |
| 181 | if test "$GCC" = yes; then |
| 182 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 183 | @@ -6354,7 +6439,8 @@ mingw* | pw32*) |
| 184 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 185 | lt_cv_file_magic_cmd='func_win32_libid' |
| 186 | else |
| 187 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 188 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 189 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 190 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 191 | fi |
| 192 | ;; |
| 193 | @@ -6508,6 +6594,21 @@ esac |
| 194 | fi |
| 195 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 196 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 197 | + |
| 198 | +file_magic_glob= |
| 199 | +want_nocaseglob=no |
| 200 | +if test "$build" = "$host"; then |
| 201 | + case $host_os in |
| 202 | + mingw* | pw32*) |
| 203 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 204 | + want_nocaseglob=yes |
| 205 | + else |
| 206 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 207 | + fi |
| 208 | + ;; |
| 209 | + esac |
| 210 | +fi |
| 211 | + |
| 212 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 213 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 214 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 215 | @@ -6521,11 +6622,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 216 | |
| 217 | |
| 218 | |
| 219 | + |
| 220 | + |
| 221 | + |
| 222 | + |
| 223 | + |
| 224 | + |
| 225 | + |
| 226 | + |
| 227 | + |
| 228 | + |
| 229 | |
| 230 | |
| 231 | if test -n "$ac_tool_prefix"; then |
| 232 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 233 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 234 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 235 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 236 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 237 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 238 | +if test "${ac_cv_prog_DLLTOOL+set}" = set; then : |
| 239 | + $as_echo_n "(cached) " >&6 |
| 240 | +else |
| 241 | + if test -n "$DLLTOOL"; then |
| 242 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 243 | +else |
| 244 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 245 | +for as_dir in $PATH |
| 246 | +do |
| 247 | + IFS=$as_save_IFS |
| 248 | + test -z "$as_dir" && as_dir=. |
| 249 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 250 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 251 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 252 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 253 | + break 2 |
| 254 | + fi |
| 255 | +done |
| 256 | + done |
| 257 | +IFS=$as_save_IFS |
| 258 | + |
| 259 | +fi |
| 260 | +fi |
| 261 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 262 | +if test -n "$DLLTOOL"; then |
| 263 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 264 | +$as_echo "$DLLTOOL" >&6; } |
| 265 | +else |
| 266 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 267 | +$as_echo "no" >&6; } |
| 268 | +fi |
| 269 | + |
| 270 | + |
| 271 | +fi |
| 272 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 273 | + ac_ct_DLLTOOL=$DLLTOOL |
| 274 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 275 | +set dummy dlltool; ac_word=$2 |
| 276 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 277 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 278 | +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : |
| 279 | + $as_echo_n "(cached) " >&6 |
| 280 | +else |
| 281 | + if test -n "$ac_ct_DLLTOOL"; then |
| 282 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 283 | +else |
| 284 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 285 | +for as_dir in $PATH |
| 286 | +do |
| 287 | + IFS=$as_save_IFS |
| 288 | + test -z "$as_dir" && as_dir=. |
| 289 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 290 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 291 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 292 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 293 | + break 2 |
| 294 | + fi |
| 295 | +done |
| 296 | + done |
| 297 | +IFS=$as_save_IFS |
| 298 | + |
| 299 | +fi |
| 300 | +fi |
| 301 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 302 | +if test -n "$ac_ct_DLLTOOL"; then |
| 303 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 304 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 305 | +else |
| 306 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 307 | +$as_echo "no" >&6; } |
| 308 | +fi |
| 309 | + |
| 310 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 311 | + DLLTOOL="false" |
| 312 | + else |
| 313 | + case $cross_compiling:$ac_tool_warned in |
| 314 | +yes:) |
| 315 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 316 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 317 | +ac_tool_warned=yes ;; |
| 318 | +esac |
| 319 | + DLLTOOL=$ac_ct_DLLTOOL |
| 320 | + fi |
| 321 | +else |
| 322 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 323 | +fi |
| 324 | + |
| 325 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 326 | + |
| 327 | + |
| 328 | + |
| 329 | + |
| 330 | + |
| 331 | + |
| 332 | + |
| 333 | + |
| 334 | + |
| 335 | + |
| 336 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 337 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 338 | +if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : |
| 339 | + $as_echo_n "(cached) " >&6 |
| 340 | +else |
| 341 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 342 | + |
| 343 | +case $host_os in |
| 344 | +cygwin* | mingw* | pw32* | cegcc*) |
| 345 | + # two different shell functions defined in ltmain.sh |
| 346 | + # decide which to use based on capabilities of $DLLTOOL |
| 347 | + case `$DLLTOOL --help 2>&1` in |
| 348 | + *--identify-strict*) |
| 349 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 350 | + ;; |
| 351 | + *) |
| 352 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 353 | + ;; |
| 354 | + esac |
| 355 | + ;; |
| 356 | +*) |
| 357 | + # fallback: assume linklib IS sharedlib |
| 358 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 359 | + ;; |
| 360 | +esac |
| 361 | + |
| 362 | +fi |
| 363 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 364 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 365 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 366 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 367 | + |
| 368 | + |
| 369 | + |
| 370 | + |
| 371 | + |
| 372 | + |
| 373 | + |
| 374 | +if test -n "$ac_tool_prefix"; then |
| 375 | + for ac_prog in ar |
| 376 | + do |
| 377 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 378 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 379 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 380 | $as_echo_n "checking for $ac_word... " >&6; } |
| 381 | if test "${ac_cv_prog_AR+set}" = set; then : |
| 382 | @@ -6541,7 +6795,7 @@ do |
| 383 | test -z "$as_dir" && as_dir=. |
| 384 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 385 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 386 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 387 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 388 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 389 | break 2 |
| 390 | fi |
| 391 | @@ -6561,11 +6815,15 @@ $as_echo "no" >&6; } |
| 392 | fi |
| 393 | |
| 394 | |
| 395 | + test -n "$AR" && break |
| 396 | + done |
| 397 | fi |
| 398 | -if test -z "$ac_cv_prog_AR"; then |
| 399 | +if test -z "$AR"; then |
| 400 | ac_ct_AR=$AR |
| 401 | - # Extract the first word of "ar", so it can be a program name with args. |
| 402 | -set dummy ar; ac_word=$2 |
| 403 | + for ac_prog in ar |
| 404 | +do |
| 405 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 406 | +set dummy $ac_prog; ac_word=$2 |
| 407 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 408 | $as_echo_n "checking for $ac_word... " >&6; } |
| 409 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
| 410 | @@ -6581,7 +6839,7 @@ do |
| 411 | test -z "$as_dir" && as_dir=. |
| 412 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 413 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 414 | - ac_cv_prog_ac_ct_AR="ar" |
| 415 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 416 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 417 | break 2 |
| 418 | fi |
| 419 | @@ -6600,6 +6858,10 @@ else |
| 420 | $as_echo "no" >&6; } |
| 421 | fi |
| 422 | |
| 423 | + |
| 424 | + test -n "$ac_ct_AR" && break |
| 425 | +done |
| 426 | + |
| 427 | if test "x$ac_ct_AR" = x; then |
| 428 | AR="false" |
| 429 | else |
| 430 | @@ -6611,16 +6873,72 @@ ac_tool_warned=yes ;; |
| 431 | esac |
| 432 | AR=$ac_ct_AR |
| 433 | fi |
| 434 | -else |
| 435 | - AR="$ac_cv_prog_AR" |
| 436 | fi |
| 437 | |
| 438 | -test -z "$AR" && AR=ar |
| 439 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 440 | +: ${AR=ar} |
| 441 | +: ${AR_FLAGS=cru} |
| 442 | + |
| 443 | + |
| 444 | + |
| 445 | + |
| 446 | + |
| 447 | + |
| 448 | + |
| 449 | + |
| 450 | + |
| 451 | + |
| 452 | + |
| 453 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 454 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 455 | +if test "${lt_cv_ar_at_file+set}" = set; then : |
| 456 | + $as_echo_n "(cached) " >&6 |
| 457 | +else |
| 458 | + lt_cv_ar_at_file=no |
| 459 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 460 | +/* end confdefs.h. */ |
| 461 | + |
| 462 | +int |
| 463 | +main () |
| 464 | +{ |
| 465 | |
| 466 | + ; |
| 467 | + return 0; |
| 468 | +} |
| 469 | +_ACEOF |
| 470 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 471 | + echo conftest.$ac_objext > conftest.lst |
| 472 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 473 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 474 | + (eval $lt_ar_try) 2>&5 |
| 475 | + ac_status=$? |
| 476 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 477 | + test $ac_status = 0; } |
| 478 | + if test "$ac_status" -eq 0; then |
| 479 | + # Ensure the archiver fails upon bogus file names. |
| 480 | + rm -f conftest.$ac_objext libconftest.a |
| 481 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 482 | + (eval $lt_ar_try) 2>&5 |
| 483 | + ac_status=$? |
| 484 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 485 | + test $ac_status = 0; } |
| 486 | + if test "$ac_status" -ne 0; then |
| 487 | + lt_cv_ar_at_file=@ |
| 488 | + fi |
| 489 | + fi |
| 490 | + rm -f conftest.* libconftest.a |
| 491 | |
| 492 | +fi |
| 493 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 494 | |
| 495 | +fi |
| 496 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 497 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 498 | |
| 499 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 500 | + archiver_list_spec= |
| 501 | +else |
| 502 | + archiver_list_spec=$lt_cv_ar_at_file |
| 503 | +fi |
| 504 | |
| 505 | |
| 506 | |
| 507 | @@ -6962,8 +7280,8 @@ esac |
| 508 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 509 | |
| 510 | # Transform an extracted symbol line into symbol name and symbol address |
| 511 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 512 | -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
| 513 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 514 | +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
| 515 | |
| 516 | # Handle CRLF in mingw tool chain |
| 517 | opt_cr= |
| 518 | @@ -6999,6 +7317,7 @@ for ac_symprfx in "" "_"; do |
| 519 | else |
| 520 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 521 | fi |
| 522 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 523 | |
| 524 | # Check to see that the pipe works correctly. |
| 525 | pipe_works=no |
| 526 | @@ -7040,6 +7359,18 @@ _LT_EOF |
| 527 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 528 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 529 | cat <<_LT_EOF > conftest.$ac_ext |
| 530 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 531 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 532 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 533 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 534 | +# define LT_DLSYM_CONST |
| 535 | +#elif defined(__osf__) |
| 536 | +/* This system does not cope well with relocations in const data. */ |
| 537 | +# define LT_DLSYM_CONST |
| 538 | +#else |
| 539 | +# define LT_DLSYM_CONST const |
| 540 | +#endif |
| 541 | + |
| 542 | #ifdef __cplusplus |
| 543 | extern "C" { |
| 544 | #endif |
| 545 | @@ -7051,7 +7382,7 @@ _LT_EOF |
| 546 | cat <<_LT_EOF >> conftest.$ac_ext |
| 547 | |
| 548 | /* The mapping between symbol names and symbols. */ |
| 549 | -const struct { |
| 550 | +LT_DLSYM_CONST struct { |
| 551 | const char *name; |
| 552 | void *address; |
| 553 | } |
| 554 | @@ -7077,8 +7408,8 @@ static const void *lt_preloaded_setup() { |
| 555 | _LT_EOF |
| 556 | # Now try linking the two files. |
| 557 | mv conftest.$ac_objext conftstm.$ac_objext |
| 558 | - lt_save_LIBS="$LIBS" |
| 559 | - lt_save_CFLAGS="$CFLAGS" |
| 560 | + lt_globsym_save_LIBS=$LIBS |
| 561 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 562 | LIBS="conftstm.$ac_objext" |
| 563 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 564 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 565 | @@ -7088,8 +7419,8 @@ _LT_EOF |
| 566 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 567 | pipe_works=yes |
| 568 | fi |
| 569 | - LIBS="$lt_save_LIBS" |
| 570 | - CFLAGS="$lt_save_CFLAGS" |
| 571 | + LIBS=$lt_globsym_save_LIBS |
| 572 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 573 | else |
| 574 | echo "cannot find nm_test_func in $nlist" >&5 |
| 575 | fi |
| 576 | @@ -7126,6 +7457,16 @@ else |
| 577 | $as_echo "ok" >&6; } |
| 578 | fi |
| 579 | |
| 580 | +# Response file support. |
| 581 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 582 | + nm_file_list_spec='@' |
| 583 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 584 | + nm_file_list_spec='@' |
| 585 | +fi |
| 586 | + |
| 587 | + |
| 588 | + |
| 589 | + |
| 590 | |
| 591 | |
| 592 | |
| 593 | @@ -7142,6 +7483,45 @@ fi |
| 594 | |
| 595 | |
| 596 | |
| 597 | + |
| 598 | + |
| 599 | + |
| 600 | + |
| 601 | + |
| 602 | + |
| 603 | + |
| 604 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 605 | +$as_echo_n "checking for sysroot... " >&6; } |
| 606 | + |
| 607 | +# Check whether --with-libtool-sysroot was given. |
| 608 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 609 | + withval=$with_libtool_sysroot; |
| 610 | +else |
| 611 | + with_libtool_sysroot=no |
| 612 | +fi |
| 613 | + |
| 614 | + |
| 615 | +lt_sysroot= |
| 616 | +case ${with_libtool_sysroot} in #( |
| 617 | + yes) |
| 618 | + if test "$GCC" = yes; then |
| 619 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 620 | + fi |
| 621 | + ;; #( |
| 622 | + /*) |
| 623 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 624 | + ;; #( |
| 625 | + no|'') |
| 626 | + ;; #( |
| 627 | + *) |
| 628 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 629 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 630 | + as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 |
| 631 | + ;; |
| 632 | +esac |
| 633 | + |
| 634 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 635 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 636 | |
| 637 | |
| 638 | |
| 639 | @@ -7353,6 +7733,123 @@ esac |
| 640 | |
| 641 | need_locks="$enable_libtool_lock" |
| 642 | |
| 643 | +if test -n "$ac_tool_prefix"; then |
| 644 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 645 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 646 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 647 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 648 | +if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : |
| 649 | + $as_echo_n "(cached) " >&6 |
| 650 | +else |
| 651 | + if test -n "$MANIFEST_TOOL"; then |
| 652 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 653 | +else |
| 654 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 655 | +for as_dir in $PATH |
| 656 | +do |
| 657 | + IFS=$as_save_IFS |
| 658 | + test -z "$as_dir" && as_dir=. |
| 659 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 660 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 661 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 662 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 663 | + break 2 |
| 664 | + fi |
| 665 | +done |
| 666 | + done |
| 667 | +IFS=$as_save_IFS |
| 668 | + |
| 669 | +fi |
| 670 | +fi |
| 671 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 672 | +if test -n "$MANIFEST_TOOL"; then |
| 673 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 674 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 675 | +else |
| 676 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 677 | +$as_echo "no" >&6; } |
| 678 | +fi |
| 679 | + |
| 680 | + |
| 681 | +fi |
| 682 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 683 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 684 | + # Extract the first word of "mt", so it can be a program name with args. |
| 685 | +set dummy mt; ac_word=$2 |
| 686 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 687 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 688 | +if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : |
| 689 | + $as_echo_n "(cached) " >&6 |
| 690 | +else |
| 691 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 692 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 693 | +else |
| 694 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 695 | +for as_dir in $PATH |
| 696 | +do |
| 697 | + IFS=$as_save_IFS |
| 698 | + test -z "$as_dir" && as_dir=. |
| 699 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 700 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 701 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 702 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 703 | + break 2 |
| 704 | + fi |
| 705 | +done |
| 706 | + done |
| 707 | +IFS=$as_save_IFS |
| 708 | + |
| 709 | +fi |
| 710 | +fi |
| 711 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 712 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 713 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 714 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 715 | +else |
| 716 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 717 | +$as_echo "no" >&6; } |
| 718 | +fi |
| 719 | + |
| 720 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 721 | + MANIFEST_TOOL=":" |
| 722 | + else |
| 723 | + case $cross_compiling:$ac_tool_warned in |
| 724 | +yes:) |
| 725 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 726 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 727 | +ac_tool_warned=yes ;; |
| 728 | +esac |
| 729 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 730 | + fi |
| 731 | +else |
| 732 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 733 | +fi |
| 734 | + |
| 735 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 736 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 737 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 738 | +if test "${lt_cv_path_mainfest_tool+set}" = set; then : |
| 739 | + $as_echo_n "(cached) " >&6 |
| 740 | +else |
| 741 | + lt_cv_path_mainfest_tool=no |
| 742 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 743 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 744 | + cat conftest.err >&5 |
| 745 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 746 | + lt_cv_path_mainfest_tool=yes |
| 747 | + fi |
| 748 | + rm -f conftest* |
| 749 | +fi |
| 750 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 751 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 752 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 753 | + MANIFEST_TOOL=: |
| 754 | +fi |
| 755 | + |
| 756 | + |
| 757 | + |
| 758 | + |
| 759 | + |
| 760 | |
| 761 | case $host_os in |
| 762 | rhapsody* | darwin*) |
| 763 | @@ -7916,6 +8413,8 @@ _LT_EOF |
| 764 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 765 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 766 | $AR cru libconftest.a conftest.o 2>&5 |
| 767 | + echo "$RANLIB libconftest.a" >&5 |
| 768 | + $RANLIB libconftest.a 2>&5 |
| 769 | cat > conftest.c << _LT_EOF |
| 770 | int main() { return 0;} |
| 771 | _LT_EOF |
| 772 | @@ -8080,7 +8579,8 @@ fi |
| 773 | LIBTOOL_DEPS="$ltmain" |
| 774 | |
| 775 | # Always use our own libtool. |
| 776 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
| 777 | +LIBTOOL='$(SHELL) $(top_builddir)' |
| 778 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" |
| 779 | |
| 780 | |
| 781 | |
| 782 | @@ -8169,7 +8669,7 @@ aix3*) |
| 783 | esac |
| 784 | |
| 785 | # Global variables: |
| 786 | -ofile=libtool |
| 787 | +ofile=${host_alias}-libtool |
| 788 | can_build_shared=yes |
| 789 | |
| 790 | # All known linkers require a `.a' archive for static linking (except MSVC, |
| 791 | @@ -8467,8 +8967,6 @@ fi |
| 792 | lt_prog_compiler_pic= |
| 793 | lt_prog_compiler_static= |
| 794 | |
| 795 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 796 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 797 | |
| 798 | if test "$GCC" = yes; then |
| 799 | lt_prog_compiler_wl='-Wl,' |
| 800 | @@ -8634,6 +9132,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 801 | lt_prog_compiler_pic='--shared' |
| 802 | lt_prog_compiler_static='--static' |
| 803 | ;; |
| 804 | + nagfor*) |
| 805 | + # NAG Fortran compiler |
| 806 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 807 | + lt_prog_compiler_pic='-PIC' |
| 808 | + lt_prog_compiler_static='-Bstatic' |
| 809 | + ;; |
| 810 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 811 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 812 | # which looks to be a dead project) |
| 813 | @@ -8696,7 +9200,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 814 | lt_prog_compiler_pic='-KPIC' |
| 815 | lt_prog_compiler_static='-Bstatic' |
| 816 | case $cc_basename in |
| 817 | - f77* | f90* | f95*) |
| 818 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 819 | lt_prog_compiler_wl='-Qoption ld ';; |
| 820 | *) |
| 821 | lt_prog_compiler_wl='-Wl,';; |
| 822 | @@ -8753,13 +9257,17 @@ case $host_os in |
| 823 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 824 | ;; |
| 825 | esac |
| 826 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 827 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 828 | - |
| 829 | - |
| 830 | - |
| 831 | - |
| 832 | |
| 833 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 834 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 835 | +if test "${lt_cv_prog_compiler_pic+set}" = set; then : |
| 836 | + $as_echo_n "(cached) " >&6 |
| 837 | +else |
| 838 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 839 | +fi |
| 840 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 841 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 842 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 843 | |
| 844 | # |
| 845 | # Check to make sure the PIC flag actually works. |
| 846 | @@ -8820,6 +9328,11 @@ fi |
| 847 | |
| 848 | |
| 849 | |
| 850 | + |
| 851 | + |
| 852 | + |
| 853 | + |
| 854 | + |
| 855 | # |
| 856 | # Check to make sure the static flag actually works. |
| 857 | # |
| 858 | @@ -9170,7 +9683,8 @@ _LT_EOF |
| 859 | allow_undefined_flag=unsupported |
| 860 | always_export_symbols=no |
| 861 | enable_shared_with_static_runtimes=yes |
| 862 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 863 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' |
| 864 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 865 | |
| 866 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 867 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 868 | @@ -9269,12 +9783,12 @@ _LT_EOF |
| 869 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 870 | hardcode_libdir_flag_spec= |
| 871 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 872 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 873 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 874 | if test "x$supports_anon_versioning" = xyes; then |
| 875 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 876 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 877 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 878 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 879 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 880 | fi |
| 881 | ;; |
| 882 | esac |
| 883 | @@ -9288,8 +9802,8 @@ _LT_EOF |
| 884 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 885 | wlarc= |
| 886 | else |
| 887 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 888 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 889 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 890 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 891 | fi |
| 892 | ;; |
| 893 | |
| 894 | @@ -9307,8 +9821,8 @@ _LT_EOF |
| 895 | |
| 896 | _LT_EOF |
| 897 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 898 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 899 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 900 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 901 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 902 | else |
| 903 | ld_shlibs=no |
| 904 | fi |
| 905 | @@ -9354,8 +9868,8 @@ _LT_EOF |
| 906 | |
| 907 | *) |
| 908 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 909 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 910 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 911 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 912 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 913 | else |
| 914 | ld_shlibs=no |
| 915 | fi |
| 916 | @@ -9485,7 +9999,13 @@ _LT_EOF |
| 917 | allow_undefined_flag='-berok' |
| 918 | # Determine the default libpath from the value encoded in an |
| 919 | # empty executable. |
| 920 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 921 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 922 | + aix_libpath=$lt_cv_aix_libpath |
| 923 | +else |
| 924 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 925 | + $as_echo_n "(cached) " >&6 |
| 926 | +else |
| 927 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 928 | /* end confdefs.h. */ |
| 929 | |
| 930 | int |
| 931 | @@ -9498,22 +10018,29 @@ main () |
| 932 | _ACEOF |
| 933 | if ac_fn_c_try_link "$LINENO"; then : |
| 934 | |
| 935 | -lt_aix_libpath_sed=' |
| 936 | - /Import File Strings/,/^$/ { |
| 937 | - /^0/ { |
| 938 | - s/^0 *\(.*\)$/\1/ |
| 939 | - p |
| 940 | - } |
| 941 | - }' |
| 942 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 943 | -# Check for a 64-bit object if we didn't find anything. |
| 944 | -if test -z "$aix_libpath"; then |
| 945 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 946 | -fi |
| 947 | + lt_aix_libpath_sed=' |
| 948 | + /Import File Strings/,/^$/ { |
| 949 | + /^0/ { |
| 950 | + s/^0 *\([^ ]*\) *$/\1/ |
| 951 | + p |
| 952 | + } |
| 953 | + }' |
| 954 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 955 | + # Check for a 64-bit object if we didn't find anything. |
| 956 | + if test -z "$lt_cv_aix_libpath_"; then |
| 957 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 958 | + fi |
| 959 | fi |
| 960 | rm -f core conftest.err conftest.$ac_objext \ |
| 961 | conftest$ac_exeext conftest.$ac_ext |
| 962 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 963 | + if test -z "$lt_cv_aix_libpath_"; then |
| 964 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 965 | + fi |
| 966 | + |
| 967 | +fi |
| 968 | + |
| 969 | + aix_libpath=$lt_cv_aix_libpath_ |
| 970 | +fi |
| 971 | |
| 972 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 973 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
| 974 | @@ -9525,7 +10052,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 975 | else |
| 976 | # Determine the default libpath from the value encoded in an |
| 977 | # empty executable. |
| 978 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 979 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 980 | + aix_libpath=$lt_cv_aix_libpath |
| 981 | +else |
| 982 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 983 | + $as_echo_n "(cached) " >&6 |
| 984 | +else |
| 985 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 986 | /* end confdefs.h. */ |
| 987 | |
| 988 | int |
| 989 | @@ -9538,22 +10071,29 @@ main () |
| 990 | _ACEOF |
| 991 | if ac_fn_c_try_link "$LINENO"; then : |
| 992 | |
| 993 | -lt_aix_libpath_sed=' |
| 994 | - /Import File Strings/,/^$/ { |
| 995 | - /^0/ { |
| 996 | - s/^0 *\(.*\)$/\1/ |
| 997 | - p |
| 998 | - } |
| 999 | - }' |
| 1000 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 1001 | -# Check for a 64-bit object if we didn't find anything. |
| 1002 | -if test -z "$aix_libpath"; then |
| 1003 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 1004 | -fi |
| 1005 | + lt_aix_libpath_sed=' |
| 1006 | + /Import File Strings/,/^$/ { |
| 1007 | + /^0/ { |
| 1008 | + s/^0 *\([^ ]*\) *$/\1/ |
| 1009 | + p |
| 1010 | + } |
| 1011 | + }' |
| 1012 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 1013 | + # Check for a 64-bit object if we didn't find anything. |
| 1014 | + if test -z "$lt_cv_aix_libpath_"; then |
| 1015 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 1016 | + fi |
| 1017 | fi |
| 1018 | rm -f core conftest.err conftest.$ac_objext \ |
| 1019 | conftest$ac_exeext conftest.$ac_ext |
| 1020 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 1021 | + if test -z "$lt_cv_aix_libpath_"; then |
| 1022 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 1023 | + fi |
| 1024 | + |
| 1025 | +fi |
| 1026 | + |
| 1027 | + aix_libpath=$lt_cv_aix_libpath_ |
| 1028 | +fi |
| 1029 | |
| 1030 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 1031 | # Warning - without using the other run time loading flags, |
| 1032 | @@ -9598,20 +10138,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 1033 | # Microsoft Visual C++. |
| 1034 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 1035 | # no search path for DLLs. |
| 1036 | - hardcode_libdir_flag_spec=' ' |
| 1037 | - allow_undefined_flag=unsupported |
| 1038 | - # Tell ltmain to make .lib files, not .a files. |
| 1039 | - libext=lib |
| 1040 | - # Tell ltmain to make .dll files, not .so files. |
| 1041 | - shrext_cmds=".dll" |
| 1042 | - # FIXME: Setting linknames here is a bad hack. |
| 1043 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 1044 | - # The linker will automatically build a .lib file if we build a DLL. |
| 1045 | - old_archive_from_new_cmds='true' |
| 1046 | - # FIXME: Should let the user specify the lib program. |
| 1047 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 1048 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 1049 | - enable_shared_with_static_runtimes=yes |
| 1050 | + case $cc_basename in |
| 1051 | + cl*) |
| 1052 | + # Native MSVC |
| 1053 | + hardcode_libdir_flag_spec=' ' |
| 1054 | + allow_undefined_flag=unsupported |
| 1055 | + always_export_symbols=yes |
| 1056 | + file_list_spec='@' |
| 1057 | + # Tell ltmain to make .lib files, not .a files. |
| 1058 | + libext=lib |
| 1059 | + # Tell ltmain to make .dll files, not .so files. |
| 1060 | + shrext_cmds=".dll" |
| 1061 | + # FIXME: Setting linknames here is a bad hack. |
| 1062 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 1063 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 1064 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 1065 | + else |
| 1066 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 1067 | + fi~ |
| 1068 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 1069 | + linknames=' |
| 1070 | + # The linker will not automatically build a static lib if we build a DLL. |
| 1071 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 1072 | + enable_shared_with_static_runtimes=yes |
| 1073 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 1074 | + # Don't use ranlib |
| 1075 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 1076 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 1077 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 1078 | + case $lt_outputfile in |
| 1079 | + *.exe|*.EXE) ;; |
| 1080 | + *) |
| 1081 | + lt_outputfile="$lt_outputfile.exe" |
| 1082 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 1083 | + ;; |
| 1084 | + esac~ |
| 1085 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 1086 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 1087 | + $RM "$lt_outputfile.manifest"; |
| 1088 | + fi' |
| 1089 | + ;; |
| 1090 | + *) |
| 1091 | + # Assume MSVC wrapper |
| 1092 | + hardcode_libdir_flag_spec=' ' |
| 1093 | + allow_undefined_flag=unsupported |
| 1094 | + # Tell ltmain to make .lib files, not .a files. |
| 1095 | + libext=lib |
| 1096 | + # Tell ltmain to make .dll files, not .so files. |
| 1097 | + shrext_cmds=".dll" |
| 1098 | + # FIXME: Setting linknames here is a bad hack. |
| 1099 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 1100 | + # The linker will automatically build a .lib file if we build a DLL. |
| 1101 | + old_archive_from_new_cmds='true' |
| 1102 | + # FIXME: Should let the user specify the lib program. |
| 1103 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 1104 | + enable_shared_with_static_runtimes=yes |
| 1105 | + ;; |
| 1106 | + esac |
| 1107 | ;; |
| 1108 | |
| 1109 | darwin* | rhapsody*) |
| 1110 | @@ -9672,7 +10255,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 1111 | |
| 1112 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 1113 | freebsd* | dragonfly*) |
| 1114 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 1115 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 1116 | hardcode_libdir_flag_spec='-R$libdir' |
| 1117 | hardcode_direct=yes |
| 1118 | hardcode_shlibpath_var=no |
| 1119 | @@ -9680,7 +10263,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 1120 | |
| 1121 | hpux9*) |
| 1122 | if test "$GCC" = yes; then |
| 1123 | - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 1124 | + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 1125 | else |
| 1126 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 1127 | fi |
| 1128 | @@ -9696,7 +10279,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 1129 | |
| 1130 | hpux10*) |
| 1131 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 1132 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 1133 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 1134 | else |
| 1135 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 1136 | fi |
| 1137 | @@ -9720,10 +10303,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 1138 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 1139 | ;; |
| 1140 | ia64*) |
| 1141 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 1142 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 1143 | ;; |
| 1144 | *) |
| 1145 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 1146 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 1147 | ;; |
| 1148 | esac |
| 1149 | else |
| 1150 | @@ -9802,23 +10385,36 @@ fi |
| 1151 | |
| 1152 | irix5* | irix6* | nonstopux*) |
| 1153 | if test "$GCC" = yes; then |
| 1154 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 1155 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 1156 | # Try to use the -exported_symbol ld option, if it does not |
| 1157 | # work, assume that -exports_file does not work either and |
| 1158 | # implicitly export all symbols. |
| 1159 | - save_LDFLAGS="$LDFLAGS" |
| 1160 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 1161 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 1162 | + # This should be the same for all languages, so no per-tag cache variable. |
| 1163 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 1164 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 1165 | +if test "${lt_cv_irix_exported_symbol+set}" = set; then : |
| 1166 | + $as_echo_n "(cached) " >&6 |
| 1167 | +else |
| 1168 | + save_LDFLAGS="$LDFLAGS" |
| 1169 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 1170 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 1171 | /* end confdefs.h. */ |
| 1172 | -int foo(void) {} |
| 1173 | +int foo (void) { return 0; } |
| 1174 | _ACEOF |
| 1175 | if ac_fn_c_try_link "$LINENO"; then : |
| 1176 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 1177 | - |
| 1178 | + lt_cv_irix_exported_symbol=yes |
| 1179 | +else |
| 1180 | + lt_cv_irix_exported_symbol=no |
| 1181 | fi |
| 1182 | rm -f core conftest.err conftest.$ac_objext \ |
| 1183 | conftest$ac_exeext conftest.$ac_ext |
| 1184 | - LDFLAGS="$save_LDFLAGS" |
| 1185 | + LDFLAGS="$save_LDFLAGS" |
| 1186 | +fi |
| 1187 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 1188 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 1189 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 1190 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 1191 | + fi |
| 1192 | else |
| 1193 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
| 1194 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
| 1195 | @@ -9903,7 +10499,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 1196 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 1197 | if test "$GCC" = yes; then |
| 1198 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 1199 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 1200 | + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 1201 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 1202 | else |
| 1203 | allow_undefined_flag=' -expect_unresolved \*' |
| 1204 | @@ -9922,9 +10518,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 1205 | no_undefined_flag=' -z defs' |
| 1206 | if test "$GCC" = yes; then |
| 1207 | wlarc='${wl}' |
| 1208 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 1209 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 1210 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 1211 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 1212 | + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 1213 | else |
| 1214 | case `$CC -V 2>&1` in |
| 1215 | *"Compilers 5.0"*) |
| 1216 | @@ -10500,8 +11096,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 1217 | need_version=no |
| 1218 | need_lib_prefix=no |
| 1219 | |
| 1220 | - case $GCC,$host_os in |
| 1221 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 1222 | + case $GCC,$cc_basename in |
| 1223 | + yes,*) |
| 1224 | + # gcc |
| 1225 | library_names_spec='$libname.dll.a' |
| 1226 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 1227 | postinstall_cmds='base_file=`basename \${file}`~ |
| 1228 | @@ -10534,13 +11131,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 1229 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 1230 | ;; |
| 1231 | esac |
| 1232 | + dynamic_linker='Win32 ld.exe' |
| 1233 | + ;; |
| 1234 | + |
| 1235 | + *,cl*) |
| 1236 | + # Native MSVC |
| 1237 | + libname_spec='$name' |
| 1238 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 1239 | + library_names_spec='${libname}.dll.lib' |
| 1240 | + |
| 1241 | + case $build_os in |
| 1242 | + mingw*) |
| 1243 | + sys_lib_search_path_spec= |
| 1244 | + lt_save_ifs=$IFS |
| 1245 | + IFS=';' |
| 1246 | + for lt_path in $LIB |
| 1247 | + do |
| 1248 | + IFS=$lt_save_ifs |
| 1249 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 1250 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 1251 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 1252 | + done |
| 1253 | + IFS=$lt_save_ifs |
| 1254 | + # Convert to MSYS style. |
| 1255 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 1256 | + ;; |
| 1257 | + cygwin*) |
| 1258 | + # Convert to unix form, then to dos form, then back to unix form |
| 1259 | + # but this time dos style (no spaces!) so that the unix form looks |
| 1260 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 1261 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 1262 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 1263 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 1264 | + ;; |
| 1265 | + *) |
| 1266 | + sys_lib_search_path_spec="$LIB" |
| 1267 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 1268 | + # It is most probably a Windows format PATH. |
| 1269 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 1270 | + else |
| 1271 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 1272 | + fi |
| 1273 | + # FIXME: find the short name or the path components, as spaces are |
| 1274 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 1275 | + ;; |
| 1276 | + esac |
| 1277 | + |
| 1278 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 1279 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 1280 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 1281 | + dldir=$destdir/`dirname \$dlpath`~ |
| 1282 | + test -d \$dldir || mkdir -p \$dldir~ |
| 1283 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 1284 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 1285 | + dlpath=$dir/\$dldll~ |
| 1286 | + $RM \$dlpath' |
| 1287 | + shlibpath_overrides_runpath=yes |
| 1288 | + dynamic_linker='Win32 link.exe' |
| 1289 | ;; |
| 1290 | |
| 1291 | *) |
| 1292 | + # Assume MSVC wrapper |
| 1293 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 1294 | + dynamic_linker='Win32 ld.exe' |
| 1295 | ;; |
| 1296 | esac |
| 1297 | - dynamic_linker='Win32 ld.exe' |
| 1298 | # FIXME: first we should search . and the directory the executable is in |
| 1299 | shlibpath_var=PATH |
| 1300 | ;; |
| 1301 | @@ -10632,7 +11287,7 @@ haiku*) |
| 1302 | soname_spec='${libname}${release}${shared_ext}$major' |
| 1303 | shlibpath_var=LIBRARY_PATH |
| 1304 | shlibpath_overrides_runpath=yes |
| 1305 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' |
| 1306 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
| 1307 | hardcode_into_libs=yes |
| 1308 | ;; |
| 1309 | |
| 1310 | @@ -11472,10 +12127,10 @@ else |
| 1311 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 1312 | correspondingly for the symbols needed. */ |
| 1313 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 1314 | -void fnord () __attribute__((visibility("default"))); |
| 1315 | +int fnord () __attribute__((visibility("default"))); |
| 1316 | #endif |
| 1317 | |
| 1318 | -void fnord () { int i=42; } |
| 1319 | +int fnord () { return 42; } |
| 1320 | int main () |
| 1321 | { |
| 1322 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 1323 | @@ -11578,10 +12233,10 @@ else |
| 1324 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 1325 | correspondingly for the symbols needed. */ |
| 1326 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 1327 | -void fnord () __attribute__((visibility("default"))); |
| 1328 | +int fnord () __attribute__((visibility("default"))); |
| 1329 | #endif |
| 1330 | |
| 1331 | -void fnord () { int i=42; } |
| 1332 | +int fnord () { return 42; } |
| 1333 | int main () |
| 1334 | { |
| 1335 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 1336 | @@ -14172,7 +14827,7 @@ SHARED_LDFLAGS= |
| 1337 | if test "$enable_shared" = "yes"; then |
| 1338 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` |
| 1339 | if test -n "$x"; then |
| 1340 | - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" |
| 1341 | + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" |
| 1342 | fi |
| 1343 | |
| 1344 | # More hacks to build DLLs on Windows. |
| 1345 | @@ -16879,13 +17534,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
| 1346 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 1347 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 1348 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 1349 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 1350 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 1351 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 1352 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 1353 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 1354 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 1355 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 1356 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 1357 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 1358 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 1359 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 1360 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 1361 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 1362 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 1363 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 1364 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 1365 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
| 1366 | @@ -16900,14 +17562,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
| 1367 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 1368 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 1369 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 1370 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 1371 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 1372 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 1373 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 1374 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 1375 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 1376 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 1377 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 1378 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 1379 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 1380 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 1381 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 1382 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 1383 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 1384 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
| 1385 | @@ -16940,12 +17605,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
| 1386 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 1387 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 1388 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 1389 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 1390 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 1391 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 1392 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 1393 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 1394 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 1395 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 1396 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 1397 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 1398 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 1399 | @@ -17000,8 +17665,13 @@ reload_flag \ |
| 1400 | OBJDUMP \ |
| 1401 | deplibs_check_method \ |
| 1402 | file_magic_cmd \ |
| 1403 | +file_magic_glob \ |
| 1404 | +want_nocaseglob \ |
| 1405 | +DLLTOOL \ |
| 1406 | +sharedlib_from_linklib_cmd \ |
| 1407 | AR \ |
| 1408 | AR_FLAGS \ |
| 1409 | +archiver_list_spec \ |
| 1410 | STRIP \ |
| 1411 | RANLIB \ |
| 1412 | CC \ |
| 1413 | @@ -17011,12 +17681,14 @@ lt_cv_sys_global_symbol_pipe \ |
| 1414 | lt_cv_sys_global_symbol_to_cdecl \ |
| 1415 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 1416 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 1417 | +nm_file_list_spec \ |
| 1418 | lt_prog_compiler_no_builtin_flag \ |
| 1419 | -lt_prog_compiler_wl \ |
| 1420 | lt_prog_compiler_pic \ |
| 1421 | +lt_prog_compiler_wl \ |
| 1422 | lt_prog_compiler_static \ |
| 1423 | lt_cv_prog_compiler_c_o \ |
| 1424 | need_locks \ |
| 1425 | +MANIFEST_TOOL \ |
| 1426 | DSYMUTIL \ |
| 1427 | NMEDIT \ |
| 1428 | LIPO \ |
| 1429 | @@ -17032,7 +17704,6 @@ no_undefined_flag \ |
| 1430 | hardcode_libdir_flag_spec \ |
| 1431 | hardcode_libdir_flag_spec_ld \ |
| 1432 | hardcode_libdir_separator \ |
| 1433 | -fix_srcfile_path \ |
| 1434 | exclude_expsyms \ |
| 1435 | include_expsyms \ |
| 1436 | file_list_spec \ |
| 1437 | @@ -17068,6 +17739,7 @@ module_cmds \ |
| 1438 | module_expsym_cmds \ |
| 1439 | export_symbols_cmds \ |
| 1440 | prelink_cmds \ |
| 1441 | +postlink_cmds \ |
| 1442 | postinstall_cmds \ |
| 1443 | postuninstall_cmds \ |
| 1444 | finish_cmds \ |
| 1445 | @@ -17847,7 +18519,8 @@ $as_echo X"$file" | |
| 1446 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 1447 | # |
| 1448 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 1449 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 1450 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 1451 | +# Inc. |
| 1452 | # Written by Gordon Matzigkeit, 1996 |
| 1453 | # |
| 1454 | # This file is part of GNU Libtool. |
| 1455 | @@ -17950,19 +18623,42 @@ SP2NL=$lt_lt_SP2NL |
| 1456 | # turn newlines into spaces. |
| 1457 | NL2SP=$lt_lt_NL2SP |
| 1458 | |
| 1459 | +# convert \$build file names to \$host format. |
| 1460 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 1461 | + |
| 1462 | +# convert \$build files to toolchain format. |
| 1463 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 1464 | + |
| 1465 | # An object symbol dumper. |
| 1466 | OBJDUMP=$lt_OBJDUMP |
| 1467 | |
| 1468 | # Method to check whether dependent libraries are shared objects. |
| 1469 | deplibs_check_method=$lt_deplibs_check_method |
| 1470 | |
| 1471 | -# Command to use when deplibs_check_method == "file_magic". |
| 1472 | +# Command to use when deplibs_check_method = "file_magic". |
| 1473 | file_magic_cmd=$lt_file_magic_cmd |
| 1474 | |
| 1475 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 1476 | +file_magic_glob=$lt_file_magic_glob |
| 1477 | + |
| 1478 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 1479 | +want_nocaseglob=$lt_want_nocaseglob |
| 1480 | + |
| 1481 | +# DLL creation program. |
| 1482 | +DLLTOOL=$lt_DLLTOOL |
| 1483 | + |
| 1484 | +# Command to associate shared and link libraries. |
| 1485 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 1486 | + |
| 1487 | # The archiver. |
| 1488 | AR=$lt_AR |
| 1489 | + |
| 1490 | +# Flags to create an archive. |
| 1491 | AR_FLAGS=$lt_AR_FLAGS |
| 1492 | |
| 1493 | +# How to feed a file listing to the archiver. |
| 1494 | +archiver_list_spec=$lt_archiver_list_spec |
| 1495 | + |
| 1496 | # A symbol stripping program. |
| 1497 | STRIP=$lt_STRIP |
| 1498 | |
| 1499 | @@ -17992,6 +18688,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
| 1500 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 1501 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 1502 | |
| 1503 | +# Specify filename containing input files for \$NM. |
| 1504 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 1505 | + |
| 1506 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 1507 | +lt_sysroot=$lt_sysroot |
| 1508 | + |
| 1509 | # The name of the directory that contains temporary libtool files. |
| 1510 | objdir=$objdir |
| 1511 | |
| 1512 | @@ -18001,6 +18703,9 @@ MAGIC_CMD=$MAGIC_CMD |
| 1513 | # Must we lock files when doing compilation? |
| 1514 | need_locks=$lt_need_locks |
| 1515 | |
| 1516 | +# Manifest tool. |
| 1517 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 1518 | + |
| 1519 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 1520 | DSYMUTIL=$lt_DSYMUTIL |
| 1521 | |
| 1522 | @@ -18115,12 +18820,12 @@ with_gcc=$GCC |
| 1523 | # Compiler flag to turn off builtin functions. |
| 1524 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 1525 | |
| 1526 | -# How to pass a linker flag through the compiler. |
| 1527 | -wl=$lt_lt_prog_compiler_wl |
| 1528 | - |
| 1529 | # Additional compiler flags for building library objects. |
| 1530 | pic_flag=$lt_lt_prog_compiler_pic |
| 1531 | |
| 1532 | +# How to pass a linker flag through the compiler. |
| 1533 | +wl=$lt_lt_prog_compiler_wl |
| 1534 | + |
| 1535 | # Compiler flag to prevent dynamic linking. |
| 1536 | link_static_flag=$lt_lt_prog_compiler_static |
| 1537 | |
| 1538 | @@ -18207,9 +18912,6 @@ inherit_rpath=$inherit_rpath |
| 1539 | # Whether libtool must link a program against all its dependency libraries. |
| 1540 | link_all_deplibs=$link_all_deplibs |
| 1541 | |
| 1542 | -# Fix the shell variable \$srcfile for the compiler. |
| 1543 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 1544 | - |
| 1545 | # Set to "yes" if exported symbols are required. |
| 1546 | always_export_symbols=$always_export_symbols |
| 1547 | |
| 1548 | @@ -18225,6 +18927,9 @@ include_expsyms=$lt_include_expsyms |
| 1549 | # Commands necessary for linking programs (against libraries) with templates. |
| 1550 | prelink_cmds=$lt_prelink_cmds |
| 1551 | |
| 1552 | +# Commands necessary for finishing linking programs. |
| 1553 | +postlink_cmds=$lt_postlink_cmds |
| 1554 | + |
| 1555 | # Specify filename containing input files. |
| 1556 | file_list_spec=$lt_file_list_spec |
| 1557 | |
| 1558 | @@ -18257,210 +18962,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
| 1559 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 1560 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 1561 | # is reportedly fixed, but why not run on old versions too? |
| 1562 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 1563 | - || (rm -f "$cfgfile"; exit 1) |
| 1564 | - |
| 1565 | - case $xsi_shell in |
| 1566 | - yes) |
| 1567 | - cat << \_LT_EOF >> "$cfgfile" |
| 1568 | - |
| 1569 | -# func_dirname file append nondir_replacement |
| 1570 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 1571 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 1572 | -func_dirname () |
| 1573 | -{ |
| 1574 | - case ${1} in |
| 1575 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 1576 | - * ) func_dirname_result="${3}" ;; |
| 1577 | - esac |
| 1578 | -} |
| 1579 | - |
| 1580 | -# func_basename file |
| 1581 | -func_basename () |
| 1582 | -{ |
| 1583 | - func_basename_result="${1##*/}" |
| 1584 | -} |
| 1585 | - |
| 1586 | -# func_dirname_and_basename file append nondir_replacement |
| 1587 | -# perform func_basename and func_dirname in a single function |
| 1588 | -# call: |
| 1589 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 1590 | -# add APPEND to the result, otherwise set result |
| 1591 | -# to NONDIR_REPLACEMENT. |
| 1592 | -# value returned in "$func_dirname_result" |
| 1593 | -# basename: Compute filename of FILE. |
| 1594 | -# value retuned in "$func_basename_result" |
| 1595 | -# Implementation must be kept synchronized with func_dirname |
| 1596 | -# and func_basename. For efficiency, we do not delegate to |
| 1597 | -# those functions but instead duplicate the functionality here. |
| 1598 | -func_dirname_and_basename () |
| 1599 | -{ |
| 1600 | - case ${1} in |
| 1601 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 1602 | - * ) func_dirname_result="${3}" ;; |
| 1603 | - esac |
| 1604 | - func_basename_result="${1##*/}" |
| 1605 | -} |
| 1606 | - |
| 1607 | -# func_stripname prefix suffix name |
| 1608 | -# strip PREFIX and SUFFIX off of NAME. |
| 1609 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 1610 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 1611 | -# dot (in which case that matches only a dot). |
| 1612 | -func_stripname () |
| 1613 | -{ |
| 1614 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 1615 | - # positional parameters, so assign one to ordinary parameter first. |
| 1616 | - func_stripname_result=${3} |
| 1617 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 1618 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 1619 | -} |
| 1620 | - |
| 1621 | -# func_opt_split |
| 1622 | -func_opt_split () |
| 1623 | -{ |
| 1624 | - func_opt_split_opt=${1%%=*} |
| 1625 | - func_opt_split_arg=${1#*=} |
| 1626 | -} |
| 1627 | - |
| 1628 | -# func_lo2o object |
| 1629 | -func_lo2o () |
| 1630 | -{ |
| 1631 | - case ${1} in |
| 1632 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 1633 | - *) func_lo2o_result=${1} ;; |
| 1634 | - esac |
| 1635 | -} |
| 1636 | - |
| 1637 | -# func_xform libobj-or-source |
| 1638 | -func_xform () |
| 1639 | -{ |
| 1640 | - func_xform_result=${1%.*}.lo |
| 1641 | -} |
| 1642 | - |
| 1643 | -# func_arith arithmetic-term... |
| 1644 | -func_arith () |
| 1645 | -{ |
| 1646 | - func_arith_result=$(( $* )) |
| 1647 | -} |
| 1648 | - |
| 1649 | -# func_len string |
| 1650 | -# STRING may not start with a hyphen. |
| 1651 | -func_len () |
| 1652 | -{ |
| 1653 | - func_len_result=${#1} |
| 1654 | -} |
| 1655 | - |
| 1656 | -_LT_EOF |
| 1657 | - ;; |
| 1658 | - *) # Bourne compatible functions. |
| 1659 | - cat << \_LT_EOF >> "$cfgfile" |
| 1660 | - |
| 1661 | -# func_dirname file append nondir_replacement |
| 1662 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 1663 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 1664 | -func_dirname () |
| 1665 | -{ |
| 1666 | - # Extract subdirectory from the argument. |
| 1667 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 1668 | - if test "X$func_dirname_result" = "X${1}"; then |
| 1669 | - func_dirname_result="${3}" |
| 1670 | - else |
| 1671 | - func_dirname_result="$func_dirname_result${2}" |
| 1672 | - fi |
| 1673 | -} |
| 1674 | - |
| 1675 | -# func_basename file |
| 1676 | -func_basename () |
| 1677 | -{ |
| 1678 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 1679 | -} |
| 1680 | - |
| 1681 | - |
| 1682 | -# func_stripname prefix suffix name |
| 1683 | -# strip PREFIX and SUFFIX off of NAME. |
| 1684 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 1685 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 1686 | -# dot (in which case that matches only a dot). |
| 1687 | -# func_strip_suffix prefix name |
| 1688 | -func_stripname () |
| 1689 | -{ |
| 1690 | - case ${2} in |
| 1691 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 1692 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 1693 | - esac |
| 1694 | -} |
| 1695 | - |
| 1696 | -# sed scripts: |
| 1697 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 1698 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 1699 | - |
| 1700 | -# func_opt_split |
| 1701 | -func_opt_split () |
| 1702 | -{ |
| 1703 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 1704 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 1705 | -} |
| 1706 | - |
| 1707 | -# func_lo2o object |
| 1708 | -func_lo2o () |
| 1709 | -{ |
| 1710 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 1711 | -} |
| 1712 | - |
| 1713 | -# func_xform libobj-or-source |
| 1714 | -func_xform () |
| 1715 | -{ |
| 1716 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 1717 | -} |
| 1718 | - |
| 1719 | -# func_arith arithmetic-term... |
| 1720 | -func_arith () |
| 1721 | -{ |
| 1722 | - func_arith_result=`expr "$@"` |
| 1723 | -} |
| 1724 | - |
| 1725 | -# func_len string |
| 1726 | -# STRING may not start with a hyphen. |
| 1727 | -func_len () |
| 1728 | -{ |
| 1729 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 1730 | -} |
| 1731 | - |
| 1732 | -_LT_EOF |
| 1733 | -esac |
| 1734 | - |
| 1735 | -case $lt_shell_append in |
| 1736 | - yes) |
| 1737 | - cat << \_LT_EOF >> "$cfgfile" |
| 1738 | - |
| 1739 | -# func_append var value |
| 1740 | -# Append VALUE to the end of shell variable VAR. |
| 1741 | -func_append () |
| 1742 | -{ |
| 1743 | - eval "$1+=\$2" |
| 1744 | -} |
| 1745 | -_LT_EOF |
| 1746 | - ;; |
| 1747 | - *) |
| 1748 | - cat << \_LT_EOF >> "$cfgfile" |
| 1749 | - |
| 1750 | -# func_append var value |
| 1751 | -# Append VALUE to the end of shell variable VAR. |
| 1752 | -func_append () |
| 1753 | -{ |
| 1754 | - eval "$1=\$$1\$2" |
| 1755 | -} |
| 1756 | - |
| 1757 | -_LT_EOF |
| 1758 | - ;; |
| 1759 | - esac |
| 1760 | - |
| 1761 | - |
| 1762 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 1763 | - || (rm -f "$cfgfile"; exit 1) |
| 1764 | - |
| 1765 | - mv -f "$cfgfile" "$ofile" || |
| 1766 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 1767 | + || (rm -f "$cfgfile"; exit 1) |
| 1768 | + |
| 1769 | + if test x"$xsi_shell" = xyes; then |
| 1770 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 1771 | +func_dirname ()\ |
| 1772 | +{\ |
| 1773 | +\ case ${1} in\ |
| 1774 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 1775 | +\ * ) func_dirname_result="${3}" ;;\ |
| 1776 | +\ esac\ |
| 1777 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1778 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1779 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1780 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1781 | + |
| 1782 | + |
| 1783 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 1784 | +func_basename ()\ |
| 1785 | +{\ |
| 1786 | +\ func_basename_result="${1##*/}"\ |
| 1787 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1788 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1789 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1790 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1791 | + |
| 1792 | + |
| 1793 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 1794 | +func_dirname_and_basename ()\ |
| 1795 | +{\ |
| 1796 | +\ case ${1} in\ |
| 1797 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 1798 | +\ * ) func_dirname_result="${3}" ;;\ |
| 1799 | +\ esac\ |
| 1800 | +\ func_basename_result="${1##*/}"\ |
| 1801 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1802 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1803 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1804 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1805 | + |
| 1806 | + |
| 1807 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 1808 | +func_stripname ()\ |
| 1809 | +{\ |
| 1810 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 1811 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 1812 | +\ func_stripname_result=${3}\ |
| 1813 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 1814 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 1815 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1816 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1817 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1818 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1819 | + |
| 1820 | + |
| 1821 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 1822 | +func_split_long_opt ()\ |
| 1823 | +{\ |
| 1824 | +\ func_split_long_opt_name=${1%%=*}\ |
| 1825 | +\ func_split_long_opt_arg=${1#*=}\ |
| 1826 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1827 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1828 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1829 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1830 | + |
| 1831 | + |
| 1832 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 1833 | +func_split_short_opt ()\ |
| 1834 | +{\ |
| 1835 | +\ func_split_short_opt_arg=${1#??}\ |
| 1836 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 1837 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1838 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1839 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1840 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1841 | + |
| 1842 | + |
| 1843 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 1844 | +func_lo2o ()\ |
| 1845 | +{\ |
| 1846 | +\ case ${1} in\ |
| 1847 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 1848 | +\ *) func_lo2o_result=${1} ;;\ |
| 1849 | +\ esac\ |
| 1850 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1851 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1852 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1853 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1854 | + |
| 1855 | + |
| 1856 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 1857 | +func_xform ()\ |
| 1858 | +{\ |
| 1859 | + func_xform_result=${1%.*}.lo\ |
| 1860 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1861 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1862 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1863 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1864 | + |
| 1865 | + |
| 1866 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 1867 | +func_arith ()\ |
| 1868 | +{\ |
| 1869 | + func_arith_result=$(( $* ))\ |
| 1870 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1871 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1872 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1873 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1874 | + |
| 1875 | + |
| 1876 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 1877 | +func_len ()\ |
| 1878 | +{\ |
| 1879 | + func_len_result=${#1}\ |
| 1880 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1881 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1882 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1883 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1884 | + |
| 1885 | +fi |
| 1886 | + |
| 1887 | +if test x"$lt_shell_append" = xyes; then |
| 1888 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 1889 | +func_append ()\ |
| 1890 | +{\ |
| 1891 | + eval "${1}+=\\${2}"\ |
| 1892 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1893 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1894 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1895 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1896 | + |
| 1897 | + |
| 1898 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 1899 | +func_append_quoted ()\ |
| 1900 | +{\ |
| 1901 | +\ func_quote_for_eval "${2}"\ |
| 1902 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 1903 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1904 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1905 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1906 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1907 | + |
| 1908 | + |
| 1909 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 1910 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 1911 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1912 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1913 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 1914 | +else |
| 1915 | + # Save a `func_append' function call even when '+=' is not available |
| 1916 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 1917 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1918 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1919 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 1920 | +fi |
| 1921 | + |
| 1922 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 1923 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 1924 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 1925 | +fi |
| 1926 | + |
| 1927 | + |
| 1928 | + mv -f "$cfgfile" "$ofile" || |
| 1929 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 1930 | chmod +x "$ofile" |
| 1931 | |
| 1932 | diff --git a/bfd/configure.ac b/bfd/configure.ac |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1933 | index 2342f3faea..a6451fccda 100644 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1934 | --- a/bfd/configure.ac |
| 1935 | +++ b/bfd/configure.ac |
| 1936 | @@ -254,7 +254,7 @@ changequote(,)dnl |
| 1937 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` |
| 1938 | changequote([,])dnl |
| 1939 | if test -n "$x"; then |
| 1940 | - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" |
| 1941 | + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" |
| 1942 | fi |
| 1943 | |
| 1944 | # More hacks to build DLLs on Windows. |
| 1945 | diff --git a/binutils/configure b/binutils/configure |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1946 | index 5d9c9105a7..a65b2b4518 100755 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1947 | --- a/binutils/configure |
| 1948 | +++ b/binutils/configure |
| 1949 | @@ -659,8 +659,11 @@ OTOOL |
| 1950 | LIPO |
| 1951 | NMEDIT |
| 1952 | DSYMUTIL |
| 1953 | +MANIFEST_TOOL |
| 1954 | RANLIB |
| 1955 | +ac_ct_AR |
| 1956 | AR |
| 1957 | +DLLTOOL |
| 1958 | OBJDUMP |
| 1959 | LN_S |
| 1960 | NM |
| 1961 | @@ -772,6 +775,7 @@ enable_static |
| 1962 | with_pic |
| 1963 | enable_fast_install |
| 1964 | with_gnu_ld |
| 1965 | +with_libtool_sysroot |
| 1966 | enable_libtool_lock |
| 1967 | enable_plugins |
| 1968 | enable_largefile |
| 1969 | @@ -1444,6 +1448,8 @@ Optional Packages: |
| 1970 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 1971 | both] |
| 1972 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 1973 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 1974 | + (or the compiler's sysroot if not specified). |
| 1975 | --with-system-zlib use installed libz |
| 1976 | --with-gnu-ld assume the C compiler uses GNU ld default=no |
| 1977 | --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib |
| 1978 | @@ -5160,8 +5166,8 @@ esac |
| 1979 | |
| 1980 | |
| 1981 | |
| 1982 | -macro_version='2.2.7a' |
| 1983 | -macro_revision='1.3134' |
| 1984 | +macro_version='2.4' |
| 1985 | +macro_revision='1.3293' |
| 1986 | |
| 1987 | |
| 1988 | |
| 1989 | @@ -5201,7 +5207,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 1990 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 1991 | $as_echo_n "checking how to print strings... " >&6; } |
| 1992 | # Test print first, because it will be a builtin if present. |
| 1993 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 1994 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 1995 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 1996 | ECHO='print -r --' |
| 1997 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 1998 | @@ -5887,8 +5893,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 1999 | # Try some XSI features |
| 2000 | xsi_shell=no |
| 2001 | ( _lt_dummy="a/b/c" |
| 2002 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 2003 | - = c,a/b,, \ |
| 2004 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 2005 | + = c,a/b,b/c, \ |
| 2006 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 2007 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 2008 | && xsi_shell=yes |
| 2009 | @@ -5937,6 +5943,80 @@ esac |
| 2010 | |
| 2011 | |
| 2012 | |
| 2013 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 2014 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 2015 | +if test "${lt_cv_to_host_file_cmd+set}" = set; then : |
| 2016 | + $as_echo_n "(cached) " >&6 |
| 2017 | +else |
| 2018 | + case $host in |
| 2019 | + *-*-mingw* ) |
| 2020 | + case $build in |
| 2021 | + *-*-mingw* ) # actually msys |
| 2022 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 2023 | + ;; |
| 2024 | + *-*-cygwin* ) |
| 2025 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 2026 | + ;; |
| 2027 | + * ) # otherwise, assume *nix |
| 2028 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 2029 | + ;; |
| 2030 | + esac |
| 2031 | + ;; |
| 2032 | + *-*-cygwin* ) |
| 2033 | + case $build in |
| 2034 | + *-*-mingw* ) # actually msys |
| 2035 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 2036 | + ;; |
| 2037 | + *-*-cygwin* ) |
| 2038 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 2039 | + ;; |
| 2040 | + * ) # otherwise, assume *nix |
| 2041 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 2042 | + ;; |
| 2043 | + esac |
| 2044 | + ;; |
| 2045 | + * ) # unhandled hosts (and "normal" native builds) |
| 2046 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 2047 | + ;; |
| 2048 | +esac |
| 2049 | + |
| 2050 | +fi |
| 2051 | + |
| 2052 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 2053 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 2054 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 2055 | + |
| 2056 | + |
| 2057 | + |
| 2058 | + |
| 2059 | + |
| 2060 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 2061 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 2062 | +if test "${lt_cv_to_tool_file_cmd+set}" = set; then : |
| 2063 | + $as_echo_n "(cached) " >&6 |
| 2064 | +else |
| 2065 | + #assume ordinary cross tools, or native build. |
| 2066 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 2067 | +case $host in |
| 2068 | + *-*-mingw* ) |
| 2069 | + case $build in |
| 2070 | + *-*-mingw* ) # actually msys |
| 2071 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 2072 | + ;; |
| 2073 | + esac |
| 2074 | + ;; |
| 2075 | +esac |
| 2076 | + |
| 2077 | +fi |
| 2078 | + |
| 2079 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 2080 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 2081 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 2082 | + |
| 2083 | + |
| 2084 | + |
| 2085 | + |
| 2086 | + |
| 2087 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 2088 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 2089 | if test "${lt_cv_ld_reload_flag+set}" = set; then : |
| 2090 | @@ -5953,6 +6033,11 @@ case $reload_flag in |
| 2091 | esac |
| 2092 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 2093 | case $host_os in |
| 2094 | + cygwin* | mingw* | pw32* | cegcc*) |
| 2095 | + if test "$GCC" != yes; then |
| 2096 | + reload_cmds=false |
| 2097 | + fi |
| 2098 | + ;; |
| 2099 | darwin*) |
| 2100 | if test "$GCC" = yes; then |
| 2101 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 2102 | @@ -6121,7 +6206,8 @@ mingw* | pw32*) |
| 2103 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 2104 | lt_cv_file_magic_cmd='func_win32_libid' |
| 2105 | else |
| 2106 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 2107 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 2108 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 2109 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 2110 | fi |
| 2111 | ;; |
| 2112 | @@ -6275,6 +6361,21 @@ esac |
| 2113 | fi |
| 2114 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 2115 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 2116 | + |
| 2117 | +file_magic_glob= |
| 2118 | +want_nocaseglob=no |
| 2119 | +if test "$build" = "$host"; then |
| 2120 | + case $host_os in |
| 2121 | + mingw* | pw32*) |
| 2122 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 2123 | + want_nocaseglob=yes |
| 2124 | + else |
| 2125 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 2126 | + fi |
| 2127 | + ;; |
| 2128 | + esac |
| 2129 | +fi |
| 2130 | + |
| 2131 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 2132 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 2133 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 2134 | @@ -6290,9 +6391,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 2135 | |
| 2136 | |
| 2137 | |
| 2138 | + |
| 2139 | + |
| 2140 | + |
| 2141 | + |
| 2142 | + |
| 2143 | + |
| 2144 | + |
| 2145 | + |
| 2146 | + |
| 2147 | + |
| 2148 | +if test -n "$ac_tool_prefix"; then |
| 2149 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 2150 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 2151 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 2152 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 2153 | +if test "${ac_cv_prog_DLLTOOL+set}" = set; then : |
| 2154 | + $as_echo_n "(cached) " >&6 |
| 2155 | +else |
| 2156 | + if test -n "$DLLTOOL"; then |
| 2157 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 2158 | +else |
| 2159 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 2160 | +for as_dir in $PATH |
| 2161 | +do |
| 2162 | + IFS=$as_save_IFS |
| 2163 | + test -z "$as_dir" && as_dir=. |
| 2164 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 2165 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 2166 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 2167 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2168 | + break 2 |
| 2169 | + fi |
| 2170 | +done |
| 2171 | + done |
| 2172 | +IFS=$as_save_IFS |
| 2173 | + |
| 2174 | +fi |
| 2175 | +fi |
| 2176 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 2177 | +if test -n "$DLLTOOL"; then |
| 2178 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 2179 | +$as_echo "$DLLTOOL" >&6; } |
| 2180 | +else |
| 2181 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 2182 | +$as_echo "no" >&6; } |
| 2183 | +fi |
| 2184 | + |
| 2185 | + |
| 2186 | +fi |
| 2187 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 2188 | + ac_ct_DLLTOOL=$DLLTOOL |
| 2189 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 2190 | +set dummy dlltool; ac_word=$2 |
| 2191 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 2192 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 2193 | +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : |
| 2194 | + $as_echo_n "(cached) " >&6 |
| 2195 | +else |
| 2196 | + if test -n "$ac_ct_DLLTOOL"; then |
| 2197 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 2198 | +else |
| 2199 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 2200 | +for as_dir in $PATH |
| 2201 | +do |
| 2202 | + IFS=$as_save_IFS |
| 2203 | + test -z "$as_dir" && as_dir=. |
| 2204 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 2205 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 2206 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 2207 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2208 | + break 2 |
| 2209 | + fi |
| 2210 | +done |
| 2211 | + done |
| 2212 | +IFS=$as_save_IFS |
| 2213 | + |
| 2214 | +fi |
| 2215 | +fi |
| 2216 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 2217 | +if test -n "$ac_ct_DLLTOOL"; then |
| 2218 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 2219 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 2220 | +else |
| 2221 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 2222 | +$as_echo "no" >&6; } |
| 2223 | +fi |
| 2224 | + |
| 2225 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 2226 | + DLLTOOL="false" |
| 2227 | + else |
| 2228 | + case $cross_compiling:$ac_tool_warned in |
| 2229 | +yes:) |
| 2230 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 2231 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 2232 | +ac_tool_warned=yes ;; |
| 2233 | +esac |
| 2234 | + DLLTOOL=$ac_ct_DLLTOOL |
| 2235 | + fi |
| 2236 | +else |
| 2237 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 2238 | +fi |
| 2239 | + |
| 2240 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 2241 | + |
| 2242 | + |
| 2243 | + |
| 2244 | + |
| 2245 | + |
| 2246 | + |
| 2247 | + |
| 2248 | + |
| 2249 | + |
| 2250 | + |
| 2251 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 2252 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 2253 | +if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : |
| 2254 | + $as_echo_n "(cached) " >&6 |
| 2255 | +else |
| 2256 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 2257 | + |
| 2258 | +case $host_os in |
| 2259 | +cygwin* | mingw* | pw32* | cegcc*) |
| 2260 | + # two different shell functions defined in ltmain.sh |
| 2261 | + # decide which to use based on capabilities of $DLLTOOL |
| 2262 | + case `$DLLTOOL --help 2>&1` in |
| 2263 | + *--identify-strict*) |
| 2264 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 2265 | + ;; |
| 2266 | + *) |
| 2267 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 2268 | + ;; |
| 2269 | + esac |
| 2270 | + ;; |
| 2271 | +*) |
| 2272 | + # fallback: assume linklib IS sharedlib |
| 2273 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 2274 | + ;; |
| 2275 | +esac |
| 2276 | + |
| 2277 | +fi |
| 2278 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 2279 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 2280 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 2281 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 2282 | + |
| 2283 | + |
| 2284 | + |
| 2285 | + |
| 2286 | + |
| 2287 | + |
| 2288 | + |
| 2289 | if test -n "$ac_tool_prefix"; then |
| 2290 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 2291 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 2292 | + for ac_prog in ar |
| 2293 | + do |
| 2294 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 2295 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 2296 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 2297 | $as_echo_n "checking for $ac_word... " >&6; } |
| 2298 | if test "${ac_cv_prog_AR+set}" = set; then : |
| 2299 | @@ -6308,7 +6562,7 @@ do |
| 2300 | test -z "$as_dir" && as_dir=. |
| 2301 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 2302 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 2303 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 2304 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 2305 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2306 | break 2 |
| 2307 | fi |
| 2308 | @@ -6328,11 +6582,15 @@ $as_echo "no" >&6; } |
| 2309 | fi |
| 2310 | |
| 2311 | |
| 2312 | + test -n "$AR" && break |
| 2313 | + done |
| 2314 | fi |
| 2315 | -if test -z "$ac_cv_prog_AR"; then |
| 2316 | +if test -z "$AR"; then |
| 2317 | ac_ct_AR=$AR |
| 2318 | - # Extract the first word of "ar", so it can be a program name with args. |
| 2319 | -set dummy ar; ac_word=$2 |
| 2320 | + for ac_prog in ar |
| 2321 | +do |
| 2322 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 2323 | +set dummy $ac_prog; ac_word=$2 |
| 2324 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 2325 | $as_echo_n "checking for $ac_word... " >&6; } |
| 2326 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
| 2327 | @@ -6348,7 +6606,7 @@ do |
| 2328 | test -z "$as_dir" && as_dir=. |
| 2329 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 2330 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 2331 | - ac_cv_prog_ac_ct_AR="ar" |
| 2332 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 2333 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2334 | break 2 |
| 2335 | fi |
| 2336 | @@ -6367,6 +6625,10 @@ else |
| 2337 | $as_echo "no" >&6; } |
| 2338 | fi |
| 2339 | |
| 2340 | + |
| 2341 | + test -n "$ac_ct_AR" && break |
| 2342 | +done |
| 2343 | + |
| 2344 | if test "x$ac_ct_AR" = x; then |
| 2345 | AR="false" |
| 2346 | else |
| 2347 | @@ -6378,12 +6640,10 @@ ac_tool_warned=yes ;; |
| 2348 | esac |
| 2349 | AR=$ac_ct_AR |
| 2350 | fi |
| 2351 | -else |
| 2352 | - AR="$ac_cv_prog_AR" |
| 2353 | fi |
| 2354 | |
| 2355 | -test -z "$AR" && AR=ar |
| 2356 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 2357 | +: ${AR=ar} |
| 2358 | +: ${AR_FLAGS=cru} |
| 2359 | |
| 2360 | |
| 2361 | |
| 2362 | @@ -6395,6 +6655,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 2363 | |
| 2364 | |
| 2365 | |
| 2366 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 2367 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 2368 | +if test "${lt_cv_ar_at_file+set}" = set; then : |
| 2369 | + $as_echo_n "(cached) " >&6 |
| 2370 | +else |
| 2371 | + lt_cv_ar_at_file=no |
| 2372 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 2373 | +/* end confdefs.h. */ |
| 2374 | + |
| 2375 | +int |
| 2376 | +main () |
| 2377 | +{ |
| 2378 | + |
| 2379 | + ; |
| 2380 | + return 0; |
| 2381 | +} |
| 2382 | +_ACEOF |
| 2383 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 2384 | + echo conftest.$ac_objext > conftest.lst |
| 2385 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 2386 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 2387 | + (eval $lt_ar_try) 2>&5 |
| 2388 | + ac_status=$? |
| 2389 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 2390 | + test $ac_status = 0; } |
| 2391 | + if test "$ac_status" -eq 0; then |
| 2392 | + # Ensure the archiver fails upon bogus file names. |
| 2393 | + rm -f conftest.$ac_objext libconftest.a |
| 2394 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 2395 | + (eval $lt_ar_try) 2>&5 |
| 2396 | + ac_status=$? |
| 2397 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 2398 | + test $ac_status = 0; } |
| 2399 | + if test "$ac_status" -ne 0; then |
| 2400 | + lt_cv_ar_at_file=@ |
| 2401 | + fi |
| 2402 | + fi |
| 2403 | + rm -f conftest.* libconftest.a |
| 2404 | + |
| 2405 | +fi |
| 2406 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 2407 | + |
| 2408 | +fi |
| 2409 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 2410 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 2411 | + |
| 2412 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 2413 | + archiver_list_spec= |
| 2414 | +else |
| 2415 | + archiver_list_spec=$lt_cv_ar_at_file |
| 2416 | +fi |
| 2417 | + |
| 2418 | + |
| 2419 | + |
| 2420 | + |
| 2421 | + |
| 2422 | + |
| 2423 | + |
| 2424 | if test -n "$ac_tool_prefix"; then |
| 2425 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
| 2426 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
| 2427 | @@ -6729,8 +7047,8 @@ esac |
| 2428 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 2429 | |
| 2430 | # Transform an extracted symbol line into symbol name and symbol address |
| 2431 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 2432 | -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
| 2433 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 2434 | +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
| 2435 | |
| 2436 | # Handle CRLF in mingw tool chain |
| 2437 | opt_cr= |
| 2438 | @@ -6766,6 +7084,7 @@ for ac_symprfx in "" "_"; do |
| 2439 | else |
| 2440 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 2441 | fi |
| 2442 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 2443 | |
| 2444 | # Check to see that the pipe works correctly. |
| 2445 | pipe_works=no |
| 2446 | @@ -6807,6 +7126,18 @@ _LT_EOF |
| 2447 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 2448 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 2449 | cat <<_LT_EOF > conftest.$ac_ext |
| 2450 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 2451 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 2452 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 2453 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 2454 | +# define LT_DLSYM_CONST |
| 2455 | +#elif defined(__osf__) |
| 2456 | +/* This system does not cope well with relocations in const data. */ |
| 2457 | +# define LT_DLSYM_CONST |
| 2458 | +#else |
| 2459 | +# define LT_DLSYM_CONST const |
| 2460 | +#endif |
| 2461 | + |
| 2462 | #ifdef __cplusplus |
| 2463 | extern "C" { |
| 2464 | #endif |
| 2465 | @@ -6818,7 +7149,7 @@ _LT_EOF |
| 2466 | cat <<_LT_EOF >> conftest.$ac_ext |
| 2467 | |
| 2468 | /* The mapping between symbol names and symbols. */ |
| 2469 | -const struct { |
| 2470 | +LT_DLSYM_CONST struct { |
| 2471 | const char *name; |
| 2472 | void *address; |
| 2473 | } |
| 2474 | @@ -6844,8 +7175,8 @@ static const void *lt_preloaded_setup() { |
| 2475 | _LT_EOF |
| 2476 | # Now try linking the two files. |
| 2477 | mv conftest.$ac_objext conftstm.$ac_objext |
| 2478 | - lt_save_LIBS="$LIBS" |
| 2479 | - lt_save_CFLAGS="$CFLAGS" |
| 2480 | + lt_globsym_save_LIBS=$LIBS |
| 2481 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 2482 | LIBS="conftstm.$ac_objext" |
| 2483 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 2484 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 2485 | @@ -6855,8 +7186,8 @@ _LT_EOF |
| 2486 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 2487 | pipe_works=yes |
| 2488 | fi |
| 2489 | - LIBS="$lt_save_LIBS" |
| 2490 | - CFLAGS="$lt_save_CFLAGS" |
| 2491 | + LIBS=$lt_globsym_save_LIBS |
| 2492 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 2493 | else |
| 2494 | echo "cannot find nm_test_func in $nlist" >&5 |
| 2495 | fi |
| 2496 | @@ -6893,6 +7224,21 @@ else |
| 2497 | $as_echo "ok" >&6; } |
| 2498 | fi |
| 2499 | |
| 2500 | +# Response file support. |
| 2501 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 2502 | + nm_file_list_spec='@' |
| 2503 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 2504 | + nm_file_list_spec='@' |
| 2505 | +fi |
| 2506 | + |
| 2507 | + |
| 2508 | + |
| 2509 | + |
| 2510 | + |
| 2511 | + |
| 2512 | + |
| 2513 | + |
| 2514 | + |
| 2515 | |
| 2516 | |
| 2517 | |
| 2518 | @@ -6908,6 +7254,40 @@ fi |
| 2519 | |
| 2520 | |
| 2521 | |
| 2522 | + |
| 2523 | + |
| 2524 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 2525 | +$as_echo_n "checking for sysroot... " >&6; } |
| 2526 | + |
| 2527 | +# Check whether --with-libtool-sysroot was given. |
| 2528 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 2529 | + withval=$with_libtool_sysroot; |
| 2530 | +else |
| 2531 | + with_libtool_sysroot=no |
| 2532 | +fi |
| 2533 | + |
| 2534 | + |
| 2535 | +lt_sysroot= |
| 2536 | +case ${with_libtool_sysroot} in #( |
| 2537 | + yes) |
| 2538 | + if test "$GCC" = yes; then |
| 2539 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 2540 | + fi |
| 2541 | + ;; #( |
| 2542 | + /*) |
| 2543 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 2544 | + ;; #( |
| 2545 | + no|'') |
| 2546 | + ;; #( |
| 2547 | + *) |
| 2548 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 2549 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 2550 | + as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 |
| 2551 | + ;; |
| 2552 | +esac |
| 2553 | + |
| 2554 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 2555 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 2556 | |
| 2557 | |
| 2558 | |
| 2559 | @@ -7120,6 +7500,123 @@ esac |
| 2560 | |
| 2561 | need_locks="$enable_libtool_lock" |
| 2562 | |
| 2563 | +if test -n "$ac_tool_prefix"; then |
| 2564 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 2565 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 2566 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 2567 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 2568 | +if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : |
| 2569 | + $as_echo_n "(cached) " >&6 |
| 2570 | +else |
| 2571 | + if test -n "$MANIFEST_TOOL"; then |
| 2572 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 2573 | +else |
| 2574 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 2575 | +for as_dir in $PATH |
| 2576 | +do |
| 2577 | + IFS=$as_save_IFS |
| 2578 | + test -z "$as_dir" && as_dir=. |
| 2579 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 2580 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 2581 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 2582 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2583 | + break 2 |
| 2584 | + fi |
| 2585 | +done |
| 2586 | + done |
| 2587 | +IFS=$as_save_IFS |
| 2588 | + |
| 2589 | +fi |
| 2590 | +fi |
| 2591 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 2592 | +if test -n "$MANIFEST_TOOL"; then |
| 2593 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 2594 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 2595 | +else |
| 2596 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 2597 | +$as_echo "no" >&6; } |
| 2598 | +fi |
| 2599 | + |
| 2600 | + |
| 2601 | +fi |
| 2602 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 2603 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 2604 | + # Extract the first word of "mt", so it can be a program name with args. |
| 2605 | +set dummy mt; ac_word=$2 |
| 2606 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 2607 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 2608 | +if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : |
| 2609 | + $as_echo_n "(cached) " >&6 |
| 2610 | +else |
| 2611 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 2612 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 2613 | +else |
| 2614 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 2615 | +for as_dir in $PATH |
| 2616 | +do |
| 2617 | + IFS=$as_save_IFS |
| 2618 | + test -z "$as_dir" && as_dir=. |
| 2619 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 2620 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 2621 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 2622 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2623 | + break 2 |
| 2624 | + fi |
| 2625 | +done |
| 2626 | + done |
| 2627 | +IFS=$as_save_IFS |
| 2628 | + |
| 2629 | +fi |
| 2630 | +fi |
| 2631 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 2632 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 2633 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 2634 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 2635 | +else |
| 2636 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 2637 | +$as_echo "no" >&6; } |
| 2638 | +fi |
| 2639 | + |
| 2640 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 2641 | + MANIFEST_TOOL=":" |
| 2642 | + else |
| 2643 | + case $cross_compiling:$ac_tool_warned in |
| 2644 | +yes:) |
| 2645 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 2646 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 2647 | +ac_tool_warned=yes ;; |
| 2648 | +esac |
| 2649 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 2650 | + fi |
| 2651 | +else |
| 2652 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 2653 | +fi |
| 2654 | + |
| 2655 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 2656 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 2657 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 2658 | +if test "${lt_cv_path_mainfest_tool+set}" = set; then : |
| 2659 | + $as_echo_n "(cached) " >&6 |
| 2660 | +else |
| 2661 | + lt_cv_path_mainfest_tool=no |
| 2662 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 2663 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 2664 | + cat conftest.err >&5 |
| 2665 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 2666 | + lt_cv_path_mainfest_tool=yes |
| 2667 | + fi |
| 2668 | + rm -f conftest* |
| 2669 | +fi |
| 2670 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 2671 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 2672 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 2673 | + MANIFEST_TOOL=: |
| 2674 | +fi |
| 2675 | + |
| 2676 | + |
| 2677 | + |
| 2678 | + |
| 2679 | + |
| 2680 | |
| 2681 | case $host_os in |
| 2682 | rhapsody* | darwin*) |
| 2683 | @@ -7683,6 +8180,8 @@ _LT_EOF |
| 2684 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 2685 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 2686 | $AR cru libconftest.a conftest.o 2>&5 |
| 2687 | + echo "$RANLIB libconftest.a" >&5 |
| 2688 | + $RANLIB libconftest.a 2>&5 |
| 2689 | cat > conftest.c << _LT_EOF |
| 2690 | int main() { return 0;} |
| 2691 | _LT_EOF |
| 2692 | @@ -7878,7 +8377,8 @@ fi |
| 2693 | LIBTOOL_DEPS="$ltmain" |
| 2694 | |
| 2695 | # Always use our own libtool. |
| 2696 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
| 2697 | +LIBTOOL='$(SHELL) $(top_builddir)' |
| 2698 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" |
| 2699 | |
| 2700 | |
| 2701 | |
| 2702 | @@ -7967,7 +8467,7 @@ aix3*) |
| 2703 | esac |
| 2704 | |
| 2705 | # Global variables: |
| 2706 | -ofile=libtool |
| 2707 | +ofile=${host_alias}-libtool |
| 2708 | can_build_shared=yes |
| 2709 | |
| 2710 | # All known linkers require a `.a' archive for static linking (except MSVC, |
| 2711 | @@ -8265,8 +8765,6 @@ fi |
| 2712 | lt_prog_compiler_pic= |
| 2713 | lt_prog_compiler_static= |
| 2714 | |
| 2715 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 2716 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 2717 | |
| 2718 | if test "$GCC" = yes; then |
| 2719 | lt_prog_compiler_wl='-Wl,' |
| 2720 | @@ -8432,6 +8930,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 2721 | lt_prog_compiler_pic='--shared' |
| 2722 | lt_prog_compiler_static='--static' |
| 2723 | ;; |
| 2724 | + nagfor*) |
| 2725 | + # NAG Fortran compiler |
| 2726 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 2727 | + lt_prog_compiler_pic='-PIC' |
| 2728 | + lt_prog_compiler_static='-Bstatic' |
| 2729 | + ;; |
| 2730 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 2731 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 2732 | # which looks to be a dead project) |
| 2733 | @@ -8494,7 +8998,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 2734 | lt_prog_compiler_pic='-KPIC' |
| 2735 | lt_prog_compiler_static='-Bstatic' |
| 2736 | case $cc_basename in |
| 2737 | - f77* | f90* | f95*) |
| 2738 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 2739 | lt_prog_compiler_wl='-Qoption ld ';; |
| 2740 | *) |
| 2741 | lt_prog_compiler_wl='-Wl,';; |
| 2742 | @@ -8551,13 +9055,17 @@ case $host_os in |
| 2743 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 2744 | ;; |
| 2745 | esac |
| 2746 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 2747 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 2748 | - |
| 2749 | - |
| 2750 | - |
| 2751 | - |
| 2752 | |
| 2753 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 2754 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 2755 | +if test "${lt_cv_prog_compiler_pic+set}" = set; then : |
| 2756 | + $as_echo_n "(cached) " >&6 |
| 2757 | +else |
| 2758 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 2759 | +fi |
| 2760 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 2761 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 2762 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 2763 | |
| 2764 | # |
| 2765 | # Check to make sure the PIC flag actually works. |
| 2766 | @@ -8618,6 +9126,11 @@ fi |
| 2767 | |
| 2768 | |
| 2769 | |
| 2770 | + |
| 2771 | + |
| 2772 | + |
| 2773 | + |
| 2774 | + |
| 2775 | # |
| 2776 | # Check to make sure the static flag actually works. |
| 2777 | # |
| 2778 | @@ -8968,7 +9481,8 @@ _LT_EOF |
| 2779 | allow_undefined_flag=unsupported |
| 2780 | always_export_symbols=no |
| 2781 | enable_shared_with_static_runtimes=yes |
| 2782 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 2783 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' |
| 2784 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 2785 | |
| 2786 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 2787 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 2788 | @@ -9067,12 +9581,12 @@ _LT_EOF |
| 2789 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 2790 | hardcode_libdir_flag_spec= |
| 2791 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 2792 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 2793 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 2794 | if test "x$supports_anon_versioning" = xyes; then |
| 2795 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 2796 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 2797 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 2798 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 2799 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 2800 | fi |
| 2801 | ;; |
| 2802 | esac |
| 2803 | @@ -9086,8 +9600,8 @@ _LT_EOF |
| 2804 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 2805 | wlarc= |
| 2806 | else |
| 2807 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 2808 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 2809 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 2810 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 2811 | fi |
| 2812 | ;; |
| 2813 | |
| 2814 | @@ -9105,8 +9619,8 @@ _LT_EOF |
| 2815 | |
| 2816 | _LT_EOF |
| 2817 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 2818 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 2819 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 2820 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 2821 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 2822 | else |
| 2823 | ld_shlibs=no |
| 2824 | fi |
| 2825 | @@ -9152,8 +9666,8 @@ _LT_EOF |
| 2826 | |
| 2827 | *) |
| 2828 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 2829 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 2830 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 2831 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 2832 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 2833 | else |
| 2834 | ld_shlibs=no |
| 2835 | fi |
| 2836 | @@ -9283,7 +9797,13 @@ _LT_EOF |
| 2837 | allow_undefined_flag='-berok' |
| 2838 | # Determine the default libpath from the value encoded in an |
| 2839 | # empty executable. |
| 2840 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 2841 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 2842 | + aix_libpath=$lt_cv_aix_libpath |
| 2843 | +else |
| 2844 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 2845 | + $as_echo_n "(cached) " >&6 |
| 2846 | +else |
| 2847 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 2848 | /* end confdefs.h. */ |
| 2849 | |
| 2850 | int |
| 2851 | @@ -9296,22 +9816,29 @@ main () |
| 2852 | _ACEOF |
| 2853 | if ac_fn_c_try_link "$LINENO"; then : |
| 2854 | |
| 2855 | -lt_aix_libpath_sed=' |
| 2856 | - /Import File Strings/,/^$/ { |
| 2857 | - /^0/ { |
| 2858 | - s/^0 *\(.*\)$/\1/ |
| 2859 | - p |
| 2860 | - } |
| 2861 | - }' |
| 2862 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 2863 | -# Check for a 64-bit object if we didn't find anything. |
| 2864 | -if test -z "$aix_libpath"; then |
| 2865 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 2866 | -fi |
| 2867 | + lt_aix_libpath_sed=' |
| 2868 | + /Import File Strings/,/^$/ { |
| 2869 | + /^0/ { |
| 2870 | + s/^0 *\([^ ]*\) *$/\1/ |
| 2871 | + p |
| 2872 | + } |
| 2873 | + }' |
| 2874 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 2875 | + # Check for a 64-bit object if we didn't find anything. |
| 2876 | + if test -z "$lt_cv_aix_libpath_"; then |
| 2877 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 2878 | + fi |
| 2879 | fi |
| 2880 | rm -f core conftest.err conftest.$ac_objext \ |
| 2881 | conftest$ac_exeext conftest.$ac_ext |
| 2882 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 2883 | + if test -z "$lt_cv_aix_libpath_"; then |
| 2884 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 2885 | + fi |
| 2886 | + |
| 2887 | +fi |
| 2888 | + |
| 2889 | + aix_libpath=$lt_cv_aix_libpath_ |
| 2890 | +fi |
| 2891 | |
| 2892 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 2893 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
| 2894 | @@ -9323,7 +9850,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 2895 | else |
| 2896 | # Determine the default libpath from the value encoded in an |
| 2897 | # empty executable. |
| 2898 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 2899 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 2900 | + aix_libpath=$lt_cv_aix_libpath |
| 2901 | +else |
| 2902 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 2903 | + $as_echo_n "(cached) " >&6 |
| 2904 | +else |
| 2905 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 2906 | /* end confdefs.h. */ |
| 2907 | |
| 2908 | int |
| 2909 | @@ -9336,22 +9869,29 @@ main () |
| 2910 | _ACEOF |
| 2911 | if ac_fn_c_try_link "$LINENO"; then : |
| 2912 | |
| 2913 | -lt_aix_libpath_sed=' |
| 2914 | - /Import File Strings/,/^$/ { |
| 2915 | - /^0/ { |
| 2916 | - s/^0 *\(.*\)$/\1/ |
| 2917 | - p |
| 2918 | - } |
| 2919 | - }' |
| 2920 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 2921 | -# Check for a 64-bit object if we didn't find anything. |
| 2922 | -if test -z "$aix_libpath"; then |
| 2923 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 2924 | -fi |
| 2925 | + lt_aix_libpath_sed=' |
| 2926 | + /Import File Strings/,/^$/ { |
| 2927 | + /^0/ { |
| 2928 | + s/^0 *\([^ ]*\) *$/\1/ |
| 2929 | + p |
| 2930 | + } |
| 2931 | + }' |
| 2932 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 2933 | + # Check for a 64-bit object if we didn't find anything. |
| 2934 | + if test -z "$lt_cv_aix_libpath_"; then |
| 2935 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 2936 | + fi |
| 2937 | fi |
| 2938 | rm -f core conftest.err conftest.$ac_objext \ |
| 2939 | conftest$ac_exeext conftest.$ac_ext |
| 2940 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 2941 | + if test -z "$lt_cv_aix_libpath_"; then |
| 2942 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 2943 | + fi |
| 2944 | + |
| 2945 | +fi |
| 2946 | + |
| 2947 | + aix_libpath=$lt_cv_aix_libpath_ |
| 2948 | +fi |
| 2949 | |
| 2950 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 2951 | # Warning - without using the other run time loading flags, |
| 2952 | @@ -9396,20 +9936,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 2953 | # Microsoft Visual C++. |
| 2954 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 2955 | # no search path for DLLs. |
| 2956 | - hardcode_libdir_flag_spec=' ' |
| 2957 | - allow_undefined_flag=unsupported |
| 2958 | - # Tell ltmain to make .lib files, not .a files. |
| 2959 | - libext=lib |
| 2960 | - # Tell ltmain to make .dll files, not .so files. |
| 2961 | - shrext_cmds=".dll" |
| 2962 | - # FIXME: Setting linknames here is a bad hack. |
| 2963 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 2964 | - # The linker will automatically build a .lib file if we build a DLL. |
| 2965 | - old_archive_from_new_cmds='true' |
| 2966 | - # FIXME: Should let the user specify the lib program. |
| 2967 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 2968 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 2969 | - enable_shared_with_static_runtimes=yes |
| 2970 | + case $cc_basename in |
| 2971 | + cl*) |
| 2972 | + # Native MSVC |
| 2973 | + hardcode_libdir_flag_spec=' ' |
| 2974 | + allow_undefined_flag=unsupported |
| 2975 | + always_export_symbols=yes |
| 2976 | + file_list_spec='@' |
| 2977 | + # Tell ltmain to make .lib files, not .a files. |
| 2978 | + libext=lib |
| 2979 | + # Tell ltmain to make .dll files, not .so files. |
| 2980 | + shrext_cmds=".dll" |
| 2981 | + # FIXME: Setting linknames here is a bad hack. |
| 2982 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 2983 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 2984 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 2985 | + else |
| 2986 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 2987 | + fi~ |
| 2988 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 2989 | + linknames=' |
| 2990 | + # The linker will not automatically build a static lib if we build a DLL. |
| 2991 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 2992 | + enable_shared_with_static_runtimes=yes |
| 2993 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 2994 | + # Don't use ranlib |
| 2995 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 2996 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 2997 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 2998 | + case $lt_outputfile in |
| 2999 | + *.exe|*.EXE) ;; |
| 3000 | + *) |
| 3001 | + lt_outputfile="$lt_outputfile.exe" |
| 3002 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 3003 | + ;; |
| 3004 | + esac~ |
| 3005 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 3006 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 3007 | + $RM "$lt_outputfile.manifest"; |
| 3008 | + fi' |
| 3009 | + ;; |
| 3010 | + *) |
| 3011 | + # Assume MSVC wrapper |
| 3012 | + hardcode_libdir_flag_spec=' ' |
| 3013 | + allow_undefined_flag=unsupported |
| 3014 | + # Tell ltmain to make .lib files, not .a files. |
| 3015 | + libext=lib |
| 3016 | + # Tell ltmain to make .dll files, not .so files. |
| 3017 | + shrext_cmds=".dll" |
| 3018 | + # FIXME: Setting linknames here is a bad hack. |
| 3019 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 3020 | + # The linker will automatically build a .lib file if we build a DLL. |
| 3021 | + old_archive_from_new_cmds='true' |
| 3022 | + # FIXME: Should let the user specify the lib program. |
| 3023 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 3024 | + enable_shared_with_static_runtimes=yes |
| 3025 | + ;; |
| 3026 | + esac |
| 3027 | ;; |
| 3028 | |
| 3029 | darwin* | rhapsody*) |
| 3030 | @@ -9470,7 +10053,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 3031 | |
| 3032 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 3033 | freebsd* | dragonfly*) |
| 3034 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 3035 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 3036 | hardcode_libdir_flag_spec='-R$libdir' |
| 3037 | hardcode_direct=yes |
| 3038 | hardcode_shlibpath_var=no |
| 3039 | @@ -9478,7 +10061,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 3040 | |
| 3041 | hpux9*) |
| 3042 | if test "$GCC" = yes; then |
| 3043 | - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 3044 | + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 3045 | else |
| 3046 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 3047 | fi |
| 3048 | @@ -9494,7 +10077,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 3049 | |
| 3050 | hpux10*) |
| 3051 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 3052 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 3053 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 3054 | else |
| 3055 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 3056 | fi |
| 3057 | @@ -9518,10 +10101,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 3058 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 3059 | ;; |
| 3060 | ia64*) |
| 3061 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 3062 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 3063 | ;; |
| 3064 | *) |
| 3065 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 3066 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 3067 | ;; |
| 3068 | esac |
| 3069 | else |
| 3070 | @@ -9600,23 +10183,36 @@ fi |
| 3071 | |
| 3072 | irix5* | irix6* | nonstopux*) |
| 3073 | if test "$GCC" = yes; then |
| 3074 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 3075 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 3076 | # Try to use the -exported_symbol ld option, if it does not |
| 3077 | # work, assume that -exports_file does not work either and |
| 3078 | # implicitly export all symbols. |
| 3079 | - save_LDFLAGS="$LDFLAGS" |
| 3080 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 3081 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 3082 | + # This should be the same for all languages, so no per-tag cache variable. |
| 3083 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 3084 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 3085 | +if test "${lt_cv_irix_exported_symbol+set}" = set; then : |
| 3086 | + $as_echo_n "(cached) " >&6 |
| 3087 | +else |
| 3088 | + save_LDFLAGS="$LDFLAGS" |
| 3089 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 3090 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 3091 | /* end confdefs.h. */ |
| 3092 | -int foo(void) {} |
| 3093 | +int foo (void) { return 0; } |
| 3094 | _ACEOF |
| 3095 | if ac_fn_c_try_link "$LINENO"; then : |
| 3096 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 3097 | - |
| 3098 | + lt_cv_irix_exported_symbol=yes |
| 3099 | +else |
| 3100 | + lt_cv_irix_exported_symbol=no |
| 3101 | fi |
| 3102 | rm -f core conftest.err conftest.$ac_objext \ |
| 3103 | conftest$ac_exeext conftest.$ac_ext |
| 3104 | - LDFLAGS="$save_LDFLAGS" |
| 3105 | + LDFLAGS="$save_LDFLAGS" |
| 3106 | +fi |
| 3107 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 3108 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 3109 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 3110 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 3111 | + fi |
| 3112 | else |
| 3113 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
| 3114 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
| 3115 | @@ -9701,7 +10297,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 3116 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 3117 | if test "$GCC" = yes; then |
| 3118 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 3119 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 3120 | + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 3121 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 3122 | else |
| 3123 | allow_undefined_flag=' -expect_unresolved \*' |
| 3124 | @@ -9720,9 +10316,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 3125 | no_undefined_flag=' -z defs' |
| 3126 | if test "$GCC" = yes; then |
| 3127 | wlarc='${wl}' |
| 3128 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 3129 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 3130 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 3131 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 3132 | + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 3133 | else |
| 3134 | case `$CC -V 2>&1` in |
| 3135 | *"Compilers 5.0"*) |
| 3136 | @@ -10298,8 +10894,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 3137 | need_version=no |
| 3138 | need_lib_prefix=no |
| 3139 | |
| 3140 | - case $GCC,$host_os in |
| 3141 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 3142 | + case $GCC,$cc_basename in |
| 3143 | + yes,*) |
| 3144 | + # gcc |
| 3145 | library_names_spec='$libname.dll.a' |
| 3146 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 3147 | postinstall_cmds='base_file=`basename \${file}`~ |
| 3148 | @@ -10332,13 +10929,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 3149 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 3150 | ;; |
| 3151 | esac |
| 3152 | + dynamic_linker='Win32 ld.exe' |
| 3153 | + ;; |
| 3154 | + |
| 3155 | + *,cl*) |
| 3156 | + # Native MSVC |
| 3157 | + libname_spec='$name' |
| 3158 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 3159 | + library_names_spec='${libname}.dll.lib' |
| 3160 | + |
| 3161 | + case $build_os in |
| 3162 | + mingw*) |
| 3163 | + sys_lib_search_path_spec= |
| 3164 | + lt_save_ifs=$IFS |
| 3165 | + IFS=';' |
| 3166 | + for lt_path in $LIB |
| 3167 | + do |
| 3168 | + IFS=$lt_save_ifs |
| 3169 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 3170 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 3171 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 3172 | + done |
| 3173 | + IFS=$lt_save_ifs |
| 3174 | + # Convert to MSYS style. |
| 3175 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 3176 | + ;; |
| 3177 | + cygwin*) |
| 3178 | + # Convert to unix form, then to dos form, then back to unix form |
| 3179 | + # but this time dos style (no spaces!) so that the unix form looks |
| 3180 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 3181 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 3182 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 3183 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 3184 | + ;; |
| 3185 | + *) |
| 3186 | + sys_lib_search_path_spec="$LIB" |
| 3187 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 3188 | + # It is most probably a Windows format PATH. |
| 3189 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 3190 | + else |
| 3191 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 3192 | + fi |
| 3193 | + # FIXME: find the short name or the path components, as spaces are |
| 3194 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 3195 | + ;; |
| 3196 | + esac |
| 3197 | + |
| 3198 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 3199 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 3200 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 3201 | + dldir=$destdir/`dirname \$dlpath`~ |
| 3202 | + test -d \$dldir || mkdir -p \$dldir~ |
| 3203 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 3204 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 3205 | + dlpath=$dir/\$dldll~ |
| 3206 | + $RM \$dlpath' |
| 3207 | + shlibpath_overrides_runpath=yes |
| 3208 | + dynamic_linker='Win32 link.exe' |
| 3209 | ;; |
| 3210 | |
| 3211 | *) |
| 3212 | + # Assume MSVC wrapper |
| 3213 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 3214 | + dynamic_linker='Win32 ld.exe' |
| 3215 | ;; |
| 3216 | esac |
| 3217 | - dynamic_linker='Win32 ld.exe' |
| 3218 | # FIXME: first we should search . and the directory the executable is in |
| 3219 | shlibpath_var=PATH |
| 3220 | ;; |
| 3221 | @@ -10430,7 +11085,7 @@ haiku*) |
| 3222 | soname_spec='${libname}${release}${shared_ext}$major' |
| 3223 | shlibpath_var=LIBRARY_PATH |
| 3224 | shlibpath_overrides_runpath=yes |
| 3225 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' |
| 3226 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
| 3227 | hardcode_into_libs=yes |
| 3228 | ;; |
| 3229 | |
| 3230 | @@ -11270,10 +11925,10 @@ else |
| 3231 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 3232 | correspondingly for the symbols needed. */ |
| 3233 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 3234 | -void fnord () __attribute__((visibility("default"))); |
| 3235 | +int fnord () __attribute__((visibility("default"))); |
| 3236 | #endif |
| 3237 | |
| 3238 | -void fnord () { int i=42; } |
| 3239 | +int fnord () { return 42; } |
| 3240 | int main () |
| 3241 | { |
| 3242 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 3243 | @@ -11376,10 +12031,10 @@ else |
| 3244 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 3245 | correspondingly for the symbols needed. */ |
| 3246 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 3247 | -void fnord () __attribute__((visibility("default"))); |
| 3248 | +int fnord () __attribute__((visibility("default"))); |
| 3249 | #endif |
| 3250 | |
| 3251 | -void fnord () { int i=42; } |
| 3252 | +int fnord () { return 42; } |
| 3253 | int main () |
| 3254 | { |
| 3255 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 3256 | @@ -15446,13 +16101,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
| 3257 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 3258 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 3259 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 3260 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 3261 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 3262 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 3263 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 3264 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 3265 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 3266 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 3267 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 3268 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 3269 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 3270 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 3271 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 3272 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 3273 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 3274 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 3275 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 3276 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
| 3277 | @@ -15467,14 +16129,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
| 3278 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 3279 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 3280 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 3281 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 3282 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 3283 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 3284 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 3285 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 3286 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 3287 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 3288 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 3289 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 3290 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 3291 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 3292 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 3293 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 3294 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 3295 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
| 3296 | @@ -15507,12 +16172,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
| 3297 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 3298 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 3299 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 3300 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 3301 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 3302 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 3303 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 3304 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 3305 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 3306 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 3307 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 3308 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 3309 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 3310 | @@ -15567,8 +16232,13 @@ reload_flag \ |
| 3311 | OBJDUMP \ |
| 3312 | deplibs_check_method \ |
| 3313 | file_magic_cmd \ |
| 3314 | +file_magic_glob \ |
| 3315 | +want_nocaseglob \ |
| 3316 | +DLLTOOL \ |
| 3317 | +sharedlib_from_linklib_cmd \ |
| 3318 | AR \ |
| 3319 | AR_FLAGS \ |
| 3320 | +archiver_list_spec \ |
| 3321 | STRIP \ |
| 3322 | RANLIB \ |
| 3323 | CC \ |
| 3324 | @@ -15578,12 +16248,14 @@ lt_cv_sys_global_symbol_pipe \ |
| 3325 | lt_cv_sys_global_symbol_to_cdecl \ |
| 3326 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 3327 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 3328 | +nm_file_list_spec \ |
| 3329 | lt_prog_compiler_no_builtin_flag \ |
| 3330 | -lt_prog_compiler_wl \ |
| 3331 | lt_prog_compiler_pic \ |
| 3332 | +lt_prog_compiler_wl \ |
| 3333 | lt_prog_compiler_static \ |
| 3334 | lt_cv_prog_compiler_c_o \ |
| 3335 | need_locks \ |
| 3336 | +MANIFEST_TOOL \ |
| 3337 | DSYMUTIL \ |
| 3338 | NMEDIT \ |
| 3339 | LIPO \ |
| 3340 | @@ -15599,7 +16271,6 @@ no_undefined_flag \ |
| 3341 | hardcode_libdir_flag_spec \ |
| 3342 | hardcode_libdir_flag_spec_ld \ |
| 3343 | hardcode_libdir_separator \ |
| 3344 | -fix_srcfile_path \ |
| 3345 | exclude_expsyms \ |
| 3346 | include_expsyms \ |
| 3347 | file_list_spec \ |
| 3348 | @@ -15635,6 +16306,7 @@ module_cmds \ |
| 3349 | module_expsym_cmds \ |
| 3350 | export_symbols_cmds \ |
| 3351 | prelink_cmds \ |
| 3352 | +postlink_cmds \ |
| 3353 | postinstall_cmds \ |
| 3354 | postuninstall_cmds \ |
| 3355 | finish_cmds \ |
| 3356 | @@ -16392,7 +17064,8 @@ $as_echo X"$file" | |
| 3357 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 3358 | # |
| 3359 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 3360 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 3361 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 3362 | +# Inc. |
| 3363 | # Written by Gordon Matzigkeit, 1996 |
| 3364 | # |
| 3365 | # This file is part of GNU Libtool. |
| 3366 | @@ -16495,19 +17168,42 @@ SP2NL=$lt_lt_SP2NL |
| 3367 | # turn newlines into spaces. |
| 3368 | NL2SP=$lt_lt_NL2SP |
| 3369 | |
| 3370 | +# convert \$build file names to \$host format. |
| 3371 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 3372 | + |
| 3373 | +# convert \$build files to toolchain format. |
| 3374 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 3375 | + |
| 3376 | # An object symbol dumper. |
| 3377 | OBJDUMP=$lt_OBJDUMP |
| 3378 | |
| 3379 | # Method to check whether dependent libraries are shared objects. |
| 3380 | deplibs_check_method=$lt_deplibs_check_method |
| 3381 | |
| 3382 | -# Command to use when deplibs_check_method == "file_magic". |
| 3383 | +# Command to use when deplibs_check_method = "file_magic". |
| 3384 | file_magic_cmd=$lt_file_magic_cmd |
| 3385 | |
| 3386 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 3387 | +file_magic_glob=$lt_file_magic_glob |
| 3388 | + |
| 3389 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 3390 | +want_nocaseglob=$lt_want_nocaseglob |
| 3391 | + |
| 3392 | +# DLL creation program. |
| 3393 | +DLLTOOL=$lt_DLLTOOL |
| 3394 | + |
| 3395 | +# Command to associate shared and link libraries. |
| 3396 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 3397 | + |
| 3398 | # The archiver. |
| 3399 | AR=$lt_AR |
| 3400 | + |
| 3401 | +# Flags to create an archive. |
| 3402 | AR_FLAGS=$lt_AR_FLAGS |
| 3403 | |
| 3404 | +# How to feed a file listing to the archiver. |
| 3405 | +archiver_list_spec=$lt_archiver_list_spec |
| 3406 | + |
| 3407 | # A symbol stripping program. |
| 3408 | STRIP=$lt_STRIP |
| 3409 | |
| 3410 | @@ -16537,6 +17233,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
| 3411 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 3412 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 3413 | |
| 3414 | +# Specify filename containing input files for \$NM. |
| 3415 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 3416 | + |
| 3417 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 3418 | +lt_sysroot=$lt_sysroot |
| 3419 | + |
| 3420 | # The name of the directory that contains temporary libtool files. |
| 3421 | objdir=$objdir |
| 3422 | |
| 3423 | @@ -16546,6 +17248,9 @@ MAGIC_CMD=$MAGIC_CMD |
| 3424 | # Must we lock files when doing compilation? |
| 3425 | need_locks=$lt_need_locks |
| 3426 | |
| 3427 | +# Manifest tool. |
| 3428 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 3429 | + |
| 3430 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 3431 | DSYMUTIL=$lt_DSYMUTIL |
| 3432 | |
| 3433 | @@ -16660,12 +17365,12 @@ with_gcc=$GCC |
| 3434 | # Compiler flag to turn off builtin functions. |
| 3435 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 3436 | |
| 3437 | -# How to pass a linker flag through the compiler. |
| 3438 | -wl=$lt_lt_prog_compiler_wl |
| 3439 | - |
| 3440 | # Additional compiler flags for building library objects. |
| 3441 | pic_flag=$lt_lt_prog_compiler_pic |
| 3442 | |
| 3443 | +# How to pass a linker flag through the compiler. |
| 3444 | +wl=$lt_lt_prog_compiler_wl |
| 3445 | + |
| 3446 | # Compiler flag to prevent dynamic linking. |
| 3447 | link_static_flag=$lt_lt_prog_compiler_static |
| 3448 | |
| 3449 | @@ -16752,9 +17457,6 @@ inherit_rpath=$inherit_rpath |
| 3450 | # Whether libtool must link a program against all its dependency libraries. |
| 3451 | link_all_deplibs=$link_all_deplibs |
| 3452 | |
| 3453 | -# Fix the shell variable \$srcfile for the compiler. |
| 3454 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 3455 | - |
| 3456 | # Set to "yes" if exported symbols are required. |
| 3457 | always_export_symbols=$always_export_symbols |
| 3458 | |
| 3459 | @@ -16770,6 +17472,9 @@ include_expsyms=$lt_include_expsyms |
| 3460 | # Commands necessary for linking programs (against libraries) with templates. |
| 3461 | prelink_cmds=$lt_prelink_cmds |
| 3462 | |
| 3463 | +# Commands necessary for finishing linking programs. |
| 3464 | +postlink_cmds=$lt_postlink_cmds |
| 3465 | + |
| 3466 | # Specify filename containing input files. |
| 3467 | file_list_spec=$lt_file_list_spec |
| 3468 | |
| 3469 | @@ -16802,210 +17507,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
| 3470 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 3471 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 3472 | # is reportedly fixed, but why not run on old versions too? |
| 3473 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 3474 | - || (rm -f "$cfgfile"; exit 1) |
| 3475 | - |
| 3476 | - case $xsi_shell in |
| 3477 | - yes) |
| 3478 | - cat << \_LT_EOF >> "$cfgfile" |
| 3479 | - |
| 3480 | -# func_dirname file append nondir_replacement |
| 3481 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 3482 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 3483 | -func_dirname () |
| 3484 | -{ |
| 3485 | - case ${1} in |
| 3486 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 3487 | - * ) func_dirname_result="${3}" ;; |
| 3488 | - esac |
| 3489 | -} |
| 3490 | - |
| 3491 | -# func_basename file |
| 3492 | -func_basename () |
| 3493 | -{ |
| 3494 | - func_basename_result="${1##*/}" |
| 3495 | -} |
| 3496 | - |
| 3497 | -# func_dirname_and_basename file append nondir_replacement |
| 3498 | -# perform func_basename and func_dirname in a single function |
| 3499 | -# call: |
| 3500 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 3501 | -# add APPEND to the result, otherwise set result |
| 3502 | -# to NONDIR_REPLACEMENT. |
| 3503 | -# value returned in "$func_dirname_result" |
| 3504 | -# basename: Compute filename of FILE. |
| 3505 | -# value retuned in "$func_basename_result" |
| 3506 | -# Implementation must be kept synchronized with func_dirname |
| 3507 | -# and func_basename. For efficiency, we do not delegate to |
| 3508 | -# those functions but instead duplicate the functionality here. |
| 3509 | -func_dirname_and_basename () |
| 3510 | -{ |
| 3511 | - case ${1} in |
| 3512 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 3513 | - * ) func_dirname_result="${3}" ;; |
| 3514 | - esac |
| 3515 | - func_basename_result="${1##*/}" |
| 3516 | -} |
| 3517 | - |
| 3518 | -# func_stripname prefix suffix name |
| 3519 | -# strip PREFIX and SUFFIX off of NAME. |
| 3520 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 3521 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 3522 | -# dot (in which case that matches only a dot). |
| 3523 | -func_stripname () |
| 3524 | -{ |
| 3525 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 3526 | - # positional parameters, so assign one to ordinary parameter first. |
| 3527 | - func_stripname_result=${3} |
| 3528 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 3529 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 3530 | -} |
| 3531 | - |
| 3532 | -# func_opt_split |
| 3533 | -func_opt_split () |
| 3534 | -{ |
| 3535 | - func_opt_split_opt=${1%%=*} |
| 3536 | - func_opt_split_arg=${1#*=} |
| 3537 | -} |
| 3538 | - |
| 3539 | -# func_lo2o object |
| 3540 | -func_lo2o () |
| 3541 | -{ |
| 3542 | - case ${1} in |
| 3543 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 3544 | - *) func_lo2o_result=${1} ;; |
| 3545 | - esac |
| 3546 | -} |
| 3547 | - |
| 3548 | -# func_xform libobj-or-source |
| 3549 | -func_xform () |
| 3550 | -{ |
| 3551 | - func_xform_result=${1%.*}.lo |
| 3552 | -} |
| 3553 | - |
| 3554 | -# func_arith arithmetic-term... |
| 3555 | -func_arith () |
| 3556 | -{ |
| 3557 | - func_arith_result=$(( $* )) |
| 3558 | -} |
| 3559 | - |
| 3560 | -# func_len string |
| 3561 | -# STRING may not start with a hyphen. |
| 3562 | -func_len () |
| 3563 | -{ |
| 3564 | - func_len_result=${#1} |
| 3565 | -} |
| 3566 | - |
| 3567 | -_LT_EOF |
| 3568 | - ;; |
| 3569 | - *) # Bourne compatible functions. |
| 3570 | - cat << \_LT_EOF >> "$cfgfile" |
| 3571 | - |
| 3572 | -# func_dirname file append nondir_replacement |
| 3573 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 3574 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 3575 | -func_dirname () |
| 3576 | -{ |
| 3577 | - # Extract subdirectory from the argument. |
| 3578 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 3579 | - if test "X$func_dirname_result" = "X${1}"; then |
| 3580 | - func_dirname_result="${3}" |
| 3581 | - else |
| 3582 | - func_dirname_result="$func_dirname_result${2}" |
| 3583 | - fi |
| 3584 | -} |
| 3585 | - |
| 3586 | -# func_basename file |
| 3587 | -func_basename () |
| 3588 | -{ |
| 3589 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 3590 | -} |
| 3591 | - |
| 3592 | - |
| 3593 | -# func_stripname prefix suffix name |
| 3594 | -# strip PREFIX and SUFFIX off of NAME. |
| 3595 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 3596 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 3597 | -# dot (in which case that matches only a dot). |
| 3598 | -# func_strip_suffix prefix name |
| 3599 | -func_stripname () |
| 3600 | -{ |
| 3601 | - case ${2} in |
| 3602 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 3603 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 3604 | - esac |
| 3605 | -} |
| 3606 | - |
| 3607 | -# sed scripts: |
| 3608 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 3609 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 3610 | - |
| 3611 | -# func_opt_split |
| 3612 | -func_opt_split () |
| 3613 | -{ |
| 3614 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 3615 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 3616 | -} |
| 3617 | - |
| 3618 | -# func_lo2o object |
| 3619 | -func_lo2o () |
| 3620 | -{ |
| 3621 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 3622 | -} |
| 3623 | - |
| 3624 | -# func_xform libobj-or-source |
| 3625 | -func_xform () |
| 3626 | -{ |
| 3627 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 3628 | -} |
| 3629 | - |
| 3630 | -# func_arith arithmetic-term... |
| 3631 | -func_arith () |
| 3632 | -{ |
| 3633 | - func_arith_result=`expr "$@"` |
| 3634 | -} |
| 3635 | - |
| 3636 | -# func_len string |
| 3637 | -# STRING may not start with a hyphen. |
| 3638 | -func_len () |
| 3639 | -{ |
| 3640 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 3641 | -} |
| 3642 | - |
| 3643 | -_LT_EOF |
| 3644 | -esac |
| 3645 | - |
| 3646 | -case $lt_shell_append in |
| 3647 | - yes) |
| 3648 | - cat << \_LT_EOF >> "$cfgfile" |
| 3649 | - |
| 3650 | -# func_append var value |
| 3651 | -# Append VALUE to the end of shell variable VAR. |
| 3652 | -func_append () |
| 3653 | -{ |
| 3654 | - eval "$1+=\$2" |
| 3655 | -} |
| 3656 | -_LT_EOF |
| 3657 | - ;; |
| 3658 | - *) |
| 3659 | - cat << \_LT_EOF >> "$cfgfile" |
| 3660 | - |
| 3661 | -# func_append var value |
| 3662 | -# Append VALUE to the end of shell variable VAR. |
| 3663 | -func_append () |
| 3664 | -{ |
| 3665 | - eval "$1=\$$1\$2" |
| 3666 | -} |
| 3667 | - |
| 3668 | -_LT_EOF |
| 3669 | - ;; |
| 3670 | - esac |
| 3671 | - |
| 3672 | - |
| 3673 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 3674 | - || (rm -f "$cfgfile"; exit 1) |
| 3675 | - |
| 3676 | - mv -f "$cfgfile" "$ofile" || |
| 3677 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 3678 | + || (rm -f "$cfgfile"; exit 1) |
| 3679 | + |
| 3680 | + if test x"$xsi_shell" = xyes; then |
| 3681 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 3682 | +func_dirname ()\ |
| 3683 | +{\ |
| 3684 | +\ case ${1} in\ |
| 3685 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 3686 | +\ * ) func_dirname_result="${3}" ;;\ |
| 3687 | +\ esac\ |
| 3688 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3689 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3690 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3691 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3692 | + |
| 3693 | + |
| 3694 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 3695 | +func_basename ()\ |
| 3696 | +{\ |
| 3697 | +\ func_basename_result="${1##*/}"\ |
| 3698 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3699 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3700 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3701 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3702 | + |
| 3703 | + |
| 3704 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 3705 | +func_dirname_and_basename ()\ |
| 3706 | +{\ |
| 3707 | +\ case ${1} in\ |
| 3708 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 3709 | +\ * ) func_dirname_result="${3}" ;;\ |
| 3710 | +\ esac\ |
| 3711 | +\ func_basename_result="${1##*/}"\ |
| 3712 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3713 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3714 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3715 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3716 | + |
| 3717 | + |
| 3718 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 3719 | +func_stripname ()\ |
| 3720 | +{\ |
| 3721 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 3722 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 3723 | +\ func_stripname_result=${3}\ |
| 3724 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 3725 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 3726 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3727 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3728 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3729 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3730 | + |
| 3731 | + |
| 3732 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 3733 | +func_split_long_opt ()\ |
| 3734 | +{\ |
| 3735 | +\ func_split_long_opt_name=${1%%=*}\ |
| 3736 | +\ func_split_long_opt_arg=${1#*=}\ |
| 3737 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3738 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3739 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3740 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3741 | + |
| 3742 | + |
| 3743 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 3744 | +func_split_short_opt ()\ |
| 3745 | +{\ |
| 3746 | +\ func_split_short_opt_arg=${1#??}\ |
| 3747 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 3748 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3749 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3750 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3751 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3752 | + |
| 3753 | + |
| 3754 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 3755 | +func_lo2o ()\ |
| 3756 | +{\ |
| 3757 | +\ case ${1} in\ |
| 3758 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 3759 | +\ *) func_lo2o_result=${1} ;;\ |
| 3760 | +\ esac\ |
| 3761 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3762 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3763 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3764 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3765 | + |
| 3766 | + |
| 3767 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 3768 | +func_xform ()\ |
| 3769 | +{\ |
| 3770 | + func_xform_result=${1%.*}.lo\ |
| 3771 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3772 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3773 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3774 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3775 | + |
| 3776 | + |
| 3777 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 3778 | +func_arith ()\ |
| 3779 | +{\ |
| 3780 | + func_arith_result=$(( $* ))\ |
| 3781 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3782 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3783 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3784 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3785 | + |
| 3786 | + |
| 3787 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 3788 | +func_len ()\ |
| 3789 | +{\ |
| 3790 | + func_len_result=${#1}\ |
| 3791 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3792 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3793 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3794 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3795 | + |
| 3796 | +fi |
| 3797 | + |
| 3798 | +if test x"$lt_shell_append" = xyes; then |
| 3799 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 3800 | +func_append ()\ |
| 3801 | +{\ |
| 3802 | + eval "${1}+=\\${2}"\ |
| 3803 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3804 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3805 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3806 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3807 | + |
| 3808 | + |
| 3809 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 3810 | +func_append_quoted ()\ |
| 3811 | +{\ |
| 3812 | +\ func_quote_for_eval "${2}"\ |
| 3813 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 3814 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3815 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3816 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3817 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3818 | + |
| 3819 | + |
| 3820 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 3821 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 3822 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3823 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3824 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 3825 | +else |
| 3826 | + # Save a `func_append' function call even when '+=' is not available |
| 3827 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 3828 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3829 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3830 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 3831 | +fi |
| 3832 | + |
| 3833 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 3834 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 3835 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 3836 | +fi |
| 3837 | + |
| 3838 | + |
| 3839 | + mv -f "$cfgfile" "$ofile" || |
| 3840 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 3841 | chmod +x "$ofile" |
| 3842 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 3843 | diff --git a/gas/configure b/gas/configure |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 3844 | index fbac8f44d5..a40ac2144f 100755 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 3845 | --- a/gas/configure |
| 3846 | +++ b/gas/configure |
| 3847 | @@ -650,8 +650,11 @@ OTOOL |
| 3848 | LIPO |
| 3849 | NMEDIT |
| 3850 | DSYMUTIL |
| 3851 | +MANIFEST_TOOL |
| 3852 | RANLIB |
| 3853 | +ac_ct_AR |
| 3854 | AR |
| 3855 | +DLLTOOL |
| 3856 | OBJDUMP |
| 3857 | LN_S |
| 3858 | NM |
| 3859 | @@ -763,6 +766,7 @@ enable_static |
| 3860 | with_pic |
| 3861 | enable_fast_install |
| 3862 | with_gnu_ld |
| 3863 | +with_libtool_sysroot |
| 3864 | enable_libtool_lock |
| 3865 | enable_plugins |
| 3866 | enable_largefile |
| 3867 | @@ -4921,8 +4925,8 @@ esac |
| 3868 | |
| 3869 | |
| 3870 | |
| 3871 | -macro_version='2.2.7a' |
| 3872 | -macro_revision='1.3134' |
| 3873 | +macro_version='2.4' |
| 3874 | +macro_revision='1.3293' |
| 3875 | |
| 3876 | |
| 3877 | |
| 3878 | @@ -4962,7 +4966,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 3879 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 3880 | $as_echo_n "checking how to print strings... " >&6; } |
| 3881 | # Test print first, because it will be a builtin if present. |
| 3882 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 3883 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 3884 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 3885 | ECHO='print -r --' |
| 3886 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 3887 | @@ -5648,8 +5652,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 3888 | # Try some XSI features |
| 3889 | xsi_shell=no |
| 3890 | ( _lt_dummy="a/b/c" |
| 3891 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 3892 | - = c,a/b,, \ |
| 3893 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 3894 | + = c,a/b,b/c, \ |
| 3895 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 3896 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 3897 | && xsi_shell=yes |
| 3898 | @@ -5698,6 +5702,80 @@ esac |
| 3899 | |
| 3900 | |
| 3901 | |
| 3902 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 3903 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 3904 | +if test "${lt_cv_to_host_file_cmd+set}" = set; then : |
| 3905 | + $as_echo_n "(cached) " >&6 |
| 3906 | +else |
| 3907 | + case $host in |
| 3908 | + *-*-mingw* ) |
| 3909 | + case $build in |
| 3910 | + *-*-mingw* ) # actually msys |
| 3911 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 3912 | + ;; |
| 3913 | + *-*-cygwin* ) |
| 3914 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 3915 | + ;; |
| 3916 | + * ) # otherwise, assume *nix |
| 3917 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 3918 | + ;; |
| 3919 | + esac |
| 3920 | + ;; |
| 3921 | + *-*-cygwin* ) |
| 3922 | + case $build in |
| 3923 | + *-*-mingw* ) # actually msys |
| 3924 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 3925 | + ;; |
| 3926 | + *-*-cygwin* ) |
| 3927 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 3928 | + ;; |
| 3929 | + * ) # otherwise, assume *nix |
| 3930 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 3931 | + ;; |
| 3932 | + esac |
| 3933 | + ;; |
| 3934 | + * ) # unhandled hosts (and "normal" native builds) |
| 3935 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 3936 | + ;; |
| 3937 | +esac |
| 3938 | + |
| 3939 | +fi |
| 3940 | + |
| 3941 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 3942 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 3943 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 3944 | + |
| 3945 | + |
| 3946 | + |
| 3947 | + |
| 3948 | + |
| 3949 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 3950 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 3951 | +if test "${lt_cv_to_tool_file_cmd+set}" = set; then : |
| 3952 | + $as_echo_n "(cached) " >&6 |
| 3953 | +else |
| 3954 | + #assume ordinary cross tools, or native build. |
| 3955 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 3956 | +case $host in |
| 3957 | + *-*-mingw* ) |
| 3958 | + case $build in |
| 3959 | + *-*-mingw* ) # actually msys |
| 3960 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 3961 | + ;; |
| 3962 | + esac |
| 3963 | + ;; |
| 3964 | +esac |
| 3965 | + |
| 3966 | +fi |
| 3967 | + |
| 3968 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 3969 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 3970 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 3971 | + |
| 3972 | + |
| 3973 | + |
| 3974 | + |
| 3975 | + |
| 3976 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 3977 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 3978 | if test "${lt_cv_ld_reload_flag+set}" = set; then : |
| 3979 | @@ -5714,6 +5792,11 @@ case $reload_flag in |
| 3980 | esac |
| 3981 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 3982 | case $host_os in |
| 3983 | + cygwin* | mingw* | pw32* | cegcc*) |
| 3984 | + if test "$GCC" != yes; then |
| 3985 | + reload_cmds=false |
| 3986 | + fi |
| 3987 | + ;; |
| 3988 | darwin*) |
| 3989 | if test "$GCC" = yes; then |
| 3990 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 3991 | @@ -5882,7 +5965,8 @@ mingw* | pw32*) |
| 3992 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 3993 | lt_cv_file_magic_cmd='func_win32_libid' |
| 3994 | else |
| 3995 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 3996 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 3997 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 3998 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 3999 | fi |
| 4000 | ;; |
| 4001 | @@ -6036,6 +6120,21 @@ esac |
| 4002 | fi |
| 4003 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 4004 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 4005 | + |
| 4006 | +file_magic_glob= |
| 4007 | +want_nocaseglob=no |
| 4008 | +if test "$build" = "$host"; then |
| 4009 | + case $host_os in |
| 4010 | + mingw* | pw32*) |
| 4011 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 4012 | + want_nocaseglob=yes |
| 4013 | + else |
| 4014 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 4015 | + fi |
| 4016 | + ;; |
| 4017 | + esac |
| 4018 | +fi |
| 4019 | + |
| 4020 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 4021 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 4022 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 4023 | @@ -6051,9 +6150,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 4024 | |
| 4025 | |
| 4026 | |
| 4027 | + |
| 4028 | + |
| 4029 | + |
| 4030 | + |
| 4031 | + |
| 4032 | + |
| 4033 | + |
| 4034 | + |
| 4035 | + |
| 4036 | + |
| 4037 | +if test -n "$ac_tool_prefix"; then |
| 4038 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 4039 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 4040 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 4041 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 4042 | +if test "${ac_cv_prog_DLLTOOL+set}" = set; then : |
| 4043 | + $as_echo_n "(cached) " >&6 |
| 4044 | +else |
| 4045 | + if test -n "$DLLTOOL"; then |
| 4046 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 4047 | +else |
| 4048 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 4049 | +for as_dir in $PATH |
| 4050 | +do |
| 4051 | + IFS=$as_save_IFS |
| 4052 | + test -z "$as_dir" && as_dir=. |
| 4053 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 4054 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 4055 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 4056 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4057 | + break 2 |
| 4058 | + fi |
| 4059 | +done |
| 4060 | + done |
| 4061 | +IFS=$as_save_IFS |
| 4062 | + |
| 4063 | +fi |
| 4064 | +fi |
| 4065 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 4066 | +if test -n "$DLLTOOL"; then |
| 4067 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 4068 | +$as_echo "$DLLTOOL" >&6; } |
| 4069 | +else |
| 4070 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 4071 | +$as_echo "no" >&6; } |
| 4072 | +fi |
| 4073 | + |
| 4074 | + |
| 4075 | +fi |
| 4076 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 4077 | + ac_ct_DLLTOOL=$DLLTOOL |
| 4078 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 4079 | +set dummy dlltool; ac_word=$2 |
| 4080 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 4081 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 4082 | +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : |
| 4083 | + $as_echo_n "(cached) " >&6 |
| 4084 | +else |
| 4085 | + if test -n "$ac_ct_DLLTOOL"; then |
| 4086 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 4087 | +else |
| 4088 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 4089 | +for as_dir in $PATH |
| 4090 | +do |
| 4091 | + IFS=$as_save_IFS |
| 4092 | + test -z "$as_dir" && as_dir=. |
| 4093 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 4094 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 4095 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 4096 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4097 | + break 2 |
| 4098 | + fi |
| 4099 | +done |
| 4100 | + done |
| 4101 | +IFS=$as_save_IFS |
| 4102 | + |
| 4103 | +fi |
| 4104 | +fi |
| 4105 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 4106 | +if test -n "$ac_ct_DLLTOOL"; then |
| 4107 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 4108 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 4109 | +else |
| 4110 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 4111 | +$as_echo "no" >&6; } |
| 4112 | +fi |
| 4113 | + |
| 4114 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 4115 | + DLLTOOL="false" |
| 4116 | + else |
| 4117 | + case $cross_compiling:$ac_tool_warned in |
| 4118 | +yes:) |
| 4119 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 4120 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 4121 | +ac_tool_warned=yes ;; |
| 4122 | +esac |
| 4123 | + DLLTOOL=$ac_ct_DLLTOOL |
| 4124 | + fi |
| 4125 | +else |
| 4126 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 4127 | +fi |
| 4128 | + |
| 4129 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 4130 | + |
| 4131 | + |
| 4132 | + |
| 4133 | + |
| 4134 | + |
| 4135 | + |
| 4136 | + |
| 4137 | + |
| 4138 | + |
| 4139 | + |
| 4140 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 4141 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 4142 | +if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : |
| 4143 | + $as_echo_n "(cached) " >&6 |
| 4144 | +else |
| 4145 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 4146 | + |
| 4147 | +case $host_os in |
| 4148 | +cygwin* | mingw* | pw32* | cegcc*) |
| 4149 | + # two different shell functions defined in ltmain.sh |
| 4150 | + # decide which to use based on capabilities of $DLLTOOL |
| 4151 | + case `$DLLTOOL --help 2>&1` in |
| 4152 | + *--identify-strict*) |
| 4153 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 4154 | + ;; |
| 4155 | + *) |
| 4156 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 4157 | + ;; |
| 4158 | + esac |
| 4159 | + ;; |
| 4160 | +*) |
| 4161 | + # fallback: assume linklib IS sharedlib |
| 4162 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 4163 | + ;; |
| 4164 | +esac |
| 4165 | + |
| 4166 | +fi |
| 4167 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 4168 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 4169 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 4170 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 4171 | + |
| 4172 | + |
| 4173 | + |
| 4174 | + |
| 4175 | + |
| 4176 | + |
| 4177 | + |
| 4178 | if test -n "$ac_tool_prefix"; then |
| 4179 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 4180 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 4181 | + for ac_prog in ar |
| 4182 | + do |
| 4183 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 4184 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 4185 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 4186 | $as_echo_n "checking for $ac_word... " >&6; } |
| 4187 | if test "${ac_cv_prog_AR+set}" = set; then : |
| 4188 | @@ -6069,7 +6321,7 @@ do |
| 4189 | test -z "$as_dir" && as_dir=. |
| 4190 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 4191 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 4192 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 4193 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 4194 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4195 | break 2 |
| 4196 | fi |
| 4197 | @@ -6089,11 +6341,15 @@ $as_echo "no" >&6; } |
| 4198 | fi |
| 4199 | |
| 4200 | |
| 4201 | + test -n "$AR" && break |
| 4202 | + done |
| 4203 | fi |
| 4204 | -if test -z "$ac_cv_prog_AR"; then |
| 4205 | +if test -z "$AR"; then |
| 4206 | ac_ct_AR=$AR |
| 4207 | - # Extract the first word of "ar", so it can be a program name with args. |
| 4208 | -set dummy ar; ac_word=$2 |
| 4209 | + for ac_prog in ar |
| 4210 | +do |
| 4211 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 4212 | +set dummy $ac_prog; ac_word=$2 |
| 4213 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 4214 | $as_echo_n "checking for $ac_word... " >&6; } |
| 4215 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
| 4216 | @@ -6109,7 +6365,7 @@ do |
| 4217 | test -z "$as_dir" && as_dir=. |
| 4218 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 4219 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 4220 | - ac_cv_prog_ac_ct_AR="ar" |
| 4221 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 4222 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4223 | break 2 |
| 4224 | fi |
| 4225 | @@ -6128,6 +6384,10 @@ else |
| 4226 | $as_echo "no" >&6; } |
| 4227 | fi |
| 4228 | |
| 4229 | + |
| 4230 | + test -n "$ac_ct_AR" && break |
| 4231 | +done |
| 4232 | + |
| 4233 | if test "x$ac_ct_AR" = x; then |
| 4234 | AR="false" |
| 4235 | else |
| 4236 | @@ -6139,12 +6399,10 @@ ac_tool_warned=yes ;; |
| 4237 | esac |
| 4238 | AR=$ac_ct_AR |
| 4239 | fi |
| 4240 | -else |
| 4241 | - AR="$ac_cv_prog_AR" |
| 4242 | fi |
| 4243 | |
| 4244 | -test -z "$AR" && AR=ar |
| 4245 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 4246 | +: ${AR=ar} |
| 4247 | +: ${AR_FLAGS=cru} |
| 4248 | |
| 4249 | |
| 4250 | |
| 4251 | @@ -6156,6 +6414,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 4252 | |
| 4253 | |
| 4254 | |
| 4255 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 4256 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 4257 | +if test "${lt_cv_ar_at_file+set}" = set; then : |
| 4258 | + $as_echo_n "(cached) " >&6 |
| 4259 | +else |
| 4260 | + lt_cv_ar_at_file=no |
| 4261 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 4262 | +/* end confdefs.h. */ |
| 4263 | + |
| 4264 | +int |
| 4265 | +main () |
| 4266 | +{ |
| 4267 | + |
| 4268 | + ; |
| 4269 | + return 0; |
| 4270 | +} |
| 4271 | +_ACEOF |
| 4272 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 4273 | + echo conftest.$ac_objext > conftest.lst |
| 4274 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 4275 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 4276 | + (eval $lt_ar_try) 2>&5 |
| 4277 | + ac_status=$? |
| 4278 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 4279 | + test $ac_status = 0; } |
| 4280 | + if test "$ac_status" -eq 0; then |
| 4281 | + # Ensure the archiver fails upon bogus file names. |
| 4282 | + rm -f conftest.$ac_objext libconftest.a |
| 4283 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 4284 | + (eval $lt_ar_try) 2>&5 |
| 4285 | + ac_status=$? |
| 4286 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 4287 | + test $ac_status = 0; } |
| 4288 | + if test "$ac_status" -ne 0; then |
| 4289 | + lt_cv_ar_at_file=@ |
| 4290 | + fi |
| 4291 | + fi |
| 4292 | + rm -f conftest.* libconftest.a |
| 4293 | + |
| 4294 | +fi |
| 4295 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 4296 | + |
| 4297 | +fi |
| 4298 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 4299 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 4300 | + |
| 4301 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 4302 | + archiver_list_spec= |
| 4303 | +else |
| 4304 | + archiver_list_spec=$lt_cv_ar_at_file |
| 4305 | +fi |
| 4306 | + |
| 4307 | + |
| 4308 | + |
| 4309 | + |
| 4310 | + |
| 4311 | + |
| 4312 | + |
| 4313 | if test -n "$ac_tool_prefix"; then |
| 4314 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
| 4315 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
| 4316 | @@ -6490,8 +6806,8 @@ esac |
| 4317 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 4318 | |
| 4319 | # Transform an extracted symbol line into symbol name and symbol address |
| 4320 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 4321 | -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
| 4322 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 4323 | +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
| 4324 | |
| 4325 | # Handle CRLF in mingw tool chain |
| 4326 | opt_cr= |
| 4327 | @@ -6527,6 +6843,7 @@ for ac_symprfx in "" "_"; do |
| 4328 | else |
| 4329 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 4330 | fi |
| 4331 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 4332 | |
| 4333 | # Check to see that the pipe works correctly. |
| 4334 | pipe_works=no |
| 4335 | @@ -6568,6 +6885,18 @@ _LT_EOF |
| 4336 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 4337 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 4338 | cat <<_LT_EOF > conftest.$ac_ext |
| 4339 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 4340 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 4341 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 4342 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 4343 | +# define LT_DLSYM_CONST |
| 4344 | +#elif defined(__osf__) |
| 4345 | +/* This system does not cope well with relocations in const data. */ |
| 4346 | +# define LT_DLSYM_CONST |
| 4347 | +#else |
| 4348 | +# define LT_DLSYM_CONST const |
| 4349 | +#endif |
| 4350 | + |
| 4351 | #ifdef __cplusplus |
| 4352 | extern "C" { |
| 4353 | #endif |
| 4354 | @@ -6579,7 +6908,7 @@ _LT_EOF |
| 4355 | cat <<_LT_EOF >> conftest.$ac_ext |
| 4356 | |
| 4357 | /* The mapping between symbol names and symbols. */ |
| 4358 | -const struct { |
| 4359 | +LT_DLSYM_CONST struct { |
| 4360 | const char *name; |
| 4361 | void *address; |
| 4362 | } |
| 4363 | @@ -6605,8 +6934,8 @@ static const void *lt_preloaded_setup() { |
| 4364 | _LT_EOF |
| 4365 | # Now try linking the two files. |
| 4366 | mv conftest.$ac_objext conftstm.$ac_objext |
| 4367 | - lt_save_LIBS="$LIBS" |
| 4368 | - lt_save_CFLAGS="$CFLAGS" |
| 4369 | + lt_globsym_save_LIBS=$LIBS |
| 4370 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 4371 | LIBS="conftstm.$ac_objext" |
| 4372 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 4373 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 4374 | @@ -6616,8 +6945,8 @@ _LT_EOF |
| 4375 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 4376 | pipe_works=yes |
| 4377 | fi |
| 4378 | - LIBS="$lt_save_LIBS" |
| 4379 | - CFLAGS="$lt_save_CFLAGS" |
| 4380 | + LIBS=$lt_globsym_save_LIBS |
| 4381 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 4382 | else |
| 4383 | echo "cannot find nm_test_func in $nlist" >&5 |
| 4384 | fi |
| 4385 | @@ -6654,6 +6983,21 @@ else |
| 4386 | $as_echo "ok" >&6; } |
| 4387 | fi |
| 4388 | |
| 4389 | +# Response file support. |
| 4390 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 4391 | + nm_file_list_spec='@' |
| 4392 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 4393 | + nm_file_list_spec='@' |
| 4394 | +fi |
| 4395 | + |
| 4396 | + |
| 4397 | + |
| 4398 | + |
| 4399 | + |
| 4400 | + |
| 4401 | + |
| 4402 | + |
| 4403 | + |
| 4404 | |
| 4405 | |
| 4406 | |
| 4407 | @@ -6669,6 +7013,40 @@ fi |
| 4408 | |
| 4409 | |
| 4410 | |
| 4411 | + |
| 4412 | + |
| 4413 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 4414 | +$as_echo_n "checking for sysroot... " >&6; } |
| 4415 | + |
| 4416 | +# Check whether --with-libtool-sysroot was given. |
| 4417 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 4418 | + withval=$with_libtool_sysroot; |
| 4419 | +else |
| 4420 | + with_libtool_sysroot=no |
| 4421 | +fi |
| 4422 | + |
| 4423 | + |
| 4424 | +lt_sysroot= |
| 4425 | +case ${with_libtool_sysroot} in #( |
| 4426 | + yes) |
| 4427 | + if test "$GCC" = yes; then |
| 4428 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 4429 | + fi |
| 4430 | + ;; #( |
| 4431 | + /*) |
| 4432 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 4433 | + ;; #( |
| 4434 | + no|'') |
| 4435 | + ;; #( |
| 4436 | + *) |
| 4437 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 4438 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 4439 | + as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 |
| 4440 | + ;; |
| 4441 | +esac |
| 4442 | + |
| 4443 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 4444 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 4445 | |
| 4446 | |
| 4447 | |
| 4448 | @@ -6881,6 +7259,123 @@ esac |
| 4449 | |
| 4450 | need_locks="$enable_libtool_lock" |
| 4451 | |
| 4452 | +if test -n "$ac_tool_prefix"; then |
| 4453 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 4454 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 4455 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 4456 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 4457 | +if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : |
| 4458 | + $as_echo_n "(cached) " >&6 |
| 4459 | +else |
| 4460 | + if test -n "$MANIFEST_TOOL"; then |
| 4461 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 4462 | +else |
| 4463 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 4464 | +for as_dir in $PATH |
| 4465 | +do |
| 4466 | + IFS=$as_save_IFS |
| 4467 | + test -z "$as_dir" && as_dir=. |
| 4468 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 4469 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 4470 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 4471 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4472 | + break 2 |
| 4473 | + fi |
| 4474 | +done |
| 4475 | + done |
| 4476 | +IFS=$as_save_IFS |
| 4477 | + |
| 4478 | +fi |
| 4479 | +fi |
| 4480 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 4481 | +if test -n "$MANIFEST_TOOL"; then |
| 4482 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 4483 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 4484 | +else |
| 4485 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 4486 | +$as_echo "no" >&6; } |
| 4487 | +fi |
| 4488 | + |
| 4489 | + |
| 4490 | +fi |
| 4491 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 4492 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 4493 | + # Extract the first word of "mt", so it can be a program name with args. |
| 4494 | +set dummy mt; ac_word=$2 |
| 4495 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 4496 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 4497 | +if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : |
| 4498 | + $as_echo_n "(cached) " >&6 |
| 4499 | +else |
| 4500 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 4501 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 4502 | +else |
| 4503 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 4504 | +for as_dir in $PATH |
| 4505 | +do |
| 4506 | + IFS=$as_save_IFS |
| 4507 | + test -z "$as_dir" && as_dir=. |
| 4508 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 4509 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 4510 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 4511 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4512 | + break 2 |
| 4513 | + fi |
| 4514 | +done |
| 4515 | + done |
| 4516 | +IFS=$as_save_IFS |
| 4517 | + |
| 4518 | +fi |
| 4519 | +fi |
| 4520 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 4521 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 4522 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 4523 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 4524 | +else |
| 4525 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 4526 | +$as_echo "no" >&6; } |
| 4527 | +fi |
| 4528 | + |
| 4529 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 4530 | + MANIFEST_TOOL=":" |
| 4531 | + else |
| 4532 | + case $cross_compiling:$ac_tool_warned in |
| 4533 | +yes:) |
| 4534 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 4535 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 4536 | +ac_tool_warned=yes ;; |
| 4537 | +esac |
| 4538 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 4539 | + fi |
| 4540 | +else |
| 4541 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 4542 | +fi |
| 4543 | + |
| 4544 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 4545 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 4546 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 4547 | +if test "${lt_cv_path_mainfest_tool+set}" = set; then : |
| 4548 | + $as_echo_n "(cached) " >&6 |
| 4549 | +else |
| 4550 | + lt_cv_path_mainfest_tool=no |
| 4551 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 4552 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 4553 | + cat conftest.err >&5 |
| 4554 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 4555 | + lt_cv_path_mainfest_tool=yes |
| 4556 | + fi |
| 4557 | + rm -f conftest* |
| 4558 | +fi |
| 4559 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 4560 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 4561 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 4562 | + MANIFEST_TOOL=: |
| 4563 | +fi |
| 4564 | + |
| 4565 | + |
| 4566 | + |
| 4567 | + |
| 4568 | + |
| 4569 | |
| 4570 | case $host_os in |
| 4571 | rhapsody* | darwin*) |
| 4572 | @@ -7444,6 +7939,8 @@ _LT_EOF |
| 4573 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 4574 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 4575 | $AR cru libconftest.a conftest.o 2>&5 |
| 4576 | + echo "$RANLIB libconftest.a" >&5 |
| 4577 | + $RANLIB libconftest.a 2>&5 |
| 4578 | cat > conftest.c << _LT_EOF |
| 4579 | int main() { return 0;} |
| 4580 | _LT_EOF |
| 4581 | @@ -7639,7 +8136,8 @@ fi |
| 4582 | LIBTOOL_DEPS="$ltmain" |
| 4583 | |
| 4584 | # Always use our own libtool. |
| 4585 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
| 4586 | +LIBTOOL='$(SHELL) $(top_builddir)' |
| 4587 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" |
| 4588 | |
| 4589 | |
| 4590 | |
| 4591 | @@ -7728,7 +8226,7 @@ aix3*) |
| 4592 | esac |
| 4593 | |
| 4594 | # Global variables: |
| 4595 | -ofile=libtool |
| 4596 | +ofile=${host_alias}-libtool |
| 4597 | can_build_shared=yes |
| 4598 | |
| 4599 | # All known linkers require a `.a' archive for static linking (except MSVC, |
| 4600 | @@ -8026,8 +8524,6 @@ fi |
| 4601 | lt_prog_compiler_pic= |
| 4602 | lt_prog_compiler_static= |
| 4603 | |
| 4604 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 4605 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 4606 | |
| 4607 | if test "$GCC" = yes; then |
| 4608 | lt_prog_compiler_wl='-Wl,' |
| 4609 | @@ -8193,6 +8689,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 4610 | lt_prog_compiler_pic='--shared' |
| 4611 | lt_prog_compiler_static='--static' |
| 4612 | ;; |
| 4613 | + nagfor*) |
| 4614 | + # NAG Fortran compiler |
| 4615 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 4616 | + lt_prog_compiler_pic='-PIC' |
| 4617 | + lt_prog_compiler_static='-Bstatic' |
| 4618 | + ;; |
| 4619 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 4620 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 4621 | # which looks to be a dead project) |
| 4622 | @@ -8255,7 +8757,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 4623 | lt_prog_compiler_pic='-KPIC' |
| 4624 | lt_prog_compiler_static='-Bstatic' |
| 4625 | case $cc_basename in |
| 4626 | - f77* | f90* | f95*) |
| 4627 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 4628 | lt_prog_compiler_wl='-Qoption ld ';; |
| 4629 | *) |
| 4630 | lt_prog_compiler_wl='-Wl,';; |
| 4631 | @@ -8312,13 +8814,17 @@ case $host_os in |
| 4632 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 4633 | ;; |
| 4634 | esac |
| 4635 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 4636 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 4637 | - |
| 4638 | - |
| 4639 | - |
| 4640 | - |
| 4641 | |
| 4642 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 4643 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 4644 | +if test "${lt_cv_prog_compiler_pic+set}" = set; then : |
| 4645 | + $as_echo_n "(cached) " >&6 |
| 4646 | +else |
| 4647 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 4648 | +fi |
| 4649 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 4650 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 4651 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 4652 | |
| 4653 | # |
| 4654 | # Check to make sure the PIC flag actually works. |
| 4655 | @@ -8379,6 +8885,11 @@ fi |
| 4656 | |
| 4657 | |
| 4658 | |
| 4659 | + |
| 4660 | + |
| 4661 | + |
| 4662 | + |
| 4663 | + |
| 4664 | # |
| 4665 | # Check to make sure the static flag actually works. |
| 4666 | # |
| 4667 | @@ -8729,7 +9240,8 @@ _LT_EOF |
| 4668 | allow_undefined_flag=unsupported |
| 4669 | always_export_symbols=no |
| 4670 | enable_shared_with_static_runtimes=yes |
| 4671 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 4672 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' |
| 4673 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 4674 | |
| 4675 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 4676 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 4677 | @@ -8828,12 +9340,12 @@ _LT_EOF |
| 4678 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 4679 | hardcode_libdir_flag_spec= |
| 4680 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 4681 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 4682 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 4683 | if test "x$supports_anon_versioning" = xyes; then |
| 4684 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 4685 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 4686 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 4687 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 4688 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 4689 | fi |
| 4690 | ;; |
| 4691 | esac |
| 4692 | @@ -8847,8 +9359,8 @@ _LT_EOF |
| 4693 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 4694 | wlarc= |
| 4695 | else |
| 4696 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 4697 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 4698 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 4699 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 4700 | fi |
| 4701 | ;; |
| 4702 | |
| 4703 | @@ -8866,8 +9378,8 @@ _LT_EOF |
| 4704 | |
| 4705 | _LT_EOF |
| 4706 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 4707 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 4708 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 4709 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 4710 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 4711 | else |
| 4712 | ld_shlibs=no |
| 4713 | fi |
| 4714 | @@ -8913,8 +9425,8 @@ _LT_EOF |
| 4715 | |
| 4716 | *) |
| 4717 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 4718 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 4719 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 4720 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 4721 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 4722 | else |
| 4723 | ld_shlibs=no |
| 4724 | fi |
| 4725 | @@ -9044,7 +9556,13 @@ _LT_EOF |
| 4726 | allow_undefined_flag='-berok' |
| 4727 | # Determine the default libpath from the value encoded in an |
| 4728 | # empty executable. |
| 4729 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 4730 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 4731 | + aix_libpath=$lt_cv_aix_libpath |
| 4732 | +else |
| 4733 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 4734 | + $as_echo_n "(cached) " >&6 |
| 4735 | +else |
| 4736 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 4737 | /* end confdefs.h. */ |
| 4738 | |
| 4739 | int |
| 4740 | @@ -9057,22 +9575,29 @@ main () |
| 4741 | _ACEOF |
| 4742 | if ac_fn_c_try_link "$LINENO"; then : |
| 4743 | |
| 4744 | -lt_aix_libpath_sed=' |
| 4745 | - /Import File Strings/,/^$/ { |
| 4746 | - /^0/ { |
| 4747 | - s/^0 *\(.*\)$/\1/ |
| 4748 | - p |
| 4749 | - } |
| 4750 | - }' |
| 4751 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4752 | -# Check for a 64-bit object if we didn't find anything. |
| 4753 | -if test -z "$aix_libpath"; then |
| 4754 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4755 | -fi |
| 4756 | + lt_aix_libpath_sed=' |
| 4757 | + /Import File Strings/,/^$/ { |
| 4758 | + /^0/ { |
| 4759 | + s/^0 *\([^ ]*\) *$/\1/ |
| 4760 | + p |
| 4761 | + } |
| 4762 | + }' |
| 4763 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4764 | + # Check for a 64-bit object if we didn't find anything. |
| 4765 | + if test -z "$lt_cv_aix_libpath_"; then |
| 4766 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4767 | + fi |
| 4768 | fi |
| 4769 | rm -f core conftest.err conftest.$ac_objext \ |
| 4770 | conftest$ac_exeext conftest.$ac_ext |
| 4771 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 4772 | + if test -z "$lt_cv_aix_libpath_"; then |
| 4773 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 4774 | + fi |
| 4775 | + |
| 4776 | +fi |
| 4777 | + |
| 4778 | + aix_libpath=$lt_cv_aix_libpath_ |
| 4779 | +fi |
| 4780 | |
| 4781 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 4782 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
| 4783 | @@ -9084,7 +9609,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 4784 | else |
| 4785 | # Determine the default libpath from the value encoded in an |
| 4786 | # empty executable. |
| 4787 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 4788 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 4789 | + aix_libpath=$lt_cv_aix_libpath |
| 4790 | +else |
| 4791 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 4792 | + $as_echo_n "(cached) " >&6 |
| 4793 | +else |
| 4794 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 4795 | /* end confdefs.h. */ |
| 4796 | |
| 4797 | int |
| 4798 | @@ -9097,22 +9628,29 @@ main () |
| 4799 | _ACEOF |
| 4800 | if ac_fn_c_try_link "$LINENO"; then : |
| 4801 | |
| 4802 | -lt_aix_libpath_sed=' |
| 4803 | - /Import File Strings/,/^$/ { |
| 4804 | - /^0/ { |
| 4805 | - s/^0 *\(.*\)$/\1/ |
| 4806 | - p |
| 4807 | - } |
| 4808 | - }' |
| 4809 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4810 | -# Check for a 64-bit object if we didn't find anything. |
| 4811 | -if test -z "$aix_libpath"; then |
| 4812 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4813 | -fi |
| 4814 | + lt_aix_libpath_sed=' |
| 4815 | + /Import File Strings/,/^$/ { |
| 4816 | + /^0/ { |
| 4817 | + s/^0 *\([^ ]*\) *$/\1/ |
| 4818 | + p |
| 4819 | + } |
| 4820 | + }' |
| 4821 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4822 | + # Check for a 64-bit object if we didn't find anything. |
| 4823 | + if test -z "$lt_cv_aix_libpath_"; then |
| 4824 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4825 | + fi |
| 4826 | fi |
| 4827 | rm -f core conftest.err conftest.$ac_objext \ |
| 4828 | conftest$ac_exeext conftest.$ac_ext |
| 4829 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 4830 | + if test -z "$lt_cv_aix_libpath_"; then |
| 4831 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 4832 | + fi |
| 4833 | + |
| 4834 | +fi |
| 4835 | + |
| 4836 | + aix_libpath=$lt_cv_aix_libpath_ |
| 4837 | +fi |
| 4838 | |
| 4839 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 4840 | # Warning - without using the other run time loading flags, |
| 4841 | @@ -9157,20 +9695,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 4842 | # Microsoft Visual C++. |
| 4843 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 4844 | # no search path for DLLs. |
| 4845 | - hardcode_libdir_flag_spec=' ' |
| 4846 | - allow_undefined_flag=unsupported |
| 4847 | - # Tell ltmain to make .lib files, not .a files. |
| 4848 | - libext=lib |
| 4849 | - # Tell ltmain to make .dll files, not .so files. |
| 4850 | - shrext_cmds=".dll" |
| 4851 | - # FIXME: Setting linknames here is a bad hack. |
| 4852 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 4853 | - # The linker will automatically build a .lib file if we build a DLL. |
| 4854 | - old_archive_from_new_cmds='true' |
| 4855 | - # FIXME: Should let the user specify the lib program. |
| 4856 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 4857 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 4858 | - enable_shared_with_static_runtimes=yes |
| 4859 | + case $cc_basename in |
| 4860 | + cl*) |
| 4861 | + # Native MSVC |
| 4862 | + hardcode_libdir_flag_spec=' ' |
| 4863 | + allow_undefined_flag=unsupported |
| 4864 | + always_export_symbols=yes |
| 4865 | + file_list_spec='@' |
| 4866 | + # Tell ltmain to make .lib files, not .a files. |
| 4867 | + libext=lib |
| 4868 | + # Tell ltmain to make .dll files, not .so files. |
| 4869 | + shrext_cmds=".dll" |
| 4870 | + # FIXME: Setting linknames here is a bad hack. |
| 4871 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 4872 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 4873 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 4874 | + else |
| 4875 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 4876 | + fi~ |
| 4877 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 4878 | + linknames=' |
| 4879 | + # The linker will not automatically build a static lib if we build a DLL. |
| 4880 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 4881 | + enable_shared_with_static_runtimes=yes |
| 4882 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 4883 | + # Don't use ranlib |
| 4884 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 4885 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 4886 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 4887 | + case $lt_outputfile in |
| 4888 | + *.exe|*.EXE) ;; |
| 4889 | + *) |
| 4890 | + lt_outputfile="$lt_outputfile.exe" |
| 4891 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 4892 | + ;; |
| 4893 | + esac~ |
| 4894 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 4895 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 4896 | + $RM "$lt_outputfile.manifest"; |
| 4897 | + fi' |
| 4898 | + ;; |
| 4899 | + *) |
| 4900 | + # Assume MSVC wrapper |
| 4901 | + hardcode_libdir_flag_spec=' ' |
| 4902 | + allow_undefined_flag=unsupported |
| 4903 | + # Tell ltmain to make .lib files, not .a files. |
| 4904 | + libext=lib |
| 4905 | + # Tell ltmain to make .dll files, not .so files. |
| 4906 | + shrext_cmds=".dll" |
| 4907 | + # FIXME: Setting linknames here is a bad hack. |
| 4908 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 4909 | + # The linker will automatically build a .lib file if we build a DLL. |
| 4910 | + old_archive_from_new_cmds='true' |
| 4911 | + # FIXME: Should let the user specify the lib program. |
| 4912 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 4913 | + enable_shared_with_static_runtimes=yes |
| 4914 | + ;; |
| 4915 | + esac |
| 4916 | ;; |
| 4917 | |
| 4918 | darwin* | rhapsody*) |
| 4919 | @@ -9231,7 +9812,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 4920 | |
| 4921 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 4922 | freebsd* | dragonfly*) |
| 4923 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 4924 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 4925 | hardcode_libdir_flag_spec='-R$libdir' |
| 4926 | hardcode_direct=yes |
| 4927 | hardcode_shlibpath_var=no |
| 4928 | @@ -9239,7 +9820,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 4929 | |
| 4930 | hpux9*) |
| 4931 | if test "$GCC" = yes; then |
| 4932 | - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 4933 | + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 4934 | else |
| 4935 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 4936 | fi |
| 4937 | @@ -9255,7 +9836,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 4938 | |
| 4939 | hpux10*) |
| 4940 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 4941 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 4942 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 4943 | else |
| 4944 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 4945 | fi |
| 4946 | @@ -9279,10 +9860,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 4947 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 4948 | ;; |
| 4949 | ia64*) |
| 4950 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 4951 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 4952 | ;; |
| 4953 | *) |
| 4954 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 4955 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 4956 | ;; |
| 4957 | esac |
| 4958 | else |
| 4959 | @@ -9361,23 +9942,36 @@ fi |
| 4960 | |
| 4961 | irix5* | irix6* | nonstopux*) |
| 4962 | if test "$GCC" = yes; then |
| 4963 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 4964 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 4965 | # Try to use the -exported_symbol ld option, if it does not |
| 4966 | # work, assume that -exports_file does not work either and |
| 4967 | # implicitly export all symbols. |
| 4968 | - save_LDFLAGS="$LDFLAGS" |
| 4969 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 4970 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 4971 | + # This should be the same for all languages, so no per-tag cache variable. |
| 4972 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 4973 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 4974 | +if test "${lt_cv_irix_exported_symbol+set}" = set; then : |
| 4975 | + $as_echo_n "(cached) " >&6 |
| 4976 | +else |
| 4977 | + save_LDFLAGS="$LDFLAGS" |
| 4978 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 4979 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 4980 | /* end confdefs.h. */ |
| 4981 | -int foo(void) {} |
| 4982 | +int foo (void) { return 0; } |
| 4983 | _ACEOF |
| 4984 | if ac_fn_c_try_link "$LINENO"; then : |
| 4985 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 4986 | - |
| 4987 | + lt_cv_irix_exported_symbol=yes |
| 4988 | +else |
| 4989 | + lt_cv_irix_exported_symbol=no |
| 4990 | fi |
| 4991 | rm -f core conftest.err conftest.$ac_objext \ |
| 4992 | conftest$ac_exeext conftest.$ac_ext |
| 4993 | - LDFLAGS="$save_LDFLAGS" |
| 4994 | + LDFLAGS="$save_LDFLAGS" |
| 4995 | +fi |
| 4996 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 4997 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 4998 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 4999 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 5000 | + fi |
| 5001 | else |
| 5002 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
| 5003 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
| 5004 | @@ -9462,7 +10056,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 5005 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 5006 | if test "$GCC" = yes; then |
| 5007 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 5008 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 5009 | + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 5010 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 5011 | else |
| 5012 | allow_undefined_flag=' -expect_unresolved \*' |
| 5013 | @@ -9481,9 +10075,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 5014 | no_undefined_flag=' -z defs' |
| 5015 | if test "$GCC" = yes; then |
| 5016 | wlarc='${wl}' |
| 5017 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 5018 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 5019 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 5020 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 5021 | + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 5022 | else |
| 5023 | case `$CC -V 2>&1` in |
| 5024 | *"Compilers 5.0"*) |
| 5025 | @@ -10059,8 +10653,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 5026 | need_version=no |
| 5027 | need_lib_prefix=no |
| 5028 | |
| 5029 | - case $GCC,$host_os in |
| 5030 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 5031 | + case $GCC,$cc_basename in |
| 5032 | + yes,*) |
| 5033 | + # gcc |
| 5034 | library_names_spec='$libname.dll.a' |
| 5035 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 5036 | postinstall_cmds='base_file=`basename \${file}`~ |
| 5037 | @@ -10093,13 +10688,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 5038 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 5039 | ;; |
| 5040 | esac |
| 5041 | + dynamic_linker='Win32 ld.exe' |
| 5042 | + ;; |
| 5043 | + |
| 5044 | + *,cl*) |
| 5045 | + # Native MSVC |
| 5046 | + libname_spec='$name' |
| 5047 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 5048 | + library_names_spec='${libname}.dll.lib' |
| 5049 | + |
| 5050 | + case $build_os in |
| 5051 | + mingw*) |
| 5052 | + sys_lib_search_path_spec= |
| 5053 | + lt_save_ifs=$IFS |
| 5054 | + IFS=';' |
| 5055 | + for lt_path in $LIB |
| 5056 | + do |
| 5057 | + IFS=$lt_save_ifs |
| 5058 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 5059 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 5060 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 5061 | + done |
| 5062 | + IFS=$lt_save_ifs |
| 5063 | + # Convert to MSYS style. |
| 5064 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 5065 | + ;; |
| 5066 | + cygwin*) |
| 5067 | + # Convert to unix form, then to dos form, then back to unix form |
| 5068 | + # but this time dos style (no spaces!) so that the unix form looks |
| 5069 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 5070 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 5071 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 5072 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 5073 | + ;; |
| 5074 | + *) |
| 5075 | + sys_lib_search_path_spec="$LIB" |
| 5076 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 5077 | + # It is most probably a Windows format PATH. |
| 5078 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 5079 | + else |
| 5080 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 5081 | + fi |
| 5082 | + # FIXME: find the short name or the path components, as spaces are |
| 5083 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 5084 | + ;; |
| 5085 | + esac |
| 5086 | + |
| 5087 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 5088 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 5089 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 5090 | + dldir=$destdir/`dirname \$dlpath`~ |
| 5091 | + test -d \$dldir || mkdir -p \$dldir~ |
| 5092 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 5093 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 5094 | + dlpath=$dir/\$dldll~ |
| 5095 | + $RM \$dlpath' |
| 5096 | + shlibpath_overrides_runpath=yes |
| 5097 | + dynamic_linker='Win32 link.exe' |
| 5098 | ;; |
| 5099 | |
| 5100 | *) |
| 5101 | + # Assume MSVC wrapper |
| 5102 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 5103 | + dynamic_linker='Win32 ld.exe' |
| 5104 | ;; |
| 5105 | esac |
| 5106 | - dynamic_linker='Win32 ld.exe' |
| 5107 | # FIXME: first we should search . and the directory the executable is in |
| 5108 | shlibpath_var=PATH |
| 5109 | ;; |
| 5110 | @@ -10191,7 +10844,7 @@ haiku*) |
| 5111 | soname_spec='${libname}${release}${shared_ext}$major' |
| 5112 | shlibpath_var=LIBRARY_PATH |
| 5113 | shlibpath_overrides_runpath=yes |
| 5114 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' |
| 5115 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
| 5116 | hardcode_into_libs=yes |
| 5117 | ;; |
| 5118 | |
| 5119 | @@ -11031,10 +11684,10 @@ else |
| 5120 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 5121 | correspondingly for the symbols needed. */ |
| 5122 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 5123 | -void fnord () __attribute__((visibility("default"))); |
| 5124 | +int fnord () __attribute__((visibility("default"))); |
| 5125 | #endif |
| 5126 | |
| 5127 | -void fnord () { int i=42; } |
| 5128 | +int fnord () { return 42; } |
| 5129 | int main () |
| 5130 | { |
| 5131 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 5132 | @@ -11137,10 +11790,10 @@ else |
| 5133 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 5134 | correspondingly for the symbols needed. */ |
| 5135 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 5136 | -void fnord () __attribute__((visibility("default"))); |
| 5137 | +int fnord () __attribute__((visibility("default"))); |
| 5138 | #endif |
| 5139 | |
| 5140 | -void fnord () { int i=42; } |
| 5141 | +int fnord () { return 42; } |
| 5142 | int main () |
| 5143 | { |
| 5144 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5145 | @@ -15437,13 +16090,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5146 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 5147 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 5148 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 5149 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 5150 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 5151 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 5152 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 5153 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 5154 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 5155 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 5156 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 5157 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 5158 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 5159 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 5160 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 5161 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 5162 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 5163 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 5164 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 5165 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5166 | @@ -15458,14 +16118,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5167 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 5168 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 5169 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 5170 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 5171 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 5172 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 5173 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 5174 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 5175 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 5176 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 5177 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 5178 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 5179 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 5180 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 5181 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 5182 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 5183 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 5184 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5185 | @@ -15498,12 +16161,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5186 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 5187 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 5188 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 5189 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 5190 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 5191 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 5192 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 5193 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 5194 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 5195 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 5196 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 5197 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 5198 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5199 | @@ -15558,8 +16221,13 @@ reload_flag \ |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5200 | OBJDUMP \ |
| 5201 | deplibs_check_method \ |
| 5202 | file_magic_cmd \ |
| 5203 | +file_magic_glob \ |
| 5204 | +want_nocaseglob \ |
| 5205 | +DLLTOOL \ |
| 5206 | +sharedlib_from_linklib_cmd \ |
| 5207 | AR \ |
| 5208 | AR_FLAGS \ |
| 5209 | +archiver_list_spec \ |
| 5210 | STRIP \ |
| 5211 | RANLIB \ |
| 5212 | CC \ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5213 | @@ -15569,12 +16237,14 @@ lt_cv_sys_global_symbol_pipe \ |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5214 | lt_cv_sys_global_symbol_to_cdecl \ |
| 5215 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 5216 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 5217 | +nm_file_list_spec \ |
| 5218 | lt_prog_compiler_no_builtin_flag \ |
| 5219 | -lt_prog_compiler_wl \ |
| 5220 | lt_prog_compiler_pic \ |
| 5221 | +lt_prog_compiler_wl \ |
| 5222 | lt_prog_compiler_static \ |
| 5223 | lt_cv_prog_compiler_c_o \ |
| 5224 | need_locks \ |
| 5225 | +MANIFEST_TOOL \ |
| 5226 | DSYMUTIL \ |
| 5227 | NMEDIT \ |
| 5228 | LIPO \ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5229 | @@ -15590,7 +16260,6 @@ no_undefined_flag \ |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5230 | hardcode_libdir_flag_spec \ |
| 5231 | hardcode_libdir_flag_spec_ld \ |
| 5232 | hardcode_libdir_separator \ |
| 5233 | -fix_srcfile_path \ |
| 5234 | exclude_expsyms \ |
| 5235 | include_expsyms \ |
| 5236 | file_list_spec \ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5237 | @@ -15626,6 +16295,7 @@ module_cmds \ |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5238 | module_expsym_cmds \ |
| 5239 | export_symbols_cmds \ |
| 5240 | prelink_cmds \ |
| 5241 | +postlink_cmds \ |
| 5242 | postinstall_cmds \ |
| 5243 | postuninstall_cmds \ |
| 5244 | finish_cmds \ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5245 | @@ -16390,7 +17060,8 @@ $as_echo X"$file" | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5246 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 5247 | # |
| 5248 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 5249 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 5250 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 5251 | +# Inc. |
| 5252 | # Written by Gordon Matzigkeit, 1996 |
| 5253 | # |
| 5254 | # This file is part of GNU Libtool. |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5255 | @@ -16493,19 +17164,42 @@ SP2NL=$lt_lt_SP2NL |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5256 | # turn newlines into spaces. |
| 5257 | NL2SP=$lt_lt_NL2SP |
| 5258 | |
| 5259 | +# convert \$build file names to \$host format. |
| 5260 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 5261 | + |
| 5262 | +# convert \$build files to toolchain format. |
| 5263 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 5264 | + |
| 5265 | # An object symbol dumper. |
| 5266 | OBJDUMP=$lt_OBJDUMP |
| 5267 | |
| 5268 | # Method to check whether dependent libraries are shared objects. |
| 5269 | deplibs_check_method=$lt_deplibs_check_method |
| 5270 | |
| 5271 | -# Command to use when deplibs_check_method == "file_magic". |
| 5272 | +# Command to use when deplibs_check_method = "file_magic". |
| 5273 | file_magic_cmd=$lt_file_magic_cmd |
| 5274 | |
| 5275 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 5276 | +file_magic_glob=$lt_file_magic_glob |
| 5277 | + |
| 5278 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 5279 | +want_nocaseglob=$lt_want_nocaseglob |
| 5280 | + |
| 5281 | +# DLL creation program. |
| 5282 | +DLLTOOL=$lt_DLLTOOL |
| 5283 | + |
| 5284 | +# Command to associate shared and link libraries. |
| 5285 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 5286 | + |
| 5287 | # The archiver. |
| 5288 | AR=$lt_AR |
| 5289 | + |
| 5290 | +# Flags to create an archive. |
| 5291 | AR_FLAGS=$lt_AR_FLAGS |
| 5292 | |
| 5293 | +# How to feed a file listing to the archiver. |
| 5294 | +archiver_list_spec=$lt_archiver_list_spec |
| 5295 | + |
| 5296 | # A symbol stripping program. |
| 5297 | STRIP=$lt_STRIP |
| 5298 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5299 | @@ -16535,6 +17229,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5300 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 5301 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 5302 | |
| 5303 | +# Specify filename containing input files for \$NM. |
| 5304 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 5305 | + |
| 5306 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 5307 | +lt_sysroot=$lt_sysroot |
| 5308 | + |
| 5309 | # The name of the directory that contains temporary libtool files. |
| 5310 | objdir=$objdir |
| 5311 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5312 | @@ -16544,6 +17244,9 @@ MAGIC_CMD=$MAGIC_CMD |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5313 | # Must we lock files when doing compilation? |
| 5314 | need_locks=$lt_need_locks |
| 5315 | |
| 5316 | +# Manifest tool. |
| 5317 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 5318 | + |
| 5319 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 5320 | DSYMUTIL=$lt_DSYMUTIL |
| 5321 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5322 | @@ -16658,12 +17361,12 @@ with_gcc=$GCC |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5323 | # Compiler flag to turn off builtin functions. |
| 5324 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 5325 | |
| 5326 | -# How to pass a linker flag through the compiler. |
| 5327 | -wl=$lt_lt_prog_compiler_wl |
| 5328 | - |
| 5329 | # Additional compiler flags for building library objects. |
| 5330 | pic_flag=$lt_lt_prog_compiler_pic |
| 5331 | |
| 5332 | +# How to pass a linker flag through the compiler. |
| 5333 | +wl=$lt_lt_prog_compiler_wl |
| 5334 | + |
| 5335 | # Compiler flag to prevent dynamic linking. |
| 5336 | link_static_flag=$lt_lt_prog_compiler_static |
| 5337 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5338 | @@ -16750,9 +17453,6 @@ inherit_rpath=$inherit_rpath |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5339 | # Whether libtool must link a program against all its dependency libraries. |
| 5340 | link_all_deplibs=$link_all_deplibs |
| 5341 | |
| 5342 | -# Fix the shell variable \$srcfile for the compiler. |
| 5343 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 5344 | - |
| 5345 | # Set to "yes" if exported symbols are required. |
| 5346 | always_export_symbols=$always_export_symbols |
| 5347 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5348 | @@ -16768,6 +17468,9 @@ include_expsyms=$lt_include_expsyms |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5349 | # Commands necessary for linking programs (against libraries) with templates. |
| 5350 | prelink_cmds=$lt_prelink_cmds |
| 5351 | |
| 5352 | +# Commands necessary for finishing linking programs. |
| 5353 | +postlink_cmds=$lt_postlink_cmds |
| 5354 | + |
| 5355 | # Specify filename containing input files. |
| 5356 | file_list_spec=$lt_file_list_spec |
| 5357 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5358 | @@ -16800,210 +17503,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5359 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 5360 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 5361 | # is reportedly fixed, but why not run on old versions too? |
| 5362 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 5363 | - || (rm -f "$cfgfile"; exit 1) |
| 5364 | - |
| 5365 | - case $xsi_shell in |
| 5366 | - yes) |
| 5367 | - cat << \_LT_EOF >> "$cfgfile" |
| 5368 | - |
| 5369 | -# func_dirname file append nondir_replacement |
| 5370 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 5371 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 5372 | -func_dirname () |
| 5373 | -{ |
| 5374 | - case ${1} in |
| 5375 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 5376 | - * ) func_dirname_result="${3}" ;; |
| 5377 | - esac |
| 5378 | -} |
| 5379 | - |
| 5380 | -# func_basename file |
| 5381 | -func_basename () |
| 5382 | -{ |
| 5383 | - func_basename_result="${1##*/}" |
| 5384 | -} |
| 5385 | - |
| 5386 | -# func_dirname_and_basename file append nondir_replacement |
| 5387 | -# perform func_basename and func_dirname in a single function |
| 5388 | -# call: |
| 5389 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 5390 | -# add APPEND to the result, otherwise set result |
| 5391 | -# to NONDIR_REPLACEMENT. |
| 5392 | -# value returned in "$func_dirname_result" |
| 5393 | -# basename: Compute filename of FILE. |
| 5394 | -# value retuned in "$func_basename_result" |
| 5395 | -# Implementation must be kept synchronized with func_dirname |
| 5396 | -# and func_basename. For efficiency, we do not delegate to |
| 5397 | -# those functions but instead duplicate the functionality here. |
| 5398 | -func_dirname_and_basename () |
| 5399 | -{ |
| 5400 | - case ${1} in |
| 5401 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 5402 | - * ) func_dirname_result="${3}" ;; |
| 5403 | - esac |
| 5404 | - func_basename_result="${1##*/}" |
| 5405 | -} |
| 5406 | - |
| 5407 | -# func_stripname prefix suffix name |
| 5408 | -# strip PREFIX and SUFFIX off of NAME. |
| 5409 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 5410 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 5411 | -# dot (in which case that matches only a dot). |
| 5412 | -func_stripname () |
| 5413 | -{ |
| 5414 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 5415 | - # positional parameters, so assign one to ordinary parameter first. |
| 5416 | - func_stripname_result=${3} |
| 5417 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 5418 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 5419 | -} |
| 5420 | - |
| 5421 | -# func_opt_split |
| 5422 | -func_opt_split () |
| 5423 | -{ |
| 5424 | - func_opt_split_opt=${1%%=*} |
| 5425 | - func_opt_split_arg=${1#*=} |
| 5426 | -} |
| 5427 | - |
| 5428 | -# func_lo2o object |
| 5429 | -func_lo2o () |
| 5430 | -{ |
| 5431 | - case ${1} in |
| 5432 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 5433 | - *) func_lo2o_result=${1} ;; |
| 5434 | - esac |
| 5435 | -} |
| 5436 | - |
| 5437 | -# func_xform libobj-or-source |
| 5438 | -func_xform () |
| 5439 | -{ |
| 5440 | - func_xform_result=${1%.*}.lo |
| 5441 | -} |
| 5442 | - |
| 5443 | -# func_arith arithmetic-term... |
| 5444 | -func_arith () |
| 5445 | -{ |
| 5446 | - func_arith_result=$(( $* )) |
| 5447 | -} |
| 5448 | - |
| 5449 | -# func_len string |
| 5450 | -# STRING may not start with a hyphen. |
| 5451 | -func_len () |
| 5452 | -{ |
| 5453 | - func_len_result=${#1} |
| 5454 | -} |
| 5455 | - |
| 5456 | -_LT_EOF |
| 5457 | - ;; |
| 5458 | - *) # Bourne compatible functions. |
| 5459 | - cat << \_LT_EOF >> "$cfgfile" |
| 5460 | - |
| 5461 | -# func_dirname file append nondir_replacement |
| 5462 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 5463 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 5464 | -func_dirname () |
| 5465 | -{ |
| 5466 | - # Extract subdirectory from the argument. |
| 5467 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 5468 | - if test "X$func_dirname_result" = "X${1}"; then |
| 5469 | - func_dirname_result="${3}" |
| 5470 | - else |
| 5471 | - func_dirname_result="$func_dirname_result${2}" |
| 5472 | - fi |
| 5473 | -} |
| 5474 | - |
| 5475 | -# func_basename file |
| 5476 | -func_basename () |
| 5477 | -{ |
| 5478 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 5479 | -} |
| 5480 | - |
| 5481 | - |
| 5482 | -# func_stripname prefix suffix name |
| 5483 | -# strip PREFIX and SUFFIX off of NAME. |
| 5484 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 5485 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 5486 | -# dot (in which case that matches only a dot). |
| 5487 | -# func_strip_suffix prefix name |
| 5488 | -func_stripname () |
| 5489 | -{ |
| 5490 | - case ${2} in |
| 5491 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 5492 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 5493 | - esac |
| 5494 | -} |
| 5495 | - |
| 5496 | -# sed scripts: |
| 5497 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 5498 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 5499 | - |
| 5500 | -# func_opt_split |
| 5501 | -func_opt_split () |
| 5502 | -{ |
| 5503 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 5504 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 5505 | -} |
| 5506 | - |
| 5507 | -# func_lo2o object |
| 5508 | -func_lo2o () |
| 5509 | -{ |
| 5510 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 5511 | -} |
| 5512 | - |
| 5513 | -# func_xform libobj-or-source |
| 5514 | -func_xform () |
| 5515 | -{ |
| 5516 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 5517 | -} |
| 5518 | - |
| 5519 | -# func_arith arithmetic-term... |
| 5520 | -func_arith () |
| 5521 | -{ |
| 5522 | - func_arith_result=`expr "$@"` |
| 5523 | -} |
| 5524 | - |
| 5525 | -# func_len string |
| 5526 | -# STRING may not start with a hyphen. |
| 5527 | -func_len () |
| 5528 | -{ |
| 5529 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 5530 | -} |
| 5531 | - |
| 5532 | -_LT_EOF |
| 5533 | -esac |
| 5534 | - |
| 5535 | -case $lt_shell_append in |
| 5536 | - yes) |
| 5537 | - cat << \_LT_EOF >> "$cfgfile" |
| 5538 | - |
| 5539 | -# func_append var value |
| 5540 | -# Append VALUE to the end of shell variable VAR. |
| 5541 | -func_append () |
| 5542 | -{ |
| 5543 | - eval "$1+=\$2" |
| 5544 | -} |
| 5545 | -_LT_EOF |
| 5546 | - ;; |
| 5547 | - *) |
| 5548 | - cat << \_LT_EOF >> "$cfgfile" |
| 5549 | - |
| 5550 | -# func_append var value |
| 5551 | -# Append VALUE to the end of shell variable VAR. |
| 5552 | -func_append () |
| 5553 | -{ |
| 5554 | - eval "$1=\$$1\$2" |
| 5555 | -} |
| 5556 | - |
| 5557 | -_LT_EOF |
| 5558 | - ;; |
| 5559 | - esac |
| 5560 | - |
| 5561 | - |
| 5562 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 5563 | - || (rm -f "$cfgfile"; exit 1) |
| 5564 | - |
| 5565 | - mv -f "$cfgfile" "$ofile" || |
| 5566 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 5567 | + || (rm -f "$cfgfile"; exit 1) |
| 5568 | + |
| 5569 | + if test x"$xsi_shell" = xyes; then |
| 5570 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 5571 | +func_dirname ()\ |
| 5572 | +{\ |
| 5573 | +\ case ${1} in\ |
| 5574 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 5575 | +\ * ) func_dirname_result="${3}" ;;\ |
| 5576 | +\ esac\ |
| 5577 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5578 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5579 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5580 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5581 | + |
| 5582 | + |
| 5583 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 5584 | +func_basename ()\ |
| 5585 | +{\ |
| 5586 | +\ func_basename_result="${1##*/}"\ |
| 5587 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5588 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5589 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5590 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5591 | + |
| 5592 | + |
| 5593 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 5594 | +func_dirname_and_basename ()\ |
| 5595 | +{\ |
| 5596 | +\ case ${1} in\ |
| 5597 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 5598 | +\ * ) func_dirname_result="${3}" ;;\ |
| 5599 | +\ esac\ |
| 5600 | +\ func_basename_result="${1##*/}"\ |
| 5601 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5602 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5603 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5604 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5605 | + |
| 5606 | + |
| 5607 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 5608 | +func_stripname ()\ |
| 5609 | +{\ |
| 5610 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 5611 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 5612 | +\ func_stripname_result=${3}\ |
| 5613 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 5614 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 5615 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5616 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5617 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5618 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5619 | + |
| 5620 | + |
| 5621 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 5622 | +func_split_long_opt ()\ |
| 5623 | +{\ |
| 5624 | +\ func_split_long_opt_name=${1%%=*}\ |
| 5625 | +\ func_split_long_opt_arg=${1#*=}\ |
| 5626 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5627 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5628 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5629 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5630 | + |
| 5631 | + |
| 5632 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 5633 | +func_split_short_opt ()\ |
| 5634 | +{\ |
| 5635 | +\ func_split_short_opt_arg=${1#??}\ |
| 5636 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 5637 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5638 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5639 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5640 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5641 | + |
| 5642 | + |
| 5643 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 5644 | +func_lo2o ()\ |
| 5645 | +{\ |
| 5646 | +\ case ${1} in\ |
| 5647 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 5648 | +\ *) func_lo2o_result=${1} ;;\ |
| 5649 | +\ esac\ |
| 5650 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5651 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5652 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5653 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5654 | + |
| 5655 | + |
| 5656 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 5657 | +func_xform ()\ |
| 5658 | +{\ |
| 5659 | + func_xform_result=${1%.*}.lo\ |
| 5660 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5661 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5662 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5663 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5664 | + |
| 5665 | + |
| 5666 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 5667 | +func_arith ()\ |
| 5668 | +{\ |
| 5669 | + func_arith_result=$(( $* ))\ |
| 5670 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5671 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5672 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5673 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5674 | + |
| 5675 | + |
| 5676 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 5677 | +func_len ()\ |
| 5678 | +{\ |
| 5679 | + func_len_result=${#1}\ |
| 5680 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5681 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5682 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5683 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5684 | + |
| 5685 | +fi |
| 5686 | + |
| 5687 | +if test x"$lt_shell_append" = xyes; then |
| 5688 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 5689 | +func_append ()\ |
| 5690 | +{\ |
| 5691 | + eval "${1}+=\\${2}"\ |
| 5692 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5693 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5694 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5695 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5696 | + |
| 5697 | + |
| 5698 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 5699 | +func_append_quoted ()\ |
| 5700 | +{\ |
| 5701 | +\ func_quote_for_eval "${2}"\ |
| 5702 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 5703 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5704 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5705 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5706 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5707 | + |
| 5708 | + |
| 5709 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 5710 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 5711 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5712 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5713 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 5714 | +else |
| 5715 | + # Save a `func_append' function call even when '+=' is not available |
| 5716 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 5717 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5718 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5719 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 5720 | +fi |
| 5721 | + |
| 5722 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 5723 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 5724 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 5725 | +fi |
| 5726 | + |
| 5727 | + |
| 5728 | + mv -f "$cfgfile" "$ofile" || |
| 5729 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 5730 | chmod +x "$ofile" |
| 5731 | |
| 5732 | diff --git a/gprof/configure b/gprof/configure |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5733 | index 6b43bf2b18..245ee48bc3 100755 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5734 | --- a/gprof/configure |
| 5735 | +++ b/gprof/configure |
| 5736 | @@ -631,8 +631,11 @@ OTOOL |
| 5737 | LIPO |
| 5738 | NMEDIT |
| 5739 | DSYMUTIL |
| 5740 | +MANIFEST_TOOL |
| 5741 | RANLIB |
| 5742 | +ac_ct_AR |
| 5743 | AR |
| 5744 | +DLLTOOL |
| 5745 | OBJDUMP |
| 5746 | LN_S |
| 5747 | NM |
| 5748 | @@ -744,6 +747,7 @@ enable_static |
| 5749 | with_pic |
| 5750 | enable_fast_install |
| 5751 | with_gnu_ld |
| 5752 | +with_libtool_sysroot |
| 5753 | enable_libtool_lock |
| 5754 | enable_plugins |
| 5755 | enable_largefile |
| 5756 | @@ -1402,6 +1406,8 @@ Optional Packages: |
| 5757 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 5758 | both] |
| 5759 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 5760 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 5761 | + (or the compiler's sysroot if not specified). |
| 5762 | |
| 5763 | Some influential environment variables: |
| 5764 | CC C compiler command |
| 5765 | @@ -4836,8 +4842,8 @@ esac |
| 5766 | |
| 5767 | |
| 5768 | |
| 5769 | -macro_version='2.2.7a' |
| 5770 | -macro_revision='1.3134' |
| 5771 | +macro_version='2.4' |
| 5772 | +macro_revision='1.3293' |
| 5773 | |
| 5774 | |
| 5775 | |
| 5776 | @@ -4877,7 +4883,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 5777 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 5778 | $as_echo_n "checking how to print strings... " >&6; } |
| 5779 | # Test print first, because it will be a builtin if present. |
| 5780 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 5781 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 5782 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 5783 | ECHO='print -r --' |
| 5784 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 5785 | @@ -5563,8 +5569,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 5786 | # Try some XSI features |
| 5787 | xsi_shell=no |
| 5788 | ( _lt_dummy="a/b/c" |
| 5789 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 5790 | - = c,a/b,, \ |
| 5791 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 5792 | + = c,a/b,b/c, \ |
| 5793 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 5794 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 5795 | && xsi_shell=yes |
| 5796 | @@ -5613,6 +5619,80 @@ esac |
| 5797 | |
| 5798 | |
| 5799 | |
| 5800 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 5801 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 5802 | +if test "${lt_cv_to_host_file_cmd+set}" = set; then : |
| 5803 | + $as_echo_n "(cached) " >&6 |
| 5804 | +else |
| 5805 | + case $host in |
| 5806 | + *-*-mingw* ) |
| 5807 | + case $build in |
| 5808 | + *-*-mingw* ) # actually msys |
| 5809 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 5810 | + ;; |
| 5811 | + *-*-cygwin* ) |
| 5812 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 5813 | + ;; |
| 5814 | + * ) # otherwise, assume *nix |
| 5815 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 5816 | + ;; |
| 5817 | + esac |
| 5818 | + ;; |
| 5819 | + *-*-cygwin* ) |
| 5820 | + case $build in |
| 5821 | + *-*-mingw* ) # actually msys |
| 5822 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 5823 | + ;; |
| 5824 | + *-*-cygwin* ) |
| 5825 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 5826 | + ;; |
| 5827 | + * ) # otherwise, assume *nix |
| 5828 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 5829 | + ;; |
| 5830 | + esac |
| 5831 | + ;; |
| 5832 | + * ) # unhandled hosts (and "normal" native builds) |
| 5833 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 5834 | + ;; |
| 5835 | +esac |
| 5836 | + |
| 5837 | +fi |
| 5838 | + |
| 5839 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 5840 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 5841 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 5842 | + |
| 5843 | + |
| 5844 | + |
| 5845 | + |
| 5846 | + |
| 5847 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 5848 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 5849 | +if test "${lt_cv_to_tool_file_cmd+set}" = set; then : |
| 5850 | + $as_echo_n "(cached) " >&6 |
| 5851 | +else |
| 5852 | + #assume ordinary cross tools, or native build. |
| 5853 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 5854 | +case $host in |
| 5855 | + *-*-mingw* ) |
| 5856 | + case $build in |
| 5857 | + *-*-mingw* ) # actually msys |
| 5858 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 5859 | + ;; |
| 5860 | + esac |
| 5861 | + ;; |
| 5862 | +esac |
| 5863 | + |
| 5864 | +fi |
| 5865 | + |
| 5866 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 5867 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 5868 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 5869 | + |
| 5870 | + |
| 5871 | + |
| 5872 | + |
| 5873 | + |
| 5874 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 5875 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 5876 | if test "${lt_cv_ld_reload_flag+set}" = set; then : |
| 5877 | @@ -5629,6 +5709,11 @@ case $reload_flag in |
| 5878 | esac |
| 5879 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 5880 | case $host_os in |
| 5881 | + cygwin* | mingw* | pw32* | cegcc*) |
| 5882 | + if test "$GCC" != yes; then |
| 5883 | + reload_cmds=false |
| 5884 | + fi |
| 5885 | + ;; |
| 5886 | darwin*) |
| 5887 | if test "$GCC" = yes; then |
| 5888 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 5889 | @@ -5797,7 +5882,8 @@ mingw* | pw32*) |
| 5890 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 5891 | lt_cv_file_magic_cmd='func_win32_libid' |
| 5892 | else |
| 5893 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 5894 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 5895 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 5896 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 5897 | fi |
| 5898 | ;; |
| 5899 | @@ -5874,11 +5960,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) |
| 5900 | lt_cv_deplibs_check_method=pass_all |
| 5901 | ;; |
| 5902 | |
| 5903 | -linux-uclibc*) |
| 5904 | - lt_cv_deplibs_check_method=pass_all |
| 5905 | - lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` |
| 5906 | - ;; |
| 5907 | - |
| 5908 | netbsd*) |
| 5909 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
| 5910 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' |
| 5911 | @@ -5956,6 +6037,21 @@ esac |
| 5912 | fi |
| 5913 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 5914 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 5915 | + |
| 5916 | +file_magic_glob= |
| 5917 | +want_nocaseglob=no |
| 5918 | +if test "$build" = "$host"; then |
| 5919 | + case $host_os in |
| 5920 | + mingw* | pw32*) |
| 5921 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 5922 | + want_nocaseglob=yes |
| 5923 | + else |
| 5924 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 5925 | + fi |
| 5926 | + ;; |
| 5927 | + esac |
| 5928 | +fi |
| 5929 | + |
| 5930 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 5931 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 5932 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 5933 | @@ -5971,9 +6067,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 5934 | |
| 5935 | |
| 5936 | |
| 5937 | + |
| 5938 | + |
| 5939 | + |
| 5940 | + |
| 5941 | + |
| 5942 | + |
| 5943 | + |
| 5944 | + |
| 5945 | + |
| 5946 | + |
| 5947 | +if test -n "$ac_tool_prefix"; then |
| 5948 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 5949 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 5950 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 5951 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 5952 | +if test "${ac_cv_prog_DLLTOOL+set}" = set; then : |
| 5953 | + $as_echo_n "(cached) " >&6 |
| 5954 | +else |
| 5955 | + if test -n "$DLLTOOL"; then |
| 5956 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 5957 | +else |
| 5958 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 5959 | +for as_dir in $PATH |
| 5960 | +do |
| 5961 | + IFS=$as_save_IFS |
| 5962 | + test -z "$as_dir" && as_dir=. |
| 5963 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 5964 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 5965 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 5966 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 5967 | + break 2 |
| 5968 | + fi |
| 5969 | +done |
| 5970 | + done |
| 5971 | +IFS=$as_save_IFS |
| 5972 | + |
| 5973 | +fi |
| 5974 | +fi |
| 5975 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 5976 | +if test -n "$DLLTOOL"; then |
| 5977 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 5978 | +$as_echo "$DLLTOOL" >&6; } |
| 5979 | +else |
| 5980 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 5981 | +$as_echo "no" >&6; } |
| 5982 | +fi |
| 5983 | + |
| 5984 | + |
| 5985 | +fi |
| 5986 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 5987 | + ac_ct_DLLTOOL=$DLLTOOL |
| 5988 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 5989 | +set dummy dlltool; ac_word=$2 |
| 5990 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 5991 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 5992 | +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : |
| 5993 | + $as_echo_n "(cached) " >&6 |
| 5994 | +else |
| 5995 | + if test -n "$ac_ct_DLLTOOL"; then |
| 5996 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 5997 | +else |
| 5998 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 5999 | +for as_dir in $PATH |
| 6000 | +do |
| 6001 | + IFS=$as_save_IFS |
| 6002 | + test -z "$as_dir" && as_dir=. |
| 6003 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 6004 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 6005 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 6006 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 6007 | + break 2 |
| 6008 | + fi |
| 6009 | +done |
| 6010 | + done |
| 6011 | +IFS=$as_save_IFS |
| 6012 | + |
| 6013 | +fi |
| 6014 | +fi |
| 6015 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 6016 | +if test -n "$ac_ct_DLLTOOL"; then |
| 6017 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 6018 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 6019 | +else |
| 6020 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 6021 | +$as_echo "no" >&6; } |
| 6022 | +fi |
| 6023 | + |
| 6024 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 6025 | + DLLTOOL="false" |
| 6026 | + else |
| 6027 | + case $cross_compiling:$ac_tool_warned in |
| 6028 | +yes:) |
| 6029 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 6030 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 6031 | +ac_tool_warned=yes ;; |
| 6032 | +esac |
| 6033 | + DLLTOOL=$ac_ct_DLLTOOL |
| 6034 | + fi |
| 6035 | +else |
| 6036 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 6037 | +fi |
| 6038 | + |
| 6039 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 6040 | + |
| 6041 | + |
| 6042 | + |
| 6043 | + |
| 6044 | + |
| 6045 | + |
| 6046 | + |
| 6047 | + |
| 6048 | + |
| 6049 | + |
| 6050 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 6051 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 6052 | +if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : |
| 6053 | + $as_echo_n "(cached) " >&6 |
| 6054 | +else |
| 6055 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 6056 | + |
| 6057 | +case $host_os in |
| 6058 | +cygwin* | mingw* | pw32* | cegcc*) |
| 6059 | + # two different shell functions defined in ltmain.sh |
| 6060 | + # decide which to use based on capabilities of $DLLTOOL |
| 6061 | + case `$DLLTOOL --help 2>&1` in |
| 6062 | + *--identify-strict*) |
| 6063 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 6064 | + ;; |
| 6065 | + *) |
| 6066 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 6067 | + ;; |
| 6068 | + esac |
| 6069 | + ;; |
| 6070 | +*) |
| 6071 | + # fallback: assume linklib IS sharedlib |
| 6072 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 6073 | + ;; |
| 6074 | +esac |
| 6075 | + |
| 6076 | +fi |
| 6077 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 6078 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 6079 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 6080 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 6081 | + |
| 6082 | + |
| 6083 | + |
| 6084 | + |
| 6085 | + |
| 6086 | + |
| 6087 | + |
| 6088 | if test -n "$ac_tool_prefix"; then |
| 6089 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 6090 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 6091 | + for ac_prog in ar |
| 6092 | + do |
| 6093 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 6094 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 6095 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 6096 | $as_echo_n "checking for $ac_word... " >&6; } |
| 6097 | if test "${ac_cv_prog_AR+set}" = set; then : |
| 6098 | @@ -5989,7 +6238,7 @@ do |
| 6099 | test -z "$as_dir" && as_dir=. |
| 6100 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 6101 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 6102 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 6103 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 6104 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 6105 | break 2 |
| 6106 | fi |
| 6107 | @@ -6009,11 +6258,15 @@ $as_echo "no" >&6; } |
| 6108 | fi |
| 6109 | |
| 6110 | |
| 6111 | + test -n "$AR" && break |
| 6112 | + done |
| 6113 | fi |
| 6114 | -if test -z "$ac_cv_prog_AR"; then |
| 6115 | +if test -z "$AR"; then |
| 6116 | ac_ct_AR=$AR |
| 6117 | - # Extract the first word of "ar", so it can be a program name with args. |
| 6118 | -set dummy ar; ac_word=$2 |
| 6119 | + for ac_prog in ar |
| 6120 | +do |
| 6121 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 6122 | +set dummy $ac_prog; ac_word=$2 |
| 6123 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 6124 | $as_echo_n "checking for $ac_word... " >&6; } |
| 6125 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
| 6126 | @@ -6029,7 +6282,7 @@ do |
| 6127 | test -z "$as_dir" && as_dir=. |
| 6128 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 6129 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 6130 | - ac_cv_prog_ac_ct_AR="ar" |
| 6131 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 6132 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 6133 | break 2 |
| 6134 | fi |
| 6135 | @@ -6048,6 +6301,10 @@ else |
| 6136 | $as_echo "no" >&6; } |
| 6137 | fi |
| 6138 | |
| 6139 | + |
| 6140 | + test -n "$ac_ct_AR" && break |
| 6141 | +done |
| 6142 | + |
| 6143 | if test "x$ac_ct_AR" = x; then |
| 6144 | AR="false" |
| 6145 | else |
| 6146 | @@ -6059,12 +6316,10 @@ ac_tool_warned=yes ;; |
| 6147 | esac |
| 6148 | AR=$ac_ct_AR |
| 6149 | fi |
| 6150 | -else |
| 6151 | - AR="$ac_cv_prog_AR" |
| 6152 | fi |
| 6153 | |
| 6154 | -test -z "$AR" && AR=ar |
| 6155 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 6156 | +: ${AR=ar} |
| 6157 | +: ${AR_FLAGS=cru} |
| 6158 | |
| 6159 | |
| 6160 | |
| 6161 | @@ -6076,6 +6331,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 6162 | |
| 6163 | |
| 6164 | |
| 6165 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 6166 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 6167 | +if test "${lt_cv_ar_at_file+set}" = set; then : |
| 6168 | + $as_echo_n "(cached) " >&6 |
| 6169 | +else |
| 6170 | + lt_cv_ar_at_file=no |
| 6171 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 6172 | +/* end confdefs.h. */ |
| 6173 | + |
| 6174 | +int |
| 6175 | +main () |
| 6176 | +{ |
| 6177 | + |
| 6178 | + ; |
| 6179 | + return 0; |
| 6180 | +} |
| 6181 | +_ACEOF |
| 6182 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 6183 | + echo conftest.$ac_objext > conftest.lst |
| 6184 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 6185 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 6186 | + (eval $lt_ar_try) 2>&5 |
| 6187 | + ac_status=$? |
| 6188 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 6189 | + test $ac_status = 0; } |
| 6190 | + if test "$ac_status" -eq 0; then |
| 6191 | + # Ensure the archiver fails upon bogus file names. |
| 6192 | + rm -f conftest.$ac_objext libconftest.a |
| 6193 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 6194 | + (eval $lt_ar_try) 2>&5 |
| 6195 | + ac_status=$? |
| 6196 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 6197 | + test $ac_status = 0; } |
| 6198 | + if test "$ac_status" -ne 0; then |
| 6199 | + lt_cv_ar_at_file=@ |
| 6200 | + fi |
| 6201 | + fi |
| 6202 | + rm -f conftest.* libconftest.a |
| 6203 | + |
| 6204 | +fi |
| 6205 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 6206 | + |
| 6207 | +fi |
| 6208 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 6209 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 6210 | + |
| 6211 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 6212 | + archiver_list_spec= |
| 6213 | +else |
| 6214 | + archiver_list_spec=$lt_cv_ar_at_file |
| 6215 | +fi |
| 6216 | + |
| 6217 | + |
| 6218 | + |
| 6219 | + |
| 6220 | + |
| 6221 | + |
| 6222 | + |
| 6223 | if test -n "$ac_tool_prefix"; then |
| 6224 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
| 6225 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
| 6226 | @@ -6410,8 +6723,8 @@ esac |
| 6227 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 6228 | |
| 6229 | # Transform an extracted symbol line into symbol name and symbol address |
| 6230 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 6231 | -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
| 6232 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 6233 | +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
| 6234 | |
| 6235 | # Handle CRLF in mingw tool chain |
| 6236 | opt_cr= |
| 6237 | @@ -6447,6 +6760,7 @@ for ac_symprfx in "" "_"; do |
| 6238 | else |
| 6239 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 6240 | fi |
| 6241 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 6242 | |
| 6243 | # Check to see that the pipe works correctly. |
| 6244 | pipe_works=no |
| 6245 | @@ -6488,6 +6802,18 @@ _LT_EOF |
| 6246 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 6247 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 6248 | cat <<_LT_EOF > conftest.$ac_ext |
| 6249 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 6250 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 6251 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 6252 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 6253 | +# define LT_DLSYM_CONST |
| 6254 | +#elif defined(__osf__) |
| 6255 | +/* This system does not cope well with relocations in const data. */ |
| 6256 | +# define LT_DLSYM_CONST |
| 6257 | +#else |
| 6258 | +# define LT_DLSYM_CONST const |
| 6259 | +#endif |
| 6260 | + |
| 6261 | #ifdef __cplusplus |
| 6262 | extern "C" { |
| 6263 | #endif |
| 6264 | @@ -6499,7 +6825,7 @@ _LT_EOF |
| 6265 | cat <<_LT_EOF >> conftest.$ac_ext |
| 6266 | |
| 6267 | /* The mapping between symbol names and symbols. */ |
| 6268 | -const struct { |
| 6269 | +LT_DLSYM_CONST struct { |
| 6270 | const char *name; |
| 6271 | void *address; |
| 6272 | } |
| 6273 | @@ -6525,8 +6851,8 @@ static const void *lt_preloaded_setup() { |
| 6274 | _LT_EOF |
| 6275 | # Now try linking the two files. |
| 6276 | mv conftest.$ac_objext conftstm.$ac_objext |
| 6277 | - lt_save_LIBS="$LIBS" |
| 6278 | - lt_save_CFLAGS="$CFLAGS" |
| 6279 | + lt_globsym_save_LIBS=$LIBS |
| 6280 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 6281 | LIBS="conftstm.$ac_objext" |
| 6282 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 6283 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 6284 | @@ -6536,8 +6862,8 @@ _LT_EOF |
| 6285 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 6286 | pipe_works=yes |
| 6287 | fi |
| 6288 | - LIBS="$lt_save_LIBS" |
| 6289 | - CFLAGS="$lt_save_CFLAGS" |
| 6290 | + LIBS=$lt_globsym_save_LIBS |
| 6291 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 6292 | else |
| 6293 | echo "cannot find nm_test_func in $nlist" >&5 |
| 6294 | fi |
| 6295 | @@ -6574,6 +6900,18 @@ else |
| 6296 | $as_echo "ok" >&6; } |
| 6297 | fi |
| 6298 | |
| 6299 | +# Response file support. |
| 6300 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 6301 | + nm_file_list_spec='@' |
| 6302 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 6303 | + nm_file_list_spec='@' |
| 6304 | +fi |
| 6305 | + |
| 6306 | + |
| 6307 | + |
| 6308 | + |
| 6309 | + |
| 6310 | + |
| 6311 | |
| 6312 | |
| 6313 | |
| 6314 | @@ -6590,6 +6928,43 @@ fi |
| 6315 | |
| 6316 | |
| 6317 | |
| 6318 | + |
| 6319 | + |
| 6320 | + |
| 6321 | + |
| 6322 | + |
| 6323 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 6324 | +$as_echo_n "checking for sysroot... " >&6; } |
| 6325 | + |
| 6326 | +# Check whether --with-libtool-sysroot was given. |
| 6327 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 6328 | + withval=$with_libtool_sysroot; |
| 6329 | +else |
| 6330 | + with_libtool_sysroot=no |
| 6331 | +fi |
| 6332 | + |
| 6333 | + |
| 6334 | +lt_sysroot= |
| 6335 | +case ${with_libtool_sysroot} in #( |
| 6336 | + yes) |
| 6337 | + if test "$GCC" = yes; then |
| 6338 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 6339 | + fi |
| 6340 | + ;; #( |
| 6341 | + /*) |
| 6342 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 6343 | + ;; #( |
| 6344 | + no|'') |
| 6345 | + ;; #( |
| 6346 | + *) |
| 6347 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 6348 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 6349 | + as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 |
| 6350 | + ;; |
| 6351 | +esac |
| 6352 | + |
| 6353 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 6354 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 6355 | |
| 6356 | |
| 6357 | |
| 6358 | @@ -6801,6 +7176,123 @@ esac |
| 6359 | |
| 6360 | need_locks="$enable_libtool_lock" |
| 6361 | |
| 6362 | +if test -n "$ac_tool_prefix"; then |
| 6363 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 6364 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 6365 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 6366 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 6367 | +if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : |
| 6368 | + $as_echo_n "(cached) " >&6 |
| 6369 | +else |
| 6370 | + if test -n "$MANIFEST_TOOL"; then |
| 6371 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 6372 | +else |
| 6373 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 6374 | +for as_dir in $PATH |
| 6375 | +do |
| 6376 | + IFS=$as_save_IFS |
| 6377 | + test -z "$as_dir" && as_dir=. |
| 6378 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 6379 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 6380 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 6381 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 6382 | + break 2 |
| 6383 | + fi |
| 6384 | +done |
| 6385 | + done |
| 6386 | +IFS=$as_save_IFS |
| 6387 | + |
| 6388 | +fi |
| 6389 | +fi |
| 6390 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 6391 | +if test -n "$MANIFEST_TOOL"; then |
| 6392 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 6393 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 6394 | +else |
| 6395 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 6396 | +$as_echo "no" >&6; } |
| 6397 | +fi |
| 6398 | + |
| 6399 | + |
| 6400 | +fi |
| 6401 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 6402 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 6403 | + # Extract the first word of "mt", so it can be a program name with args. |
| 6404 | +set dummy mt; ac_word=$2 |
| 6405 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 6406 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 6407 | +if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : |
| 6408 | + $as_echo_n "(cached) " >&6 |
| 6409 | +else |
| 6410 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 6411 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 6412 | +else |
| 6413 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 6414 | +for as_dir in $PATH |
| 6415 | +do |
| 6416 | + IFS=$as_save_IFS |
| 6417 | + test -z "$as_dir" && as_dir=. |
| 6418 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 6419 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 6420 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 6421 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 6422 | + break 2 |
| 6423 | + fi |
| 6424 | +done |
| 6425 | + done |
| 6426 | +IFS=$as_save_IFS |
| 6427 | + |
| 6428 | +fi |
| 6429 | +fi |
| 6430 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 6431 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 6432 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 6433 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 6434 | +else |
| 6435 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 6436 | +$as_echo "no" >&6; } |
| 6437 | +fi |
| 6438 | + |
| 6439 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 6440 | + MANIFEST_TOOL=":" |
| 6441 | + else |
| 6442 | + case $cross_compiling:$ac_tool_warned in |
| 6443 | +yes:) |
| 6444 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 6445 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 6446 | +ac_tool_warned=yes ;; |
| 6447 | +esac |
| 6448 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 6449 | + fi |
| 6450 | +else |
| 6451 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 6452 | +fi |
| 6453 | + |
| 6454 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 6455 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 6456 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 6457 | +if test "${lt_cv_path_mainfest_tool+set}" = set; then : |
| 6458 | + $as_echo_n "(cached) " >&6 |
| 6459 | +else |
| 6460 | + lt_cv_path_mainfest_tool=no |
| 6461 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 6462 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 6463 | + cat conftest.err >&5 |
| 6464 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 6465 | + lt_cv_path_mainfest_tool=yes |
| 6466 | + fi |
| 6467 | + rm -f conftest* |
| 6468 | +fi |
| 6469 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 6470 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 6471 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 6472 | + MANIFEST_TOOL=: |
| 6473 | +fi |
| 6474 | + |
| 6475 | + |
| 6476 | + |
| 6477 | + |
| 6478 | + |
| 6479 | |
| 6480 | case $host_os in |
| 6481 | rhapsody* | darwin*) |
| 6482 | @@ -7364,6 +7856,8 @@ _LT_EOF |
| 6483 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 6484 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 6485 | $AR cru libconftest.a conftest.o 2>&5 |
| 6486 | + echo "$RANLIB libconftest.a" >&5 |
| 6487 | + $RANLIB libconftest.a 2>&5 |
| 6488 | cat > conftest.c << _LT_EOF |
| 6489 | int main() { return 0;} |
| 6490 | _LT_EOF |
| 6491 | @@ -7559,7 +8053,8 @@ fi |
| 6492 | LIBTOOL_DEPS="$ltmain" |
| 6493 | |
| 6494 | # Always use our own libtool. |
| 6495 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
| 6496 | +LIBTOOL='$(SHELL) $(top_builddir)' |
| 6497 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" |
| 6498 | |
| 6499 | |
| 6500 | |
| 6501 | @@ -7648,7 +8143,7 @@ aix3*) |
| 6502 | esac |
| 6503 | |
| 6504 | # Global variables: |
| 6505 | -ofile=libtool |
| 6506 | +ofile=${host_alias}-libtool |
| 6507 | can_build_shared=yes |
| 6508 | |
| 6509 | # All known linkers require a `.a' archive for static linking (except MSVC, |
| 6510 | @@ -7946,8 +8441,6 @@ fi |
| 6511 | lt_prog_compiler_pic= |
| 6512 | lt_prog_compiler_static= |
| 6513 | |
| 6514 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 6515 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 6516 | |
| 6517 | if test "$GCC" = yes; then |
| 6518 | lt_prog_compiler_wl='-Wl,' |
| 6519 | @@ -8113,6 +8606,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 6520 | lt_prog_compiler_pic='--shared' |
| 6521 | lt_prog_compiler_static='--static' |
| 6522 | ;; |
| 6523 | + nagfor*) |
| 6524 | + # NAG Fortran compiler |
| 6525 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 6526 | + lt_prog_compiler_pic='-PIC' |
| 6527 | + lt_prog_compiler_static='-Bstatic' |
| 6528 | + ;; |
| 6529 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 6530 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 6531 | # which looks to be a dead project) |
| 6532 | @@ -8175,7 +8674,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 6533 | lt_prog_compiler_pic='-KPIC' |
| 6534 | lt_prog_compiler_static='-Bstatic' |
| 6535 | case $cc_basename in |
| 6536 | - f77* | f90* | f95*) |
| 6537 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 6538 | lt_prog_compiler_wl='-Qoption ld ';; |
| 6539 | *) |
| 6540 | lt_prog_compiler_wl='-Wl,';; |
| 6541 | @@ -8232,13 +8731,17 @@ case $host_os in |
| 6542 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 6543 | ;; |
| 6544 | esac |
| 6545 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 6546 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 6547 | - |
| 6548 | - |
| 6549 | - |
| 6550 | - |
| 6551 | |
| 6552 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 6553 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 6554 | +if test "${lt_cv_prog_compiler_pic+set}" = set; then : |
| 6555 | + $as_echo_n "(cached) " >&6 |
| 6556 | +else |
| 6557 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 6558 | +fi |
| 6559 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 6560 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 6561 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 6562 | |
| 6563 | # |
| 6564 | # Check to make sure the PIC flag actually works. |
| 6565 | @@ -8299,6 +8802,11 @@ fi |
| 6566 | |
| 6567 | |
| 6568 | |
| 6569 | + |
| 6570 | + |
| 6571 | + |
| 6572 | + |
| 6573 | + |
| 6574 | # |
| 6575 | # Check to make sure the static flag actually works. |
| 6576 | # |
| 6577 | @@ -8649,7 +9157,8 @@ _LT_EOF |
| 6578 | allow_undefined_flag=unsupported |
| 6579 | always_export_symbols=no |
| 6580 | enable_shared_with_static_runtimes=yes |
| 6581 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 6582 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' |
| 6583 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 6584 | |
| 6585 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 6586 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 6587 | @@ -8748,12 +9257,12 @@ _LT_EOF |
| 6588 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 6589 | hardcode_libdir_flag_spec= |
| 6590 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 6591 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 6592 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 6593 | if test "x$supports_anon_versioning" = xyes; then |
| 6594 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 6595 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 6596 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 6597 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 6598 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 6599 | fi |
| 6600 | ;; |
| 6601 | esac |
| 6602 | @@ -8767,8 +9276,8 @@ _LT_EOF |
| 6603 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 6604 | wlarc= |
| 6605 | else |
| 6606 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 6607 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 6608 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 6609 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 6610 | fi |
| 6611 | ;; |
| 6612 | |
| 6613 | @@ -8786,8 +9295,8 @@ _LT_EOF |
| 6614 | |
| 6615 | _LT_EOF |
| 6616 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 6617 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 6618 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 6619 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 6620 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 6621 | else |
| 6622 | ld_shlibs=no |
| 6623 | fi |
| 6624 | @@ -8833,8 +9342,8 @@ _LT_EOF |
| 6625 | |
| 6626 | *) |
| 6627 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 6628 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 6629 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 6630 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 6631 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 6632 | else |
| 6633 | ld_shlibs=no |
| 6634 | fi |
| 6635 | @@ -8964,7 +9473,13 @@ _LT_EOF |
| 6636 | allow_undefined_flag='-berok' |
| 6637 | # Determine the default libpath from the value encoded in an |
| 6638 | # empty executable. |
| 6639 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 6640 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 6641 | + aix_libpath=$lt_cv_aix_libpath |
| 6642 | +else |
| 6643 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 6644 | + $as_echo_n "(cached) " >&6 |
| 6645 | +else |
| 6646 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 6647 | /* end confdefs.h. */ |
| 6648 | |
| 6649 | int |
| 6650 | @@ -8977,22 +9492,29 @@ main () |
| 6651 | _ACEOF |
| 6652 | if ac_fn_c_try_link "$LINENO"; then : |
| 6653 | |
| 6654 | -lt_aix_libpath_sed=' |
| 6655 | - /Import File Strings/,/^$/ { |
| 6656 | - /^0/ { |
| 6657 | - s/^0 *\(.*\)$/\1/ |
| 6658 | - p |
| 6659 | - } |
| 6660 | - }' |
| 6661 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6662 | -# Check for a 64-bit object if we didn't find anything. |
| 6663 | -if test -z "$aix_libpath"; then |
| 6664 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6665 | -fi |
| 6666 | + lt_aix_libpath_sed=' |
| 6667 | + /Import File Strings/,/^$/ { |
| 6668 | + /^0/ { |
| 6669 | + s/^0 *\([^ ]*\) *$/\1/ |
| 6670 | + p |
| 6671 | + } |
| 6672 | + }' |
| 6673 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6674 | + # Check for a 64-bit object if we didn't find anything. |
| 6675 | + if test -z "$lt_cv_aix_libpath_"; then |
| 6676 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6677 | + fi |
| 6678 | fi |
| 6679 | rm -f core conftest.err conftest.$ac_objext \ |
| 6680 | conftest$ac_exeext conftest.$ac_ext |
| 6681 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6682 | + if test -z "$lt_cv_aix_libpath_"; then |
| 6683 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 6684 | + fi |
| 6685 | + |
| 6686 | +fi |
| 6687 | + |
| 6688 | + aix_libpath=$lt_cv_aix_libpath_ |
| 6689 | +fi |
| 6690 | |
| 6691 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 6692 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
| 6693 | @@ -9004,7 +9526,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6694 | else |
| 6695 | # Determine the default libpath from the value encoded in an |
| 6696 | # empty executable. |
| 6697 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 6698 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 6699 | + aix_libpath=$lt_cv_aix_libpath |
| 6700 | +else |
| 6701 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 6702 | + $as_echo_n "(cached) " >&6 |
| 6703 | +else |
| 6704 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 6705 | /* end confdefs.h. */ |
| 6706 | |
| 6707 | int |
| 6708 | @@ -9017,22 +9545,29 @@ main () |
| 6709 | _ACEOF |
| 6710 | if ac_fn_c_try_link "$LINENO"; then : |
| 6711 | |
| 6712 | -lt_aix_libpath_sed=' |
| 6713 | - /Import File Strings/,/^$/ { |
| 6714 | - /^0/ { |
| 6715 | - s/^0 *\(.*\)$/\1/ |
| 6716 | - p |
| 6717 | - } |
| 6718 | - }' |
| 6719 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6720 | -# Check for a 64-bit object if we didn't find anything. |
| 6721 | -if test -z "$aix_libpath"; then |
| 6722 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6723 | -fi |
| 6724 | + lt_aix_libpath_sed=' |
| 6725 | + /Import File Strings/,/^$/ { |
| 6726 | + /^0/ { |
| 6727 | + s/^0 *\([^ ]*\) *$/\1/ |
| 6728 | + p |
| 6729 | + } |
| 6730 | + }' |
| 6731 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6732 | + # Check for a 64-bit object if we didn't find anything. |
| 6733 | + if test -z "$lt_cv_aix_libpath_"; then |
| 6734 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6735 | + fi |
| 6736 | fi |
| 6737 | rm -f core conftest.err conftest.$ac_objext \ |
| 6738 | conftest$ac_exeext conftest.$ac_ext |
| 6739 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6740 | + if test -z "$lt_cv_aix_libpath_"; then |
| 6741 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 6742 | + fi |
| 6743 | + |
| 6744 | +fi |
| 6745 | + |
| 6746 | + aix_libpath=$lt_cv_aix_libpath_ |
| 6747 | +fi |
| 6748 | |
| 6749 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 6750 | # Warning - without using the other run time loading flags, |
| 6751 | @@ -9077,20 +9612,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6752 | # Microsoft Visual C++. |
| 6753 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 6754 | # no search path for DLLs. |
| 6755 | - hardcode_libdir_flag_spec=' ' |
| 6756 | - allow_undefined_flag=unsupported |
| 6757 | - # Tell ltmain to make .lib files, not .a files. |
| 6758 | - libext=lib |
| 6759 | - # Tell ltmain to make .dll files, not .so files. |
| 6760 | - shrext_cmds=".dll" |
| 6761 | - # FIXME: Setting linknames here is a bad hack. |
| 6762 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 6763 | - # The linker will automatically build a .lib file if we build a DLL. |
| 6764 | - old_archive_from_new_cmds='true' |
| 6765 | - # FIXME: Should let the user specify the lib program. |
| 6766 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 6767 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 6768 | - enable_shared_with_static_runtimes=yes |
| 6769 | + case $cc_basename in |
| 6770 | + cl*) |
| 6771 | + # Native MSVC |
| 6772 | + hardcode_libdir_flag_spec=' ' |
| 6773 | + allow_undefined_flag=unsupported |
| 6774 | + always_export_symbols=yes |
| 6775 | + file_list_spec='@' |
| 6776 | + # Tell ltmain to make .lib files, not .a files. |
| 6777 | + libext=lib |
| 6778 | + # Tell ltmain to make .dll files, not .so files. |
| 6779 | + shrext_cmds=".dll" |
| 6780 | + # FIXME: Setting linknames here is a bad hack. |
| 6781 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 6782 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 6783 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 6784 | + else |
| 6785 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 6786 | + fi~ |
| 6787 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 6788 | + linknames=' |
| 6789 | + # The linker will not automatically build a static lib if we build a DLL. |
| 6790 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 6791 | + enable_shared_with_static_runtimes=yes |
| 6792 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 6793 | + # Don't use ranlib |
| 6794 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 6795 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 6796 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 6797 | + case $lt_outputfile in |
| 6798 | + *.exe|*.EXE) ;; |
| 6799 | + *) |
| 6800 | + lt_outputfile="$lt_outputfile.exe" |
| 6801 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 6802 | + ;; |
| 6803 | + esac~ |
| 6804 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 6805 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 6806 | + $RM "$lt_outputfile.manifest"; |
| 6807 | + fi' |
| 6808 | + ;; |
| 6809 | + *) |
| 6810 | + # Assume MSVC wrapper |
| 6811 | + hardcode_libdir_flag_spec=' ' |
| 6812 | + allow_undefined_flag=unsupported |
| 6813 | + # Tell ltmain to make .lib files, not .a files. |
| 6814 | + libext=lib |
| 6815 | + # Tell ltmain to make .dll files, not .so files. |
| 6816 | + shrext_cmds=".dll" |
| 6817 | + # FIXME: Setting linknames here is a bad hack. |
| 6818 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 6819 | + # The linker will automatically build a .lib file if we build a DLL. |
| 6820 | + old_archive_from_new_cmds='true' |
| 6821 | + # FIXME: Should let the user specify the lib program. |
| 6822 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 6823 | + enable_shared_with_static_runtimes=yes |
| 6824 | + ;; |
| 6825 | + esac |
| 6826 | ;; |
| 6827 | |
| 6828 | darwin* | rhapsody*) |
| 6829 | @@ -9151,7 +9729,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6830 | |
| 6831 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 6832 | freebsd* | dragonfly*) |
| 6833 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 6834 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 6835 | hardcode_libdir_flag_spec='-R$libdir' |
| 6836 | hardcode_direct=yes |
| 6837 | hardcode_shlibpath_var=no |
| 6838 | @@ -9159,7 +9737,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6839 | |
| 6840 | hpux9*) |
| 6841 | if test "$GCC" = yes; then |
| 6842 | - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 6843 | + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 6844 | else |
| 6845 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 6846 | fi |
| 6847 | @@ -9175,7 +9753,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6848 | |
| 6849 | hpux10*) |
| 6850 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 6851 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 6852 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 6853 | else |
| 6854 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 6855 | fi |
| 6856 | @@ -9199,10 +9777,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6857 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 6858 | ;; |
| 6859 | ia64*) |
| 6860 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 6861 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 6862 | ;; |
| 6863 | *) |
| 6864 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 6865 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 6866 | ;; |
| 6867 | esac |
| 6868 | else |
| 6869 | @@ -9281,23 +9859,36 @@ fi |
| 6870 | |
| 6871 | irix5* | irix6* | nonstopux*) |
| 6872 | if test "$GCC" = yes; then |
| 6873 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 6874 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 6875 | # Try to use the -exported_symbol ld option, if it does not |
| 6876 | # work, assume that -exports_file does not work either and |
| 6877 | # implicitly export all symbols. |
| 6878 | - save_LDFLAGS="$LDFLAGS" |
| 6879 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 6880 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 6881 | + # This should be the same for all languages, so no per-tag cache variable. |
| 6882 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 6883 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 6884 | +if test "${lt_cv_irix_exported_symbol+set}" = set; then : |
| 6885 | + $as_echo_n "(cached) " >&6 |
| 6886 | +else |
| 6887 | + save_LDFLAGS="$LDFLAGS" |
| 6888 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 6889 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 6890 | /* end confdefs.h. */ |
| 6891 | -int foo(void) {} |
| 6892 | +int foo (void) { return 0; } |
| 6893 | _ACEOF |
| 6894 | if ac_fn_c_try_link "$LINENO"; then : |
| 6895 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 6896 | - |
| 6897 | + lt_cv_irix_exported_symbol=yes |
| 6898 | +else |
| 6899 | + lt_cv_irix_exported_symbol=no |
| 6900 | fi |
| 6901 | rm -f core conftest.err conftest.$ac_objext \ |
| 6902 | conftest$ac_exeext conftest.$ac_ext |
| 6903 | - LDFLAGS="$save_LDFLAGS" |
| 6904 | + LDFLAGS="$save_LDFLAGS" |
| 6905 | +fi |
| 6906 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 6907 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 6908 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 6909 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 6910 | + fi |
| 6911 | else |
| 6912 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
| 6913 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
| 6914 | @@ -9382,7 +9973,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 6915 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 6916 | if test "$GCC" = yes; then |
| 6917 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 6918 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 6919 | + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 6920 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 6921 | else |
| 6922 | allow_undefined_flag=' -expect_unresolved \*' |
| 6923 | @@ -9401,9 +9992,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 6924 | no_undefined_flag=' -z defs' |
| 6925 | if test "$GCC" = yes; then |
| 6926 | wlarc='${wl}' |
| 6927 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 6928 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 6929 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 6930 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 6931 | + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 6932 | else |
| 6933 | case `$CC -V 2>&1` in |
| 6934 | *"Compilers 5.0"*) |
| 6935 | @@ -9979,8 +10570,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 6936 | need_version=no |
| 6937 | need_lib_prefix=no |
| 6938 | |
| 6939 | - case $GCC,$host_os in |
| 6940 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 6941 | + case $GCC,$cc_basename in |
| 6942 | + yes,*) |
| 6943 | + # gcc |
| 6944 | library_names_spec='$libname.dll.a' |
| 6945 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 6946 | postinstall_cmds='base_file=`basename \${file}`~ |
| 6947 | @@ -10013,13 +10605,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 6948 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 6949 | ;; |
| 6950 | esac |
| 6951 | + dynamic_linker='Win32 ld.exe' |
| 6952 | + ;; |
| 6953 | + |
| 6954 | + *,cl*) |
| 6955 | + # Native MSVC |
| 6956 | + libname_spec='$name' |
| 6957 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 6958 | + library_names_spec='${libname}.dll.lib' |
| 6959 | + |
| 6960 | + case $build_os in |
| 6961 | + mingw*) |
| 6962 | + sys_lib_search_path_spec= |
| 6963 | + lt_save_ifs=$IFS |
| 6964 | + IFS=';' |
| 6965 | + for lt_path in $LIB |
| 6966 | + do |
| 6967 | + IFS=$lt_save_ifs |
| 6968 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 6969 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 6970 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 6971 | + done |
| 6972 | + IFS=$lt_save_ifs |
| 6973 | + # Convert to MSYS style. |
| 6974 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 6975 | + ;; |
| 6976 | + cygwin*) |
| 6977 | + # Convert to unix form, then to dos form, then back to unix form |
| 6978 | + # but this time dos style (no spaces!) so that the unix form looks |
| 6979 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 6980 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 6981 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 6982 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 6983 | + ;; |
| 6984 | + *) |
| 6985 | + sys_lib_search_path_spec="$LIB" |
| 6986 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 6987 | + # It is most probably a Windows format PATH. |
| 6988 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 6989 | + else |
| 6990 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 6991 | + fi |
| 6992 | + # FIXME: find the short name or the path components, as spaces are |
| 6993 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 6994 | + ;; |
| 6995 | + esac |
| 6996 | + |
| 6997 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 6998 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 6999 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 7000 | + dldir=$destdir/`dirname \$dlpath`~ |
| 7001 | + test -d \$dldir || mkdir -p \$dldir~ |
| 7002 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 7003 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 7004 | + dlpath=$dir/\$dldll~ |
| 7005 | + $RM \$dlpath' |
| 7006 | + shlibpath_overrides_runpath=yes |
| 7007 | + dynamic_linker='Win32 link.exe' |
| 7008 | ;; |
| 7009 | |
| 7010 | *) |
| 7011 | + # Assume MSVC wrapper |
| 7012 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 7013 | + dynamic_linker='Win32 ld.exe' |
| 7014 | ;; |
| 7015 | esac |
| 7016 | - dynamic_linker='Win32 ld.exe' |
| 7017 | # FIXME: first we should search . and the directory the executable is in |
| 7018 | shlibpath_var=PATH |
| 7019 | ;; |
| 7020 | @@ -10111,7 +10761,7 @@ haiku*) |
| 7021 | soname_spec='${libname}${release}${shared_ext}$major' |
| 7022 | shlibpath_var=LIBRARY_PATH |
| 7023 | shlibpath_overrides_runpath=yes |
| 7024 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' |
| 7025 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
| 7026 | hardcode_into_libs=yes |
| 7027 | ;; |
| 7028 | |
| 7029 | @@ -10951,10 +11601,10 @@ else |
| 7030 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 7031 | correspondingly for the symbols needed. */ |
| 7032 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 7033 | -void fnord () __attribute__((visibility("default"))); |
| 7034 | +int fnord () __attribute__((visibility("default"))); |
| 7035 | #endif |
| 7036 | |
| 7037 | -void fnord () { int i=42; } |
| 7038 | +int fnord () { return 42; } |
| 7039 | int main () |
| 7040 | { |
| 7041 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 7042 | @@ -11057,10 +11707,10 @@ else |
| 7043 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 7044 | correspondingly for the symbols needed. */ |
| 7045 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 7046 | -void fnord () __attribute__((visibility("default"))); |
| 7047 | +int fnord () __attribute__((visibility("default"))); |
| 7048 | #endif |
| 7049 | |
| 7050 | -void fnord () { int i=42; } |
| 7051 | +int fnord () { return 42; } |
| 7052 | int main () |
| 7053 | { |
| 7054 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 7055 | @@ -13005,13 +13655,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
| 7056 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 7057 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 7058 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 7059 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 7060 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 7061 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 7062 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 7063 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 7064 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 7065 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 7066 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 7067 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 7068 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 7069 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 7070 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 7071 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 7072 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 7073 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 7074 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 7075 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
| 7076 | @@ -13026,14 +13683,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
| 7077 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 7078 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 7079 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 7080 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 7081 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 7082 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 7083 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 7084 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 7085 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 7086 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 7087 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 7088 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 7089 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 7090 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 7091 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 7092 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 7093 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 7094 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
| 7095 | @@ -13066,12 +13726,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
| 7096 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 7097 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 7098 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 7099 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 7100 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 7101 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 7102 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 7103 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 7104 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 7105 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 7106 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 7107 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 7108 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 7109 | @@ -13126,8 +13786,13 @@ reload_flag \ |
| 7110 | OBJDUMP \ |
| 7111 | deplibs_check_method \ |
| 7112 | file_magic_cmd \ |
| 7113 | +file_magic_glob \ |
| 7114 | +want_nocaseglob \ |
| 7115 | +DLLTOOL \ |
| 7116 | +sharedlib_from_linklib_cmd \ |
| 7117 | AR \ |
| 7118 | AR_FLAGS \ |
| 7119 | +archiver_list_spec \ |
| 7120 | STRIP \ |
| 7121 | RANLIB \ |
| 7122 | CC \ |
| 7123 | @@ -13137,12 +13802,14 @@ lt_cv_sys_global_symbol_pipe \ |
| 7124 | lt_cv_sys_global_symbol_to_cdecl \ |
| 7125 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 7126 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 7127 | +nm_file_list_spec \ |
| 7128 | lt_prog_compiler_no_builtin_flag \ |
| 7129 | -lt_prog_compiler_wl \ |
| 7130 | lt_prog_compiler_pic \ |
| 7131 | +lt_prog_compiler_wl \ |
| 7132 | lt_prog_compiler_static \ |
| 7133 | lt_cv_prog_compiler_c_o \ |
| 7134 | need_locks \ |
| 7135 | +MANIFEST_TOOL \ |
| 7136 | DSYMUTIL \ |
| 7137 | NMEDIT \ |
| 7138 | LIPO \ |
| 7139 | @@ -13158,7 +13825,6 @@ no_undefined_flag \ |
| 7140 | hardcode_libdir_flag_spec \ |
| 7141 | hardcode_libdir_flag_spec_ld \ |
| 7142 | hardcode_libdir_separator \ |
| 7143 | -fix_srcfile_path \ |
| 7144 | exclude_expsyms \ |
| 7145 | include_expsyms \ |
| 7146 | file_list_spec \ |
| 7147 | @@ -13194,6 +13860,7 @@ module_cmds \ |
| 7148 | module_expsym_cmds \ |
| 7149 | export_symbols_cmds \ |
| 7150 | prelink_cmds \ |
| 7151 | +postlink_cmds \ |
| 7152 | postinstall_cmds \ |
| 7153 | postuninstall_cmds \ |
| 7154 | finish_cmds \ |
| 7155 | @@ -13950,7 +14617,8 @@ $as_echo X"$file" | |
| 7156 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 7157 | # |
| 7158 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 7159 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 7160 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 7161 | +# Inc. |
| 7162 | # Written by Gordon Matzigkeit, 1996 |
| 7163 | # |
| 7164 | # This file is part of GNU Libtool. |
| 7165 | @@ -14053,19 +14721,42 @@ SP2NL=$lt_lt_SP2NL |
| 7166 | # turn newlines into spaces. |
| 7167 | NL2SP=$lt_lt_NL2SP |
| 7168 | |
| 7169 | +# convert \$build file names to \$host format. |
| 7170 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 7171 | + |
| 7172 | +# convert \$build files to toolchain format. |
| 7173 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 7174 | + |
| 7175 | # An object symbol dumper. |
| 7176 | OBJDUMP=$lt_OBJDUMP |
| 7177 | |
| 7178 | # Method to check whether dependent libraries are shared objects. |
| 7179 | deplibs_check_method=$lt_deplibs_check_method |
| 7180 | |
| 7181 | -# Command to use when deplibs_check_method == "file_magic". |
| 7182 | +# Command to use when deplibs_check_method = "file_magic". |
| 7183 | file_magic_cmd=$lt_file_magic_cmd |
| 7184 | |
| 7185 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 7186 | +file_magic_glob=$lt_file_magic_glob |
| 7187 | + |
| 7188 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 7189 | +want_nocaseglob=$lt_want_nocaseglob |
| 7190 | + |
| 7191 | +# DLL creation program. |
| 7192 | +DLLTOOL=$lt_DLLTOOL |
| 7193 | + |
| 7194 | +# Command to associate shared and link libraries. |
| 7195 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 7196 | + |
| 7197 | # The archiver. |
| 7198 | AR=$lt_AR |
| 7199 | + |
| 7200 | +# Flags to create an archive. |
| 7201 | AR_FLAGS=$lt_AR_FLAGS |
| 7202 | |
| 7203 | +# How to feed a file listing to the archiver. |
| 7204 | +archiver_list_spec=$lt_archiver_list_spec |
| 7205 | + |
| 7206 | # A symbol stripping program. |
| 7207 | STRIP=$lt_STRIP |
| 7208 | |
| 7209 | @@ -14095,6 +14786,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
| 7210 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 7211 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 7212 | |
| 7213 | +# Specify filename containing input files for \$NM. |
| 7214 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 7215 | + |
| 7216 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 7217 | +lt_sysroot=$lt_sysroot |
| 7218 | + |
| 7219 | # The name of the directory that contains temporary libtool files. |
| 7220 | objdir=$objdir |
| 7221 | |
| 7222 | @@ -14104,6 +14801,9 @@ MAGIC_CMD=$MAGIC_CMD |
| 7223 | # Must we lock files when doing compilation? |
| 7224 | need_locks=$lt_need_locks |
| 7225 | |
| 7226 | +# Manifest tool. |
| 7227 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 7228 | + |
| 7229 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 7230 | DSYMUTIL=$lt_DSYMUTIL |
| 7231 | |
| 7232 | @@ -14218,12 +14918,12 @@ with_gcc=$GCC |
| 7233 | # Compiler flag to turn off builtin functions. |
| 7234 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 7235 | |
| 7236 | -# How to pass a linker flag through the compiler. |
| 7237 | -wl=$lt_lt_prog_compiler_wl |
| 7238 | - |
| 7239 | # Additional compiler flags for building library objects. |
| 7240 | pic_flag=$lt_lt_prog_compiler_pic |
| 7241 | |
| 7242 | +# How to pass a linker flag through the compiler. |
| 7243 | +wl=$lt_lt_prog_compiler_wl |
| 7244 | + |
| 7245 | # Compiler flag to prevent dynamic linking. |
| 7246 | link_static_flag=$lt_lt_prog_compiler_static |
| 7247 | |
| 7248 | @@ -14310,9 +15010,6 @@ inherit_rpath=$inherit_rpath |
| 7249 | # Whether libtool must link a program against all its dependency libraries. |
| 7250 | link_all_deplibs=$link_all_deplibs |
| 7251 | |
| 7252 | -# Fix the shell variable \$srcfile for the compiler. |
| 7253 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 7254 | - |
| 7255 | # Set to "yes" if exported symbols are required. |
| 7256 | always_export_symbols=$always_export_symbols |
| 7257 | |
| 7258 | @@ -14328,6 +15025,9 @@ include_expsyms=$lt_include_expsyms |
| 7259 | # Commands necessary for linking programs (against libraries) with templates. |
| 7260 | prelink_cmds=$lt_prelink_cmds |
| 7261 | |
| 7262 | +# Commands necessary for finishing linking programs. |
| 7263 | +postlink_cmds=$lt_postlink_cmds |
| 7264 | + |
| 7265 | # Specify filename containing input files. |
| 7266 | file_list_spec=$lt_file_list_spec |
| 7267 | |
| 7268 | @@ -14360,210 +15060,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
| 7269 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 7270 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 7271 | # is reportedly fixed, but why not run on old versions too? |
| 7272 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 7273 | - || (rm -f "$cfgfile"; exit 1) |
| 7274 | - |
| 7275 | - case $xsi_shell in |
| 7276 | - yes) |
| 7277 | - cat << \_LT_EOF >> "$cfgfile" |
| 7278 | - |
| 7279 | -# func_dirname file append nondir_replacement |
| 7280 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 7281 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 7282 | -func_dirname () |
| 7283 | -{ |
| 7284 | - case ${1} in |
| 7285 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 7286 | - * ) func_dirname_result="${3}" ;; |
| 7287 | - esac |
| 7288 | -} |
| 7289 | - |
| 7290 | -# func_basename file |
| 7291 | -func_basename () |
| 7292 | -{ |
| 7293 | - func_basename_result="${1##*/}" |
| 7294 | -} |
| 7295 | - |
| 7296 | -# func_dirname_and_basename file append nondir_replacement |
| 7297 | -# perform func_basename and func_dirname in a single function |
| 7298 | -# call: |
| 7299 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 7300 | -# add APPEND to the result, otherwise set result |
| 7301 | -# to NONDIR_REPLACEMENT. |
| 7302 | -# value returned in "$func_dirname_result" |
| 7303 | -# basename: Compute filename of FILE. |
| 7304 | -# value retuned in "$func_basename_result" |
| 7305 | -# Implementation must be kept synchronized with func_dirname |
| 7306 | -# and func_basename. For efficiency, we do not delegate to |
| 7307 | -# those functions but instead duplicate the functionality here. |
| 7308 | -func_dirname_and_basename () |
| 7309 | -{ |
| 7310 | - case ${1} in |
| 7311 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 7312 | - * ) func_dirname_result="${3}" ;; |
| 7313 | - esac |
| 7314 | - func_basename_result="${1##*/}" |
| 7315 | -} |
| 7316 | - |
| 7317 | -# func_stripname prefix suffix name |
| 7318 | -# strip PREFIX and SUFFIX off of NAME. |
| 7319 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 7320 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 7321 | -# dot (in which case that matches only a dot). |
| 7322 | -func_stripname () |
| 7323 | -{ |
| 7324 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 7325 | - # positional parameters, so assign one to ordinary parameter first. |
| 7326 | - func_stripname_result=${3} |
| 7327 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 7328 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 7329 | -} |
| 7330 | - |
| 7331 | -# func_opt_split |
| 7332 | -func_opt_split () |
| 7333 | -{ |
| 7334 | - func_opt_split_opt=${1%%=*} |
| 7335 | - func_opt_split_arg=${1#*=} |
| 7336 | -} |
| 7337 | - |
| 7338 | -# func_lo2o object |
| 7339 | -func_lo2o () |
| 7340 | -{ |
| 7341 | - case ${1} in |
| 7342 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 7343 | - *) func_lo2o_result=${1} ;; |
| 7344 | - esac |
| 7345 | -} |
| 7346 | - |
| 7347 | -# func_xform libobj-or-source |
| 7348 | -func_xform () |
| 7349 | -{ |
| 7350 | - func_xform_result=${1%.*}.lo |
| 7351 | -} |
| 7352 | - |
| 7353 | -# func_arith arithmetic-term... |
| 7354 | -func_arith () |
| 7355 | -{ |
| 7356 | - func_arith_result=$(( $* )) |
| 7357 | -} |
| 7358 | - |
| 7359 | -# func_len string |
| 7360 | -# STRING may not start with a hyphen. |
| 7361 | -func_len () |
| 7362 | -{ |
| 7363 | - func_len_result=${#1} |
| 7364 | -} |
| 7365 | - |
| 7366 | -_LT_EOF |
| 7367 | - ;; |
| 7368 | - *) # Bourne compatible functions. |
| 7369 | - cat << \_LT_EOF >> "$cfgfile" |
| 7370 | - |
| 7371 | -# func_dirname file append nondir_replacement |
| 7372 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 7373 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 7374 | -func_dirname () |
| 7375 | -{ |
| 7376 | - # Extract subdirectory from the argument. |
| 7377 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 7378 | - if test "X$func_dirname_result" = "X${1}"; then |
| 7379 | - func_dirname_result="${3}" |
| 7380 | - else |
| 7381 | - func_dirname_result="$func_dirname_result${2}" |
| 7382 | - fi |
| 7383 | -} |
| 7384 | - |
| 7385 | -# func_basename file |
| 7386 | -func_basename () |
| 7387 | -{ |
| 7388 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 7389 | -} |
| 7390 | - |
| 7391 | - |
| 7392 | -# func_stripname prefix suffix name |
| 7393 | -# strip PREFIX and SUFFIX off of NAME. |
| 7394 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 7395 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 7396 | -# dot (in which case that matches only a dot). |
| 7397 | -# func_strip_suffix prefix name |
| 7398 | -func_stripname () |
| 7399 | -{ |
| 7400 | - case ${2} in |
| 7401 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 7402 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 7403 | - esac |
| 7404 | -} |
| 7405 | - |
| 7406 | -# sed scripts: |
| 7407 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 7408 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 7409 | - |
| 7410 | -# func_opt_split |
| 7411 | -func_opt_split () |
| 7412 | -{ |
| 7413 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 7414 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 7415 | -} |
| 7416 | - |
| 7417 | -# func_lo2o object |
| 7418 | -func_lo2o () |
| 7419 | -{ |
| 7420 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 7421 | -} |
| 7422 | - |
| 7423 | -# func_xform libobj-or-source |
| 7424 | -func_xform () |
| 7425 | -{ |
| 7426 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 7427 | -} |
| 7428 | - |
| 7429 | -# func_arith arithmetic-term... |
| 7430 | -func_arith () |
| 7431 | -{ |
| 7432 | - func_arith_result=`expr "$@"` |
| 7433 | -} |
| 7434 | - |
| 7435 | -# func_len string |
| 7436 | -# STRING may not start with a hyphen. |
| 7437 | -func_len () |
| 7438 | -{ |
| 7439 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 7440 | -} |
| 7441 | - |
| 7442 | -_LT_EOF |
| 7443 | -esac |
| 7444 | - |
| 7445 | -case $lt_shell_append in |
| 7446 | - yes) |
| 7447 | - cat << \_LT_EOF >> "$cfgfile" |
| 7448 | - |
| 7449 | -# func_append var value |
| 7450 | -# Append VALUE to the end of shell variable VAR. |
| 7451 | -func_append () |
| 7452 | -{ |
| 7453 | - eval "$1+=\$2" |
| 7454 | -} |
| 7455 | -_LT_EOF |
| 7456 | - ;; |
| 7457 | - *) |
| 7458 | - cat << \_LT_EOF >> "$cfgfile" |
| 7459 | - |
| 7460 | -# func_append var value |
| 7461 | -# Append VALUE to the end of shell variable VAR. |
| 7462 | -func_append () |
| 7463 | -{ |
| 7464 | - eval "$1=\$$1\$2" |
| 7465 | -} |
| 7466 | - |
| 7467 | -_LT_EOF |
| 7468 | - ;; |
| 7469 | - esac |
| 7470 | - |
| 7471 | - |
| 7472 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 7473 | - || (rm -f "$cfgfile"; exit 1) |
| 7474 | - |
| 7475 | - mv -f "$cfgfile" "$ofile" || |
| 7476 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 7477 | + || (rm -f "$cfgfile"; exit 1) |
| 7478 | + |
| 7479 | + if test x"$xsi_shell" = xyes; then |
| 7480 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 7481 | +func_dirname ()\ |
| 7482 | +{\ |
| 7483 | +\ case ${1} in\ |
| 7484 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 7485 | +\ * ) func_dirname_result="${3}" ;;\ |
| 7486 | +\ esac\ |
| 7487 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7488 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7489 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7490 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7491 | + |
| 7492 | + |
| 7493 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 7494 | +func_basename ()\ |
| 7495 | +{\ |
| 7496 | +\ func_basename_result="${1##*/}"\ |
| 7497 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7498 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7499 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7500 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7501 | + |
| 7502 | + |
| 7503 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 7504 | +func_dirname_and_basename ()\ |
| 7505 | +{\ |
| 7506 | +\ case ${1} in\ |
| 7507 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 7508 | +\ * ) func_dirname_result="${3}" ;;\ |
| 7509 | +\ esac\ |
| 7510 | +\ func_basename_result="${1##*/}"\ |
| 7511 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7512 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7513 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7514 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7515 | + |
| 7516 | + |
| 7517 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 7518 | +func_stripname ()\ |
| 7519 | +{\ |
| 7520 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 7521 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 7522 | +\ func_stripname_result=${3}\ |
| 7523 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 7524 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 7525 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7526 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7527 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7528 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7529 | + |
| 7530 | + |
| 7531 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 7532 | +func_split_long_opt ()\ |
| 7533 | +{\ |
| 7534 | +\ func_split_long_opt_name=${1%%=*}\ |
| 7535 | +\ func_split_long_opt_arg=${1#*=}\ |
| 7536 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7537 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7538 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7539 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7540 | + |
| 7541 | + |
| 7542 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 7543 | +func_split_short_opt ()\ |
| 7544 | +{\ |
| 7545 | +\ func_split_short_opt_arg=${1#??}\ |
| 7546 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 7547 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7548 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7549 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7550 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7551 | + |
| 7552 | + |
| 7553 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 7554 | +func_lo2o ()\ |
| 7555 | +{\ |
| 7556 | +\ case ${1} in\ |
| 7557 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 7558 | +\ *) func_lo2o_result=${1} ;;\ |
| 7559 | +\ esac\ |
| 7560 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7561 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7562 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7563 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7564 | + |
| 7565 | + |
| 7566 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 7567 | +func_xform ()\ |
| 7568 | +{\ |
| 7569 | + func_xform_result=${1%.*}.lo\ |
| 7570 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7571 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7572 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7573 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7574 | + |
| 7575 | + |
| 7576 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 7577 | +func_arith ()\ |
| 7578 | +{\ |
| 7579 | + func_arith_result=$(( $* ))\ |
| 7580 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7581 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7582 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7583 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7584 | + |
| 7585 | + |
| 7586 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 7587 | +func_len ()\ |
| 7588 | +{\ |
| 7589 | + func_len_result=${#1}\ |
| 7590 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7591 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7592 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7593 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7594 | + |
| 7595 | +fi |
| 7596 | + |
| 7597 | +if test x"$lt_shell_append" = xyes; then |
| 7598 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 7599 | +func_append ()\ |
| 7600 | +{\ |
| 7601 | + eval "${1}+=\\${2}"\ |
| 7602 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7603 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7604 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7605 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7606 | + |
| 7607 | + |
| 7608 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 7609 | +func_append_quoted ()\ |
| 7610 | +{\ |
| 7611 | +\ func_quote_for_eval "${2}"\ |
| 7612 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 7613 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7614 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7615 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7616 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7617 | + |
| 7618 | + |
| 7619 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 7620 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 7621 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7622 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7623 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 7624 | +else |
| 7625 | + # Save a `func_append' function call even when '+=' is not available |
| 7626 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 7627 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7628 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7629 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 7630 | +fi |
| 7631 | + |
| 7632 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 7633 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 7634 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 7635 | +fi |
| 7636 | + |
| 7637 | + |
| 7638 | + mv -f "$cfgfile" "$ofile" || |
| 7639 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 7640 | chmod +x "$ofile" |
| 7641 | |
| 7642 | diff --git a/ld/configure b/ld/configure |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 7643 | index 0cc6e8a50f..db8b998722 100755 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 7644 | --- a/ld/configure |
| 7645 | +++ b/ld/configure |
| 7646 | @@ -655,8 +655,11 @@ OTOOL |
| 7647 | LIPO |
| 7648 | NMEDIT |
| 7649 | DSYMUTIL |
| 7650 | +MANIFEST_TOOL |
| 7651 | RANLIB |
| 7652 | +ac_ct_AR |
| 7653 | AR |
| 7654 | +DLLTOOL |
| 7655 | OBJDUMP |
| 7656 | LN_S |
| 7657 | NM |
| 7658 | @@ -778,6 +781,7 @@ enable_static |
| 7659 | with_pic |
| 7660 | enable_fast_install |
| 7661 | with_gnu_ld |
| 7662 | +with_libtool_sysroot |
| 7663 | enable_libtool_lock |
| 7664 | enable_plugins |
| 7665 | enable_largefile |
| 7666 | @@ -1464,6 +1468,8 @@ Optional Packages: |
| 7667 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 7668 | both] |
| 7669 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 7670 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 7671 | + (or the compiler's sysroot if not specified). |
| 7672 | --with-lib-path=dir1:dir2... set default LIB_PATH |
| 7673 | --with-sysroot=DIR Search for usr/lib et al within DIR. |
| 7674 | |
| 7675 | @@ -5658,8 +5664,8 @@ esac |
| 7676 | |
| 7677 | |
| 7678 | |
| 7679 | -macro_version='2.2.7a' |
| 7680 | -macro_revision='1.3134' |
| 7681 | +macro_version='2.4' |
| 7682 | +macro_revision='1.3293' |
| 7683 | |
| 7684 | |
| 7685 | |
| 7686 | @@ -5699,7 +5705,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 7687 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 7688 | $as_echo_n "checking how to print strings... " >&6; } |
| 7689 | # Test print first, because it will be a builtin if present. |
| 7690 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 7691 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 7692 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 7693 | ECHO='print -r --' |
| 7694 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 7695 | @@ -6385,8 +6391,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 7696 | # Try some XSI features |
| 7697 | xsi_shell=no |
| 7698 | ( _lt_dummy="a/b/c" |
| 7699 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 7700 | - = c,a/b,, \ |
| 7701 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 7702 | + = c,a/b,b/c, \ |
| 7703 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 7704 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 7705 | && xsi_shell=yes |
| 7706 | @@ -6435,6 +6441,80 @@ esac |
| 7707 | |
| 7708 | |
| 7709 | |
| 7710 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 7711 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 7712 | +if test "${lt_cv_to_host_file_cmd+set}" = set; then : |
| 7713 | + $as_echo_n "(cached) " >&6 |
| 7714 | +else |
| 7715 | + case $host in |
| 7716 | + *-*-mingw* ) |
| 7717 | + case $build in |
| 7718 | + *-*-mingw* ) # actually msys |
| 7719 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 7720 | + ;; |
| 7721 | + *-*-cygwin* ) |
| 7722 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 7723 | + ;; |
| 7724 | + * ) # otherwise, assume *nix |
| 7725 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 7726 | + ;; |
| 7727 | + esac |
| 7728 | + ;; |
| 7729 | + *-*-cygwin* ) |
| 7730 | + case $build in |
| 7731 | + *-*-mingw* ) # actually msys |
| 7732 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 7733 | + ;; |
| 7734 | + *-*-cygwin* ) |
| 7735 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 7736 | + ;; |
| 7737 | + * ) # otherwise, assume *nix |
| 7738 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 7739 | + ;; |
| 7740 | + esac |
| 7741 | + ;; |
| 7742 | + * ) # unhandled hosts (and "normal" native builds) |
| 7743 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 7744 | + ;; |
| 7745 | +esac |
| 7746 | + |
| 7747 | +fi |
| 7748 | + |
| 7749 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 7750 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 7751 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 7752 | + |
| 7753 | + |
| 7754 | + |
| 7755 | + |
| 7756 | + |
| 7757 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 7758 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 7759 | +if test "${lt_cv_to_tool_file_cmd+set}" = set; then : |
| 7760 | + $as_echo_n "(cached) " >&6 |
| 7761 | +else |
| 7762 | + #assume ordinary cross tools, or native build. |
| 7763 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 7764 | +case $host in |
| 7765 | + *-*-mingw* ) |
| 7766 | + case $build in |
| 7767 | + *-*-mingw* ) # actually msys |
| 7768 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 7769 | + ;; |
| 7770 | + esac |
| 7771 | + ;; |
| 7772 | +esac |
| 7773 | + |
| 7774 | +fi |
| 7775 | + |
| 7776 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 7777 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 7778 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 7779 | + |
| 7780 | + |
| 7781 | + |
| 7782 | + |
| 7783 | + |
| 7784 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 7785 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 7786 | if test "${lt_cv_ld_reload_flag+set}" = set; then : |
| 7787 | @@ -6451,6 +6531,11 @@ case $reload_flag in |
| 7788 | esac |
| 7789 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 7790 | case $host_os in |
| 7791 | + cygwin* | mingw* | pw32* | cegcc*) |
| 7792 | + if test "$GCC" != yes; then |
| 7793 | + reload_cmds=false |
| 7794 | + fi |
| 7795 | + ;; |
| 7796 | darwin*) |
| 7797 | if test "$GCC" = yes; then |
| 7798 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 7799 | @@ -6619,7 +6704,8 @@ mingw* | pw32*) |
| 7800 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 7801 | lt_cv_file_magic_cmd='func_win32_libid' |
| 7802 | else |
| 7803 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 7804 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 7805 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 7806 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 7807 | fi |
| 7808 | ;; |
| 7809 | @@ -6773,6 +6859,21 @@ esac |
| 7810 | fi |
| 7811 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 7812 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 7813 | + |
| 7814 | +file_magic_glob= |
| 7815 | +want_nocaseglob=no |
| 7816 | +if test "$build" = "$host"; then |
| 7817 | + case $host_os in |
| 7818 | + mingw* | pw32*) |
| 7819 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 7820 | + want_nocaseglob=yes |
| 7821 | + else |
| 7822 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 7823 | + fi |
| 7824 | + ;; |
| 7825 | + esac |
| 7826 | +fi |
| 7827 | + |
| 7828 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 7829 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 7830 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 7831 | @@ -6788,9 +6889,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 7832 | |
| 7833 | |
| 7834 | |
| 7835 | + |
| 7836 | + |
| 7837 | + |
| 7838 | + |
| 7839 | + |
| 7840 | + |
| 7841 | + |
| 7842 | + |
| 7843 | + |
| 7844 | + |
| 7845 | +if test -n "$ac_tool_prefix"; then |
| 7846 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 7847 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 7848 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 7849 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 7850 | +if test "${ac_cv_prog_DLLTOOL+set}" = set; then : |
| 7851 | + $as_echo_n "(cached) " >&6 |
| 7852 | +else |
| 7853 | + if test -n "$DLLTOOL"; then |
| 7854 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 7855 | +else |
| 7856 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 7857 | +for as_dir in $PATH |
| 7858 | +do |
| 7859 | + IFS=$as_save_IFS |
| 7860 | + test -z "$as_dir" && as_dir=. |
| 7861 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 7862 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 7863 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 7864 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 7865 | + break 2 |
| 7866 | + fi |
| 7867 | +done |
| 7868 | + done |
| 7869 | +IFS=$as_save_IFS |
| 7870 | + |
| 7871 | +fi |
| 7872 | +fi |
| 7873 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 7874 | +if test -n "$DLLTOOL"; then |
| 7875 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 7876 | +$as_echo "$DLLTOOL" >&6; } |
| 7877 | +else |
| 7878 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 7879 | +$as_echo "no" >&6; } |
| 7880 | +fi |
| 7881 | + |
| 7882 | + |
| 7883 | +fi |
| 7884 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 7885 | + ac_ct_DLLTOOL=$DLLTOOL |
| 7886 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 7887 | +set dummy dlltool; ac_word=$2 |
| 7888 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 7889 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 7890 | +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : |
| 7891 | + $as_echo_n "(cached) " >&6 |
| 7892 | +else |
| 7893 | + if test -n "$ac_ct_DLLTOOL"; then |
| 7894 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 7895 | +else |
| 7896 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 7897 | +for as_dir in $PATH |
| 7898 | +do |
| 7899 | + IFS=$as_save_IFS |
| 7900 | + test -z "$as_dir" && as_dir=. |
| 7901 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 7902 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 7903 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 7904 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 7905 | + break 2 |
| 7906 | + fi |
| 7907 | +done |
| 7908 | + done |
| 7909 | +IFS=$as_save_IFS |
| 7910 | + |
| 7911 | +fi |
| 7912 | +fi |
| 7913 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 7914 | +if test -n "$ac_ct_DLLTOOL"; then |
| 7915 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 7916 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 7917 | +else |
| 7918 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 7919 | +$as_echo "no" >&6; } |
| 7920 | +fi |
| 7921 | + |
| 7922 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 7923 | + DLLTOOL="false" |
| 7924 | + else |
| 7925 | + case $cross_compiling:$ac_tool_warned in |
| 7926 | +yes:) |
| 7927 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 7928 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 7929 | +ac_tool_warned=yes ;; |
| 7930 | +esac |
| 7931 | + DLLTOOL=$ac_ct_DLLTOOL |
| 7932 | + fi |
| 7933 | +else |
| 7934 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 7935 | +fi |
| 7936 | + |
| 7937 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 7938 | + |
| 7939 | + |
| 7940 | + |
| 7941 | + |
| 7942 | + |
| 7943 | + |
| 7944 | + |
| 7945 | + |
| 7946 | + |
| 7947 | + |
| 7948 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 7949 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 7950 | +if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : |
| 7951 | + $as_echo_n "(cached) " >&6 |
| 7952 | +else |
| 7953 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 7954 | + |
| 7955 | +case $host_os in |
| 7956 | +cygwin* | mingw* | pw32* | cegcc*) |
| 7957 | + # two different shell functions defined in ltmain.sh |
| 7958 | + # decide which to use based on capabilities of $DLLTOOL |
| 7959 | + case `$DLLTOOL --help 2>&1` in |
| 7960 | + *--identify-strict*) |
| 7961 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 7962 | + ;; |
| 7963 | + *) |
| 7964 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 7965 | + ;; |
| 7966 | + esac |
| 7967 | + ;; |
| 7968 | +*) |
| 7969 | + # fallback: assume linklib IS sharedlib |
| 7970 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 7971 | + ;; |
| 7972 | +esac |
| 7973 | + |
| 7974 | +fi |
| 7975 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 7976 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 7977 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 7978 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 7979 | + |
| 7980 | + |
| 7981 | + |
| 7982 | + |
| 7983 | + |
| 7984 | + |
| 7985 | + |
| 7986 | if test -n "$ac_tool_prefix"; then |
| 7987 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 7988 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 7989 | + for ac_prog in ar |
| 7990 | + do |
| 7991 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 7992 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 7993 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 7994 | $as_echo_n "checking for $ac_word... " >&6; } |
| 7995 | if test "${ac_cv_prog_AR+set}" = set; then : |
| 7996 | @@ -6806,7 +7060,7 @@ do |
| 7997 | test -z "$as_dir" && as_dir=. |
| 7998 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 7999 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 8000 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 8001 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 8002 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 8003 | break 2 |
| 8004 | fi |
| 8005 | @@ -6826,11 +7080,15 @@ $as_echo "no" >&6; } |
| 8006 | fi |
| 8007 | |
| 8008 | |
| 8009 | + test -n "$AR" && break |
| 8010 | + done |
| 8011 | fi |
| 8012 | -if test -z "$ac_cv_prog_AR"; then |
| 8013 | +if test -z "$AR"; then |
| 8014 | ac_ct_AR=$AR |
| 8015 | - # Extract the first word of "ar", so it can be a program name with args. |
| 8016 | -set dummy ar; ac_word=$2 |
| 8017 | + for ac_prog in ar |
| 8018 | +do |
| 8019 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 8020 | +set dummy $ac_prog; ac_word=$2 |
| 8021 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 8022 | $as_echo_n "checking for $ac_word... " >&6; } |
| 8023 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
| 8024 | @@ -6846,7 +7104,7 @@ do |
| 8025 | test -z "$as_dir" && as_dir=. |
| 8026 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 8027 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 8028 | - ac_cv_prog_ac_ct_AR="ar" |
| 8029 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 8030 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 8031 | break 2 |
| 8032 | fi |
| 8033 | @@ -6865,6 +7123,10 @@ else |
| 8034 | $as_echo "no" >&6; } |
| 8035 | fi |
| 8036 | |
| 8037 | + |
| 8038 | + test -n "$ac_ct_AR" && break |
| 8039 | +done |
| 8040 | + |
| 8041 | if test "x$ac_ct_AR" = x; then |
| 8042 | AR="false" |
| 8043 | else |
| 8044 | @@ -6876,12 +7138,12 @@ ac_tool_warned=yes ;; |
| 8045 | esac |
| 8046 | AR=$ac_ct_AR |
| 8047 | fi |
| 8048 | -else |
| 8049 | - AR="$ac_cv_prog_AR" |
| 8050 | fi |
| 8051 | |
| 8052 | -test -z "$AR" && AR=ar |
| 8053 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 8054 | +: ${AR=ar} |
| 8055 | +: ${AR_FLAGS=cru} |
| 8056 | + |
| 8057 | + |
| 8058 | |
| 8059 | |
| 8060 | |
| 8061 | @@ -6891,6 +7153,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 8062 | |
| 8063 | |
| 8064 | |
| 8065 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 8066 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 8067 | +if test "${lt_cv_ar_at_file+set}" = set; then : |
| 8068 | + $as_echo_n "(cached) " >&6 |
| 8069 | +else |
| 8070 | + lt_cv_ar_at_file=no |
| 8071 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 8072 | +/* end confdefs.h. */ |
| 8073 | + |
| 8074 | +int |
| 8075 | +main () |
| 8076 | +{ |
| 8077 | + |
| 8078 | + ; |
| 8079 | + return 0; |
| 8080 | +} |
| 8081 | +_ACEOF |
| 8082 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 8083 | + echo conftest.$ac_objext > conftest.lst |
| 8084 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 8085 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 8086 | + (eval $lt_ar_try) 2>&5 |
| 8087 | + ac_status=$? |
| 8088 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 8089 | + test $ac_status = 0; } |
| 8090 | + if test "$ac_status" -eq 0; then |
| 8091 | + # Ensure the archiver fails upon bogus file names. |
| 8092 | + rm -f conftest.$ac_objext libconftest.a |
| 8093 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 8094 | + (eval $lt_ar_try) 2>&5 |
| 8095 | + ac_status=$? |
| 8096 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 8097 | + test $ac_status = 0; } |
| 8098 | + if test "$ac_status" -ne 0; then |
| 8099 | + lt_cv_ar_at_file=@ |
| 8100 | + fi |
| 8101 | + fi |
| 8102 | + rm -f conftest.* libconftest.a |
| 8103 | + |
| 8104 | +fi |
| 8105 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 8106 | + |
| 8107 | +fi |
| 8108 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 8109 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 8110 | + |
| 8111 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 8112 | + archiver_list_spec= |
| 8113 | +else |
| 8114 | + archiver_list_spec=$lt_cv_ar_at_file |
| 8115 | +fi |
| 8116 | + |
| 8117 | + |
| 8118 | + |
| 8119 | + |
| 8120 | + |
| 8121 | |
| 8122 | |
| 8123 | if test -n "$ac_tool_prefix"; then |
| 8124 | @@ -7227,8 +7545,8 @@ esac |
| 8125 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 8126 | |
| 8127 | # Transform an extracted symbol line into symbol name and symbol address |
| 8128 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 8129 | -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
| 8130 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 8131 | +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
| 8132 | |
| 8133 | # Handle CRLF in mingw tool chain |
| 8134 | opt_cr= |
| 8135 | @@ -7264,6 +7582,7 @@ for ac_symprfx in "" "_"; do |
| 8136 | else |
| 8137 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 8138 | fi |
| 8139 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 8140 | |
| 8141 | # Check to see that the pipe works correctly. |
| 8142 | pipe_works=no |
| 8143 | @@ -7305,6 +7624,18 @@ _LT_EOF |
| 8144 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 8145 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 8146 | cat <<_LT_EOF > conftest.$ac_ext |
| 8147 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 8148 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 8149 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 8150 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 8151 | +# define LT_DLSYM_CONST |
| 8152 | +#elif defined(__osf__) |
| 8153 | +/* This system does not cope well with relocations in const data. */ |
| 8154 | +# define LT_DLSYM_CONST |
| 8155 | +#else |
| 8156 | +# define LT_DLSYM_CONST const |
| 8157 | +#endif |
| 8158 | + |
| 8159 | #ifdef __cplusplus |
| 8160 | extern "C" { |
| 8161 | #endif |
| 8162 | @@ -7316,7 +7647,7 @@ _LT_EOF |
| 8163 | cat <<_LT_EOF >> conftest.$ac_ext |
| 8164 | |
| 8165 | /* The mapping between symbol names and symbols. */ |
| 8166 | -const struct { |
| 8167 | +LT_DLSYM_CONST struct { |
| 8168 | const char *name; |
| 8169 | void *address; |
| 8170 | } |
| 8171 | @@ -7342,8 +7673,8 @@ static const void *lt_preloaded_setup() { |
| 8172 | _LT_EOF |
| 8173 | # Now try linking the two files. |
| 8174 | mv conftest.$ac_objext conftstm.$ac_objext |
| 8175 | - lt_save_LIBS="$LIBS" |
| 8176 | - lt_save_CFLAGS="$CFLAGS" |
| 8177 | + lt_globsym_save_LIBS=$LIBS |
| 8178 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 8179 | LIBS="conftstm.$ac_objext" |
| 8180 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 8181 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 8182 | @@ -7353,8 +7684,8 @@ _LT_EOF |
| 8183 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 8184 | pipe_works=yes |
| 8185 | fi |
| 8186 | - LIBS="$lt_save_LIBS" |
| 8187 | - CFLAGS="$lt_save_CFLAGS" |
| 8188 | + LIBS=$lt_globsym_save_LIBS |
| 8189 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 8190 | else |
| 8191 | echo "cannot find nm_test_func in $nlist" >&5 |
| 8192 | fi |
| 8193 | @@ -7391,6 +7722,19 @@ else |
| 8194 | $as_echo "ok" >&6; } |
| 8195 | fi |
| 8196 | |
| 8197 | +# Response file support. |
| 8198 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 8199 | + nm_file_list_spec='@' |
| 8200 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 8201 | + nm_file_list_spec='@' |
| 8202 | +fi |
| 8203 | + |
| 8204 | + |
| 8205 | + |
| 8206 | + |
| 8207 | + |
| 8208 | + |
| 8209 | + |
| 8210 | |
| 8211 | |
| 8212 | |
| 8213 | @@ -7404,6 +7748,42 @@ fi |
| 8214 | |
| 8215 | |
| 8216 | |
| 8217 | + |
| 8218 | + |
| 8219 | + |
| 8220 | + |
| 8221 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 8222 | +$as_echo_n "checking for sysroot... " >&6; } |
| 8223 | + |
| 8224 | +# Check whether --with-libtool-sysroot was given. |
| 8225 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 8226 | + withval=$with_libtool_sysroot; |
| 8227 | +else |
| 8228 | + with_libtool_sysroot=no |
| 8229 | +fi |
| 8230 | + |
| 8231 | + |
| 8232 | +lt_sysroot= |
| 8233 | +case ${with_libtool_sysroot} in #( |
| 8234 | + yes) |
| 8235 | + if test "$GCC" = yes; then |
| 8236 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 8237 | + fi |
| 8238 | + ;; #( |
| 8239 | + /*) |
| 8240 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 8241 | + ;; #( |
| 8242 | + no|'') |
| 8243 | + ;; #( |
| 8244 | + *) |
| 8245 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 8246 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 8247 | + as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 |
| 8248 | + ;; |
| 8249 | +esac |
| 8250 | + |
| 8251 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 8252 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 8253 | |
| 8254 | |
| 8255 | |
| 8256 | @@ -7618,6 +7998,123 @@ esac |
| 8257 | |
| 8258 | need_locks="$enable_libtool_lock" |
| 8259 | |
| 8260 | +if test -n "$ac_tool_prefix"; then |
| 8261 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 8262 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 8263 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 8264 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 8265 | +if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : |
| 8266 | + $as_echo_n "(cached) " >&6 |
| 8267 | +else |
| 8268 | + if test -n "$MANIFEST_TOOL"; then |
| 8269 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 8270 | +else |
| 8271 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 8272 | +for as_dir in $PATH |
| 8273 | +do |
| 8274 | + IFS=$as_save_IFS |
| 8275 | + test -z "$as_dir" && as_dir=. |
| 8276 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 8277 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 8278 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 8279 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 8280 | + break 2 |
| 8281 | + fi |
| 8282 | +done |
| 8283 | + done |
| 8284 | +IFS=$as_save_IFS |
| 8285 | + |
| 8286 | +fi |
| 8287 | +fi |
| 8288 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 8289 | +if test -n "$MANIFEST_TOOL"; then |
| 8290 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 8291 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 8292 | +else |
| 8293 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 8294 | +$as_echo "no" >&6; } |
| 8295 | +fi |
| 8296 | + |
| 8297 | + |
| 8298 | +fi |
| 8299 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 8300 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 8301 | + # Extract the first word of "mt", so it can be a program name with args. |
| 8302 | +set dummy mt; ac_word=$2 |
| 8303 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 8304 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 8305 | +if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : |
| 8306 | + $as_echo_n "(cached) " >&6 |
| 8307 | +else |
| 8308 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 8309 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 8310 | +else |
| 8311 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 8312 | +for as_dir in $PATH |
| 8313 | +do |
| 8314 | + IFS=$as_save_IFS |
| 8315 | + test -z "$as_dir" && as_dir=. |
| 8316 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 8317 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 8318 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 8319 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 8320 | + break 2 |
| 8321 | + fi |
| 8322 | +done |
| 8323 | + done |
| 8324 | +IFS=$as_save_IFS |
| 8325 | + |
| 8326 | +fi |
| 8327 | +fi |
| 8328 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 8329 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 8330 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 8331 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 8332 | +else |
| 8333 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 8334 | +$as_echo "no" >&6; } |
| 8335 | +fi |
| 8336 | + |
| 8337 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 8338 | + MANIFEST_TOOL=":" |
| 8339 | + else |
| 8340 | + case $cross_compiling:$ac_tool_warned in |
| 8341 | +yes:) |
| 8342 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 8343 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 8344 | +ac_tool_warned=yes ;; |
| 8345 | +esac |
| 8346 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 8347 | + fi |
| 8348 | +else |
| 8349 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 8350 | +fi |
| 8351 | + |
| 8352 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 8353 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 8354 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 8355 | +if test "${lt_cv_path_mainfest_tool+set}" = set; then : |
| 8356 | + $as_echo_n "(cached) " >&6 |
| 8357 | +else |
| 8358 | + lt_cv_path_mainfest_tool=no |
| 8359 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 8360 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 8361 | + cat conftest.err >&5 |
| 8362 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 8363 | + lt_cv_path_mainfest_tool=yes |
| 8364 | + fi |
| 8365 | + rm -f conftest* |
| 8366 | +fi |
| 8367 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 8368 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 8369 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 8370 | + MANIFEST_TOOL=: |
| 8371 | +fi |
| 8372 | + |
| 8373 | + |
| 8374 | + |
| 8375 | + |
| 8376 | + |
| 8377 | |
| 8378 | case $host_os in |
| 8379 | rhapsody* | darwin*) |
| 8380 | @@ -8181,6 +8678,8 @@ _LT_EOF |
| 8381 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 8382 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 8383 | $AR cru libconftest.a conftest.o 2>&5 |
| 8384 | + echo "$RANLIB libconftest.a" >&5 |
| 8385 | + $RANLIB libconftest.a 2>&5 |
| 8386 | cat > conftest.c << _LT_EOF |
| 8387 | int main() { return 0;} |
| 8388 | _LT_EOF |
| 8389 | @@ -8249,6 +8748,16 @@ done |
| 8390 | |
| 8391 | |
| 8392 | |
| 8393 | +func_stripname_cnf () |
| 8394 | +{ |
| 8395 | + case ${2} in |
| 8396 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 8397 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 8398 | + esac |
| 8399 | +} # func_stripname_cnf |
| 8400 | + |
| 8401 | + |
| 8402 | + |
| 8403 | |
| 8404 | |
| 8405 | # Set options |
| 8406 | @@ -8377,7 +8886,8 @@ fi |
| 8407 | LIBTOOL_DEPS="$ltmain" |
| 8408 | |
| 8409 | # Always use our own libtool. |
| 8410 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
| 8411 | +LIBTOOL='$(SHELL) $(top_builddir)' |
| 8412 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" |
| 8413 | |
| 8414 | |
| 8415 | |
| 8416 | @@ -8466,7 +8976,7 @@ aix3*) |
| 8417 | esac |
| 8418 | |
| 8419 | # Global variables: |
| 8420 | -ofile=libtool |
| 8421 | +ofile=${host_alias}-libtool |
| 8422 | can_build_shared=yes |
| 8423 | |
| 8424 | # All known linkers require a `.a' archive for static linking (except MSVC, |
| 8425 | @@ -8764,8 +9274,6 @@ fi |
| 8426 | lt_prog_compiler_pic= |
| 8427 | lt_prog_compiler_static= |
| 8428 | |
| 8429 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 8430 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 8431 | |
| 8432 | if test "$GCC" = yes; then |
| 8433 | lt_prog_compiler_wl='-Wl,' |
| 8434 | @@ -8931,6 +9439,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 8435 | lt_prog_compiler_pic='--shared' |
| 8436 | lt_prog_compiler_static='--static' |
| 8437 | ;; |
| 8438 | + nagfor*) |
| 8439 | + # NAG Fortran compiler |
| 8440 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 8441 | + lt_prog_compiler_pic='-PIC' |
| 8442 | + lt_prog_compiler_static='-Bstatic' |
| 8443 | + ;; |
| 8444 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 8445 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 8446 | # which looks to be a dead project) |
| 8447 | @@ -8993,7 +9507,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 8448 | lt_prog_compiler_pic='-KPIC' |
| 8449 | lt_prog_compiler_static='-Bstatic' |
| 8450 | case $cc_basename in |
| 8451 | - f77* | f90* | f95*) |
| 8452 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 8453 | lt_prog_compiler_wl='-Qoption ld ';; |
| 8454 | *) |
| 8455 | lt_prog_compiler_wl='-Wl,';; |
| 8456 | @@ -9050,13 +9564,17 @@ case $host_os in |
| 8457 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 8458 | ;; |
| 8459 | esac |
| 8460 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 8461 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 8462 | - |
| 8463 | - |
| 8464 | - |
| 8465 | - |
| 8466 | |
| 8467 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 8468 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 8469 | +if test "${lt_cv_prog_compiler_pic+set}" = set; then : |
| 8470 | + $as_echo_n "(cached) " >&6 |
| 8471 | +else |
| 8472 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 8473 | +fi |
| 8474 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 8475 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 8476 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 8477 | |
| 8478 | # |
| 8479 | # Check to make sure the PIC flag actually works. |
| 8480 | @@ -9117,6 +9635,11 @@ fi |
| 8481 | |
| 8482 | |
| 8483 | |
| 8484 | + |
| 8485 | + |
| 8486 | + |
| 8487 | + |
| 8488 | + |
| 8489 | # |
| 8490 | # Check to make sure the static flag actually works. |
| 8491 | # |
| 8492 | @@ -9467,7 +9990,8 @@ _LT_EOF |
| 8493 | allow_undefined_flag=unsupported |
| 8494 | always_export_symbols=no |
| 8495 | enable_shared_with_static_runtimes=yes |
| 8496 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 8497 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' |
| 8498 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 8499 | |
| 8500 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 8501 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 8502 | @@ -9566,12 +10090,12 @@ _LT_EOF |
| 8503 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 8504 | hardcode_libdir_flag_spec= |
| 8505 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 8506 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 8507 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 8508 | if test "x$supports_anon_versioning" = xyes; then |
| 8509 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 8510 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 8511 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 8512 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 8513 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 8514 | fi |
| 8515 | ;; |
| 8516 | esac |
| 8517 | @@ -9585,8 +10109,8 @@ _LT_EOF |
| 8518 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 8519 | wlarc= |
| 8520 | else |
| 8521 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 8522 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 8523 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 8524 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 8525 | fi |
| 8526 | ;; |
| 8527 | |
| 8528 | @@ -9604,8 +10128,8 @@ _LT_EOF |
| 8529 | |
| 8530 | _LT_EOF |
| 8531 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 8532 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 8533 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 8534 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 8535 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 8536 | else |
| 8537 | ld_shlibs=no |
| 8538 | fi |
| 8539 | @@ -9651,8 +10175,8 @@ _LT_EOF |
| 8540 | |
| 8541 | *) |
| 8542 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 8543 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 8544 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 8545 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 8546 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 8547 | else |
| 8548 | ld_shlibs=no |
| 8549 | fi |
| 8550 | @@ -9782,7 +10306,13 @@ _LT_EOF |
| 8551 | allow_undefined_flag='-berok' |
| 8552 | # Determine the default libpath from the value encoded in an |
| 8553 | # empty executable. |
| 8554 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 8555 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 8556 | + aix_libpath=$lt_cv_aix_libpath |
| 8557 | +else |
| 8558 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 8559 | + $as_echo_n "(cached) " >&6 |
| 8560 | +else |
| 8561 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 8562 | /* end confdefs.h. */ |
| 8563 | |
| 8564 | int |
| 8565 | @@ -9795,22 +10325,29 @@ main () |
| 8566 | _ACEOF |
| 8567 | if ac_fn_c_try_link "$LINENO"; then : |
| 8568 | |
| 8569 | -lt_aix_libpath_sed=' |
| 8570 | - /Import File Strings/,/^$/ { |
| 8571 | - /^0/ { |
| 8572 | - s/^0 *\(.*\)$/\1/ |
| 8573 | - p |
| 8574 | - } |
| 8575 | - }' |
| 8576 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8577 | -# Check for a 64-bit object if we didn't find anything. |
| 8578 | -if test -z "$aix_libpath"; then |
| 8579 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8580 | -fi |
| 8581 | + lt_aix_libpath_sed=' |
| 8582 | + /Import File Strings/,/^$/ { |
| 8583 | + /^0/ { |
| 8584 | + s/^0 *\([^ ]*\) *$/\1/ |
| 8585 | + p |
| 8586 | + } |
| 8587 | + }' |
| 8588 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8589 | + # Check for a 64-bit object if we didn't find anything. |
| 8590 | + if test -z "$lt_cv_aix_libpath_"; then |
| 8591 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8592 | + fi |
| 8593 | fi |
| 8594 | rm -f core conftest.err conftest.$ac_objext \ |
| 8595 | conftest$ac_exeext conftest.$ac_ext |
| 8596 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 8597 | + if test -z "$lt_cv_aix_libpath_"; then |
| 8598 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 8599 | + fi |
| 8600 | + |
| 8601 | +fi |
| 8602 | + |
| 8603 | + aix_libpath=$lt_cv_aix_libpath_ |
| 8604 | +fi |
| 8605 | |
| 8606 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 8607 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
| 8608 | @@ -9822,7 +10359,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 8609 | else |
| 8610 | # Determine the default libpath from the value encoded in an |
| 8611 | # empty executable. |
| 8612 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 8613 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 8614 | + aix_libpath=$lt_cv_aix_libpath |
| 8615 | +else |
| 8616 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 8617 | + $as_echo_n "(cached) " >&6 |
| 8618 | +else |
| 8619 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 8620 | /* end confdefs.h. */ |
| 8621 | |
| 8622 | int |
| 8623 | @@ -9835,22 +10378,29 @@ main () |
| 8624 | _ACEOF |
| 8625 | if ac_fn_c_try_link "$LINENO"; then : |
| 8626 | |
| 8627 | -lt_aix_libpath_sed=' |
| 8628 | - /Import File Strings/,/^$/ { |
| 8629 | - /^0/ { |
| 8630 | - s/^0 *\(.*\)$/\1/ |
| 8631 | - p |
| 8632 | - } |
| 8633 | - }' |
| 8634 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8635 | -# Check for a 64-bit object if we didn't find anything. |
| 8636 | -if test -z "$aix_libpath"; then |
| 8637 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8638 | -fi |
| 8639 | + lt_aix_libpath_sed=' |
| 8640 | + /Import File Strings/,/^$/ { |
| 8641 | + /^0/ { |
| 8642 | + s/^0 *\([^ ]*\) *$/\1/ |
| 8643 | + p |
| 8644 | + } |
| 8645 | + }' |
| 8646 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8647 | + # Check for a 64-bit object if we didn't find anything. |
| 8648 | + if test -z "$lt_cv_aix_libpath_"; then |
| 8649 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8650 | + fi |
| 8651 | fi |
| 8652 | rm -f core conftest.err conftest.$ac_objext \ |
| 8653 | conftest$ac_exeext conftest.$ac_ext |
| 8654 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 8655 | + if test -z "$lt_cv_aix_libpath_"; then |
| 8656 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 8657 | + fi |
| 8658 | + |
| 8659 | +fi |
| 8660 | + |
| 8661 | + aix_libpath=$lt_cv_aix_libpath_ |
| 8662 | +fi |
| 8663 | |
| 8664 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 8665 | # Warning - without using the other run time loading flags, |
| 8666 | @@ -9894,21 +10444,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 8667 | # When not using gcc, we currently assume that we are using |
| 8668 | # Microsoft Visual C++. |
| 8669 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 8670 | - # no search path for DLLs. |
| 8671 | - hardcode_libdir_flag_spec=' ' |
| 8672 | - allow_undefined_flag=unsupported |
| 8673 | - # Tell ltmain to make .lib files, not .a files. |
| 8674 | - libext=lib |
| 8675 | - # Tell ltmain to make .dll files, not .so files. |
| 8676 | - shrext_cmds=".dll" |
| 8677 | - # FIXME: Setting linknames here is a bad hack. |
| 8678 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 8679 | - # The linker will automatically build a .lib file if we build a DLL. |
| 8680 | - old_archive_from_new_cmds='true' |
| 8681 | - # FIXME: Should let the user specify the lib program. |
| 8682 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 8683 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 8684 | - enable_shared_with_static_runtimes=yes |
| 8685 | + # no search path for DLLs. |
| 8686 | + case $cc_basename in |
| 8687 | + cl*) |
| 8688 | + # Native MSVC |
| 8689 | + hardcode_libdir_flag_spec=' ' |
| 8690 | + allow_undefined_flag=unsupported |
| 8691 | + always_export_symbols=yes |
| 8692 | + file_list_spec='@' |
| 8693 | + # Tell ltmain to make .lib files, not .a files. |
| 8694 | + libext=lib |
| 8695 | + # Tell ltmain to make .dll files, not .so files. |
| 8696 | + shrext_cmds=".dll" |
| 8697 | + # FIXME: Setting linknames here is a bad hack. |
| 8698 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 8699 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 8700 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 8701 | + else |
| 8702 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 8703 | + fi~ |
| 8704 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 8705 | + linknames=' |
| 8706 | + # The linker will not automatically build a static lib if we build a DLL. |
| 8707 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 8708 | + enable_shared_with_static_runtimes=yes |
| 8709 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 8710 | + # Don't use ranlib |
| 8711 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 8712 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 8713 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 8714 | + case $lt_outputfile in |
| 8715 | + *.exe|*.EXE) ;; |
| 8716 | + *) |
| 8717 | + lt_outputfile="$lt_outputfile.exe" |
| 8718 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 8719 | + ;; |
| 8720 | + esac~ |
| 8721 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 8722 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 8723 | + $RM "$lt_outputfile.manifest"; |
| 8724 | + fi' |
| 8725 | + ;; |
| 8726 | + *) |
| 8727 | + # Assume MSVC wrapper |
| 8728 | + hardcode_libdir_flag_spec=' ' |
| 8729 | + allow_undefined_flag=unsupported |
| 8730 | + # Tell ltmain to make .lib files, not .a files. |
| 8731 | + libext=lib |
| 8732 | + # Tell ltmain to make .dll files, not .so files. |
| 8733 | + shrext_cmds=".dll" |
| 8734 | + # FIXME: Setting linknames here is a bad hack. |
| 8735 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 8736 | + # The linker will automatically build a .lib file if we build a DLL. |
| 8737 | + old_archive_from_new_cmds='true' |
| 8738 | + # FIXME: Should let the user specify the lib program. |
| 8739 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 8740 | + enable_shared_with_static_runtimes=yes |
| 8741 | + ;; |
| 8742 | + esac |
| 8743 | ;; |
| 8744 | |
| 8745 | darwin* | rhapsody*) |
| 8746 | @@ -9969,7 +10562,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 8747 | |
| 8748 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 8749 | freebsd* | dragonfly*) |
| 8750 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 8751 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 8752 | hardcode_libdir_flag_spec='-R$libdir' |
| 8753 | hardcode_direct=yes |
| 8754 | hardcode_shlibpath_var=no |
| 8755 | @@ -9977,7 +10570,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 8756 | |
| 8757 | hpux9*) |
| 8758 | if test "$GCC" = yes; then |
| 8759 | - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 8760 | + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 8761 | else |
| 8762 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 8763 | fi |
| 8764 | @@ -9993,7 +10586,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 8765 | |
| 8766 | hpux10*) |
| 8767 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 8768 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 8769 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 8770 | else |
| 8771 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 8772 | fi |
| 8773 | @@ -10017,10 +10610,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 8774 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 8775 | ;; |
| 8776 | ia64*) |
| 8777 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 8778 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 8779 | ;; |
| 8780 | *) |
| 8781 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 8782 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 8783 | ;; |
| 8784 | esac |
| 8785 | else |
| 8786 | @@ -10099,23 +10692,36 @@ fi |
| 8787 | |
| 8788 | irix5* | irix6* | nonstopux*) |
| 8789 | if test "$GCC" = yes; then |
| 8790 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 8791 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 8792 | # Try to use the -exported_symbol ld option, if it does not |
| 8793 | # work, assume that -exports_file does not work either and |
| 8794 | # implicitly export all symbols. |
| 8795 | - save_LDFLAGS="$LDFLAGS" |
| 8796 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 8797 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 8798 | + # This should be the same for all languages, so no per-tag cache variable. |
| 8799 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 8800 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 8801 | +if test "${lt_cv_irix_exported_symbol+set}" = set; then : |
| 8802 | + $as_echo_n "(cached) " >&6 |
| 8803 | +else |
| 8804 | + save_LDFLAGS="$LDFLAGS" |
| 8805 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 8806 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 8807 | /* end confdefs.h. */ |
| 8808 | -int foo(void) {} |
| 8809 | +int foo (void) { return 0; } |
| 8810 | _ACEOF |
| 8811 | if ac_fn_c_try_link "$LINENO"; then : |
| 8812 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 8813 | - |
| 8814 | + lt_cv_irix_exported_symbol=yes |
| 8815 | +else |
| 8816 | + lt_cv_irix_exported_symbol=no |
| 8817 | fi |
| 8818 | rm -f core conftest.err conftest.$ac_objext \ |
| 8819 | conftest$ac_exeext conftest.$ac_ext |
| 8820 | - LDFLAGS="$save_LDFLAGS" |
| 8821 | + LDFLAGS="$save_LDFLAGS" |
| 8822 | +fi |
| 8823 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 8824 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 8825 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 8826 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 8827 | + fi |
| 8828 | else |
| 8829 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
| 8830 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
| 8831 | @@ -10200,7 +10806,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 8832 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 8833 | if test "$GCC" = yes; then |
| 8834 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 8835 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 8836 | + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 8837 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 8838 | else |
| 8839 | allow_undefined_flag=' -expect_unresolved \*' |
| 8840 | @@ -10219,9 +10825,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 8841 | no_undefined_flag=' -z defs' |
| 8842 | if test "$GCC" = yes; then |
| 8843 | wlarc='${wl}' |
| 8844 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 8845 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 8846 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 8847 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 8848 | + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 8849 | else |
| 8850 | case `$CC -V 2>&1` in |
| 8851 | *"Compilers 5.0"*) |
| 8852 | @@ -10797,8 +11403,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 8853 | need_version=no |
| 8854 | need_lib_prefix=no |
| 8855 | |
| 8856 | - case $GCC,$host_os in |
| 8857 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 8858 | + case $GCC,$cc_basename in |
| 8859 | + yes,*) |
| 8860 | + # gcc |
| 8861 | library_names_spec='$libname.dll.a' |
| 8862 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 8863 | postinstall_cmds='base_file=`basename \${file}`~ |
| 8864 | @@ -10831,13 +11438,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 8865 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 8866 | ;; |
| 8867 | esac |
| 8868 | + dynamic_linker='Win32 ld.exe' |
| 8869 | + ;; |
| 8870 | + |
| 8871 | + *,cl*) |
| 8872 | + # Native MSVC |
| 8873 | + libname_spec='$name' |
| 8874 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 8875 | + library_names_spec='${libname}.dll.lib' |
| 8876 | + |
| 8877 | + case $build_os in |
| 8878 | + mingw*) |
| 8879 | + sys_lib_search_path_spec= |
| 8880 | + lt_save_ifs=$IFS |
| 8881 | + IFS=';' |
| 8882 | + for lt_path in $LIB |
| 8883 | + do |
| 8884 | + IFS=$lt_save_ifs |
| 8885 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 8886 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 8887 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 8888 | + done |
| 8889 | + IFS=$lt_save_ifs |
| 8890 | + # Convert to MSYS style. |
| 8891 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 8892 | + ;; |
| 8893 | + cygwin*) |
| 8894 | + # Convert to unix form, then to dos form, then back to unix form |
| 8895 | + # but this time dos style (no spaces!) so that the unix form looks |
| 8896 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 8897 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 8898 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 8899 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 8900 | + ;; |
| 8901 | + *) |
| 8902 | + sys_lib_search_path_spec="$LIB" |
| 8903 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 8904 | + # It is most probably a Windows format PATH. |
| 8905 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 8906 | + else |
| 8907 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 8908 | + fi |
| 8909 | + # FIXME: find the short name or the path components, as spaces are |
| 8910 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 8911 | + ;; |
| 8912 | + esac |
| 8913 | + |
| 8914 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 8915 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 8916 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 8917 | + dldir=$destdir/`dirname \$dlpath`~ |
| 8918 | + test -d \$dldir || mkdir -p \$dldir~ |
| 8919 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 8920 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 8921 | + dlpath=$dir/\$dldll~ |
| 8922 | + $RM \$dlpath' |
| 8923 | + shlibpath_overrides_runpath=yes |
| 8924 | + dynamic_linker='Win32 link.exe' |
| 8925 | ;; |
| 8926 | |
| 8927 | *) |
| 8928 | + # Assume MSVC wrapper |
| 8929 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 8930 | + dynamic_linker='Win32 ld.exe' |
| 8931 | ;; |
| 8932 | esac |
| 8933 | - dynamic_linker='Win32 ld.exe' |
| 8934 | # FIXME: first we should search . and the directory the executable is in |
| 8935 | shlibpath_var=PATH |
| 8936 | ;; |
| 8937 | @@ -10929,7 +11594,7 @@ haiku*) |
| 8938 | soname_spec='${libname}${release}${shared_ext}$major' |
| 8939 | shlibpath_var=LIBRARY_PATH |
| 8940 | shlibpath_overrides_runpath=yes |
| 8941 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' |
| 8942 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
| 8943 | hardcode_into_libs=yes |
| 8944 | ;; |
| 8945 | |
| 8946 | @@ -11769,10 +12434,10 @@ else |
| 8947 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 8948 | correspondingly for the symbols needed. */ |
| 8949 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 8950 | -void fnord () __attribute__((visibility("default"))); |
| 8951 | +int fnord () __attribute__((visibility("default"))); |
| 8952 | #endif |
| 8953 | |
| 8954 | -void fnord () { int i=42; } |
| 8955 | +int fnord () { return 42; } |
| 8956 | int main () |
| 8957 | { |
| 8958 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 8959 | @@ -11875,10 +12540,10 @@ else |
| 8960 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 8961 | correspondingly for the symbols needed. */ |
| 8962 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 8963 | -void fnord () __attribute__((visibility("default"))); |
| 8964 | +int fnord () __attribute__((visibility("default"))); |
| 8965 | #endif |
| 8966 | |
| 8967 | -void fnord () { int i=42; } |
| 8968 | +int fnord () { return 42; } |
| 8969 | int main () |
| 8970 | { |
| 8971 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 8972 | @@ -12270,6 +12935,7 @@ $RM -r conftest* |
| 8973 | |
| 8974 | # Allow CC to be a program name with arguments. |
| 8975 | lt_save_CC=$CC |
| 8976 | + lt_save_CFLAGS=$CFLAGS |
| 8977 | lt_save_LD=$LD |
| 8978 | lt_save_GCC=$GCC |
| 8979 | GCC=$GXX |
| 8980 | @@ -12287,6 +12953,7 @@ $RM -r conftest* |
| 8981 | fi |
| 8982 | test -z "${LDCXX+set}" || LD=$LDCXX |
| 8983 | CC=${CXX-"c++"} |
| 8984 | + CFLAGS=$CXXFLAGS |
| 8985 | compiler=$CC |
| 8986 | compiler_CXX=$CC |
| 8987 | for cc_temp in $compiler""; do |
| 8988 | @@ -12569,7 +13236,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie |
| 8989 | allow_undefined_flag_CXX='-berok' |
| 8990 | # Determine the default libpath from the value encoded in an empty |
| 8991 | # executable. |
| 8992 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 8993 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 8994 | + aix_libpath=$lt_cv_aix_libpath |
| 8995 | +else |
| 8996 | + if test "${lt_cv_aix_libpath__CXX+set}" = set; then : |
| 8997 | + $as_echo_n "(cached) " >&6 |
| 8998 | +else |
| 8999 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 9000 | /* end confdefs.h. */ |
| 9001 | |
| 9002 | int |
| 9003 | @@ -12582,22 +13255,29 @@ main () |
| 9004 | _ACEOF |
| 9005 | if ac_fn_cxx_try_link "$LINENO"; then : |
| 9006 | |
| 9007 | -lt_aix_libpath_sed=' |
| 9008 | - /Import File Strings/,/^$/ { |
| 9009 | - /^0/ { |
| 9010 | - s/^0 *\(.*\)$/\1/ |
| 9011 | - p |
| 9012 | - } |
| 9013 | - }' |
| 9014 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9015 | -# Check for a 64-bit object if we didn't find anything. |
| 9016 | -if test -z "$aix_libpath"; then |
| 9017 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9018 | -fi |
| 9019 | + lt_aix_libpath_sed=' |
| 9020 | + /Import File Strings/,/^$/ { |
| 9021 | + /^0/ { |
| 9022 | + s/^0 *\([^ ]*\) *$/\1/ |
| 9023 | + p |
| 9024 | + } |
| 9025 | + }' |
| 9026 | + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9027 | + # Check for a 64-bit object if we didn't find anything. |
| 9028 | + if test -z "$lt_cv_aix_libpath__CXX"; then |
| 9029 | + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9030 | + fi |
| 9031 | fi |
| 9032 | rm -f core conftest.err conftest.$ac_objext \ |
| 9033 | conftest$ac_exeext conftest.$ac_ext |
| 9034 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9035 | + if test -z "$lt_cv_aix_libpath__CXX"; then |
| 9036 | + lt_cv_aix_libpath__CXX="/usr/lib:/lib" |
| 9037 | + fi |
| 9038 | + |
| 9039 | +fi |
| 9040 | + |
| 9041 | + aix_libpath=$lt_cv_aix_libpath__CXX |
| 9042 | +fi |
| 9043 | |
| 9044 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 9045 | |
| 9046 | @@ -12610,7 +13290,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9047 | else |
| 9048 | # Determine the default libpath from the value encoded in an |
| 9049 | # empty executable. |
| 9050 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 9051 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 9052 | + aix_libpath=$lt_cv_aix_libpath |
| 9053 | +else |
| 9054 | + if test "${lt_cv_aix_libpath__CXX+set}" = set; then : |
| 9055 | + $as_echo_n "(cached) " >&6 |
| 9056 | +else |
| 9057 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 9058 | /* end confdefs.h. */ |
| 9059 | |
| 9060 | int |
| 9061 | @@ -12623,22 +13309,29 @@ main () |
| 9062 | _ACEOF |
| 9063 | if ac_fn_cxx_try_link "$LINENO"; then : |
| 9064 | |
| 9065 | -lt_aix_libpath_sed=' |
| 9066 | - /Import File Strings/,/^$/ { |
| 9067 | - /^0/ { |
| 9068 | - s/^0 *\(.*\)$/\1/ |
| 9069 | - p |
| 9070 | - } |
| 9071 | - }' |
| 9072 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9073 | -# Check for a 64-bit object if we didn't find anything. |
| 9074 | -if test -z "$aix_libpath"; then |
| 9075 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9076 | -fi |
| 9077 | + lt_aix_libpath_sed=' |
| 9078 | + /Import File Strings/,/^$/ { |
| 9079 | + /^0/ { |
| 9080 | + s/^0 *\([^ ]*\) *$/\1/ |
| 9081 | + p |
| 9082 | + } |
| 9083 | + }' |
| 9084 | + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9085 | + # Check for a 64-bit object if we didn't find anything. |
| 9086 | + if test -z "$lt_cv_aix_libpath__CXX"; then |
| 9087 | + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9088 | + fi |
| 9089 | fi |
| 9090 | rm -f core conftest.err conftest.$ac_objext \ |
| 9091 | conftest$ac_exeext conftest.$ac_ext |
| 9092 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9093 | + if test -z "$lt_cv_aix_libpath__CXX"; then |
| 9094 | + lt_cv_aix_libpath__CXX="/usr/lib:/lib" |
| 9095 | + fi |
| 9096 | + |
| 9097 | +fi |
| 9098 | + |
| 9099 | + aix_libpath=$lt_cv_aix_libpath__CXX |
| 9100 | +fi |
| 9101 | |
| 9102 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 9103 | # Warning - without using the other run time loading flags, |
| 9104 | @@ -12681,29 +13374,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9105 | ;; |
| 9106 | |
| 9107 | cygwin* | mingw* | pw32* | cegcc*) |
| 9108 | - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, |
| 9109 | - # as there is no search path for DLLs. |
| 9110 | - hardcode_libdir_flag_spec_CXX='-L$libdir' |
| 9111 | - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' |
| 9112 | - allow_undefined_flag_CXX=unsupported |
| 9113 | - always_export_symbols_CXX=no |
| 9114 | - enable_shared_with_static_runtimes_CXX=yes |
| 9115 | - |
| 9116 | - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 9117 | - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 9118 | - # If the export-symbols file already is a .def file (1st line |
| 9119 | - # is EXPORTS), use it as is; otherwise, prepend... |
| 9120 | - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 9121 | - cp $export_symbols $output_objdir/$soname.def; |
| 9122 | - else |
| 9123 | - echo EXPORTS > $output_objdir/$soname.def; |
| 9124 | - cat $export_symbols >> $output_objdir/$soname.def; |
| 9125 | - fi~ |
| 9126 | - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 9127 | - else |
| 9128 | - ld_shlibs_CXX=no |
| 9129 | - fi |
| 9130 | - ;; |
| 9131 | + case $GXX,$cc_basename in |
| 9132 | + ,cl* | no,cl*) |
| 9133 | + # Native MSVC |
| 9134 | + # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 9135 | + # no search path for DLLs. |
| 9136 | + hardcode_libdir_flag_spec_CXX=' ' |
| 9137 | + allow_undefined_flag_CXX=unsupported |
| 9138 | + always_export_symbols_CXX=yes |
| 9139 | + file_list_spec_CXX='@' |
| 9140 | + # Tell ltmain to make .lib files, not .a files. |
| 9141 | + libext=lib |
| 9142 | + # Tell ltmain to make .dll files, not .so files. |
| 9143 | + shrext_cmds=".dll" |
| 9144 | + # FIXME: Setting linknames here is a bad hack. |
| 9145 | + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 9146 | + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 9147 | + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 9148 | + else |
| 9149 | + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 9150 | + fi~ |
| 9151 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 9152 | + linknames=' |
| 9153 | + # The linker will not automatically build a static lib if we build a DLL. |
| 9154 | + # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' |
| 9155 | + enable_shared_with_static_runtimes_CXX=yes |
| 9156 | + # Don't use ranlib |
| 9157 | + old_postinstall_cmds_CXX='chmod 644 $oldlib' |
| 9158 | + postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ |
| 9159 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 9160 | + case $lt_outputfile in |
| 9161 | + *.exe|*.EXE) ;; |
| 9162 | + *) |
| 9163 | + lt_outputfile="$lt_outputfile.exe" |
| 9164 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 9165 | + ;; |
| 9166 | + esac~ |
| 9167 | + func_to_tool_file "$lt_outputfile"~ |
| 9168 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 9169 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 9170 | + $RM "$lt_outputfile.manifest"; |
| 9171 | + fi' |
| 9172 | + ;; |
| 9173 | + *) |
| 9174 | + # g++ |
| 9175 | + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, |
| 9176 | + # as there is no search path for DLLs. |
| 9177 | + hardcode_libdir_flag_spec_CXX='-L$libdir' |
| 9178 | + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' |
| 9179 | + allow_undefined_flag_CXX=unsupported |
| 9180 | + always_export_symbols_CXX=no |
| 9181 | + enable_shared_with_static_runtimes_CXX=yes |
| 9182 | + |
| 9183 | + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 9184 | + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 9185 | + # If the export-symbols file already is a .def file (1st line |
| 9186 | + # is EXPORTS), use it as is; otherwise, prepend... |
| 9187 | + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 9188 | + cp $export_symbols $output_objdir/$soname.def; |
| 9189 | + else |
| 9190 | + echo EXPORTS > $output_objdir/$soname.def; |
| 9191 | + cat $export_symbols >> $output_objdir/$soname.def; |
| 9192 | + fi~ |
| 9193 | + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 9194 | + else |
| 9195 | + ld_shlibs_CXX=no |
| 9196 | + fi |
| 9197 | + ;; |
| 9198 | + esac |
| 9199 | + ;; |
| 9200 | darwin* | rhapsody*) |
| 9201 | |
| 9202 | |
| 9203 | @@ -12809,7 +13548,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9204 | ;; |
| 9205 | *) |
| 9206 | if test "$GXX" = yes; then |
| 9207 | - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 9208 | + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 9209 | else |
| 9210 | # FIXME: insert proper C++ library support |
| 9211 | ld_shlibs_CXX=no |
| 9212 | @@ -12880,10 +13619,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9213 | archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 9214 | ;; |
| 9215 | ia64*) |
| 9216 | - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 9217 | + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 9218 | ;; |
| 9219 | *) |
| 9220 | - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 9221 | + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 9222 | ;; |
| 9223 | esac |
| 9224 | fi |
| 9225 | @@ -12924,9 +13663,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9226 | *) |
| 9227 | if test "$GXX" = yes; then |
| 9228 | if test "$with_gnu_ld" = no; then |
| 9229 | - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 9230 | + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 9231 | else |
| 9232 | - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' |
| 9233 | + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' |
| 9234 | fi |
| 9235 | fi |
| 9236 | link_all_deplibs_CXX=yes |
| 9237 | @@ -12996,20 +13735,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9238 | prelink_cmds_CXX='tpldir=Template.dir~ |
| 9239 | rm -rf $tpldir~ |
| 9240 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
| 9241 | - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' |
| 9242 | + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' |
| 9243 | old_archive_cmds_CXX='tpldir=Template.dir~ |
| 9244 | rm -rf $tpldir~ |
| 9245 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ |
| 9246 | - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ |
| 9247 | + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ |
| 9248 | $RANLIB $oldlib' |
| 9249 | archive_cmds_CXX='tpldir=Template.dir~ |
| 9250 | rm -rf $tpldir~ |
| 9251 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
| 9252 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 9253 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 9254 | archive_expsym_cmds_CXX='tpldir=Template.dir~ |
| 9255 | rm -rf $tpldir~ |
| 9256 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
| 9257 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
| 9258 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
| 9259 | ;; |
| 9260 | *) # Version 6 and above use weak symbols |
| 9261 | archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 9262 | @@ -13204,7 +13943,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9263 | archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 9264 | ;; |
| 9265 | *) |
| 9266 | - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 9267 | + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 9268 | ;; |
| 9269 | esac |
| 9270 | |
| 9271 | @@ -13250,7 +13989,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9272 | |
| 9273 | solaris*) |
| 9274 | case $cc_basename in |
| 9275 | - CC*) |
| 9276 | + CC* | sunCC*) |
| 9277 | # Sun C++ 4.2, 5.x and Centerline C++ |
| 9278 | archive_cmds_need_lc_CXX=yes |
| 9279 | no_undefined_flag_CXX=' -zdefs' |
| 9280 | @@ -13291,9 +14030,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9281 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
| 9282 | no_undefined_flag_CXX=' ${wl}-z ${wl}defs' |
| 9283 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
| 9284 | - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
| 9285 | + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
| 9286 | archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 9287 | - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
| 9288 | + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
| 9289 | |
| 9290 | # Commands to make compiler produce verbose output that lists |
| 9291 | # what "hidden" libraries, object files and flags are used when |
| 9292 | @@ -13428,6 +14167,13 @@ private: |
| 9293 | }; |
| 9294 | _LT_EOF |
| 9295 | |
| 9296 | + |
| 9297 | +_lt_libdeps_save_CFLAGS=$CFLAGS |
| 9298 | +case "$CC $CFLAGS " in #( |
| 9299 | +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; |
| 9300 | +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; |
| 9301 | +esac |
| 9302 | + |
| 9303 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
| 9304 | (eval $ac_compile) 2>&5 |
| 9305 | ac_status=$? |
| 9306 | @@ -13441,7 +14187,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
| 9307 | pre_test_object_deps_done=no |
| 9308 | |
| 9309 | for p in `eval "$output_verbose_link_cmd"`; do |
| 9310 | - case $p in |
| 9311 | + case ${prev}${p} in |
| 9312 | |
| 9313 | -L* | -R* | -l*) |
| 9314 | # Some compilers place space between "-{L,R}" and the path. |
| 9315 | @@ -13450,13 +14196,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
| 9316 | test $p = "-R"; then |
| 9317 | prev=$p |
| 9318 | continue |
| 9319 | - else |
| 9320 | - prev= |
| 9321 | fi |
| 9322 | |
| 9323 | + # Expand the sysroot to ease extracting the directories later. |
| 9324 | + if test -z "$prev"; then |
| 9325 | + case $p in |
| 9326 | + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; |
| 9327 | + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; |
| 9328 | + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; |
| 9329 | + esac |
| 9330 | + fi |
| 9331 | + case $p in |
| 9332 | + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; |
| 9333 | + esac |
| 9334 | if test "$pre_test_object_deps_done" = no; then |
| 9335 | - case $p in |
| 9336 | - -L* | -R*) |
| 9337 | + case ${prev} in |
| 9338 | + -L | -R) |
| 9339 | # Internal compiler library paths should come after those |
| 9340 | # provided the user. The postdeps already come after the |
| 9341 | # user supplied libs so there is no need to process them. |
| 9342 | @@ -13476,8 +14231,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
| 9343 | postdeps_CXX="${postdeps_CXX} ${prev}${p}" |
| 9344 | fi |
| 9345 | fi |
| 9346 | + prev= |
| 9347 | ;; |
| 9348 | |
| 9349 | + *.lto.$objext) ;; # Ignore GCC LTO objects |
| 9350 | *.$objext) |
| 9351 | # This assumes that the test object file only shows up |
| 9352 | # once in the compiler output. |
| 9353 | @@ -13513,6 +14270,7 @@ else |
| 9354 | fi |
| 9355 | |
| 9356 | $RM -f confest.$objext |
| 9357 | +CFLAGS=$_lt_libdeps_save_CFLAGS |
| 9358 | |
| 9359 | # PORTME: override above test on systems where it is broken |
| 9360 | case $host_os in |
| 9361 | @@ -13548,7 +14306,7 @@ linux*) |
| 9362 | |
| 9363 | solaris*) |
| 9364 | case $cc_basename in |
| 9365 | - CC*) |
| 9366 | + CC* | sunCC*) |
| 9367 | # The more standards-conforming stlport4 library is |
| 9368 | # incompatible with the Cstd library. Avoid specifying |
| 9369 | # it if it's in CXXFLAGS. Ignore libCrun as |
| 9370 | @@ -13613,8 +14371,6 @@ fi |
| 9371 | lt_prog_compiler_pic_CXX= |
| 9372 | lt_prog_compiler_static_CXX= |
| 9373 | |
| 9374 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 9375 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 9376 | |
| 9377 | # C++ specific cases for pic, static, wl, etc. |
| 9378 | if test "$GXX" = yes; then |
| 9379 | @@ -13719,6 +14475,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 9380 | ;; |
| 9381 | esac |
| 9382 | ;; |
| 9383 | + mingw* | cygwin* | os2* | pw32* | cegcc*) |
| 9384 | + # This hack is so that the source file can tell whether it is being |
| 9385 | + # built for inclusion in a dll (and should export symbols for example). |
| 9386 | + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' |
| 9387 | + ;; |
| 9388 | dgux*) |
| 9389 | case $cc_basename in |
| 9390 | ec++*) |
| 9391 | @@ -13871,7 +14632,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 9392 | ;; |
| 9393 | solaris*) |
| 9394 | case $cc_basename in |
| 9395 | - CC*) |
| 9396 | + CC* | sunCC*) |
| 9397 | # Sun C++ 4.2, 5.x and Centerline C++ |
| 9398 | lt_prog_compiler_pic_CXX='-KPIC' |
| 9399 | lt_prog_compiler_static_CXX='-Bstatic' |
| 9400 | @@ -13936,10 +14697,17 @@ case $host_os in |
| 9401 | lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" |
| 9402 | ;; |
| 9403 | esac |
| 9404 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 |
| 9405 | -$as_echo "$lt_prog_compiler_pic_CXX" >&6; } |
| 9406 | - |
| 9407 | |
| 9408 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 9409 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 9410 | +if test "${lt_cv_prog_compiler_pic_CXX+set}" = set; then : |
| 9411 | + $as_echo_n "(cached) " >&6 |
| 9412 | +else |
| 9413 | + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX |
| 9414 | +fi |
| 9415 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 |
| 9416 | +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } |
| 9417 | +lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX |
| 9418 | |
| 9419 | # |
| 9420 | # Check to make sure the PIC flag actually works. |
| 9421 | @@ -13997,6 +14765,8 @@ fi |
| 9422 | |
| 9423 | |
| 9424 | |
| 9425 | + |
| 9426 | + |
| 9427 | # |
| 9428 | # Check to make sure the static flag actually works. |
| 9429 | # |
| 9430 | @@ -14174,6 +14944,7 @@ fi |
| 9431 | $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } |
| 9432 | |
| 9433 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
| 9434 | + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' |
| 9435 | case $host_os in |
| 9436 | aix[4-9]*) |
| 9437 | # If we're using GNU nm, then we don't want the "-C" option. |
| 9438 | @@ -14188,15 +14959,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie |
| 9439 | ;; |
| 9440 | pw32*) |
| 9441 | export_symbols_cmds_CXX="$ltdll_cmds" |
| 9442 | - ;; |
| 9443 | + ;; |
| 9444 | cygwin* | mingw* | cegcc*) |
| 9445 | - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' |
| 9446 | - ;; |
| 9447 | + case $cc_basename in |
| 9448 | + cl*) ;; |
| 9449 | + *) |
| 9450 | + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' |
| 9451 | + exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 9452 | + ;; |
| 9453 | + esac |
| 9454 | + ;; |
| 9455 | *) |
| 9456 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
| 9457 | - ;; |
| 9458 | + ;; |
| 9459 | esac |
| 9460 | - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' |
| 9461 | |
| 9462 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 |
| 9463 | $as_echo "$ld_shlibs_CXX" >&6; } |
| 9464 | @@ -14459,8 +15235,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 9465 | need_version=no |
| 9466 | need_lib_prefix=no |
| 9467 | |
| 9468 | - case $GCC,$host_os in |
| 9469 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 9470 | + case $GCC,$cc_basename in |
| 9471 | + yes,*) |
| 9472 | + # gcc |
| 9473 | library_names_spec='$libname.dll.a' |
| 9474 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 9475 | postinstall_cmds='base_file=`basename \${file}`~ |
| 9476 | @@ -14492,13 +15269,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 9477 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 9478 | ;; |
| 9479 | esac |
| 9480 | + dynamic_linker='Win32 ld.exe' |
| 9481 | + ;; |
| 9482 | + |
| 9483 | + *,cl*) |
| 9484 | + # Native MSVC |
| 9485 | + libname_spec='$name' |
| 9486 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 9487 | + library_names_spec='${libname}.dll.lib' |
| 9488 | + |
| 9489 | + case $build_os in |
| 9490 | + mingw*) |
| 9491 | + sys_lib_search_path_spec= |
| 9492 | + lt_save_ifs=$IFS |
| 9493 | + IFS=';' |
| 9494 | + for lt_path in $LIB |
| 9495 | + do |
| 9496 | + IFS=$lt_save_ifs |
| 9497 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 9498 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 9499 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 9500 | + done |
| 9501 | + IFS=$lt_save_ifs |
| 9502 | + # Convert to MSYS style. |
| 9503 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 9504 | + ;; |
| 9505 | + cygwin*) |
| 9506 | + # Convert to unix form, then to dos form, then back to unix form |
| 9507 | + # but this time dos style (no spaces!) so that the unix form looks |
| 9508 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 9509 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 9510 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 9511 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 9512 | + ;; |
| 9513 | + *) |
| 9514 | + sys_lib_search_path_spec="$LIB" |
| 9515 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 9516 | + # It is most probably a Windows format PATH. |
| 9517 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 9518 | + else |
| 9519 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 9520 | + fi |
| 9521 | + # FIXME: find the short name or the path components, as spaces are |
| 9522 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 9523 | + ;; |
| 9524 | + esac |
| 9525 | + |
| 9526 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 9527 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 9528 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 9529 | + dldir=$destdir/`dirname \$dlpath`~ |
| 9530 | + test -d \$dldir || mkdir -p \$dldir~ |
| 9531 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 9532 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 9533 | + dlpath=$dir/\$dldll~ |
| 9534 | + $RM \$dlpath' |
| 9535 | + shlibpath_overrides_runpath=yes |
| 9536 | + dynamic_linker='Win32 link.exe' |
| 9537 | ;; |
| 9538 | |
| 9539 | *) |
| 9540 | + # Assume MSVC wrapper |
| 9541 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 9542 | + dynamic_linker='Win32 ld.exe' |
| 9543 | ;; |
| 9544 | esac |
| 9545 | - dynamic_linker='Win32 ld.exe' |
| 9546 | # FIXME: first we should search . and the directory the executable is in |
| 9547 | shlibpath_var=PATH |
| 9548 | ;; |
| 9549 | @@ -14589,7 +15424,7 @@ haiku*) |
| 9550 | soname_spec='${libname}${release}${shared_ext}$major' |
| 9551 | shlibpath_var=LIBRARY_PATH |
| 9552 | shlibpath_overrides_runpath=yes |
| 9553 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' |
| 9554 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
| 9555 | hardcode_into_libs=yes |
| 9556 | ;; |
| 9557 | |
| 9558 | @@ -15048,6 +15883,7 @@ fi |
| 9559 | fi # test -n "$compiler" |
| 9560 | |
| 9561 | CC=$lt_save_CC |
| 9562 | + CFLAGS=$lt_save_CFLAGS |
| 9563 | LDCXX=$LD |
| 9564 | LD=$lt_save_LD |
| 9565 | GCC=$lt_save_GCC |
| 9566 | @@ -18083,13 +18919,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
| 9567 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 9568 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 9569 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 9570 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 9571 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 9572 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 9573 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 9574 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 9575 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 9576 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 9577 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 9578 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 9579 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 9580 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 9581 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 9582 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 9583 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 9584 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 9585 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 9586 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
| 9587 | @@ -18104,14 +18947,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
| 9588 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 9589 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 9590 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 9591 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 9592 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 9593 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 9594 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 9595 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 9596 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 9597 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 9598 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 9599 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 9600 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 9601 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 9602 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 9603 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 9604 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 9605 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
| 9606 | @@ -18144,12 +18990,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
| 9607 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 9608 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 9609 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 9610 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 9611 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 9612 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 9613 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 9614 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 9615 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 9616 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 9617 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 9618 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 9619 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 9620 | @@ -18188,8 +19034,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote |
| 9621 | compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' |
| 9622 | GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' |
| 9623 | lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' |
| 9624 | -lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' |
| 9625 | lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' |
| 9626 | +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' |
| 9627 | lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' |
| 9628 | lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' |
| 9629 | archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' |
| 9630 | @@ -18216,12 +19062,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ |
| 9631 | hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' |
| 9632 | inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' |
| 9633 | link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' |
| 9634 | -fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' |
| 9635 | always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' |
| 9636 | export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' |
| 9637 | exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' |
| 9638 | include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' |
| 9639 | prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' |
| 9640 | +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' |
| 9641 | file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' |
| 9642 | hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' |
| 9643 | compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' |
| 9644 | @@ -18259,8 +19105,13 @@ reload_flag \ |
| 9645 | OBJDUMP \ |
| 9646 | deplibs_check_method \ |
| 9647 | file_magic_cmd \ |
| 9648 | +file_magic_glob \ |
| 9649 | +want_nocaseglob \ |
| 9650 | +DLLTOOL \ |
| 9651 | +sharedlib_from_linklib_cmd \ |
| 9652 | AR \ |
| 9653 | AR_FLAGS \ |
| 9654 | +archiver_list_spec \ |
| 9655 | STRIP \ |
| 9656 | RANLIB \ |
| 9657 | CC \ |
| 9658 | @@ -18270,12 +19121,14 @@ lt_cv_sys_global_symbol_pipe \ |
| 9659 | lt_cv_sys_global_symbol_to_cdecl \ |
| 9660 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 9661 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 9662 | +nm_file_list_spec \ |
| 9663 | lt_prog_compiler_no_builtin_flag \ |
| 9664 | -lt_prog_compiler_wl \ |
| 9665 | lt_prog_compiler_pic \ |
| 9666 | +lt_prog_compiler_wl \ |
| 9667 | lt_prog_compiler_static \ |
| 9668 | lt_cv_prog_compiler_c_o \ |
| 9669 | need_locks \ |
| 9670 | +MANIFEST_TOOL \ |
| 9671 | DSYMUTIL \ |
| 9672 | NMEDIT \ |
| 9673 | LIPO \ |
| 9674 | @@ -18291,7 +19144,6 @@ no_undefined_flag \ |
| 9675 | hardcode_libdir_flag_spec \ |
| 9676 | hardcode_libdir_flag_spec_ld \ |
| 9677 | hardcode_libdir_separator \ |
| 9678 | -fix_srcfile_path \ |
| 9679 | exclude_expsyms \ |
| 9680 | include_expsyms \ |
| 9681 | file_list_spec \ |
| 9682 | @@ -18313,8 +19165,8 @@ LD_CXX \ |
| 9683 | reload_flag_CXX \ |
| 9684 | compiler_CXX \ |
| 9685 | lt_prog_compiler_no_builtin_flag_CXX \ |
| 9686 | -lt_prog_compiler_wl_CXX \ |
| 9687 | lt_prog_compiler_pic_CXX \ |
| 9688 | +lt_prog_compiler_wl_CXX \ |
| 9689 | lt_prog_compiler_static_CXX \ |
| 9690 | lt_cv_prog_compiler_c_o_CXX \ |
| 9691 | export_dynamic_flag_spec_CXX \ |
| 9692 | @@ -18326,7 +19178,6 @@ no_undefined_flag_CXX \ |
| 9693 | hardcode_libdir_flag_spec_CXX \ |
| 9694 | hardcode_libdir_flag_spec_ld_CXX \ |
| 9695 | hardcode_libdir_separator_CXX \ |
| 9696 | -fix_srcfile_path_CXX \ |
| 9697 | exclude_expsyms_CXX \ |
| 9698 | include_expsyms_CXX \ |
| 9699 | file_list_spec_CXX \ |
| 9700 | @@ -18360,6 +19211,7 @@ module_cmds \ |
| 9701 | module_expsym_cmds \ |
| 9702 | export_symbols_cmds \ |
| 9703 | prelink_cmds \ |
| 9704 | +postlink_cmds \ |
| 9705 | postinstall_cmds \ |
| 9706 | postuninstall_cmds \ |
| 9707 | finish_cmds \ |
| 9708 | @@ -18374,7 +19226,8 @@ archive_expsym_cmds_CXX \ |
| 9709 | module_cmds_CXX \ |
| 9710 | module_expsym_cmds_CXX \ |
| 9711 | export_symbols_cmds_CXX \ |
| 9712 | -prelink_cmds_CXX; do |
| 9713 | +prelink_cmds_CXX \ |
| 9714 | +postlink_cmds_CXX; do |
| 9715 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
| 9716 | *[\\\\\\\`\\"\\\$]*) |
| 9717 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
| 9718 | @@ -19167,7 +20020,8 @@ $as_echo X"$file" | |
| 9719 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 9720 | # |
| 9721 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 9722 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 9723 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 9724 | +# Inc. |
| 9725 | # Written by Gordon Matzigkeit, 1996 |
| 9726 | # |
| 9727 | # This file is part of GNU Libtool. |
| 9728 | @@ -19270,19 +20124,42 @@ SP2NL=$lt_lt_SP2NL |
| 9729 | # turn newlines into spaces. |
| 9730 | NL2SP=$lt_lt_NL2SP |
| 9731 | |
| 9732 | +# convert \$build file names to \$host format. |
| 9733 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 9734 | + |
| 9735 | +# convert \$build files to toolchain format. |
| 9736 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 9737 | + |
| 9738 | # An object symbol dumper. |
| 9739 | OBJDUMP=$lt_OBJDUMP |
| 9740 | |
| 9741 | # Method to check whether dependent libraries are shared objects. |
| 9742 | deplibs_check_method=$lt_deplibs_check_method |
| 9743 | |
| 9744 | -# Command to use when deplibs_check_method == "file_magic". |
| 9745 | +# Command to use when deplibs_check_method = "file_magic". |
| 9746 | file_magic_cmd=$lt_file_magic_cmd |
| 9747 | |
| 9748 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 9749 | +file_magic_glob=$lt_file_magic_glob |
| 9750 | + |
| 9751 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 9752 | +want_nocaseglob=$lt_want_nocaseglob |
| 9753 | + |
| 9754 | +# DLL creation program. |
| 9755 | +DLLTOOL=$lt_DLLTOOL |
| 9756 | + |
| 9757 | +# Command to associate shared and link libraries. |
| 9758 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 9759 | + |
| 9760 | # The archiver. |
| 9761 | AR=$lt_AR |
| 9762 | + |
| 9763 | +# Flags to create an archive. |
| 9764 | AR_FLAGS=$lt_AR_FLAGS |
| 9765 | |
| 9766 | +# How to feed a file listing to the archiver. |
| 9767 | +archiver_list_spec=$lt_archiver_list_spec |
| 9768 | + |
| 9769 | # A symbol stripping program. |
| 9770 | STRIP=$lt_STRIP |
| 9771 | |
| 9772 | @@ -19312,6 +20189,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
| 9773 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 9774 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 9775 | |
| 9776 | +# Specify filename containing input files for \$NM. |
| 9777 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 9778 | + |
| 9779 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 9780 | +lt_sysroot=$lt_sysroot |
| 9781 | + |
| 9782 | # The name of the directory that contains temporary libtool files. |
| 9783 | objdir=$objdir |
| 9784 | |
| 9785 | @@ -19321,6 +20204,9 @@ MAGIC_CMD=$MAGIC_CMD |
| 9786 | # Must we lock files when doing compilation? |
| 9787 | need_locks=$lt_need_locks |
| 9788 | |
| 9789 | +# Manifest tool. |
| 9790 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 9791 | + |
| 9792 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 9793 | DSYMUTIL=$lt_DSYMUTIL |
| 9794 | |
| 9795 | @@ -19435,12 +20321,12 @@ with_gcc=$GCC |
| 9796 | # Compiler flag to turn off builtin functions. |
| 9797 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 9798 | |
| 9799 | -# How to pass a linker flag through the compiler. |
| 9800 | -wl=$lt_lt_prog_compiler_wl |
| 9801 | - |
| 9802 | # Additional compiler flags for building library objects. |
| 9803 | pic_flag=$lt_lt_prog_compiler_pic |
| 9804 | |
| 9805 | +# How to pass a linker flag through the compiler. |
| 9806 | +wl=$lt_lt_prog_compiler_wl |
| 9807 | + |
| 9808 | # Compiler flag to prevent dynamic linking. |
| 9809 | link_static_flag=$lt_lt_prog_compiler_static |
| 9810 | |
| 9811 | @@ -19527,9 +20413,6 @@ inherit_rpath=$inherit_rpath |
| 9812 | # Whether libtool must link a program against all its dependency libraries. |
| 9813 | link_all_deplibs=$link_all_deplibs |
| 9814 | |
| 9815 | -# Fix the shell variable \$srcfile for the compiler. |
| 9816 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 9817 | - |
| 9818 | # Set to "yes" if exported symbols are required. |
| 9819 | always_export_symbols=$always_export_symbols |
| 9820 | |
| 9821 | @@ -19545,6 +20428,9 @@ include_expsyms=$lt_include_expsyms |
| 9822 | # Commands necessary for linking programs (against libraries) with templates. |
| 9823 | prelink_cmds=$lt_prelink_cmds |
| 9824 | |
| 9825 | +# Commands necessary for finishing linking programs. |
| 9826 | +postlink_cmds=$lt_postlink_cmds |
| 9827 | + |
| 9828 | # Specify filename containing input files. |
| 9829 | file_list_spec=$lt_file_list_spec |
| 9830 | |
| 9831 | @@ -19591,210 +20477,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
| 9832 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 9833 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 9834 | # is reportedly fixed, but why not run on old versions too? |
| 9835 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 9836 | - || (rm -f "$cfgfile"; exit 1) |
| 9837 | - |
| 9838 | - case $xsi_shell in |
| 9839 | - yes) |
| 9840 | - cat << \_LT_EOF >> "$cfgfile" |
| 9841 | - |
| 9842 | -# func_dirname file append nondir_replacement |
| 9843 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 9844 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 9845 | -func_dirname () |
| 9846 | -{ |
| 9847 | - case ${1} in |
| 9848 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 9849 | - * ) func_dirname_result="${3}" ;; |
| 9850 | - esac |
| 9851 | -} |
| 9852 | - |
| 9853 | -# func_basename file |
| 9854 | -func_basename () |
| 9855 | -{ |
| 9856 | - func_basename_result="${1##*/}" |
| 9857 | -} |
| 9858 | - |
| 9859 | -# func_dirname_and_basename file append nondir_replacement |
| 9860 | -# perform func_basename and func_dirname in a single function |
| 9861 | -# call: |
| 9862 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 9863 | -# add APPEND to the result, otherwise set result |
| 9864 | -# to NONDIR_REPLACEMENT. |
| 9865 | -# value returned in "$func_dirname_result" |
| 9866 | -# basename: Compute filename of FILE. |
| 9867 | -# value retuned in "$func_basename_result" |
| 9868 | -# Implementation must be kept synchronized with func_dirname |
| 9869 | -# and func_basename. For efficiency, we do not delegate to |
| 9870 | -# those functions but instead duplicate the functionality here. |
| 9871 | -func_dirname_and_basename () |
| 9872 | -{ |
| 9873 | - case ${1} in |
| 9874 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 9875 | - * ) func_dirname_result="${3}" ;; |
| 9876 | - esac |
| 9877 | - func_basename_result="${1##*/}" |
| 9878 | -} |
| 9879 | - |
| 9880 | -# func_stripname prefix suffix name |
| 9881 | -# strip PREFIX and SUFFIX off of NAME. |
| 9882 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 9883 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 9884 | -# dot (in which case that matches only a dot). |
| 9885 | -func_stripname () |
| 9886 | -{ |
| 9887 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 9888 | - # positional parameters, so assign one to ordinary parameter first. |
| 9889 | - func_stripname_result=${3} |
| 9890 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 9891 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 9892 | -} |
| 9893 | - |
| 9894 | -# func_opt_split |
| 9895 | -func_opt_split () |
| 9896 | -{ |
| 9897 | - func_opt_split_opt=${1%%=*} |
| 9898 | - func_opt_split_arg=${1#*=} |
| 9899 | -} |
| 9900 | - |
| 9901 | -# func_lo2o object |
| 9902 | -func_lo2o () |
| 9903 | -{ |
| 9904 | - case ${1} in |
| 9905 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 9906 | - *) func_lo2o_result=${1} ;; |
| 9907 | - esac |
| 9908 | -} |
| 9909 | - |
| 9910 | -# func_xform libobj-or-source |
| 9911 | -func_xform () |
| 9912 | -{ |
| 9913 | - func_xform_result=${1%.*}.lo |
| 9914 | -} |
| 9915 | - |
| 9916 | -# func_arith arithmetic-term... |
| 9917 | -func_arith () |
| 9918 | -{ |
| 9919 | - func_arith_result=$(( $* )) |
| 9920 | -} |
| 9921 | - |
| 9922 | -# func_len string |
| 9923 | -# STRING may not start with a hyphen. |
| 9924 | -func_len () |
| 9925 | -{ |
| 9926 | - func_len_result=${#1} |
| 9927 | -} |
| 9928 | - |
| 9929 | -_LT_EOF |
| 9930 | - ;; |
| 9931 | - *) # Bourne compatible functions. |
| 9932 | - cat << \_LT_EOF >> "$cfgfile" |
| 9933 | - |
| 9934 | -# func_dirname file append nondir_replacement |
| 9935 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 9936 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 9937 | -func_dirname () |
| 9938 | -{ |
| 9939 | - # Extract subdirectory from the argument. |
| 9940 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 9941 | - if test "X$func_dirname_result" = "X${1}"; then |
| 9942 | - func_dirname_result="${3}" |
| 9943 | - else |
| 9944 | - func_dirname_result="$func_dirname_result${2}" |
| 9945 | - fi |
| 9946 | -} |
| 9947 | - |
| 9948 | -# func_basename file |
| 9949 | -func_basename () |
| 9950 | -{ |
| 9951 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 9952 | -} |
| 9953 | - |
| 9954 | - |
| 9955 | -# func_stripname prefix suffix name |
| 9956 | -# strip PREFIX and SUFFIX off of NAME. |
| 9957 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 9958 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 9959 | -# dot (in which case that matches only a dot). |
| 9960 | -# func_strip_suffix prefix name |
| 9961 | -func_stripname () |
| 9962 | -{ |
| 9963 | - case ${2} in |
| 9964 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 9965 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 9966 | - esac |
| 9967 | -} |
| 9968 | - |
| 9969 | -# sed scripts: |
| 9970 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 9971 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 9972 | - |
| 9973 | -# func_opt_split |
| 9974 | -func_opt_split () |
| 9975 | -{ |
| 9976 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 9977 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 9978 | -} |
| 9979 | - |
| 9980 | -# func_lo2o object |
| 9981 | -func_lo2o () |
| 9982 | -{ |
| 9983 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 9984 | -} |
| 9985 | - |
| 9986 | -# func_xform libobj-or-source |
| 9987 | -func_xform () |
| 9988 | -{ |
| 9989 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 9990 | -} |
| 9991 | - |
| 9992 | -# func_arith arithmetic-term... |
| 9993 | -func_arith () |
| 9994 | -{ |
| 9995 | - func_arith_result=`expr "$@"` |
| 9996 | -} |
| 9997 | - |
| 9998 | -# func_len string |
| 9999 | -# STRING may not start with a hyphen. |
| 10000 | -func_len () |
| 10001 | -{ |
| 10002 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 10003 | -} |
| 10004 | - |
| 10005 | -_LT_EOF |
| 10006 | -esac |
| 10007 | - |
| 10008 | -case $lt_shell_append in |
| 10009 | - yes) |
| 10010 | - cat << \_LT_EOF >> "$cfgfile" |
| 10011 | - |
| 10012 | -# func_append var value |
| 10013 | -# Append VALUE to the end of shell variable VAR. |
| 10014 | -func_append () |
| 10015 | -{ |
| 10016 | - eval "$1+=\$2" |
| 10017 | -} |
| 10018 | -_LT_EOF |
| 10019 | - ;; |
| 10020 | - *) |
| 10021 | - cat << \_LT_EOF >> "$cfgfile" |
| 10022 | - |
| 10023 | -# func_append var value |
| 10024 | -# Append VALUE to the end of shell variable VAR. |
| 10025 | -func_append () |
| 10026 | -{ |
| 10027 | - eval "$1=\$$1\$2" |
| 10028 | -} |
| 10029 | - |
| 10030 | -_LT_EOF |
| 10031 | - ;; |
| 10032 | - esac |
| 10033 | - |
| 10034 | - |
| 10035 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 10036 | - || (rm -f "$cfgfile"; exit 1) |
| 10037 | - |
| 10038 | - mv -f "$cfgfile" "$ofile" || |
| 10039 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 10040 | + || (rm -f "$cfgfile"; exit 1) |
| 10041 | + |
| 10042 | + if test x"$xsi_shell" = xyes; then |
| 10043 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 10044 | +func_dirname ()\ |
| 10045 | +{\ |
| 10046 | +\ case ${1} in\ |
| 10047 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 10048 | +\ * ) func_dirname_result="${3}" ;;\ |
| 10049 | +\ esac\ |
| 10050 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10051 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10052 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10053 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10054 | + |
| 10055 | + |
| 10056 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 10057 | +func_basename ()\ |
| 10058 | +{\ |
| 10059 | +\ func_basename_result="${1##*/}"\ |
| 10060 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10061 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10062 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10063 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10064 | + |
| 10065 | + |
| 10066 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 10067 | +func_dirname_and_basename ()\ |
| 10068 | +{\ |
| 10069 | +\ case ${1} in\ |
| 10070 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 10071 | +\ * ) func_dirname_result="${3}" ;;\ |
| 10072 | +\ esac\ |
| 10073 | +\ func_basename_result="${1##*/}"\ |
| 10074 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10075 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10076 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10077 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10078 | + |
| 10079 | + |
| 10080 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 10081 | +func_stripname ()\ |
| 10082 | +{\ |
| 10083 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 10084 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 10085 | +\ func_stripname_result=${3}\ |
| 10086 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 10087 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 10088 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10089 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10090 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10091 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10092 | + |
| 10093 | + |
| 10094 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 10095 | +func_split_long_opt ()\ |
| 10096 | +{\ |
| 10097 | +\ func_split_long_opt_name=${1%%=*}\ |
| 10098 | +\ func_split_long_opt_arg=${1#*=}\ |
| 10099 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10100 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10101 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10102 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10103 | + |
| 10104 | + |
| 10105 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 10106 | +func_split_short_opt ()\ |
| 10107 | +{\ |
| 10108 | +\ func_split_short_opt_arg=${1#??}\ |
| 10109 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 10110 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10111 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10112 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10113 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10114 | + |
| 10115 | + |
| 10116 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 10117 | +func_lo2o ()\ |
| 10118 | +{\ |
| 10119 | +\ case ${1} in\ |
| 10120 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 10121 | +\ *) func_lo2o_result=${1} ;;\ |
| 10122 | +\ esac\ |
| 10123 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10124 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10125 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10126 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10127 | + |
| 10128 | + |
| 10129 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 10130 | +func_xform ()\ |
| 10131 | +{\ |
| 10132 | + func_xform_result=${1%.*}.lo\ |
| 10133 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10134 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10135 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10136 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10137 | + |
| 10138 | + |
| 10139 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 10140 | +func_arith ()\ |
| 10141 | +{\ |
| 10142 | + func_arith_result=$(( $* ))\ |
| 10143 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10144 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10145 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10146 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10147 | + |
| 10148 | + |
| 10149 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 10150 | +func_len ()\ |
| 10151 | +{\ |
| 10152 | + func_len_result=${#1}\ |
| 10153 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10154 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10155 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10156 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10157 | + |
| 10158 | +fi |
| 10159 | + |
| 10160 | +if test x"$lt_shell_append" = xyes; then |
| 10161 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 10162 | +func_append ()\ |
| 10163 | +{\ |
| 10164 | + eval "${1}+=\\${2}"\ |
| 10165 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10166 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10167 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10168 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10169 | + |
| 10170 | + |
| 10171 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 10172 | +func_append_quoted ()\ |
| 10173 | +{\ |
| 10174 | +\ func_quote_for_eval "${2}"\ |
| 10175 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 10176 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10177 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10178 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10179 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10180 | + |
| 10181 | + |
| 10182 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 10183 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 10184 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10185 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10186 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 10187 | +else |
| 10188 | + # Save a `func_append' function call even when '+=' is not available |
| 10189 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 10190 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10191 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10192 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 10193 | +fi |
| 10194 | + |
| 10195 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 10196 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 10197 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 10198 | +fi |
| 10199 | + |
| 10200 | + |
| 10201 | + mv -f "$cfgfile" "$ofile" || |
| 10202 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 10203 | chmod +x "$ofile" |
| 10204 | |
| 10205 | @@ -19822,12 +20667,12 @@ with_gcc=$GCC_CXX |
| 10206 | # Compiler flag to turn off builtin functions. |
| 10207 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX |
| 10208 | |
| 10209 | -# How to pass a linker flag through the compiler. |
| 10210 | -wl=$lt_lt_prog_compiler_wl_CXX |
| 10211 | - |
| 10212 | # Additional compiler flags for building library objects. |
| 10213 | pic_flag=$lt_lt_prog_compiler_pic_CXX |
| 10214 | |
| 10215 | +# How to pass a linker flag through the compiler. |
| 10216 | +wl=$lt_lt_prog_compiler_wl_CXX |
| 10217 | + |
| 10218 | # Compiler flag to prevent dynamic linking. |
| 10219 | link_static_flag=$lt_lt_prog_compiler_static_CXX |
| 10220 | |
| 10221 | @@ -19914,9 +20759,6 @@ inherit_rpath=$inherit_rpath_CXX |
| 10222 | # Whether libtool must link a program against all its dependency libraries. |
| 10223 | link_all_deplibs=$link_all_deplibs_CXX |
| 10224 | |
| 10225 | -# Fix the shell variable \$srcfile for the compiler. |
| 10226 | -fix_srcfile_path=$lt_fix_srcfile_path_CXX |
| 10227 | - |
| 10228 | # Set to "yes" if exported symbols are required. |
| 10229 | always_export_symbols=$always_export_symbols_CXX |
| 10230 | |
| 10231 | @@ -19932,6 +20774,9 @@ include_expsyms=$lt_include_expsyms_CXX |
| 10232 | # Commands necessary for linking programs (against libraries) with templates. |
| 10233 | prelink_cmds=$lt_prelink_cmds_CXX |
| 10234 | |
| 10235 | +# Commands necessary for finishing linking programs. |
| 10236 | +postlink_cmds=$lt_postlink_cmds_CXX |
| 10237 | + |
| 10238 | # Specify filename containing input files. |
| 10239 | file_list_spec=$lt_file_list_spec_CXX |
| 10240 | |
| 10241 | diff --git a/libtool.m4 b/libtool.m4 |
| 10242 | index 24d13f3440..e45fdc6998 100644 |
| 10243 | --- a/libtool.m4 |
| 10244 | +++ b/libtool.m4 |
| 10245 | @@ -1,7 +1,8 @@ |
| 10246 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
| 10247 | # |
| 10248 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 10249 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 10250 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 10251 | +# Inc. |
| 10252 | # Written by Gordon Matzigkeit, 1996 |
| 10253 | # |
| 10254 | # This file is free software; the Free Software Foundation gives |
| 10255 | @@ -10,7 +11,8 @@ |
| 10256 | |
| 10257 | m4_define([_LT_COPYING], [dnl |
| 10258 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 10259 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 10260 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 10261 | +# Inc. |
| 10262 | # Written by Gordon Matzigkeit, 1996 |
| 10263 | # |
| 10264 | # This file is part of GNU Libtool. |
| 10265 | @@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl |
| 10266 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
| 10267 | ]) |
| 10268 | |
| 10269 | -# serial 56 LT_INIT |
| 10270 | +# serial 57 LT_INIT |
| 10271 | |
| 10272 | |
| 10273 | # LT_PREREQ(VERSION) |
| 10274 | @@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) |
| 10275 | LIBTOOL_DEPS="$ltmain" |
| 10276 | |
| 10277 | # Always use our own libtool. |
| 10278 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
| 10279 | +LIBTOOL='$(SHELL) $(top_builddir)' |
| 10280 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" |
| 10281 | AC_SUBST(LIBTOOL)dnl |
| 10282 | |
| 10283 | _LT_SETUP |
| 10284 | @@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl |
| 10285 | dnl |
| 10286 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
| 10287 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
| 10288 | +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl |
| 10289 | m4_require([_LT_CMD_RELOAD])dnl |
| 10290 | m4_require([_LT_CHECK_MAGIC_METHOD])dnl |
| 10291 | +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl |
| 10292 | m4_require([_LT_CMD_OLD_ARCHIVE])dnl |
| 10293 | m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl |
| 10294 | +m4_require([_LT_WITH_SYSROOT])dnl |
| 10295 | |
| 10296 | _LT_CONFIG_LIBTOOL_INIT([ |
| 10297 | # See if we are running on zsh, and set the options which allow our |
| 10298 | @@ -199,7 +205,7 @@ aix3*) |
| 10299 | esac |
| 10300 | |
| 10301 | # Global variables: |
| 10302 | -ofile=libtool |
| 10303 | +ofile=${host_alias}-libtool |
| 10304 | can_build_shared=yes |
| 10305 | |
| 10306 | # All known linkers require a `.a' archive for static linking (except MSVC, |
| 10307 | @@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl |
| 10308 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
| 10309 | configured by $[0], generated by m4_PACKAGE_STRING. |
| 10310 | |
| 10311 | -Copyright (C) 2009 Free Software Foundation, Inc. |
| 10312 | +Copyright (C) 2010 Free Software Foundation, Inc. |
| 10313 | This config.lt script is free software; the Free Software Foundation |
| 10314 | gives unlimited permision to copy, distribute and modify it." |
| 10315 | |
| 10316 | @@ -746,15 +752,12 @@ _LT_EOF |
| 10317 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 10318 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 10319 | # is reportedly fixed, but why not run on old versions too? |
| 10320 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 10321 | - || (rm -f "$cfgfile"; exit 1) |
| 10322 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 10323 | + || (rm -f "$cfgfile"; exit 1) |
| 10324 | |
| 10325 | - _LT_PROG_XSI_SHELLFNS |
| 10326 | + _LT_PROG_REPLACE_SHELLFNS |
| 10327 | |
| 10328 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 10329 | - || (rm -f "$cfgfile"; exit 1) |
| 10330 | - |
| 10331 | - mv -f "$cfgfile" "$ofile" || |
| 10332 | + mv -f "$cfgfile" "$ofile" || |
| 10333 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 10334 | chmod +x "$ofile" |
| 10335 | ], |
| 10336 | @@ -980,6 +983,8 @@ _LT_EOF |
| 10337 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD |
| 10338 | echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD |
| 10339 | $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD |
| 10340 | + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD |
| 10341 | + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD |
| 10342 | cat > conftest.c << _LT_EOF |
| 10343 | int main() { return 0;} |
| 10344 | _LT_EOF |
| 10345 | @@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], |
| 10346 | fi |
| 10347 | ]) |
| 10348 | |
| 10349 | -# _LT_SYS_MODULE_PATH_AIX |
| 10350 | -# ----------------------- |
| 10351 | +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) |
| 10352 | +# ---------------------------------- |
| 10353 | # Links a minimal program and checks the executable |
| 10354 | # for the system default hardcoded library path. In most cases, |
| 10355 | # this is /usr/lib:/lib, but when the MPI compilers are used |
| 10356 | # the location of the communication and MPI libs are included too. |
| 10357 | # If we don't find anything, use the default library path according |
| 10358 | # to the aix ld manual. |
| 10359 | +# Store the results from the different compilers for each TAGNAME. |
| 10360 | +# Allow to override them for all tags through lt_cv_aix_libpath. |
| 10361 | m4_defun([_LT_SYS_MODULE_PATH_AIX], |
| 10362 | [m4_require([_LT_DECL_SED])dnl |
| 10363 | -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ |
| 10364 | -lt_aix_libpath_sed=' |
| 10365 | - /Import File Strings/,/^$/ { |
| 10366 | - /^0/ { |
| 10367 | - s/^0 *\(.*\)$/\1/ |
| 10368 | - p |
| 10369 | - } |
| 10370 | - }' |
| 10371 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 10372 | -# Check for a 64-bit object if we didn't find anything. |
| 10373 | -if test -z "$aix_libpath"; then |
| 10374 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 10375 | -fi],[]) |
| 10376 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 10377 | +if test "${lt_cv_aix_libpath+set}" = set; then |
| 10378 | + aix_libpath=$lt_cv_aix_libpath |
| 10379 | +else |
| 10380 | + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], |
| 10381 | + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ |
| 10382 | + lt_aix_libpath_sed='[ |
| 10383 | + /Import File Strings/,/^$/ { |
| 10384 | + /^0/ { |
| 10385 | + s/^0 *\([^ ]*\) *$/\1/ |
| 10386 | + p |
| 10387 | + } |
| 10388 | + }]' |
| 10389 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 10390 | + # Check for a 64-bit object if we didn't find anything. |
| 10391 | + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then |
| 10392 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 10393 | + fi],[]) |
| 10394 | + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then |
| 10395 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" |
| 10396 | + fi |
| 10397 | + ]) |
| 10398 | + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) |
| 10399 | +fi |
| 10400 | ])# _LT_SYS_MODULE_PATH_AIX |
| 10401 | |
| 10402 | |
| 10403 | @@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 10404 | |
| 10405 | AC_MSG_CHECKING([how to print strings]) |
| 10406 | # Test print first, because it will be a builtin if present. |
| 10407 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 10408 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 10409 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 10410 | ECHO='print -r --' |
| 10411 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 10412 | @@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) |
| 10413 | ])# _LT_PROG_ECHO_BACKSLASH |
| 10414 | |
| 10415 | |
| 10416 | +# _LT_WITH_SYSROOT |
| 10417 | +# ---------------- |
| 10418 | +AC_DEFUN([_LT_WITH_SYSROOT], |
| 10419 | +[AC_MSG_CHECKING([for sysroot]) |
| 10420 | +AC_ARG_WITH([libtool-sysroot], |
| 10421 | +[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR |
| 10422 | + (or the compiler's sysroot if not specified).], |
| 10423 | +[], [with_libtool_sysroot=no]) |
| 10424 | + |
| 10425 | +dnl lt_sysroot will always be passed unquoted. We quote it here |
| 10426 | +dnl in case the user passed a directory name. |
| 10427 | +lt_sysroot= |
| 10428 | +case ${with_libtool_sysroot} in #( |
| 10429 | + yes) |
| 10430 | + if test "$GCC" = yes; then |
| 10431 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 10432 | + fi |
| 10433 | + ;; #( |
| 10434 | + /*) |
| 10435 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 10436 | + ;; #( |
| 10437 | + no|'') |
| 10438 | + ;; #( |
| 10439 | + *) |
| 10440 | + AC_MSG_RESULT([${with_libtool_sysroot}]) |
| 10441 | + AC_MSG_ERROR([The sysroot must be an absolute path.]) |
| 10442 | + ;; |
| 10443 | +esac |
| 10444 | + |
| 10445 | + AC_MSG_RESULT([${lt_sysroot:-no}]) |
| 10446 | +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl |
| 10447 | +[dependent libraries, and in which our libraries should be installed.])]) |
| 10448 | + |
| 10449 | # _LT_ENABLE_LOCK |
| 10450 | # --------------- |
| 10451 | m4_defun([_LT_ENABLE_LOCK], |
| 10452 | @@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock" |
| 10453 | ])# _LT_ENABLE_LOCK |
| 10454 | |
| 10455 | |
| 10456 | +# _LT_PROG_AR |
| 10457 | +# ----------- |
| 10458 | +m4_defun([_LT_PROG_AR], |
| 10459 | +[AC_CHECK_TOOLS(AR, [ar], false) |
| 10460 | +: ${AR=ar} |
| 10461 | +: ${AR_FLAGS=cru} |
| 10462 | +_LT_DECL([], [AR], [1], [The archiver]) |
| 10463 | +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) |
| 10464 | + |
| 10465 | +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], |
| 10466 | + [lt_cv_ar_at_file=no |
| 10467 | + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], |
| 10468 | + [echo conftest.$ac_objext > conftest.lst |
| 10469 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' |
| 10470 | + AC_TRY_EVAL([lt_ar_try]) |
| 10471 | + if test "$ac_status" -eq 0; then |
| 10472 | + # Ensure the archiver fails upon bogus file names. |
| 10473 | + rm -f conftest.$ac_objext libconftest.a |
| 10474 | + AC_TRY_EVAL([lt_ar_try]) |
| 10475 | + if test "$ac_status" -ne 0; then |
| 10476 | + lt_cv_ar_at_file=@ |
| 10477 | + fi |
| 10478 | + fi |
| 10479 | + rm -f conftest.* libconftest.a |
| 10480 | + ]) |
| 10481 | + ]) |
| 10482 | + |
| 10483 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 10484 | + archiver_list_spec= |
| 10485 | +else |
| 10486 | + archiver_list_spec=$lt_cv_ar_at_file |
| 10487 | +fi |
| 10488 | +_LT_DECL([], [archiver_list_spec], [1], |
| 10489 | + [How to feed a file listing to the archiver]) |
| 10490 | +])# _LT_PROG_AR |
| 10491 | + |
| 10492 | + |
| 10493 | # _LT_CMD_OLD_ARCHIVE |
| 10494 | # ------------------- |
| 10495 | m4_defun([_LT_CMD_OLD_ARCHIVE], |
| 10496 | -[AC_CHECK_TOOL(AR, ar, false) |
| 10497 | -test -z "$AR" && AR=ar |
| 10498 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 10499 | -_LT_DECL([], [AR], [1], [The archiver]) |
| 10500 | -_LT_DECL([], [AR_FLAGS], [1]) |
| 10501 | +[_LT_PROG_AR |
| 10502 | |
| 10503 | AC_CHECK_TOOL(STRIP, strip, :) |
| 10504 | test -z "$STRIP" && STRIP=: |
| 10505 | @@ -1623,7 +1705,7 @@ else |
| 10506 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 10507 | lt_status=$lt_dlunknown |
| 10508 | cat > conftest.$ac_ext <<_LT_EOF |
| 10509 | -[#line __oline__ "configure" |
| 10510 | +[#line $LINENO "configure" |
| 10511 | #include "confdefs.h" |
| 10512 | |
| 10513 | #if HAVE_DLFCN_H |
| 10514 | @@ -1667,10 +1749,10 @@ else |
| 10515 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 10516 | correspondingly for the symbols needed. */ |
| 10517 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 10518 | -void fnord () __attribute__((visibility("default"))); |
| 10519 | +int fnord () __attribute__((visibility("default"))); |
| 10520 | #endif |
| 10521 | |
| 10522 | -void fnord () { int i=42; } |
| 10523 | +int fnord () { return 42; } |
| 10524 | int main () |
| 10525 | { |
| 10526 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 10527 | @@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 10528 | need_version=no |
| 10529 | need_lib_prefix=no |
| 10530 | |
| 10531 | - case $GCC,$host_os in |
| 10532 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 10533 | + case $GCC,$cc_basename in |
| 10534 | + yes,*) |
| 10535 | + # gcc |
| 10536 | library_names_spec='$libname.dll.a' |
| 10537 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 10538 | postinstall_cmds='base_file=`basename \${file}`~ |
| 10539 | @@ -2244,13 +2327,71 @@ m4_if([$1], [],[ |
| 10540 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
| 10541 | ;; |
| 10542 | esac |
| 10543 | + dynamic_linker='Win32 ld.exe' |
| 10544 | + ;; |
| 10545 | + |
| 10546 | + *,cl*) |
| 10547 | + # Native MSVC |
| 10548 | + libname_spec='$name' |
| 10549 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
| 10550 | + library_names_spec='${libname}.dll.lib' |
| 10551 | + |
| 10552 | + case $build_os in |
| 10553 | + mingw*) |
| 10554 | + sys_lib_search_path_spec= |
| 10555 | + lt_save_ifs=$IFS |
| 10556 | + IFS=';' |
| 10557 | + for lt_path in $LIB |
| 10558 | + do |
| 10559 | + IFS=$lt_save_ifs |
| 10560 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 10561 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 10562 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 10563 | + done |
| 10564 | + IFS=$lt_save_ifs |
| 10565 | + # Convert to MSYS style. |
| 10566 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` |
| 10567 | + ;; |
| 10568 | + cygwin*) |
| 10569 | + # Convert to unix form, then to dos form, then back to unix form |
| 10570 | + # but this time dos style (no spaces!) so that the unix form looks |
| 10571 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 10572 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 10573 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 10574 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 10575 | + ;; |
| 10576 | + *) |
| 10577 | + sys_lib_search_path_spec="$LIB" |
| 10578 | + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then |
| 10579 | + # It is most probably a Windows format PATH. |
| 10580 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 10581 | + else |
| 10582 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 10583 | + fi |
| 10584 | + # FIXME: find the short name or the path components, as spaces are |
| 10585 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 10586 | + ;; |
| 10587 | + esac |
| 10588 | + |
| 10589 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 10590 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 10591 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 10592 | + dldir=$destdir/`dirname \$dlpath`~ |
| 10593 | + test -d \$dldir || mkdir -p \$dldir~ |
| 10594 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 10595 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 10596 | + dlpath=$dir/\$dldll~ |
| 10597 | + $RM \$dlpath' |
| 10598 | + shlibpath_overrides_runpath=yes |
| 10599 | + dynamic_linker='Win32 link.exe' |
| 10600 | ;; |
| 10601 | |
| 10602 | *) |
| 10603 | + # Assume MSVC wrapper |
| 10604 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 10605 | + dynamic_linker='Win32 ld.exe' |
| 10606 | ;; |
| 10607 | esac |
| 10608 | - dynamic_linker='Win32 ld.exe' |
| 10609 | # FIXME: first we should search . and the directory the executable is in |
| 10610 | shlibpath_var=PATH |
| 10611 | ;; |
| 10612 | @@ -2342,7 +2483,7 @@ haiku*) |
| 10613 | soname_spec='${libname}${release}${shared_ext}$major' |
| 10614 | shlibpath_var=LIBRARY_PATH |
| 10615 | shlibpath_overrides_runpath=yes |
| 10616 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' |
| 10617 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
| 10618 | hardcode_into_libs=yes |
| 10619 | ;; |
| 10620 | |
| 10621 | @@ -2950,6 +3091,11 @@ case $reload_flag in |
| 10622 | esac |
| 10623 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 10624 | case $host_os in |
| 10625 | + cygwin* | mingw* | pw32* | cegcc*) |
| 10626 | + if test "$GCC" != yes; then |
| 10627 | + reload_cmds=false |
| 10628 | + fi |
| 10629 | + ;; |
| 10630 | darwin*) |
| 10631 | if test "$GCC" = yes; then |
| 10632 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 10633 | @@ -3016,7 +3162,8 @@ mingw* | pw32*) |
| 10634 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 10635 | lt_cv_file_magic_cmd='func_win32_libid' |
| 10636 | else |
| 10637 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 10638 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 10639 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 10640 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 10641 | fi |
| 10642 | ;; |
| 10643 | @@ -3167,6 +3314,21 @@ tpf*) |
| 10644 | ;; |
| 10645 | esac |
| 10646 | ]) |
| 10647 | + |
| 10648 | +file_magic_glob= |
| 10649 | +want_nocaseglob=no |
| 10650 | +if test "$build" = "$host"; then |
| 10651 | + case $host_os in |
| 10652 | + mingw* | pw32*) |
| 10653 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 10654 | + want_nocaseglob=yes |
| 10655 | + else |
| 10656 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` |
| 10657 | + fi |
| 10658 | + ;; |
| 10659 | + esac |
| 10660 | +fi |
| 10661 | + |
| 10662 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 10663 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 10664 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 10665 | @@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 10666 | _LT_DECL([], [deplibs_check_method], [1], |
| 10667 | [Method to check whether dependent libraries are shared objects]) |
| 10668 | _LT_DECL([], [file_magic_cmd], [1], |
| 10669 | - [Command to use when deplibs_check_method == "file_magic"]) |
| 10670 | + [Command to use when deplibs_check_method = "file_magic"]) |
| 10671 | +_LT_DECL([], [file_magic_glob], [1], |
| 10672 | + [How to find potential files when deplibs_check_method = "file_magic"]) |
| 10673 | +_LT_DECL([], [want_nocaseglob], [1], |
| 10674 | + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) |
| 10675 | ])# _LT_CHECK_MAGIC_METHOD |
| 10676 | |
| 10677 | |
| 10678 | @@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility: |
| 10679 | dnl AC_DEFUN([AM_PROG_NM], []) |
| 10680 | dnl AC_DEFUN([AC_PROG_NM], []) |
| 10681 | |
| 10682 | +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB |
| 10683 | +# -------------------------------- |
| 10684 | +# how to determine the name of the shared library |
| 10685 | +# associated with a specific link library. |
| 10686 | +# -- PORTME fill in with the dynamic library characteristics |
| 10687 | +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], |
| 10688 | +[m4_require([_LT_DECL_EGREP]) |
| 10689 | +m4_require([_LT_DECL_OBJDUMP]) |
| 10690 | +m4_require([_LT_DECL_DLLTOOL]) |
| 10691 | +AC_CACHE_CHECK([how to associate runtime and link libraries], |
| 10692 | +lt_cv_sharedlib_from_linklib_cmd, |
| 10693 | +[lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 10694 | + |
| 10695 | +case $host_os in |
| 10696 | +cygwin* | mingw* | pw32* | cegcc*) |
| 10697 | + # two different shell functions defined in ltmain.sh |
| 10698 | + # decide which to use based on capabilities of $DLLTOOL |
| 10699 | + case `$DLLTOOL --help 2>&1` in |
| 10700 | + *--identify-strict*) |
| 10701 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 10702 | + ;; |
| 10703 | + *) |
| 10704 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 10705 | + ;; |
| 10706 | + esac |
| 10707 | + ;; |
| 10708 | +*) |
| 10709 | + # fallback: assume linklib IS sharedlib |
| 10710 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 10711 | + ;; |
| 10712 | +esac |
| 10713 | +]) |
| 10714 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 10715 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 10716 | + |
| 10717 | +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], |
| 10718 | + [Command to associate shared and link libraries]) |
| 10719 | +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB |
| 10720 | + |
| 10721 | + |
| 10722 | +# _LT_PATH_MANIFEST_TOOL |
| 10723 | +# ---------------------- |
| 10724 | +# locate the manifest tool |
| 10725 | +m4_defun([_LT_PATH_MANIFEST_TOOL], |
| 10726 | +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) |
| 10727 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 10728 | +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], |
| 10729 | + [lt_cv_path_mainfest_tool=no |
| 10730 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD |
| 10731 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 10732 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
| 10733 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 10734 | + lt_cv_path_mainfest_tool=yes |
| 10735 | + fi |
| 10736 | + rm -f conftest*]) |
| 10737 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 10738 | + MANIFEST_TOOL=: |
| 10739 | +fi |
| 10740 | +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl |
| 10741 | +])# _LT_PATH_MANIFEST_TOOL |
| 10742 | + |
| 10743 | |
| 10744 | # LT_LIB_M |
| 10745 | # -------- |
| 10746 | @@ -3403,8 +3630,8 @@ esac |
| 10747 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 10748 | |
| 10749 | # Transform an extracted symbol line into symbol name and symbol address |
| 10750 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 10751 | -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
| 10752 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 10753 | +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
| 10754 | |
| 10755 | # Handle CRLF in mingw tool chain |
| 10756 | opt_cr= |
| 10757 | @@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do |
| 10758 | else |
| 10759 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 10760 | fi |
| 10761 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 10762 | |
| 10763 | # Check to see that the pipe works correctly. |
| 10764 | pipe_works=no |
| 10765 | @@ -3473,6 +3701,18 @@ _LT_EOF |
| 10766 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 10767 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 10768 | cat <<_LT_EOF > conftest.$ac_ext |
| 10769 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 10770 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 10771 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 10772 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 10773 | +# define LT@&t@_DLSYM_CONST |
| 10774 | +#elif defined(__osf__) |
| 10775 | +/* This system does not cope well with relocations in const data. */ |
| 10776 | +# define LT@&t@_DLSYM_CONST |
| 10777 | +#else |
| 10778 | +# define LT@&t@_DLSYM_CONST const |
| 10779 | +#endif |
| 10780 | + |
| 10781 | #ifdef __cplusplus |
| 10782 | extern "C" { |
| 10783 | #endif |
| 10784 | @@ -3484,7 +3724,7 @@ _LT_EOF |
| 10785 | cat <<_LT_EOF >> conftest.$ac_ext |
| 10786 | |
| 10787 | /* The mapping between symbol names and symbols. */ |
| 10788 | -const struct { |
| 10789 | +LT@&t@_DLSYM_CONST struct { |
| 10790 | const char *name; |
| 10791 | void *address; |
| 10792 | } |
| 10793 | @@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() { |
| 10794 | _LT_EOF |
| 10795 | # Now try linking the two files. |
| 10796 | mv conftest.$ac_objext conftstm.$ac_objext |
| 10797 | - lt_save_LIBS="$LIBS" |
| 10798 | - lt_save_CFLAGS="$CFLAGS" |
| 10799 | + lt_globsym_save_LIBS=$LIBS |
| 10800 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 10801 | LIBS="conftstm.$ac_objext" |
| 10802 | CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" |
| 10803 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then |
| 10804 | pipe_works=yes |
| 10805 | fi |
| 10806 | - LIBS="$lt_save_LIBS" |
| 10807 | - CFLAGS="$lt_save_CFLAGS" |
| 10808 | + LIBS=$lt_globsym_save_LIBS |
| 10809 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 10810 | else |
| 10811 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD |
| 10812 | fi |
| 10813 | @@ -3551,6 +3791,13 @@ else |
| 10814 | AC_MSG_RESULT(ok) |
| 10815 | fi |
| 10816 | |
| 10817 | +# Response file support. |
| 10818 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 10819 | + nm_file_list_spec='@' |
| 10820 | +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then |
| 10821 | + nm_file_list_spec='@' |
| 10822 | +fi |
| 10823 | + |
| 10824 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], |
| 10825 | [Take the output of nm and produce a listing of raw symbols and C names]) |
| 10826 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], |
| 10827 | @@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address], |
| 10828 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], |
| 10829 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], |
| 10830 | [Transform the output of nm in a C name address pair when lib prefix is needed]) |
| 10831 | +_LT_DECL([], [nm_file_list_spec], [1], |
| 10832 | + [Specify filename containing input files for $NM]) |
| 10833 | ]) # _LT_CMD_GLOBAL_SYMBOLS |
| 10834 | |
| 10835 | |
| 10836 | @@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= |
| 10837 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
| 10838 | _LT_TAGVAR(lt_prog_compiler_static, $1)= |
| 10839 | |
| 10840 | -AC_MSG_CHECKING([for $compiler option to produce PIC]) |
| 10841 | m4_if([$1], [CXX], [ |
| 10842 | # C++ specific cases for pic, static, wl, etc. |
| 10843 | if test "$GXX" = yes; then |
| 10844 | @@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [ |
| 10845 | ;; |
| 10846 | esac |
| 10847 | ;; |
| 10848 | + mingw* | cygwin* | os2* | pw32* | cegcc*) |
| 10849 | + # This hack is so that the source file can tell whether it is being |
| 10850 | + # built for inclusion in a dll (and should export symbols for example). |
| 10851 | + m4_if([$1], [GCJ], [], |
| 10852 | + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) |
| 10853 | + ;; |
| 10854 | dgux*) |
| 10855 | case $cc_basename in |
| 10856 | ec++*) |
| 10857 | @@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [ |
| 10858 | ;; |
| 10859 | solaris*) |
| 10860 | case $cc_basename in |
| 10861 | - CC*) |
| 10862 | + CC* | sunCC*) |
| 10863 | # Sun C++ 4.2, 5.x and Centerline C++ |
| 10864 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
| 10865 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
| 10866 | @@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [ |
| 10867 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' |
| 10868 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' |
| 10869 | ;; |
| 10870 | + nagfor*) |
| 10871 | + # NAG Fortran compiler |
| 10872 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' |
| 10873 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' |
| 10874 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
| 10875 | + ;; |
| 10876 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 10877 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 10878 | # which looks to be a dead project) |
| 10879 | @@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [ |
| 10880 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
| 10881 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
| 10882 | case $cc_basename in |
| 10883 | - f77* | f90* | f95*) |
| 10884 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 10885 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; |
| 10886 | *) |
| 10887 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; |
| 10888 | @@ -4172,9 +4432,11 @@ case $host_os in |
| 10889 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" |
| 10890 | ;; |
| 10891 | esac |
| 10892 | -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) |
| 10893 | -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], |
| 10894 | - [How to pass a linker flag through the compiler]) |
| 10895 | + |
| 10896 | +AC_CACHE_CHECK([for $compiler option to produce PIC], |
| 10897 | + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], |
| 10898 | + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) |
| 10899 | +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) |
| 10900 | |
| 10901 | # |
| 10902 | # Check to make sure the PIC flag actually works. |
| 10903 | @@ -4193,6 +4455,8 @@ fi |
| 10904 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], |
| 10905 | [Additional compiler flags for building library objects]) |
| 10906 | |
| 10907 | +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], |
| 10908 | + [How to pass a linker flag through the compiler]) |
| 10909 | # |
| 10910 | # Check to make sure the static flag actually works. |
| 10911 | # |
| 10912 | @@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], |
| 10913 | m4_defun([_LT_LINKER_SHLIBS], |
| 10914 | [AC_REQUIRE([LT_PATH_LD])dnl |
| 10915 | AC_REQUIRE([LT_PATH_NM])dnl |
| 10916 | +m4_require([_LT_PATH_MANIFEST_TOOL])dnl |
| 10917 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
| 10918 | m4_require([_LT_DECL_EGREP])dnl |
| 10919 | m4_require([_LT_DECL_SED])dnl |
| 10920 | @@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl |
| 10921 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) |
| 10922 | m4_if([$1], [CXX], [ |
| 10923 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
| 10924 | + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] |
| 10925 | case $host_os in |
| 10926 | aix[[4-9]]*) |
| 10927 | # If we're using GNU nm, then we don't want the "-C" option. |
| 10928 | @@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [ |
| 10929 | ;; |
| 10930 | pw32*) |
| 10931 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" |
| 10932 | - ;; |
| 10933 | + ;; |
| 10934 | cygwin* | mingw* | cegcc*) |
| 10935 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
| 10936 | - ;; |
| 10937 | + case $cc_basename in |
| 10938 | + cl*) ;; |
| 10939 | + *) |
| 10940 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
| 10941 | + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
| 10942 | + ;; |
| 10943 | + esac |
| 10944 | + ;; |
| 10945 | *) |
| 10946 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
| 10947 | - ;; |
| 10948 | + ;; |
| 10949 | esac |
| 10950 | - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] |
| 10951 | ], [ |
| 10952 | runpath_var= |
| 10953 | _LT_TAGVAR(allow_undefined_flag, $1)= |
| 10954 | @@ -4411,7 +4682,8 @@ _LT_EOF |
| 10955 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 10956 | _LT_TAGVAR(always_export_symbols, $1)=no |
| 10957 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 10958 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' |
| 10959 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
| 10960 | + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
| 10961 | |
| 10962 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 10963 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 10964 | @@ -4510,12 +4782,12 @@ _LT_EOF |
| 10965 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
| 10966 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
| 10967 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' |
| 10968 | - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 10969 | + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 10970 | if test "x$supports_anon_versioning" = xyes; then |
| 10971 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ |
| 10972 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 10973 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 10974 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 10975 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 10976 | fi |
| 10977 | ;; |
| 10978 | esac |
| 10979 | @@ -4529,8 +4801,8 @@ _LT_EOF |
| 10980 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 10981 | wlarc= |
| 10982 | else |
| 10983 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 10984 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 10985 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 10986 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 10987 | fi |
| 10988 | ;; |
| 10989 | |
| 10990 | @@ -4548,8 +4820,8 @@ _LT_EOF |
| 10991 | |
| 10992 | _LT_EOF |
| 10993 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 10994 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 10995 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 10996 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 10997 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 10998 | else |
| 10999 | _LT_TAGVAR(ld_shlibs, $1)=no |
| 11000 | fi |
| 11001 | @@ -4595,8 +4867,8 @@ _LT_EOF |
| 11002 | |
| 11003 | *) |
| 11004 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 11005 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 11006 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 11007 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 11008 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 11009 | else |
| 11010 | _LT_TAGVAR(ld_shlibs, $1)=no |
| 11011 | fi |
| 11012 | @@ -4726,7 +4998,7 @@ _LT_EOF |
| 11013 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
| 11014 | # Determine the default libpath from the value encoded in an |
| 11015 | # empty executable. |
| 11016 | - _LT_SYS_MODULE_PATH_AIX |
| 11017 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
| 11018 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 11019 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
| 11020 | else |
| 11021 | @@ -4737,7 +5009,7 @@ _LT_EOF |
| 11022 | else |
| 11023 | # Determine the default libpath from the value encoded in an |
| 11024 | # empty executable. |
| 11025 | - _LT_SYS_MODULE_PATH_AIX |
| 11026 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
| 11027 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 11028 | # Warning - without using the other run time loading flags, |
| 11029 | # -berok will link without error, but may produce a broken library. |
| 11030 | @@ -4781,20 +5053,63 @@ _LT_EOF |
| 11031 | # Microsoft Visual C++. |
| 11032 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 11033 | # no search path for DLLs. |
| 11034 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
| 11035 | - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 11036 | - # Tell ltmain to make .lib files, not .a files. |
| 11037 | - libext=lib |
| 11038 | - # Tell ltmain to make .dll files, not .so files. |
| 11039 | - shrext_cmds=".dll" |
| 11040 | - # FIXME: Setting linknames here is a bad hack. |
| 11041 | - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 11042 | - # The linker will automatically build a .lib file if we build a DLL. |
| 11043 | - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
| 11044 | - # FIXME: Should let the user specify the lib program. |
| 11045 | - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 11046 | - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' |
| 11047 | - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 11048 | + case $cc_basename in |
| 11049 | + cl*) |
| 11050 | + # Native MSVC |
| 11051 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
| 11052 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 11053 | + _LT_TAGVAR(always_export_symbols, $1)=yes |
| 11054 | + _LT_TAGVAR(file_list_spec, $1)='@' |
| 11055 | + # Tell ltmain to make .lib files, not .a files. |
| 11056 | + libext=lib |
| 11057 | + # Tell ltmain to make .dll files, not .so files. |
| 11058 | + shrext_cmds=".dll" |
| 11059 | + # FIXME: Setting linknames here is a bad hack. |
| 11060 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 11061 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 11062 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 11063 | + else |
| 11064 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 11065 | + fi~ |
| 11066 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 11067 | + linknames=' |
| 11068 | + # The linker will not automatically build a static lib if we build a DLL. |
| 11069 | + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
| 11070 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 11071 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' |
| 11072 | + # Don't use ranlib |
| 11073 | + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
| 11074 | + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ |
| 11075 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 11076 | + case $lt_outputfile in |
| 11077 | + *.exe|*.EXE) ;; |
| 11078 | + *) |
| 11079 | + lt_outputfile="$lt_outputfile.exe" |
| 11080 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 11081 | + ;; |
| 11082 | + esac~ |
| 11083 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 11084 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 11085 | + $RM "$lt_outputfile.manifest"; |
| 11086 | + fi' |
| 11087 | + ;; |
| 11088 | + *) |
| 11089 | + # Assume MSVC wrapper |
| 11090 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
| 11091 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 11092 | + # Tell ltmain to make .lib files, not .a files. |
| 11093 | + libext=lib |
| 11094 | + # Tell ltmain to make .dll files, not .so files. |
| 11095 | + shrext_cmds=".dll" |
| 11096 | + # FIXME: Setting linknames here is a bad hack. |
| 11097 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 11098 | + # The linker will automatically build a .lib file if we build a DLL. |
| 11099 | + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
| 11100 | + # FIXME: Should let the user specify the lib program. |
| 11101 | + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 11102 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 11103 | + ;; |
| 11104 | + esac |
| 11105 | ;; |
| 11106 | |
| 11107 | darwin* | rhapsody*) |
| 11108 | @@ -4828,7 +5143,7 @@ _LT_EOF |
| 11109 | |
| 11110 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 11111 | freebsd* | dragonfly*) |
| 11112 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 11113 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 11114 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
| 11115 | _LT_TAGVAR(hardcode_direct, $1)=yes |
| 11116 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
| 11117 | @@ -4836,7 +5151,7 @@ _LT_EOF |
| 11118 | |
| 11119 | hpux9*) |
| 11120 | if test "$GCC" = yes; then |
| 11121 | - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 11122 | + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 11123 | else |
| 11124 | _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 11125 | fi |
| 11126 | @@ -4852,7 +5167,7 @@ _LT_EOF |
| 11127 | |
| 11128 | hpux10*) |
| 11129 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 11130 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 11131 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 11132 | else |
| 11133 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 11134 | fi |
| 11135 | @@ -4876,10 +5191,10 @@ _LT_EOF |
| 11136 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 11137 | ;; |
| 11138 | ia64*) |
| 11139 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 11140 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 11141 | ;; |
| 11142 | *) |
| 11143 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 11144 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 11145 | ;; |
| 11146 | esac |
| 11147 | else |
| 11148 | @@ -4926,16 +5241,31 @@ _LT_EOF |
| 11149 | |
| 11150 | irix5* | irix6* | nonstopux*) |
| 11151 | if test "$GCC" = yes; then |
| 11152 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 11153 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 11154 | # Try to use the -exported_symbol ld option, if it does not |
| 11155 | # work, assume that -exports_file does not work either and |
| 11156 | # implicitly export all symbols. |
| 11157 | - save_LDFLAGS="$LDFLAGS" |
| 11158 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 11159 | - AC_LINK_IFELSE(int foo(void) {}, |
| 11160 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 11161 | - ) |
| 11162 | - LDFLAGS="$save_LDFLAGS" |
| 11163 | + # This should be the same for all languages, so no per-tag cache variable. |
| 11164 | + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], |
| 11165 | + [lt_cv_irix_exported_symbol], |
| 11166 | + [save_LDFLAGS="$LDFLAGS" |
| 11167 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 11168 | + AC_LINK_IFELSE( |
| 11169 | + [AC_LANG_SOURCE( |
| 11170 | + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], |
| 11171 | + [C++], [[int foo (void) { return 0; }]], |
| 11172 | + [Fortran 77], [[ |
| 11173 | + subroutine foo |
| 11174 | + end]], |
| 11175 | + [Fortran], [[ |
| 11176 | + subroutine foo |
| 11177 | + end]])])], |
| 11178 | + [lt_cv_irix_exported_symbol=yes], |
| 11179 | + [lt_cv_irix_exported_symbol=no]) |
| 11180 | + LDFLAGS="$save_LDFLAGS"]) |
| 11181 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 11182 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 11183 | + fi |
| 11184 | else |
| 11185 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
| 11186 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
| 11187 | @@ -5020,7 +5350,7 @@ _LT_EOF |
| 11188 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 11189 | if test "$GCC" = yes; then |
| 11190 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
| 11191 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 11192 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 11193 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
| 11194 | else |
| 11195 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
| 11196 | @@ -5039,9 +5369,9 @@ _LT_EOF |
| 11197 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' |
| 11198 | if test "$GCC" = yes; then |
| 11199 | wlarc='${wl}' |
| 11200 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 11201 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 11202 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 11203 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 11204 | + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 11205 | else |
| 11206 | case `$CC -V 2>&1` in |
| 11207 | *"Compilers 5.0"*) |
| 11208 | @@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], |
| 11209 | to runtime path list]) |
| 11210 | _LT_TAGDECL([], [link_all_deplibs], [0], |
| 11211 | [Whether libtool must link a program against all its dependency libraries]) |
| 11212 | -_LT_TAGDECL([], [fix_srcfile_path], [1], |
| 11213 | - [Fix the shell variable $srcfile for the compiler]) |
| 11214 | _LT_TAGDECL([], [always_export_symbols], [0], |
| 11215 | [Set to "yes" if exported symbols are required]) |
| 11216 | _LT_TAGDECL([], [export_symbols_cmds], [2], |
| 11217 | @@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1], |
| 11218 | [Symbols that must always be exported]) |
| 11219 | _LT_TAGDECL([], [prelink_cmds], [2], |
| 11220 | [Commands necessary for linking programs (against libraries) with templates]) |
| 11221 | +_LT_TAGDECL([], [postlink_cmds], [2], |
| 11222 | + [Commands necessary for finishing linking programs]) |
| 11223 | _LT_TAGDECL([], [file_list_spec], [1], |
| 11224 | [Specify filename containing input files]) |
| 11225 | dnl FIXME: Not yet implemented |
| 11226 | @@ -5426,6 +5756,7 @@ CC="$lt_save_CC" |
| 11227 | m4_defun([_LT_LANG_CXX_CONFIG], |
| 11228 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
| 11229 | m4_require([_LT_DECL_EGREP])dnl |
| 11230 | +m4_require([_LT_PATH_MANIFEST_TOOL])dnl |
| 11231 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
| 11232 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
| 11233 | (test "X$CXX" != "Xg++"))) ; then |
| 11234 | @@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11235 | |
| 11236 | # Allow CC to be a program name with arguments. |
| 11237 | lt_save_CC=$CC |
| 11238 | + lt_save_CFLAGS=$CFLAGS |
| 11239 | lt_save_LD=$LD |
| 11240 | lt_save_GCC=$GCC |
| 11241 | GCC=$GXX |
| 11242 | @@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11243 | fi |
| 11244 | test -z "${LDCXX+set}" || LD=$LDCXX |
| 11245 | CC=${CXX-"c++"} |
| 11246 | + CFLAGS=$CXXFLAGS |
| 11247 | compiler=$CC |
| 11248 | _LT_TAGVAR(compiler, $1)=$CC |
| 11249 | _LT_CC_BASENAME([$compiler]) |
| 11250 | @@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11251 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
| 11252 | # Determine the default libpath from the value encoded in an empty |
| 11253 | # executable. |
| 11254 | - _LT_SYS_MODULE_PATH_AIX |
| 11255 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
| 11256 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 11257 | |
| 11258 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
| 11259 | @@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11260 | else |
| 11261 | # Determine the default libpath from the value encoded in an |
| 11262 | # empty executable. |
| 11263 | - _LT_SYS_MODULE_PATH_AIX |
| 11264 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
| 11265 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 11266 | # Warning - without using the other run time loading flags, |
| 11267 | # -berok will link without error, but may produce a broken library. |
| 11268 | @@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11269 | ;; |
| 11270 | |
| 11271 | cygwin* | mingw* | pw32* | cegcc*) |
| 11272 | - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
| 11273 | - # as there is no search path for DLLs. |
| 11274 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
| 11275 | - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' |
| 11276 | - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 11277 | - _LT_TAGVAR(always_export_symbols, $1)=no |
| 11278 | - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 11279 | - |
| 11280 | - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 11281 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 11282 | - # If the export-symbols file already is a .def file (1st line |
| 11283 | - # is EXPORTS), use it as is; otherwise, prepend... |
| 11284 | - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 11285 | - cp $export_symbols $output_objdir/$soname.def; |
| 11286 | - else |
| 11287 | - echo EXPORTS > $output_objdir/$soname.def; |
| 11288 | - cat $export_symbols >> $output_objdir/$soname.def; |
| 11289 | - fi~ |
| 11290 | - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 11291 | - else |
| 11292 | - _LT_TAGVAR(ld_shlibs, $1)=no |
| 11293 | - fi |
| 11294 | - ;; |
| 11295 | + case $GXX,$cc_basename in |
| 11296 | + ,cl* | no,cl*) |
| 11297 | + # Native MSVC |
| 11298 | + # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 11299 | + # no search path for DLLs. |
| 11300 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
| 11301 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 11302 | + _LT_TAGVAR(always_export_symbols, $1)=yes |
| 11303 | + _LT_TAGVAR(file_list_spec, $1)='@' |
| 11304 | + # Tell ltmain to make .lib files, not .a files. |
| 11305 | + libext=lib |
| 11306 | + # Tell ltmain to make .dll files, not .so files. |
| 11307 | + shrext_cmds=".dll" |
| 11308 | + # FIXME: Setting linknames here is a bad hack. |
| 11309 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 11310 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 11311 | + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 11312 | + else |
| 11313 | + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 11314 | + fi~ |
| 11315 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 11316 | + linknames=' |
| 11317 | + # The linker will not automatically build a static lib if we build a DLL. |
| 11318 | + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
| 11319 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 11320 | + # Don't use ranlib |
| 11321 | + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
| 11322 | + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ |
| 11323 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 11324 | + case $lt_outputfile in |
| 11325 | + *.exe|*.EXE) ;; |
| 11326 | + *) |
| 11327 | + lt_outputfile="$lt_outputfile.exe" |
| 11328 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 11329 | + ;; |
| 11330 | + esac~ |
| 11331 | + func_to_tool_file "$lt_outputfile"~ |
| 11332 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 11333 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 11334 | + $RM "$lt_outputfile.manifest"; |
| 11335 | + fi' |
| 11336 | + ;; |
| 11337 | + *) |
| 11338 | + # g++ |
| 11339 | + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
| 11340 | + # as there is no search path for DLLs. |
| 11341 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
| 11342 | + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' |
| 11343 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 11344 | + _LT_TAGVAR(always_export_symbols, $1)=no |
| 11345 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 11346 | + |
| 11347 | + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 11348 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 11349 | + # If the export-symbols file already is a .def file (1st line |
| 11350 | + # is EXPORTS), use it as is; otherwise, prepend... |
| 11351 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 11352 | + cp $export_symbols $output_objdir/$soname.def; |
| 11353 | + else |
| 11354 | + echo EXPORTS > $output_objdir/$soname.def; |
| 11355 | + cat $export_symbols >> $output_objdir/$soname.def; |
| 11356 | + fi~ |
| 11357 | + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 11358 | + else |
| 11359 | + _LT_TAGVAR(ld_shlibs, $1)=no |
| 11360 | + fi |
| 11361 | + ;; |
| 11362 | + esac |
| 11363 | + ;; |
| 11364 | darwin* | rhapsody*) |
| 11365 | _LT_DARWIN_LINKER_FEATURES($1) |
| 11366 | ;; |
| 11367 | @@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11368 | ;; |
| 11369 | *) |
| 11370 | if test "$GXX" = yes; then |
| 11371 | - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 11372 | + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 11373 | else |
| 11374 | # FIXME: insert proper C++ library support |
| 11375 | _LT_TAGVAR(ld_shlibs, $1)=no |
| 11376 | @@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11377 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 11378 | ;; |
| 11379 | ia64*) |
| 11380 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 11381 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 11382 | ;; |
| 11383 | *) |
| 11384 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 11385 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 11386 | ;; |
| 11387 | esac |
| 11388 | fi |
| 11389 | @@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11390 | *) |
| 11391 | if test "$GXX" = yes; then |
| 11392 | if test "$with_gnu_ld" = no; then |
| 11393 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 11394 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 11395 | else |
| 11396 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' |
| 11397 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' |
| 11398 | fi |
| 11399 | fi |
| 11400 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
| 11401 | @@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11402 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ |
| 11403 | rm -rf $tpldir~ |
| 11404 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
| 11405 | - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' |
| 11406 | + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' |
| 11407 | _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ |
| 11408 | rm -rf $tpldir~ |
| 11409 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ |
| 11410 | - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ |
| 11411 | + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ |
| 11412 | $RANLIB $oldlib' |
| 11413 | _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ |
| 11414 | rm -rf $tpldir~ |
| 11415 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
| 11416 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 11417 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 11418 | _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ |
| 11419 | rm -rf $tpldir~ |
| 11420 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
| 11421 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
| 11422 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
| 11423 | ;; |
| 11424 | *) # Version 6 and above use weak symbols |
| 11425 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 11426 | @@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11427 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 11428 | ;; |
| 11429 | *) |
| 11430 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 11431 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 11432 | ;; |
| 11433 | esac |
| 11434 | |
| 11435 | @@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11436 | |
| 11437 | solaris*) |
| 11438 | case $cc_basename in |
| 11439 | - CC*) |
| 11440 | + CC* | sunCC*) |
| 11441 | # Sun C++ 4.2, 5.x and Centerline C++ |
| 11442 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes |
| 11443 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' |
| 11444 | @@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11445 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
| 11446 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' |
| 11447 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
| 11448 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
| 11449 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
| 11450 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 11451 | - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
| 11452 | + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
| 11453 | |
| 11454 | # Commands to make compiler produce verbose output that lists |
| 11455 | # what "hidden" libraries, object files and flags are used when |
| 11456 | @@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11457 | fi # test -n "$compiler" |
| 11458 | |
| 11459 | CC=$lt_save_CC |
| 11460 | + CFLAGS=$lt_save_CFLAGS |
| 11461 | LDCXX=$LD |
| 11462 | LD=$lt_save_LD |
| 11463 | GCC=$lt_save_GCC |
| 11464 | @@ -6445,6 +6825,29 @@ AC_LANG_POP |
| 11465 | ])# _LT_LANG_CXX_CONFIG |
| 11466 | |
| 11467 | |
| 11468 | +# _LT_FUNC_STRIPNAME_CNF |
| 11469 | +# ---------------------- |
| 11470 | +# func_stripname_cnf prefix suffix name |
| 11471 | +# strip PREFIX and SUFFIX off of NAME. |
| 11472 | +# PREFIX and SUFFIX must not contain globbing or regex special |
| 11473 | +# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 11474 | +# dot (in which case that matches only a dot). |
| 11475 | +# |
| 11476 | +# This function is identical to the (non-XSI) version of func_stripname, |
| 11477 | +# except this one can be used by m4 code that may be executed by configure, |
| 11478 | +# rather than the libtool script. |
| 11479 | +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl |
| 11480 | +AC_REQUIRE([_LT_DECL_SED]) |
| 11481 | +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) |
| 11482 | +func_stripname_cnf () |
| 11483 | +{ |
| 11484 | + case ${2} in |
| 11485 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 11486 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 11487 | + esac |
| 11488 | +} # func_stripname_cnf |
| 11489 | +])# _LT_FUNC_STRIPNAME_CNF |
| 11490 | + |
| 11491 | # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) |
| 11492 | # --------------------------------- |
| 11493 | # Figure out "hidden" library dependencies from verbose |
| 11494 | @@ -6453,6 +6856,7 @@ AC_LANG_POP |
| 11495 | # objects, libraries and library flags. |
| 11496 | m4_defun([_LT_SYS_HIDDEN_LIBDEPS], |
| 11497 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
| 11498 | +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl |
| 11499 | # Dependencies to place before and after the object being linked: |
| 11500 | _LT_TAGVAR(predep_objects, $1)= |
| 11501 | _LT_TAGVAR(postdep_objects, $1)= |
| 11502 | @@ -6503,6 +6907,13 @@ public class foo { |
| 11503 | }; |
| 11504 | _LT_EOF |
| 11505 | ]) |
| 11506 | + |
| 11507 | +_lt_libdeps_save_CFLAGS=$CFLAGS |
| 11508 | +case "$CC $CFLAGS " in #( |
| 11509 | +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; |
| 11510 | +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; |
| 11511 | +esac |
| 11512 | + |
| 11513 | dnl Parse the compiler output and extract the necessary |
| 11514 | dnl objects, libraries and library flags. |
| 11515 | if AC_TRY_EVAL(ac_compile); then |
| 11516 | @@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then |
| 11517 | pre_test_object_deps_done=no |
| 11518 | |
| 11519 | for p in `eval "$output_verbose_link_cmd"`; do |
| 11520 | - case $p in |
| 11521 | + case ${prev}${p} in |
| 11522 | |
| 11523 | -L* | -R* | -l*) |
| 11524 | # Some compilers place space between "-{L,R}" and the path. |
| 11525 | @@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then |
| 11526 | test $p = "-R"; then |
| 11527 | prev=$p |
| 11528 | continue |
| 11529 | - else |
| 11530 | - prev= |
| 11531 | fi |
| 11532 | |
| 11533 | + # Expand the sysroot to ease extracting the directories later. |
| 11534 | + if test -z "$prev"; then |
| 11535 | + case $p in |
| 11536 | + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; |
| 11537 | + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; |
| 11538 | + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; |
| 11539 | + esac |
| 11540 | + fi |
| 11541 | + case $p in |
| 11542 | + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; |
| 11543 | + esac |
| 11544 | if test "$pre_test_object_deps_done" = no; then |
| 11545 | - case $p in |
| 11546 | - -L* | -R*) |
| 11547 | + case ${prev} in |
| 11548 | + -L | -R) |
| 11549 | # Internal compiler library paths should come after those |
| 11550 | # provided the user. The postdeps already come after the |
| 11551 | # user supplied libs so there is no need to process them. |
| 11552 | @@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then |
| 11553 | _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" |
| 11554 | fi |
| 11555 | fi |
| 11556 | + prev= |
| 11557 | ;; |
| 11558 | |
| 11559 | + *.lto.$objext) ;; # Ignore GCC LTO objects |
| 11560 | *.$objext) |
| 11561 | # This assumes that the test object file only shows up |
| 11562 | # once in the compiler output. |
| 11563 | @@ -6586,6 +7008,7 @@ else |
| 11564 | fi |
| 11565 | |
| 11566 | $RM -f confest.$objext |
| 11567 | +CFLAGS=$_lt_libdeps_save_CFLAGS |
| 11568 | |
| 11569 | # PORTME: override above test on systems where it is broken |
| 11570 | m4_if([$1], [CXX], |
| 11571 | @@ -6622,7 +7045,7 @@ linux*) |
| 11572 | |
| 11573 | solaris*) |
| 11574 | case $cc_basename in |
| 11575 | - CC*) |
| 11576 | + CC* | sunCC*) |
| 11577 | # The more standards-conforming stlport4 library is |
| 11578 | # incompatible with the Cstd library. Avoid specifying |
| 11579 | # it if it's in CXXFLAGS. Ignore libCrun as |
| 11580 | @@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then |
| 11581 | # Allow CC to be a program name with arguments. |
| 11582 | lt_save_CC="$CC" |
| 11583 | lt_save_GCC=$GCC |
| 11584 | + lt_save_CFLAGS=$CFLAGS |
| 11585 | CC=${F77-"f77"} |
| 11586 | + CFLAGS=$FFLAGS |
| 11587 | compiler=$CC |
| 11588 | _LT_TAGVAR(compiler, $1)=$CC |
| 11589 | _LT_CC_BASENAME([$compiler]) |
| 11590 | @@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then |
| 11591 | |
| 11592 | GCC=$lt_save_GCC |
| 11593 | CC="$lt_save_CC" |
| 11594 | + CFLAGS="$lt_save_CFLAGS" |
| 11595 | fi # test "$_lt_disable_F77" != yes |
| 11596 | |
| 11597 | AC_LANG_POP |
| 11598 | @@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then |
| 11599 | # Allow CC to be a program name with arguments. |
| 11600 | lt_save_CC="$CC" |
| 11601 | lt_save_GCC=$GCC |
| 11602 | + lt_save_CFLAGS=$CFLAGS |
| 11603 | CC=${FC-"f95"} |
| 11604 | + CFLAGS=$FCFLAGS |
| 11605 | compiler=$CC |
| 11606 | GCC=$ac_cv_fc_compiler_gnu |
| 11607 | |
| 11608 | @@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then |
| 11609 | fi # test -n "$compiler" |
| 11610 | |
| 11611 | GCC=$lt_save_GCC |
| 11612 | - CC="$lt_save_CC" |
| 11613 | + CC=$lt_save_CC |
| 11614 | + CFLAGS=$lt_save_CFLAGS |
| 11615 | fi # test "$_lt_disable_FC" != yes |
| 11616 | |
| 11617 | AC_LANG_POP |
| 11618 | @@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE |
| 11619 | _LT_LINKER_BOILERPLATE |
| 11620 | |
| 11621 | # Allow CC to be a program name with arguments. |
| 11622 | -lt_save_CC="$CC" |
| 11623 | +lt_save_CC=$CC |
| 11624 | +lt_save_CFLAGS=$CFLAGS |
| 11625 | lt_save_GCC=$GCC |
| 11626 | GCC=yes |
| 11627 | CC=${GCJ-"gcj"} |
| 11628 | +CFLAGS=$GCJFLAGS |
| 11629 | compiler=$CC |
| 11630 | _LT_TAGVAR(compiler, $1)=$CC |
| 11631 | _LT_TAGVAR(LD, $1)="$LD" |
| 11632 | @@ -6992,7 +7423,8 @@ fi |
| 11633 | AC_LANG_RESTORE |
| 11634 | |
| 11635 | GCC=$lt_save_GCC |
| 11636 | -CC="$lt_save_CC" |
| 11637 | +CC=$lt_save_CC |
| 11638 | +CFLAGS=$lt_save_CFLAGS |
| 11639 | ])# _LT_LANG_GCJ_CONFIG |
| 11640 | |
| 11641 | |
| 11642 | @@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE |
| 11643 | |
| 11644 | # Allow CC to be a program name with arguments. |
| 11645 | lt_save_CC="$CC" |
| 11646 | +lt_save_CFLAGS=$CFLAGS |
| 11647 | lt_save_GCC=$GCC |
| 11648 | GCC= |
| 11649 | CC=${RC-"windres"} |
| 11650 | +CFLAGS= |
| 11651 | compiler=$CC |
| 11652 | _LT_TAGVAR(compiler, $1)=$CC |
| 11653 | _LT_CC_BASENAME([$compiler]) |
| 11654 | @@ -7042,7 +7476,8 @@ fi |
| 11655 | |
| 11656 | GCC=$lt_save_GCC |
| 11657 | AC_LANG_RESTORE |
| 11658 | -CC="$lt_save_CC" |
| 11659 | +CC=$lt_save_CC |
| 11660 | +CFLAGS=$lt_save_CFLAGS |
| 11661 | ])# _LT_LANG_RC_CONFIG |
| 11662 | |
| 11663 | |
| 11664 | @@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) |
| 11665 | AC_SUBST([OBJDUMP]) |
| 11666 | ]) |
| 11667 | |
| 11668 | +# _LT_DECL_DLLTOOL |
| 11669 | +# ---------------- |
| 11670 | +# Ensure DLLTOOL variable is set. |
| 11671 | +m4_defun([_LT_DECL_DLLTOOL], |
| 11672 | +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) |
| 11673 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 11674 | +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) |
| 11675 | +AC_SUBST([DLLTOOL]) |
| 11676 | +]) |
| 11677 | |
| 11678 | # _LT_DECL_SED |
| 11679 | # ------------ |
| 11680 | @@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], |
| 11681 | # Try some XSI features |
| 11682 | xsi_shell=no |
| 11683 | ( _lt_dummy="a/b/c" |
| 11684 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 11685 | - = c,a/b,, \ |
| 11686 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 11687 | + = c,a/b,b/c, \ |
| 11688 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 11689 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 11690 | && xsi_shell=yes |
| 11691 | @@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl |
| 11692 | ])# _LT_CHECK_SHELL_FEATURES |
| 11693 | |
| 11694 | |
| 11695 | -# _LT_PROG_XSI_SHELLFNS |
| 11696 | -# --------------------- |
| 11697 | -# Bourne and XSI compatible variants of some useful shell functions. |
| 11698 | -m4_defun([_LT_PROG_XSI_SHELLFNS], |
| 11699 | -[case $xsi_shell in |
| 11700 | - yes) |
| 11701 | - cat << \_LT_EOF >> "$cfgfile" |
| 11702 | - |
| 11703 | -# func_dirname file append nondir_replacement |
| 11704 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 11705 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 11706 | -func_dirname () |
| 11707 | -{ |
| 11708 | - case ${1} in |
| 11709 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 11710 | - * ) func_dirname_result="${3}" ;; |
| 11711 | - esac |
| 11712 | -} |
| 11713 | - |
| 11714 | -# func_basename file |
| 11715 | -func_basename () |
| 11716 | -{ |
| 11717 | - func_basename_result="${1##*/}" |
| 11718 | -} |
| 11719 | - |
| 11720 | -# func_dirname_and_basename file append nondir_replacement |
| 11721 | -# perform func_basename and func_dirname in a single function |
| 11722 | -# call: |
| 11723 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 11724 | -# add APPEND to the result, otherwise set result |
| 11725 | -# to NONDIR_REPLACEMENT. |
| 11726 | -# value returned in "$func_dirname_result" |
| 11727 | -# basename: Compute filename of FILE. |
| 11728 | -# value retuned in "$func_basename_result" |
| 11729 | -# Implementation must be kept synchronized with func_dirname |
| 11730 | -# and func_basename. For efficiency, we do not delegate to |
| 11731 | -# those functions but instead duplicate the functionality here. |
| 11732 | -func_dirname_and_basename () |
| 11733 | -{ |
| 11734 | - case ${1} in |
| 11735 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 11736 | - * ) func_dirname_result="${3}" ;; |
| 11737 | - esac |
| 11738 | - func_basename_result="${1##*/}" |
| 11739 | -} |
| 11740 | - |
| 11741 | -# func_stripname prefix suffix name |
| 11742 | -# strip PREFIX and SUFFIX off of NAME. |
| 11743 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 11744 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 11745 | -# dot (in which case that matches only a dot). |
| 11746 | -func_stripname () |
| 11747 | -{ |
| 11748 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 11749 | - # positional parameters, so assign one to ordinary parameter first. |
| 11750 | - func_stripname_result=${3} |
| 11751 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 11752 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 11753 | -} |
| 11754 | - |
| 11755 | -# func_opt_split |
| 11756 | -func_opt_split () |
| 11757 | -{ |
| 11758 | - func_opt_split_opt=${1%%=*} |
| 11759 | - func_opt_split_arg=${1#*=} |
| 11760 | -} |
| 11761 | - |
| 11762 | -# func_lo2o object |
| 11763 | -func_lo2o () |
| 11764 | -{ |
| 11765 | - case ${1} in |
| 11766 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 11767 | - *) func_lo2o_result=${1} ;; |
| 11768 | - esac |
| 11769 | -} |
| 11770 | - |
| 11771 | -# func_xform libobj-or-source |
| 11772 | -func_xform () |
| 11773 | -{ |
| 11774 | - func_xform_result=${1%.*}.lo |
| 11775 | -} |
| 11776 | - |
| 11777 | -# func_arith arithmetic-term... |
| 11778 | -func_arith () |
| 11779 | -{ |
| 11780 | - func_arith_result=$(( $[*] )) |
| 11781 | -} |
| 11782 | - |
| 11783 | -# func_len string |
| 11784 | -# STRING may not start with a hyphen. |
| 11785 | -func_len () |
| 11786 | -{ |
| 11787 | - func_len_result=${#1} |
| 11788 | -} |
| 11789 | +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) |
| 11790 | +# ------------------------------------------------------ |
| 11791 | +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and |
| 11792 | +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. |
| 11793 | +m4_defun([_LT_PROG_FUNCTION_REPLACE], |
| 11794 | +[dnl { |
| 11795 | +sed -e '/^$1 ()$/,/^} # $1 /c\ |
| 11796 | +$1 ()\ |
| 11797 | +{\ |
| 11798 | +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) |
| 11799 | +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ |
| 11800 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 11801 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 11802 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 11803 | +]) |
| 11804 | |
| 11805 | -_LT_EOF |
| 11806 | - ;; |
| 11807 | - *) # Bourne compatible functions. |
| 11808 | - cat << \_LT_EOF >> "$cfgfile" |
| 11809 | |
| 11810 | -# func_dirname file append nondir_replacement |
| 11811 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 11812 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 11813 | -func_dirname () |
| 11814 | -{ |
| 11815 | - # Extract subdirectory from the argument. |
| 11816 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 11817 | - if test "X$func_dirname_result" = "X${1}"; then |
| 11818 | - func_dirname_result="${3}" |
| 11819 | - else |
| 11820 | - func_dirname_result="$func_dirname_result${2}" |
| 11821 | - fi |
| 11822 | -} |
| 11823 | +# _LT_PROG_REPLACE_SHELLFNS |
| 11824 | +# ------------------------- |
| 11825 | +# Replace existing portable implementations of several shell functions with |
| 11826 | +# equivalent extended shell implementations where those features are available.. |
| 11827 | +m4_defun([_LT_PROG_REPLACE_SHELLFNS], |
| 11828 | +[if test x"$xsi_shell" = xyes; then |
| 11829 | + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl |
| 11830 | + case ${1} in |
| 11831 | + */*) func_dirname_result="${1%/*}${2}" ;; |
| 11832 | + * ) func_dirname_result="${3}" ;; |
| 11833 | + esac]) |
| 11834 | + |
| 11835 | + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl |
| 11836 | + func_basename_result="${1##*/}"]) |
| 11837 | + |
| 11838 | + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl |
| 11839 | + case ${1} in |
| 11840 | + */*) func_dirname_result="${1%/*}${2}" ;; |
| 11841 | + * ) func_dirname_result="${3}" ;; |
| 11842 | + esac |
| 11843 | + func_basename_result="${1##*/}"]) |
| 11844 | |
| 11845 | -# func_basename file |
| 11846 | -func_basename () |
| 11847 | -{ |
| 11848 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 11849 | -} |
| 11850 | + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl |
| 11851 | + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 11852 | + # positional parameters, so assign one to ordinary parameter first. |
| 11853 | + func_stripname_result=${3} |
| 11854 | + func_stripname_result=${func_stripname_result#"${1}"} |
| 11855 | + func_stripname_result=${func_stripname_result%"${2}"}]) |
| 11856 | |
| 11857 | -dnl func_dirname_and_basename |
| 11858 | -dnl A portable version of this function is already defined in general.m4sh |
| 11859 | -dnl so there is no need for it here. |
| 11860 | + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl |
| 11861 | + func_split_long_opt_name=${1%%=*} |
| 11862 | + func_split_long_opt_arg=${1#*=}]) |
| 11863 | |
| 11864 | -# func_stripname prefix suffix name |
| 11865 | -# strip PREFIX and SUFFIX off of NAME. |
| 11866 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 11867 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 11868 | -# dot (in which case that matches only a dot). |
| 11869 | -# func_strip_suffix prefix name |
| 11870 | -func_stripname () |
| 11871 | -{ |
| 11872 | - case ${2} in |
| 11873 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 11874 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 11875 | - esac |
| 11876 | -} |
| 11877 | + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl |
| 11878 | + func_split_short_opt_arg=${1#??} |
| 11879 | + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) |
| 11880 | |
| 11881 | -# sed scripts: |
| 11882 | -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' |
| 11883 | -my_sed_long_arg='1s/^-[[^=]]*=//' |
| 11884 | + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl |
| 11885 | + case ${1} in |
| 11886 | + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 11887 | + *) func_lo2o_result=${1} ;; |
| 11888 | + esac]) |
| 11889 | |
| 11890 | -# func_opt_split |
| 11891 | -func_opt_split () |
| 11892 | -{ |
| 11893 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 11894 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 11895 | -} |
| 11896 | + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) |
| 11897 | |
| 11898 | -# func_lo2o object |
| 11899 | -func_lo2o () |
| 11900 | -{ |
| 11901 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 11902 | -} |
| 11903 | + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) |
| 11904 | |
| 11905 | -# func_xform libobj-or-source |
| 11906 | -func_xform () |
| 11907 | -{ |
| 11908 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` |
| 11909 | -} |
| 11910 | + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) |
| 11911 | +fi |
| 11912 | |
| 11913 | -# func_arith arithmetic-term... |
| 11914 | -func_arith () |
| 11915 | -{ |
| 11916 | - func_arith_result=`expr "$[@]"` |
| 11917 | -} |
| 11918 | +if test x"$lt_shell_append" = xyes; then |
| 11919 | + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) |
| 11920 | |
| 11921 | -# func_len string |
| 11922 | -# STRING may not start with a hyphen. |
| 11923 | -func_len () |
| 11924 | -{ |
| 11925 | - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 11926 | -} |
| 11927 | + _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl |
| 11928 | + func_quote_for_eval "${2}" |
| 11929 | +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ |
| 11930 | + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) |
| 11931 | |
| 11932 | -_LT_EOF |
| 11933 | -esac |
| 11934 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 11935 | + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 11936 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 11937 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 11938 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 11939 | +else |
| 11940 | + # Save a `func_append' function call even when '+=' is not available |
| 11941 | + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 11942 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 11943 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 11944 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 11945 | +fi |
| 11946 | |
| 11947 | -case $lt_shell_append in |
| 11948 | - yes) |
| 11949 | - cat << \_LT_EOF >> "$cfgfile" |
| 11950 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 11951 | + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) |
| 11952 | +fi |
| 11953 | +]) |
| 11954 | |
| 11955 | -# func_append var value |
| 11956 | -# Append VALUE to the end of shell variable VAR. |
| 11957 | -func_append () |
| 11958 | -{ |
| 11959 | - eval "$[1]+=\$[2]" |
| 11960 | -} |
| 11961 | -_LT_EOF |
| 11962 | +# _LT_PATH_CONVERSION_FUNCTIONS |
| 11963 | +# ----------------------------- |
| 11964 | +# Determine which file name conversion functions should be used by |
| 11965 | +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed |
| 11966 | +# for certain cross-compile configurations and native mingw. |
| 11967 | +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], |
| 11968 | +[AC_REQUIRE([AC_CANONICAL_HOST])dnl |
| 11969 | +AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
| 11970 | +AC_MSG_CHECKING([how to convert $build file names to $host format]) |
| 11971 | +AC_CACHE_VAL(lt_cv_to_host_file_cmd, |
| 11972 | +[case $host in |
| 11973 | + *-*-mingw* ) |
| 11974 | + case $build in |
| 11975 | + *-*-mingw* ) # actually msys |
| 11976 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 11977 | + ;; |
| 11978 | + *-*-cygwin* ) |
| 11979 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 11980 | + ;; |
| 11981 | + * ) # otherwise, assume *nix |
| 11982 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 11983 | + ;; |
| 11984 | + esac |
| 11985 | ;; |
| 11986 | - *) |
| 11987 | - cat << \_LT_EOF >> "$cfgfile" |
| 11988 | - |
| 11989 | -# func_append var value |
| 11990 | -# Append VALUE to the end of shell variable VAR. |
| 11991 | -func_append () |
| 11992 | -{ |
| 11993 | - eval "$[1]=\$$[1]\$[2]" |
| 11994 | -} |
| 11995 | - |
| 11996 | -_LT_EOF |
| 11997 | + *-*-cygwin* ) |
| 11998 | + case $build in |
| 11999 | + *-*-mingw* ) # actually msys |
| 12000 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 12001 | + ;; |
| 12002 | + *-*-cygwin* ) |
| 12003 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 12004 | + ;; |
| 12005 | + * ) # otherwise, assume *nix |
| 12006 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 12007 | + ;; |
| 12008 | + esac |
| 12009 | ;; |
| 12010 | - esac |
| 12011 | + * ) # unhandled hosts (and "normal" native builds) |
| 12012 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 12013 | + ;; |
| 12014 | +esac |
| 12015 | +]) |
| 12016 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 12017 | +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) |
| 12018 | +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], |
| 12019 | + [0], [convert $build file names to $host format])dnl |
| 12020 | + |
| 12021 | +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) |
| 12022 | +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, |
| 12023 | +[#assume ordinary cross tools, or native build. |
| 12024 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 12025 | +case $host in |
| 12026 | + *-*-mingw* ) |
| 12027 | + case $build in |
| 12028 | + *-*-mingw* ) # actually msys |
| 12029 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 12030 | + ;; |
| 12031 | + esac |
| 12032 | + ;; |
| 12033 | +esac |
| 12034 | ]) |
| 12035 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 12036 | +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) |
| 12037 | +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], |
| 12038 | + [0], [convert $build files to toolchain format])dnl |
| 12039 | +])# _LT_PATH_CONVERSION_FUNCTIONS |
| 12040 | diff --git a/ltmain.sh b/ltmain.sh |
| 12041 | index 9503ec85d7..70e856e065 100644 |
| 12042 | --- a/ltmain.sh |
| 12043 | +++ b/ltmain.sh |
| 12044 | @@ -1,10 +1,9 @@ |
| 12045 | -# Generated from ltmain.m4sh. |
| 12046 | |
| 12047 | -# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a |
| 12048 | +# libtool (GNU libtool) 2.4 |
| 12049 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 |
| 12050 | |
| 12051 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, |
| 12052 | -# 2007, 2008, 2009 Free Software Foundation, Inc. |
| 12053 | +# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
| 12054 | # This is free software; see the source for copying conditions. There is NO |
| 12055 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 12056 | |
| 12057 | @@ -38,7 +37,6 @@ |
| 12058 | # -n, --dry-run display commands without modifying any files |
| 12059 | # --features display basic configuration information and exit |
| 12060 | # --mode=MODE use operation mode MODE |
| 12061 | -# --no-finish let install mode avoid finish commands |
| 12062 | # --preserve-dup-deps don't remove duplicate dependency libraries |
| 12063 | # --quiet, --silent don't print informational messages |
| 12064 | # --no-quiet, --no-silent |
| 12065 | @@ -71,17 +69,19 @@ |
| 12066 | # compiler: $LTCC |
| 12067 | # compiler flags: $LTCFLAGS |
| 12068 | # linker: $LD (gnu? $with_gnu_ld) |
| 12069 | -# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a |
| 12070 | +# $progname: (GNU libtool) 2.4 |
| 12071 | # automake: $automake_version |
| 12072 | # autoconf: $autoconf_version |
| 12073 | # |
| 12074 | # Report bugs to <bug-libtool@gnu.org>. |
| 12075 | +# GNU libtool home page: <http://www.gnu.org/software/libtool/>. |
| 12076 | +# General help using GNU software: <http://www.gnu.org/gethelp/>. |
| 12077 | |
| 12078 | PROGRAM=libtool |
| 12079 | PACKAGE=libtool |
| 12080 | -VERSION=2.2.7a |
| 12081 | -TIMESTAMP=" 1.3134 2009-11-29" |
| 12082 | -package_revision=1.3134 |
| 12083 | +VERSION=2.4 |
| 12084 | +TIMESTAMP="" |
| 12085 | +package_revision=1.3293 |
| 12086 | |
| 12087 | # Be Bourne compatible |
| 12088 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
| 12089 | @@ -106,9 +106,6 @@ _LTECHO_EOF' |
| 12090 | } |
| 12091 | |
| 12092 | # NLS nuisances: We save the old values to restore during execute mode. |
| 12093 | -# Only set LANG and LC_ALL to C if already set. |
| 12094 | -# These must not be set unconditionally because not all systems understand |
| 12095 | -# e.g. LANG=C (notably SCO). |
| 12096 | lt_user_locale= |
| 12097 | lt_safe_locale= |
| 12098 | for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES |
| 12099 | @@ -121,15 +118,13 @@ do |
| 12100 | lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" |
| 12101 | fi" |
| 12102 | done |
| 12103 | +LC_ALL=C |
| 12104 | +LANGUAGE=C |
| 12105 | +export LANGUAGE LC_ALL |
| 12106 | |
| 12107 | $lt_unset CDPATH |
| 12108 | |
| 12109 | |
| 12110 | - |
| 12111 | - |
| 12112 | - |
| 12113 | - |
| 12114 | - |
| 12115 | # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh |
| 12116 | # is ksh but when the shell is invoked as "sh" and the current value of |
| 12117 | # the _XPG environment variable is not equal to 1 (one), the special |
| 12118 | @@ -140,7 +135,7 @@ progpath="$0" |
| 12119 | |
| 12120 | |
| 12121 | : ${CP="cp -f"} |
| 12122 | -: ${ECHO=$as_echo} |
| 12123 | +test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} |
| 12124 | : ${EGREP="/bin/grep -E"} |
| 12125 | : ${FGREP="/bin/grep -F"} |
| 12126 | : ${GREP="/bin/grep"} |
| 12127 | @@ -149,7 +144,7 @@ progpath="$0" |
| 12128 | : ${MKDIR="mkdir"} |
| 12129 | : ${MV="mv -f"} |
| 12130 | : ${RM="rm -f"} |
| 12131 | -: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"} |
| 12132 | +: ${SED="/bin/sed"} |
| 12133 | : ${SHELL="${CONFIG_SHELL-/bin/sh}"} |
| 12134 | : ${Xsed="$SED -e 1s/^X//"} |
| 12135 | |
| 12136 | @@ -169,6 +164,27 @@ IFS=" $lt_nl" |
| 12137 | dirname="s,/[^/]*$,," |
| 12138 | basename="s,^.*/,," |
| 12139 | |
| 12140 | +# func_dirname file append nondir_replacement |
| 12141 | +# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 12142 | +# otherwise set result to NONDIR_REPLACEMENT. |
| 12143 | +func_dirname () |
| 12144 | +{ |
| 12145 | + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 12146 | + if test "X$func_dirname_result" = "X${1}"; then |
| 12147 | + func_dirname_result="${3}" |
| 12148 | + else |
| 12149 | + func_dirname_result="$func_dirname_result${2}" |
| 12150 | + fi |
| 12151 | +} # func_dirname may be replaced by extended shell implementation |
| 12152 | + |
| 12153 | + |
| 12154 | +# func_basename file |
| 12155 | +func_basename () |
| 12156 | +{ |
| 12157 | + func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 12158 | +} # func_basename may be replaced by extended shell implementation |
| 12159 | + |
| 12160 | + |
| 12161 | # func_dirname_and_basename file append nondir_replacement |
| 12162 | # perform func_basename and func_dirname in a single function |
| 12163 | # call: |
| 12164 | @@ -183,17 +199,31 @@ basename="s,^.*/,," |
| 12165 | # those functions but instead duplicate the functionality here. |
| 12166 | func_dirname_and_basename () |
| 12167 | { |
| 12168 | - # Extract subdirectory from the argument. |
| 12169 | - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` |
| 12170 | - if test "X$func_dirname_result" = "X${1}"; then |
| 12171 | - func_dirname_result="${3}" |
| 12172 | - else |
| 12173 | - func_dirname_result="$func_dirname_result${2}" |
| 12174 | - fi |
| 12175 | - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` |
| 12176 | -} |
| 12177 | + # Extract subdirectory from the argument. |
| 12178 | + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` |
| 12179 | + if test "X$func_dirname_result" = "X${1}"; then |
| 12180 | + func_dirname_result="${3}" |
| 12181 | + else |
| 12182 | + func_dirname_result="$func_dirname_result${2}" |
| 12183 | + fi |
| 12184 | + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` |
| 12185 | +} # func_dirname_and_basename may be replaced by extended shell implementation |
| 12186 | + |
| 12187 | + |
| 12188 | +# func_stripname prefix suffix name |
| 12189 | +# strip PREFIX and SUFFIX off of NAME. |
| 12190 | +# PREFIX and SUFFIX must not contain globbing or regex special |
| 12191 | +# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 12192 | +# dot (in which case that matches only a dot). |
| 12193 | +# func_strip_suffix prefix name |
| 12194 | +func_stripname () |
| 12195 | +{ |
| 12196 | + case ${2} in |
| 12197 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 12198 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 12199 | + esac |
| 12200 | +} # func_stripname may be replaced by extended shell implementation |
| 12201 | |
| 12202 | -# Generated shell functions inserted here. |
| 12203 | |
| 12204 | # These SED scripts presuppose an absolute path with a trailing slash. |
| 12205 | pathcar='s,^/\([^/]*\).*$,\1,' |
| 12206 | @@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' |
| 12207 | # Same as above, but do not quote variable references. |
| 12208 | double_quote_subst='s/\(["`\\]\)/\\\1/g' |
| 12209 | |
| 12210 | +# Sed substitution that turns a string into a regex matching for the |
| 12211 | +# string literally. |
| 12212 | +sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' |
| 12213 | + |
| 12214 | +# Sed substitution that converts a w32 file name or path |
| 12215 | +# which contains forward slashes, into one that contains |
| 12216 | +# (escaped) backslashes. A very naive implementation. |
| 12217 | +lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' |
| 12218 | + |
| 12219 | # Re-`\' parameter expansions in output of double_quote_subst that were |
| 12220 | # `\'-ed in input to the same. If an odd number of `\' preceded a '$' |
| 12221 | # in input to double_quote_subst, that '$' was protected from expansion. |
| 12222 | @@ -404,7 +443,7 @@ opt_warning=: |
| 12223 | # name if it has been set yet. |
| 12224 | func_echo () |
| 12225 | { |
| 12226 | - $ECHO "$progname${mode+: }$mode: $*" |
| 12227 | + $ECHO "$progname: ${opt_mode+$opt_mode: }$*" |
| 12228 | } |
| 12229 | |
| 12230 | # func_verbose arg... |
| 12231 | @@ -430,14 +469,14 @@ func_echo_all () |
| 12232 | # Echo program name prefixed message to standard error. |
| 12233 | func_error () |
| 12234 | { |
| 12235 | - $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 |
| 12236 | + $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 |
| 12237 | } |
| 12238 | |
| 12239 | # func_warning arg... |
| 12240 | # Echo program name prefixed warning message to standard error. |
| 12241 | func_warning () |
| 12242 | { |
| 12243 | - $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 |
| 12244 | + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 |
| 12245 | |
| 12246 | # bash bug again: |
| 12247 | : |
| 12248 | @@ -656,19 +695,35 @@ func_show_eval_locale () |
| 12249 | fi |
| 12250 | } |
| 12251 | |
| 12252 | - |
| 12253 | - |
| 12254 | +# func_tr_sh |
| 12255 | +# Turn $1 into a string suitable for a shell variable name. |
| 12256 | +# Result is stored in $func_tr_sh_result. All characters |
| 12257 | +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, |
| 12258 | +# if $1 begins with a digit, a '_' is prepended as well. |
| 12259 | +func_tr_sh () |
| 12260 | +{ |
| 12261 | + case $1 in |
| 12262 | + [0-9]* | *[!a-zA-Z0-9_]*) |
| 12263 | + func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` |
| 12264 | + ;; |
| 12265 | + * ) |
| 12266 | + func_tr_sh_result=$1 |
| 12267 | + ;; |
| 12268 | + esac |
| 12269 | +} |
| 12270 | |
| 12271 | |
| 12272 | # func_version |
| 12273 | # Echo version message to standard output and exit. |
| 12274 | func_version () |
| 12275 | { |
| 12276 | + $opt_debug |
| 12277 | + |
| 12278 | $SED -n '/(C)/!b go |
| 12279 | :more |
| 12280 | /\./!{ |
| 12281 | N |
| 12282 | - s/\n# // |
| 12283 | + s/\n# / / |
| 12284 | b more |
| 12285 | } |
| 12286 | :go |
| 12287 | @@ -685,7 +740,9 @@ func_version () |
| 12288 | # Echo short help message to standard output and exit. |
| 12289 | func_usage () |
| 12290 | { |
| 12291 | - $SED -n '/^# Usage:/,/^# *-h/ { |
| 12292 | + $opt_debug |
| 12293 | + |
| 12294 | + $SED -n '/^# Usage:/,/^# *.*--help/ { |
| 12295 | s/^# // |
| 12296 | s/^# *$// |
| 12297 | s/\$progname/'$progname'/ |
| 12298 | @@ -701,7 +758,10 @@ func_usage () |
| 12299 | # unless 'noexit' is passed as argument. |
| 12300 | func_help () |
| 12301 | { |
| 12302 | + $opt_debug |
| 12303 | + |
| 12304 | $SED -n '/^# Usage:/,/# Report bugs to/ { |
| 12305 | + :print |
| 12306 | s/^# // |
| 12307 | s/^# *$// |
| 12308 | s*\$progname*'$progname'* |
| 12309 | @@ -714,7 +774,11 @@ func_help () |
| 12310 | s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ |
| 12311 | s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ |
| 12312 | p |
| 12313 | - }' < "$progpath" |
| 12314 | + d |
| 12315 | + } |
| 12316 | + /^# .* home page:/b print |
| 12317 | + /^# General help using/b print |
| 12318 | + ' < "$progpath" |
| 12319 | ret=$? |
| 12320 | if test -z "$1"; then |
| 12321 | exit $ret |
| 12322 | @@ -726,12 +790,39 @@ func_help () |
| 12323 | # exit_cmd. |
| 12324 | func_missing_arg () |
| 12325 | { |
| 12326 | - func_error "missing argument for $1" |
| 12327 | + $opt_debug |
| 12328 | + |
| 12329 | + func_error "missing argument for $1." |
| 12330 | exit_cmd=exit |
| 12331 | } |
| 12332 | |
| 12333 | -exit_cmd=: |
| 12334 | |
| 12335 | +# func_split_short_opt shortopt |
| 12336 | +# Set func_split_short_opt_name and func_split_short_opt_arg shell |
| 12337 | +# variables after splitting SHORTOPT after the 2nd character. |
| 12338 | +func_split_short_opt () |
| 12339 | +{ |
| 12340 | + my_sed_short_opt='1s/^\(..\).*$/\1/;q' |
| 12341 | + my_sed_short_rest='1s/^..\(.*\)$/\1/;q' |
| 12342 | + |
| 12343 | + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` |
| 12344 | + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` |
| 12345 | +} # func_split_short_opt may be replaced by extended shell implementation |
| 12346 | + |
| 12347 | + |
| 12348 | +# func_split_long_opt longopt |
| 12349 | +# Set func_split_long_opt_name and func_split_long_opt_arg shell |
| 12350 | +# variables after splitting LONGOPT at the `=' sign. |
| 12351 | +func_split_long_opt () |
| 12352 | +{ |
| 12353 | + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' |
| 12354 | + my_sed_long_arg='1s/^--[^=]*=//' |
| 12355 | + |
| 12356 | + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` |
| 12357 | + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` |
| 12358 | +} # func_split_long_opt may be replaced by extended shell implementation |
| 12359 | + |
| 12360 | +exit_cmd=: |
| 12361 | |
| 12362 | |
| 12363 | |
| 12364 | @@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%" |
| 12365 | magic_exe="%%%MAGIC EXE variable%%%" |
| 12366 | |
| 12367 | # Global variables. |
| 12368 | -# $mode is unset |
| 12369 | nonopt= |
| 12370 | -execute_dlfiles= |
| 12371 | preserve_args= |
| 12372 | lo2o="s/\\.lo\$/.${objext}/" |
| 12373 | o2lo="s/\\.${objext}\$/.lo/" |
| 12374 | extracted_archives= |
| 12375 | extracted_serial=0 |
| 12376 | |
| 12377 | -opt_dry_run=false |
| 12378 | -opt_finish=: |
| 12379 | -opt_duplicate_deps=false |
| 12380 | -opt_silent=false |
| 12381 | -opt_debug=: |
| 12382 | - |
| 12383 | # If this variable is set in any of the actions, the command in it |
| 12384 | # will be execed at the end. This prevents here-documents from being |
| 12385 | # left over by shells. |
| 12386 | exec_cmd= |
| 12387 | |
| 12388 | +# func_append var value |
| 12389 | +# Append VALUE to the end of shell variable VAR. |
| 12390 | +func_append () |
| 12391 | +{ |
| 12392 | + eval "${1}=\$${1}\${2}" |
| 12393 | +} # func_append may be replaced by extended shell implementation |
| 12394 | + |
| 12395 | +# func_append_quoted var value |
| 12396 | +# Quote VALUE and append to the end of shell variable VAR, separated |
| 12397 | +# by a space. |
| 12398 | +func_append_quoted () |
| 12399 | +{ |
| 12400 | + func_quote_for_eval "${2}" |
| 12401 | + eval "${1}=\$${1}\\ \$func_quote_for_eval_result" |
| 12402 | +} # func_append_quoted may be replaced by extended shell implementation |
| 12403 | + |
| 12404 | + |
| 12405 | +# func_arith arithmetic-term... |
| 12406 | +func_arith () |
| 12407 | +{ |
| 12408 | + func_arith_result=`expr "${@}"` |
| 12409 | +} # func_arith may be replaced by extended shell implementation |
| 12410 | + |
| 12411 | + |
| 12412 | +# func_len string |
| 12413 | +# STRING may not start with a hyphen. |
| 12414 | +func_len () |
| 12415 | +{ |
| 12416 | + func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 12417 | +} # func_len may be replaced by extended shell implementation |
| 12418 | + |
| 12419 | + |
| 12420 | +# func_lo2o object |
| 12421 | +func_lo2o () |
| 12422 | +{ |
| 12423 | + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 12424 | +} # func_lo2o may be replaced by extended shell implementation |
| 12425 | + |
| 12426 | + |
| 12427 | +# func_xform libobj-or-source |
| 12428 | +func_xform () |
| 12429 | +{ |
| 12430 | + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 12431 | +} # func_xform may be replaced by extended shell implementation |
| 12432 | + |
| 12433 | + |
| 12434 | # func_fatal_configuration arg... |
| 12435 | # Echo program name prefixed message to standard error, followed by |
| 12436 | # a configuration failure hint, and exit. |
| 12437 | @@ -850,130 +979,204 @@ func_enable_tag () |
| 12438 | esac |
| 12439 | } |
| 12440 | |
| 12441 | -# Parse options once, thoroughly. This comes as soon as possible in |
| 12442 | -# the script to make things like `libtool --version' happen quickly. |
| 12443 | +# func_check_version_match |
| 12444 | +# Ensure that we are using m4 macros, and libtool script from the same |
| 12445 | +# release of libtool. |
| 12446 | +func_check_version_match () |
| 12447 | { |
| 12448 | + if test "$package_revision" != "$macro_revision"; then |
| 12449 | + if test "$VERSION" != "$macro_version"; then |
| 12450 | + if test -z "$macro_version"; then |
| 12451 | + cat >&2 <<_LT_EOF |
| 12452 | +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the |
| 12453 | +$progname: definition of this LT_INIT comes from an older release. |
| 12454 | +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION |
| 12455 | +$progname: and run autoconf again. |
| 12456 | +_LT_EOF |
| 12457 | + else |
| 12458 | + cat >&2 <<_LT_EOF |
| 12459 | +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the |
| 12460 | +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. |
| 12461 | +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION |
| 12462 | +$progname: and run autoconf again. |
| 12463 | +_LT_EOF |
| 12464 | + fi |
| 12465 | + else |
| 12466 | + cat >&2 <<_LT_EOF |
| 12467 | +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, |
| 12468 | +$progname: but the definition of this LT_INIT comes from revision $macro_revision. |
| 12469 | +$progname: You should recreate aclocal.m4 with macros from revision $package_revision |
| 12470 | +$progname: of $PACKAGE $VERSION and run autoconf again. |
| 12471 | +_LT_EOF |
| 12472 | + fi |
| 12473 | |
| 12474 | - # Shorthand for --mode=foo, only valid as the first argument |
| 12475 | - case $1 in |
| 12476 | - clean|clea|cle|cl) |
| 12477 | - shift; set dummy --mode clean ${1+"$@"}; shift |
| 12478 | - ;; |
| 12479 | - compile|compil|compi|comp|com|co|c) |
| 12480 | - shift; set dummy --mode compile ${1+"$@"}; shift |
| 12481 | - ;; |
| 12482 | - execute|execut|execu|exec|exe|ex|e) |
| 12483 | - shift; set dummy --mode execute ${1+"$@"}; shift |
| 12484 | - ;; |
| 12485 | - finish|finis|fini|fin|fi|f) |
| 12486 | - shift; set dummy --mode finish ${1+"$@"}; shift |
| 12487 | - ;; |
| 12488 | - install|instal|insta|inst|ins|in|i) |
| 12489 | - shift; set dummy --mode install ${1+"$@"}; shift |
| 12490 | - ;; |
| 12491 | - link|lin|li|l) |
| 12492 | - shift; set dummy --mode link ${1+"$@"}; shift |
| 12493 | - ;; |
| 12494 | - uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) |
| 12495 | - shift; set dummy --mode uninstall ${1+"$@"}; shift |
| 12496 | - ;; |
| 12497 | - esac |
| 12498 | + exit $EXIT_MISMATCH |
| 12499 | + fi |
| 12500 | +} |
| 12501 | + |
| 12502 | + |
| 12503 | +# Shorthand for --mode=foo, only valid as the first argument |
| 12504 | +case $1 in |
| 12505 | +clean|clea|cle|cl) |
| 12506 | + shift; set dummy --mode clean ${1+"$@"}; shift |
| 12507 | + ;; |
| 12508 | +compile|compil|compi|comp|com|co|c) |
| 12509 | + shift; set dummy --mode compile ${1+"$@"}; shift |
| 12510 | + ;; |
| 12511 | +execute|execut|execu|exec|exe|ex|e) |
| 12512 | + shift; set dummy --mode execute ${1+"$@"}; shift |
| 12513 | + ;; |
| 12514 | +finish|finis|fini|fin|fi|f) |
| 12515 | + shift; set dummy --mode finish ${1+"$@"}; shift |
| 12516 | + ;; |
| 12517 | +install|instal|insta|inst|ins|in|i) |
| 12518 | + shift; set dummy --mode install ${1+"$@"}; shift |
| 12519 | + ;; |
| 12520 | +link|lin|li|l) |
| 12521 | + shift; set dummy --mode link ${1+"$@"}; shift |
| 12522 | + ;; |
| 12523 | +uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) |
| 12524 | + shift; set dummy --mode uninstall ${1+"$@"}; shift |
| 12525 | + ;; |
| 12526 | +esac |
| 12527 | |
| 12528 | - # Parse non-mode specific arguments: |
| 12529 | - while test "$#" -gt 0; do |
| 12530 | + |
| 12531 | + |
| 12532 | +# Option defaults: |
| 12533 | +opt_debug=: |
| 12534 | +opt_dry_run=false |
| 12535 | +opt_config=false |
| 12536 | +opt_preserve_dup_deps=false |
| 12537 | +opt_features=false |
| 12538 | +opt_finish=false |
| 12539 | +opt_help=false |
| 12540 | +opt_help_all=false |
| 12541 | +opt_silent=: |
| 12542 | +opt_verbose=: |
| 12543 | +opt_silent=false |
| 12544 | +opt_verbose=false |
| 12545 | + |
| 12546 | + |
| 12547 | +# Parse options once, thoroughly. This comes as soon as possible in the |
| 12548 | +# script to make things like `--version' happen as quickly as we can. |
| 12549 | +{ |
| 12550 | + # this just eases exit handling |
| 12551 | + while test $# -gt 0; do |
| 12552 | opt="$1" |
| 12553 | shift |
| 12554 | - |
| 12555 | case $opt in |
| 12556 | - --config) func_config ;; |
| 12557 | - |
| 12558 | - --debug) preserve_args="$preserve_args $opt" |
| 12559 | + --debug|-x) opt_debug='set -x' |
| 12560 | func_echo "enabling shell trace mode" |
| 12561 | - opt_debug='set -x' |
| 12562 | $opt_debug |
| 12563 | ;; |
| 12564 | - |
| 12565 | - -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break |
| 12566 | - execute_dlfiles="$execute_dlfiles $1" |
| 12567 | - shift |
| 12568 | + --dry-run|--dryrun|-n) |
| 12569 | + opt_dry_run=: |
| 12570 | ;; |
| 12571 | - |
| 12572 | - --dry-run | -n) opt_dry_run=: ;; |
| 12573 | - --features) func_features ;; |
| 12574 | - --finish) mode="finish" ;; |
| 12575 | - --no-finish) opt_finish=false ;; |
| 12576 | - |
| 12577 | - --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break |
| 12578 | - case $1 in |
| 12579 | - # Valid mode arguments: |
| 12580 | - clean) ;; |
| 12581 | - compile) ;; |
| 12582 | - execute) ;; |
| 12583 | - finish) ;; |
| 12584 | - install) ;; |
| 12585 | - link) ;; |
| 12586 | - relink) ;; |
| 12587 | - uninstall) ;; |
| 12588 | - |
| 12589 | - # Catch anything else as an error |
| 12590 | - *) func_error "invalid argument for $opt" |
| 12591 | - exit_cmd=exit |
| 12592 | - break |
| 12593 | - ;; |
| 12594 | - esac |
| 12595 | - |
| 12596 | - mode="$1" |
| 12597 | + --config) |
| 12598 | + opt_config=: |
| 12599 | +func_config |
| 12600 | + ;; |
| 12601 | + --dlopen|-dlopen) |
| 12602 | + optarg="$1" |
| 12603 | + opt_dlopen="${opt_dlopen+$opt_dlopen |
| 12604 | +}$optarg" |
| 12605 | shift |
| 12606 | ;; |
| 12607 | - |
| 12608 | --preserve-dup-deps) |
| 12609 | - opt_duplicate_deps=: ;; |
| 12610 | - |
| 12611 | - --quiet|--silent) preserve_args="$preserve_args $opt" |
| 12612 | - opt_silent=: |
| 12613 | - opt_verbose=false |
| 12614 | + opt_preserve_dup_deps=: |
| 12615 | ;; |
| 12616 | - |
| 12617 | - --no-quiet|--no-silent) |
| 12618 | - preserve_args="$preserve_args $opt" |
| 12619 | - opt_silent=false |
| 12620 | + --features) |
| 12621 | + opt_features=: |
| 12622 | +func_features |
| 12623 | ;; |
| 12624 | - |
| 12625 | - --verbose| -v) preserve_args="$preserve_args $opt" |
| 12626 | + --finish) |
| 12627 | + opt_finish=: |
| 12628 | +set dummy --mode finish ${1+"$@"}; shift |
| 12629 | + ;; |
| 12630 | + --help) |
| 12631 | + opt_help=: |
| 12632 | + ;; |
| 12633 | + --help-all) |
| 12634 | + opt_help_all=: |
| 12635 | +opt_help=': help-all' |
| 12636 | + ;; |
| 12637 | + --mode) |
| 12638 | + test $# = 0 && func_missing_arg $opt && break |
| 12639 | + optarg="$1" |
| 12640 | + opt_mode="$optarg" |
| 12641 | +case $optarg in |
| 12642 | + # Valid mode arguments: |
| 12643 | + clean|compile|execute|finish|install|link|relink|uninstall) ;; |
| 12644 | + |
| 12645 | + # Catch anything else as an error |
| 12646 | + *) func_error "invalid argument for $opt" |
| 12647 | + exit_cmd=exit |
| 12648 | + break |
| 12649 | + ;; |
| 12650 | +esac |
| 12651 | + shift |
| 12652 | + ;; |
| 12653 | + --no-silent|--no-quiet) |
| 12654 | opt_silent=false |
| 12655 | - opt_verbose=: |
| 12656 | +func_append preserve_args " $opt" |
| 12657 | ;; |
| 12658 | - |
| 12659 | - --no-verbose) preserve_args="$preserve_args $opt" |
| 12660 | + --no-verbose) |
| 12661 | opt_verbose=false |
| 12662 | +func_append preserve_args " $opt" |
| 12663 | ;; |
| 12664 | - |
| 12665 | - --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break |
| 12666 | - preserve_args="$preserve_args $opt $1" |
| 12667 | - func_enable_tag "$1" # tagname is set here |
| 12668 | + --silent|--quiet) |
| 12669 | + opt_silent=: |
| 12670 | +func_append preserve_args " $opt" |
| 12671 | + opt_verbose=false |
| 12672 | + ;; |
| 12673 | + --verbose|-v) |
| 12674 | + opt_verbose=: |
| 12675 | +func_append preserve_args " $opt" |
| 12676 | +opt_silent=false |
| 12677 | + ;; |
| 12678 | + --tag) |
| 12679 | + test $# = 0 && func_missing_arg $opt && break |
| 12680 | + optarg="$1" |
| 12681 | + opt_tag="$optarg" |
| 12682 | +func_append preserve_args " $opt $optarg" |
| 12683 | +func_enable_tag "$optarg" |
| 12684 | shift |
| 12685 | ;; |
| 12686 | |
| 12687 | + -\?|-h) func_usage ;; |
| 12688 | + --help) func_help ;; |
| 12689 | + --version) func_version ;; |
| 12690 | + |
| 12691 | # Separate optargs to long options: |
| 12692 | - -dlopen=*|--mode=*|--tag=*) |
| 12693 | - func_opt_split "$opt" |
| 12694 | - set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} |
| 12695 | + --*=*) |
| 12696 | + func_split_long_opt "$opt" |
| 12697 | + set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} |
| 12698 | shift |
| 12699 | ;; |
| 12700 | |
| 12701 | - -\?|-h) func_usage ;; |
| 12702 | - --help) opt_help=: ;; |
| 12703 | - --help-all) opt_help=': help-all' ;; |
| 12704 | - --version) func_version ;; |
| 12705 | - |
| 12706 | - -*) func_fatal_help "unrecognized option \`$opt'" ;; |
| 12707 | - |
| 12708 | - *) nonopt="$opt" |
| 12709 | - break |
| 12710 | + # Separate non-argument short options: |
| 12711 | + -\?*|-h*|-n*|-v*) |
| 12712 | + func_split_short_opt "$opt" |
| 12713 | + set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} |
| 12714 | + shift |
| 12715 | ;; |
| 12716 | + |
| 12717 | + --) break ;; |
| 12718 | + -*) func_fatal_help "unrecognized option \`$opt'" ;; |
| 12719 | + *) set dummy "$opt" ${1+"$@"}; shift; break ;; |
| 12720 | esac |
| 12721 | done |
| 12722 | |
| 12723 | + # Validate options: |
| 12724 | + |
| 12725 | + # save first non-option argument |
| 12726 | + if test "$#" -gt 0; then |
| 12727 | + nonopt="$opt" |
| 12728 | + shift |
| 12729 | + fi |
| 12730 | + |
| 12731 | + # preserve --debug |
| 12732 | + test "$opt_debug" = : || func_append preserve_args " --debug" |
| 12733 | |
| 12734 | case $host in |
| 12735 | *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) |
| 12736 | @@ -981,82 +1184,44 @@ func_enable_tag () |
| 12737 | opt_duplicate_compiler_generated_deps=: |
| 12738 | ;; |
| 12739 | *) |
| 12740 | - opt_duplicate_compiler_generated_deps=$opt_duplicate_deps |
| 12741 | + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps |
| 12742 | ;; |
| 12743 | esac |
| 12744 | |
| 12745 | - # Having warned about all mis-specified options, bail out if |
| 12746 | - # anything was wrong. |
| 12747 | - $exit_cmd $EXIT_FAILURE |
| 12748 | -} |
| 12749 | + $opt_help || { |
| 12750 | + # Sanity checks first: |
| 12751 | + func_check_version_match |
| 12752 | |
| 12753 | -# func_check_version_match |
| 12754 | -# Ensure that we are using m4 macros, and libtool script from the same |
| 12755 | -# release of libtool. |
| 12756 | -func_check_version_match () |
| 12757 | -{ |
| 12758 | - if test "$package_revision" != "$macro_revision"; then |
| 12759 | - if test "$VERSION" != "$macro_version"; then |
| 12760 | - if test -z "$macro_version"; then |
| 12761 | - cat >&2 <<_LT_EOF |
| 12762 | -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the |
| 12763 | -$progname: definition of this LT_INIT comes from an older release. |
| 12764 | -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION |
| 12765 | -$progname: and run autoconf again. |
| 12766 | -_LT_EOF |
| 12767 | - else |
| 12768 | - cat >&2 <<_LT_EOF |
| 12769 | -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the |
| 12770 | -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. |
| 12771 | -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION |
| 12772 | -$progname: and run autoconf again. |
| 12773 | -_LT_EOF |
| 12774 | - fi |
| 12775 | - else |
| 12776 | - cat >&2 <<_LT_EOF |
| 12777 | -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, |
| 12778 | -$progname: but the definition of this LT_INIT comes from revision $macro_revision. |
| 12779 | -$progname: You should recreate aclocal.m4 with macros from revision $package_revision |
| 12780 | -$progname: of $PACKAGE $VERSION and run autoconf again. |
| 12781 | -_LT_EOF |
| 12782 | + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then |
| 12783 | + func_fatal_configuration "not configured to build any kind of library" |
| 12784 | fi |
| 12785 | |
| 12786 | - exit $EXIT_MISMATCH |
| 12787 | - fi |
| 12788 | -} |
| 12789 | - |
| 12790 | + # Darwin sucks |
| 12791 | + eval std_shrext=\"$shrext_cmds\" |
| 12792 | |
| 12793 | -## ----------- ## |
| 12794 | -## Main. ## |
| 12795 | -## ----------- ## |
| 12796 | - |
| 12797 | -$opt_help || { |
| 12798 | - # Sanity checks first: |
| 12799 | - func_check_version_match |
| 12800 | - |
| 12801 | - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then |
| 12802 | - func_fatal_configuration "not configured to build any kind of library" |
| 12803 | - fi |
| 12804 | + # Only execute mode is allowed to have -dlopen flags. |
| 12805 | + if test -n "$opt_dlopen" && test "$opt_mode" != execute; then |
| 12806 | + func_error "unrecognized option \`-dlopen'" |
| 12807 | + $ECHO "$help" 1>&2 |
| 12808 | + exit $EXIT_FAILURE |
| 12809 | + fi |
| 12810 | |
| 12811 | - test -z "$mode" && func_fatal_error "error: you must specify a MODE." |
| 12812 | + # Change the help message to a mode-specific one. |
| 12813 | + generic_help="$help" |
| 12814 | + help="Try \`$progname --help --mode=$opt_mode' for more information." |
| 12815 | + } |
| 12816 | |
| 12817 | |
| 12818 | - # Darwin sucks |
| 12819 | - eval "std_shrext=\"$shrext_cmds\"" |
| 12820 | + # Bail if the options were screwed |
| 12821 | + $exit_cmd $EXIT_FAILURE |
| 12822 | +} |
| 12823 | |
| 12824 | |
| 12825 | - # Only execute mode is allowed to have -dlopen flags. |
| 12826 | - if test -n "$execute_dlfiles" && test "$mode" != execute; then |
| 12827 | - func_error "unrecognized option \`-dlopen'" |
| 12828 | - $ECHO "$help" 1>&2 |
| 12829 | - exit $EXIT_FAILURE |
| 12830 | - fi |
| 12831 | |
| 12832 | - # Change the help message to a mode-specific one. |
| 12833 | - generic_help="$help" |
| 12834 | - help="Try \`$progname --help --mode=$mode' for more information." |
| 12835 | -} |
| 12836 | |
| 12837 | +## ----------- ## |
| 12838 | +## Main. ## |
| 12839 | +## ----------- ## |
| 12840 | |
| 12841 | # func_lalib_p file |
| 12842 | # True iff FILE is a libtool `.la' library or `.lo' object file. |
| 12843 | @@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p () |
| 12844 | # temporary ltwrapper_script. |
| 12845 | func_ltwrapper_scriptname () |
| 12846 | { |
| 12847 | - func_ltwrapper_scriptname_result="" |
| 12848 | - if func_ltwrapper_executable_p "$1"; then |
| 12849 | - func_dirname_and_basename "$1" "" "." |
| 12850 | - func_stripname '' '.exe' "$func_basename_result" |
| 12851 | - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" |
| 12852 | - fi |
| 12853 | + func_dirname_and_basename "$1" "" "." |
| 12854 | + func_stripname '' '.exe' "$func_basename_result" |
| 12855 | + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" |
| 12856 | } |
| 12857 | |
| 12858 | # func_ltwrapper_p file |
| 12859 | @@ -1149,7 +1311,7 @@ func_execute_cmds () |
| 12860 | save_ifs=$IFS; IFS='~' |
| 12861 | for cmd in $1; do |
| 12862 | IFS=$save_ifs |
| 12863 | - eval "cmd=\"$cmd\"" |
| 12864 | + eval cmd=\"$cmd\" |
| 12865 | func_show_eval "$cmd" "${2-:}" |
| 12866 | done |
| 12867 | IFS=$save_ifs |
| 12868 | @@ -1172,6 +1334,37 @@ func_source () |
| 12869 | } |
| 12870 | |
| 12871 | |
| 12872 | +# func_resolve_sysroot PATH |
| 12873 | +# Replace a leading = in PATH with a sysroot. Store the result into |
| 12874 | +# func_resolve_sysroot_result |
| 12875 | +func_resolve_sysroot () |
| 12876 | +{ |
| 12877 | + func_resolve_sysroot_result=$1 |
| 12878 | + case $func_resolve_sysroot_result in |
| 12879 | + =*) |
| 12880 | + func_stripname '=' '' "$func_resolve_sysroot_result" |
| 12881 | + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result |
| 12882 | + ;; |
| 12883 | + esac |
| 12884 | +} |
| 12885 | + |
| 12886 | +# func_replace_sysroot PATH |
| 12887 | +# If PATH begins with the sysroot, replace it with = and |
| 12888 | +# store the result into func_replace_sysroot_result. |
| 12889 | +func_replace_sysroot () |
| 12890 | +{ |
| 12891 | + case "$lt_sysroot:$1" in |
| 12892 | + ?*:"$lt_sysroot"*) |
| 12893 | + func_stripname "$lt_sysroot" '' "$1" |
| 12894 | + func_replace_sysroot_result="=$func_stripname_result" |
| 12895 | + ;; |
| 12896 | + *) |
| 12897 | + # Including no sysroot. |
| 12898 | + func_replace_sysroot_result=$1 |
| 12899 | + ;; |
| 12900 | + esac |
| 12901 | +} |
| 12902 | + |
| 12903 | # func_infer_tag arg |
| 12904 | # Infer tagged configuration to use if any are available and |
| 12905 | # if one wasn't chosen via the "--tag" command line option. |
| 12906 | @@ -1184,8 +1377,7 @@ func_infer_tag () |
| 12907 | if test -n "$available_tags" && test -z "$tagname"; then |
| 12908 | CC_quoted= |
| 12909 | for arg in $CC; do |
| 12910 | - func_quote_for_eval "$arg" |
| 12911 | - CC_quoted="$CC_quoted $func_quote_for_eval_result" |
| 12912 | + func_append_quoted CC_quoted "$arg" |
| 12913 | done |
| 12914 | CC_expanded=`func_echo_all $CC` |
| 12915 | CC_quoted_expanded=`func_echo_all $CC_quoted` |
| 12916 | @@ -1204,8 +1396,7 @@ func_infer_tag () |
| 12917 | CC_quoted= |
| 12918 | for arg in $CC; do |
| 12919 | # Double-quote args containing other shell metacharacters. |
| 12920 | - func_quote_for_eval "$arg" |
| 12921 | - CC_quoted="$CC_quoted $func_quote_for_eval_result" |
| 12922 | + func_append_quoted CC_quoted "$arg" |
| 12923 | done |
| 12924 | CC_expanded=`func_echo_all $CC` |
| 12925 | CC_quoted_expanded=`func_echo_all $CC_quoted` |
| 12926 | @@ -1274,6 +1465,486 @@ EOF |
| 12927 | } |
| 12928 | } |
| 12929 | |
| 12930 | + |
| 12931 | +################################################## |
| 12932 | +# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # |
| 12933 | +################################################## |
| 12934 | + |
| 12935 | +# func_convert_core_file_wine_to_w32 ARG |
| 12936 | +# Helper function used by file name conversion functions when $build is *nix, |
| 12937 | +# and $host is mingw, cygwin, or some other w32 environment. Relies on a |
| 12938 | +# correctly configured wine environment available, with the winepath program |
| 12939 | +# in $build's $PATH. |
| 12940 | +# |
| 12941 | +# ARG is the $build file name to be converted to w32 format. |
| 12942 | +# Result is available in $func_convert_core_file_wine_to_w32_result, and will |
| 12943 | +# be empty on error (or when ARG is empty) |
| 12944 | +func_convert_core_file_wine_to_w32 () |
| 12945 | +{ |
| 12946 | + $opt_debug |
| 12947 | + func_convert_core_file_wine_to_w32_result="$1" |
| 12948 | + if test -n "$1"; then |
| 12949 | + # Unfortunately, winepath does not exit with a non-zero error code, so we |
| 12950 | + # are forced to check the contents of stdout. On the other hand, if the |
| 12951 | + # command is not found, the shell will set an exit code of 127 and print |
| 12952 | + # *an error message* to stdout. So we must check for both error code of |
| 12953 | + # zero AND non-empty stdout, which explains the odd construction: |
| 12954 | + func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` |
| 12955 | + if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then |
| 12956 | + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | |
| 12957 | + $SED -e "$lt_sed_naive_backslashify"` |
| 12958 | + else |
| 12959 | + func_convert_core_file_wine_to_w32_result= |
| 12960 | + fi |
| 12961 | + fi |
| 12962 | +} |
| 12963 | +# end: func_convert_core_file_wine_to_w32 |
| 12964 | + |
| 12965 | + |
| 12966 | +# func_convert_core_path_wine_to_w32 ARG |
| 12967 | +# Helper function used by path conversion functions when $build is *nix, and |
| 12968 | +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly |
| 12969 | +# configured wine environment available, with the winepath program in $build's |
| 12970 | +# $PATH. Assumes ARG has no leading or trailing path separator characters. |
| 12971 | +# |
| 12972 | +# ARG is path to be converted from $build format to win32. |
| 12973 | +# Result is available in $func_convert_core_path_wine_to_w32_result. |
| 12974 | +# Unconvertible file (directory) names in ARG are skipped; if no directory names |
| 12975 | +# are convertible, then the result may be empty. |
| 12976 | +func_convert_core_path_wine_to_w32 () |
| 12977 | +{ |
| 12978 | + $opt_debug |
| 12979 | + # unfortunately, winepath doesn't convert paths, only file names |
| 12980 | + func_convert_core_path_wine_to_w32_result="" |
| 12981 | + if test -n "$1"; then |
| 12982 | + oldIFS=$IFS |
| 12983 | + IFS=: |
| 12984 | + for func_convert_core_path_wine_to_w32_f in $1; do |
| 12985 | + IFS=$oldIFS |
| 12986 | + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" |
| 12987 | + if test -n "$func_convert_core_file_wine_to_w32_result" ; then |
| 12988 | + if test -z "$func_convert_core_path_wine_to_w32_result"; then |
| 12989 | + func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" |
| 12990 | + else |
| 12991 | + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" |
| 12992 | + fi |
| 12993 | + fi |
| 12994 | + done |
| 12995 | + IFS=$oldIFS |
| 12996 | + fi |
| 12997 | +} |
| 12998 | +# end: func_convert_core_path_wine_to_w32 |
| 12999 | + |
| 13000 | + |
| 13001 | +# func_cygpath ARGS... |
| 13002 | +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when |
| 13003 | +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) |
| 13004 | +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or |
| 13005 | +# (2), returns the Cygwin file name or path in func_cygpath_result (input |
| 13006 | +# file name or path is assumed to be in w32 format, as previously converted |
| 13007 | +# from $build's *nix or MSYS format). In case (3), returns the w32 file name |
| 13008 | +# or path in func_cygpath_result (input file name or path is assumed to be in |
| 13009 | +# Cygwin format). Returns an empty string on error. |
| 13010 | +# |
| 13011 | +# ARGS are passed to cygpath, with the last one being the file name or path to |
| 13012 | +# be converted. |
| 13013 | +# |
| 13014 | +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH |
| 13015 | +# environment variable; do not put it in $PATH. |
| 13016 | +func_cygpath () |
| 13017 | +{ |
| 13018 | + $opt_debug |
| 13019 | + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then |
| 13020 | + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` |
| 13021 | + if test "$?" -ne 0; then |
| 13022 | + # on failure, ensure result is empty |
| 13023 | + func_cygpath_result= |
| 13024 | + fi |
| 13025 | + else |
| 13026 | + func_cygpath_result= |
| 13027 | + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" |
| 13028 | + fi |
| 13029 | +} |
| 13030 | +#end: func_cygpath |
| 13031 | + |
| 13032 | + |
| 13033 | +# func_convert_core_msys_to_w32 ARG |
| 13034 | +# Convert file name or path ARG from MSYS format to w32 format. Return |
| 13035 | +# result in func_convert_core_msys_to_w32_result. |
| 13036 | +func_convert_core_msys_to_w32 () |
| 13037 | +{ |
| 13038 | + $opt_debug |
| 13039 | + # awkward: cmd appends spaces to result |
| 13040 | + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | |
| 13041 | + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` |
| 13042 | +} |
| 13043 | +#end: func_convert_core_msys_to_w32 |
| 13044 | + |
| 13045 | + |
| 13046 | +# func_convert_file_check ARG1 ARG2 |
| 13047 | +# Verify that ARG1 (a file name in $build format) was converted to $host |
| 13048 | +# format in ARG2. Otherwise, emit an error message, but continue (resetting |
| 13049 | +# func_to_host_file_result to ARG1). |
| 13050 | +func_convert_file_check () |
| 13051 | +{ |
| 13052 | + $opt_debug |
| 13053 | + if test -z "$2" && test -n "$1" ; then |
| 13054 | + func_error "Could not determine host file name corresponding to" |
| 13055 | + func_error " \`$1'" |
| 13056 | + func_error "Continuing, but uninstalled executables may not work." |
| 13057 | + # Fallback: |
| 13058 | + func_to_host_file_result="$1" |
| 13059 | + fi |
| 13060 | +} |
| 13061 | +# end func_convert_file_check |
| 13062 | + |
| 13063 | + |
| 13064 | +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH |
| 13065 | +# Verify that FROM_PATH (a path in $build format) was converted to $host |
| 13066 | +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting |
| 13067 | +# func_to_host_file_result to a simplistic fallback value (see below). |
| 13068 | +func_convert_path_check () |
| 13069 | +{ |
| 13070 | + $opt_debug |
| 13071 | + if test -z "$4" && test -n "$3"; then |
| 13072 | + func_error "Could not determine the host path corresponding to" |
| 13073 | + func_error " \`$3'" |
| 13074 | + func_error "Continuing, but uninstalled executables may not work." |
| 13075 | + # Fallback. This is a deliberately simplistic "conversion" and |
| 13076 | + # should not be "improved". See libtool.info. |
| 13077 | + if test "x$1" != "x$2"; then |
| 13078 | + lt_replace_pathsep_chars="s|$1|$2|g" |
| 13079 | + func_to_host_path_result=`echo "$3" | |
| 13080 | + $SED -e "$lt_replace_pathsep_chars"` |
| 13081 | + else |
| 13082 | + func_to_host_path_result="$3" |
| 13083 | + fi |
| 13084 | + fi |
| 13085 | +} |
| 13086 | +# end func_convert_path_check |
| 13087 | + |
| 13088 | + |
| 13089 | +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG |
| 13090 | +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT |
| 13091 | +# and appending REPL if ORIG matches BACKPAT. |
| 13092 | +func_convert_path_front_back_pathsep () |
| 13093 | +{ |
| 13094 | + $opt_debug |
| 13095 | + case $4 in |
| 13096 | + $1 ) func_to_host_path_result="$3$func_to_host_path_result" |
| 13097 | + ;; |
| 13098 | + esac |
| 13099 | + case $4 in |
| 13100 | + $2 ) func_append func_to_host_path_result "$3" |
| 13101 | + ;; |
| 13102 | + esac |
| 13103 | +} |
| 13104 | +# end func_convert_path_front_back_pathsep |
| 13105 | + |
| 13106 | + |
| 13107 | +################################################## |
| 13108 | +# $build to $host FILE NAME CONVERSION FUNCTIONS # |
| 13109 | +################################################## |
| 13110 | +# invoked via `$to_host_file_cmd ARG' |
| 13111 | +# |
| 13112 | +# In each case, ARG is the path to be converted from $build to $host format. |
| 13113 | +# Result will be available in $func_to_host_file_result. |
| 13114 | + |
| 13115 | + |
| 13116 | +# func_to_host_file ARG |
| 13117 | +# Converts the file name ARG from $build format to $host format. Return result |
| 13118 | +# in func_to_host_file_result. |
| 13119 | +func_to_host_file () |
| 13120 | +{ |
| 13121 | + $opt_debug |
| 13122 | + $to_host_file_cmd "$1" |
| 13123 | +} |
| 13124 | +# end func_to_host_file |
| 13125 | + |
| 13126 | + |
| 13127 | +# func_to_tool_file ARG LAZY |
| 13128 | +# converts the file name ARG from $build format to toolchain format. Return |
| 13129 | +# result in func_to_tool_file_result. If the conversion in use is listed |
| 13130 | +# in (the comma separated) LAZY, no conversion takes place. |
| 13131 | +func_to_tool_file () |
| 13132 | +{ |
| 13133 | + $opt_debug |
| 13134 | + case ,$2, in |
| 13135 | + *,"$to_tool_file_cmd",*) |
| 13136 | + func_to_tool_file_result=$1 |
| 13137 | + ;; |
| 13138 | + *) |
| 13139 | + $to_tool_file_cmd "$1" |
| 13140 | + func_to_tool_file_result=$func_to_host_file_result |
| 13141 | + ;; |
| 13142 | + esac |
| 13143 | +} |
| 13144 | +# end func_to_tool_file |
| 13145 | + |
| 13146 | + |
| 13147 | +# func_convert_file_noop ARG |
| 13148 | +# Copy ARG to func_to_host_file_result. |
| 13149 | +func_convert_file_noop () |
| 13150 | +{ |
| 13151 | + func_to_host_file_result="$1" |
| 13152 | +} |
| 13153 | +# end func_convert_file_noop |
| 13154 | + |
| 13155 | + |
| 13156 | +# func_convert_file_msys_to_w32 ARG |
| 13157 | +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic |
| 13158 | +# conversion to w32 is not available inside the cwrapper. Returns result in |
| 13159 | +# func_to_host_file_result. |
| 13160 | +func_convert_file_msys_to_w32 () |
| 13161 | +{ |
| 13162 | + $opt_debug |
| 13163 | + func_to_host_file_result="$1" |
| 13164 | + if test -n "$1"; then |
| 13165 | + func_convert_core_msys_to_w32 "$1" |
| 13166 | + func_to_host_file_result="$func_convert_core_msys_to_w32_result" |
| 13167 | + fi |
| 13168 | + func_convert_file_check "$1" "$func_to_host_file_result" |
| 13169 | +} |
| 13170 | +# end func_convert_file_msys_to_w32 |
| 13171 | + |
| 13172 | + |
| 13173 | +# func_convert_file_cygwin_to_w32 ARG |
| 13174 | +# Convert file name ARG from Cygwin to w32 format. Returns result in |
| 13175 | +# func_to_host_file_result. |
| 13176 | +func_convert_file_cygwin_to_w32 () |
| 13177 | +{ |
| 13178 | + $opt_debug |
| 13179 | + func_to_host_file_result="$1" |
| 13180 | + if test -n "$1"; then |
| 13181 | + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use |
| 13182 | + # LT_CYGPATH in this case. |
| 13183 | + func_to_host_file_result=`cygpath -m "$1"` |
| 13184 | + fi |
| 13185 | + func_convert_file_check "$1" "$func_to_host_file_result" |
| 13186 | +} |
| 13187 | +# end func_convert_file_cygwin_to_w32 |
| 13188 | + |
| 13189 | + |
| 13190 | +# func_convert_file_nix_to_w32 ARG |
| 13191 | +# Convert file name ARG from *nix to w32 format. Requires a wine environment |
| 13192 | +# and a working winepath. Returns result in func_to_host_file_result. |
| 13193 | +func_convert_file_nix_to_w32 () |
| 13194 | +{ |
| 13195 | + $opt_debug |
| 13196 | + func_to_host_file_result="$1" |
| 13197 | + if test -n "$1"; then |
| 13198 | + func_convert_core_file_wine_to_w32 "$1" |
| 13199 | + func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" |
| 13200 | + fi |
| 13201 | + func_convert_file_check "$1" "$func_to_host_file_result" |
| 13202 | +} |
| 13203 | +# end func_convert_file_nix_to_w32 |
| 13204 | + |
| 13205 | + |
| 13206 | +# func_convert_file_msys_to_cygwin ARG |
| 13207 | +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. |
| 13208 | +# Returns result in func_to_host_file_result. |
| 13209 | +func_convert_file_msys_to_cygwin () |
| 13210 | +{ |
| 13211 | + $opt_debug |
| 13212 | + func_to_host_file_result="$1" |
| 13213 | + if test -n "$1"; then |
| 13214 | + func_convert_core_msys_to_w32 "$1" |
| 13215 | + func_cygpath -u "$func_convert_core_msys_to_w32_result" |
| 13216 | + func_to_host_file_result="$func_cygpath_result" |
| 13217 | + fi |
| 13218 | + func_convert_file_check "$1" "$func_to_host_file_result" |
| 13219 | +} |
| 13220 | +# end func_convert_file_msys_to_cygwin |
| 13221 | + |
| 13222 | + |
| 13223 | +# func_convert_file_nix_to_cygwin ARG |
| 13224 | +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed |
| 13225 | +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result |
| 13226 | +# in func_to_host_file_result. |
| 13227 | +func_convert_file_nix_to_cygwin () |
| 13228 | +{ |
| 13229 | + $opt_debug |
| 13230 | + func_to_host_file_result="$1" |
| 13231 | + if test -n "$1"; then |
| 13232 | + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. |
| 13233 | + func_convert_core_file_wine_to_w32 "$1" |
| 13234 | + func_cygpath -u "$func_convert_core_file_wine_to_w32_result" |
| 13235 | + func_to_host_file_result="$func_cygpath_result" |
| 13236 | + fi |
| 13237 | + func_convert_file_check "$1" "$func_to_host_file_result" |
| 13238 | +} |
| 13239 | +# end func_convert_file_nix_to_cygwin |
| 13240 | + |
| 13241 | + |
| 13242 | +############################################# |
| 13243 | +# $build to $host PATH CONVERSION FUNCTIONS # |
| 13244 | +############################################# |
| 13245 | +# invoked via `$to_host_path_cmd ARG' |
| 13246 | +# |
| 13247 | +# In each case, ARG is the path to be converted from $build to $host format. |
| 13248 | +# The result will be available in $func_to_host_path_result. |
| 13249 | +# |
| 13250 | +# Path separators are also converted from $build format to $host format. If |
| 13251 | +# ARG begins or ends with a path separator character, it is preserved (but |
| 13252 | +# converted to $host format) on output. |
| 13253 | +# |
| 13254 | +# All path conversion functions are named using the following convention: |
| 13255 | +# file name conversion function : func_convert_file_X_to_Y () |
| 13256 | +# path conversion function : func_convert_path_X_to_Y () |
| 13257 | +# where, for any given $build/$host combination the 'X_to_Y' value is the |
| 13258 | +# same. If conversion functions are added for new $build/$host combinations, |
| 13259 | +# the two new functions must follow this pattern, or func_init_to_host_path_cmd |
| 13260 | +# will break. |
| 13261 | + |
| 13262 | + |
| 13263 | +# func_init_to_host_path_cmd |
| 13264 | +# Ensures that function "pointer" variable $to_host_path_cmd is set to the |
| 13265 | +# appropriate value, based on the value of $to_host_file_cmd. |
| 13266 | +to_host_path_cmd= |
| 13267 | +func_init_to_host_path_cmd () |
| 13268 | +{ |
| 13269 | + $opt_debug |
| 13270 | + if test -z "$to_host_path_cmd"; then |
| 13271 | + func_stripname 'func_convert_file_' '' "$to_host_file_cmd" |
| 13272 | + to_host_path_cmd="func_convert_path_${func_stripname_result}" |
| 13273 | + fi |
| 13274 | +} |
| 13275 | + |
| 13276 | + |
| 13277 | +# func_to_host_path ARG |
| 13278 | +# Converts the path ARG from $build format to $host format. Return result |
| 13279 | +# in func_to_host_path_result. |
| 13280 | +func_to_host_path () |
| 13281 | +{ |
| 13282 | + $opt_debug |
| 13283 | + func_init_to_host_path_cmd |
| 13284 | + $to_host_path_cmd "$1" |
| 13285 | +} |
| 13286 | +# end func_to_host_path |
| 13287 | + |
| 13288 | + |
| 13289 | +# func_convert_path_noop ARG |
| 13290 | +# Copy ARG to func_to_host_path_result. |
| 13291 | +func_convert_path_noop () |
| 13292 | +{ |
| 13293 | + func_to_host_path_result="$1" |
| 13294 | +} |
| 13295 | +# end func_convert_path_noop |
| 13296 | + |
| 13297 | + |
| 13298 | +# func_convert_path_msys_to_w32 ARG |
| 13299 | +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic |
| 13300 | +# conversion to w32 is not available inside the cwrapper. Returns result in |
| 13301 | +# func_to_host_path_result. |
| 13302 | +func_convert_path_msys_to_w32 () |
| 13303 | +{ |
| 13304 | + $opt_debug |
| 13305 | + func_to_host_path_result="$1" |
| 13306 | + if test -n "$1"; then |
| 13307 | + # Remove leading and trailing path separator characters from ARG. MSYS |
| 13308 | + # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; |
| 13309 | + # and winepath ignores them completely. |
| 13310 | + func_stripname : : "$1" |
| 13311 | + func_to_host_path_tmp1=$func_stripname_result |
| 13312 | + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" |
| 13313 | + func_to_host_path_result="$func_convert_core_msys_to_w32_result" |
| 13314 | + func_convert_path_check : ";" \ |
| 13315 | + "$func_to_host_path_tmp1" "$func_to_host_path_result" |
| 13316 | + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" |
| 13317 | + fi |
| 13318 | +} |
| 13319 | +# end func_convert_path_msys_to_w32 |
| 13320 | + |
| 13321 | + |
| 13322 | +# func_convert_path_cygwin_to_w32 ARG |
| 13323 | +# Convert path ARG from Cygwin to w32 format. Returns result in |
| 13324 | +# func_to_host_file_result. |
| 13325 | +func_convert_path_cygwin_to_w32 () |
| 13326 | +{ |
| 13327 | + $opt_debug |
| 13328 | + func_to_host_path_result="$1" |
| 13329 | + if test -n "$1"; then |
| 13330 | + # See func_convert_path_msys_to_w32: |
| 13331 | + func_stripname : : "$1" |
| 13332 | + func_to_host_path_tmp1=$func_stripname_result |
| 13333 | + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` |
| 13334 | + func_convert_path_check : ";" \ |
| 13335 | + "$func_to_host_path_tmp1" "$func_to_host_path_result" |
| 13336 | + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" |
| 13337 | + fi |
| 13338 | +} |
| 13339 | +# end func_convert_path_cygwin_to_w32 |
| 13340 | + |
| 13341 | + |
| 13342 | +# func_convert_path_nix_to_w32 ARG |
| 13343 | +# Convert path ARG from *nix to w32 format. Requires a wine environment and |
| 13344 | +# a working winepath. Returns result in func_to_host_file_result. |
| 13345 | +func_convert_path_nix_to_w32 () |
| 13346 | +{ |
| 13347 | + $opt_debug |
| 13348 | + func_to_host_path_result="$1" |
| 13349 | + if test -n "$1"; then |
| 13350 | + # See func_convert_path_msys_to_w32: |
| 13351 | + func_stripname : : "$1" |
| 13352 | + func_to_host_path_tmp1=$func_stripname_result |
| 13353 | + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" |
| 13354 | + func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" |
| 13355 | + func_convert_path_check : ";" \ |
| 13356 | + "$func_to_host_path_tmp1" "$func_to_host_path_result" |
| 13357 | + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" |
| 13358 | + fi |
| 13359 | +} |
| 13360 | +# end func_convert_path_nix_to_w32 |
| 13361 | + |
| 13362 | + |
| 13363 | +# func_convert_path_msys_to_cygwin ARG |
| 13364 | +# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. |
| 13365 | +# Returns result in func_to_host_file_result. |
| 13366 | +func_convert_path_msys_to_cygwin () |
| 13367 | +{ |
| 13368 | + $opt_debug |
| 13369 | + func_to_host_path_result="$1" |
| 13370 | + if test -n "$1"; then |
| 13371 | + # See func_convert_path_msys_to_w32: |
| 13372 | + func_stripname : : "$1" |
| 13373 | + func_to_host_path_tmp1=$func_stripname_result |
| 13374 | + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" |
| 13375 | + func_cygpath -u -p "$func_convert_core_msys_to_w32_result" |
| 13376 | + func_to_host_path_result="$func_cygpath_result" |
| 13377 | + func_convert_path_check : : \ |
| 13378 | + "$func_to_host_path_tmp1" "$func_to_host_path_result" |
| 13379 | + func_convert_path_front_back_pathsep ":*" "*:" : "$1" |
| 13380 | + fi |
| 13381 | +} |
| 13382 | +# end func_convert_path_msys_to_cygwin |
| 13383 | + |
| 13384 | + |
| 13385 | +# func_convert_path_nix_to_cygwin ARG |
| 13386 | +# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a |
| 13387 | +# a wine environment, working winepath, and LT_CYGPATH set. Returns result in |
| 13388 | +# func_to_host_file_result. |
| 13389 | +func_convert_path_nix_to_cygwin () |
| 13390 | +{ |
| 13391 | + $opt_debug |
| 13392 | + func_to_host_path_result="$1" |
| 13393 | + if test -n "$1"; then |
| 13394 | + # Remove leading and trailing path separator characters from |
| 13395 | + # ARG. msys behavior is inconsistent here, cygpath turns them |
| 13396 | + # into '.;' and ';.', and winepath ignores them completely. |
| 13397 | + func_stripname : : "$1" |
| 13398 | + func_to_host_path_tmp1=$func_stripname_result |
| 13399 | + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" |
| 13400 | + func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" |
| 13401 | + func_to_host_path_result="$func_cygpath_result" |
| 13402 | + func_convert_path_check : : \ |
| 13403 | + "$func_to_host_path_tmp1" "$func_to_host_path_result" |
| 13404 | + func_convert_path_front_back_pathsep ":*" "*:" : "$1" |
| 13405 | + fi |
| 13406 | +} |
| 13407 | +# end func_convert_path_nix_to_cygwin |
| 13408 | + |
| 13409 | + |
| 13410 | # func_mode_compile arg... |
| 13411 | func_mode_compile () |
| 13412 | { |
| 13413 | @@ -1314,12 +1985,12 @@ func_mode_compile () |
| 13414 | ;; |
| 13415 | |
| 13416 | -pie | -fpie | -fPIE) |
| 13417 | - pie_flag="$pie_flag $arg" |
| 13418 | + func_append pie_flag " $arg" |
| 13419 | continue |
| 13420 | ;; |
| 13421 | |
| 13422 | -shared | -static | -prefer-pic | -prefer-non-pic) |
| 13423 | - later="$later $arg" |
| 13424 | + func_append later " $arg" |
| 13425 | continue |
| 13426 | ;; |
| 13427 | |
| 13428 | @@ -1340,15 +2011,14 @@ func_mode_compile () |
| 13429 | save_ifs="$IFS"; IFS=',' |
| 13430 | for arg in $args; do |
| 13431 | IFS="$save_ifs" |
| 13432 | - func_quote_for_eval "$arg" |
| 13433 | - lastarg="$lastarg $func_quote_for_eval_result" |
| 13434 | + func_append_quoted lastarg "$arg" |
| 13435 | done |
| 13436 | IFS="$save_ifs" |
| 13437 | func_stripname ' ' '' "$lastarg" |
| 13438 | lastarg=$func_stripname_result |
| 13439 | |
| 13440 | # Add the arguments to base_compile. |
| 13441 | - base_compile="$base_compile $lastarg" |
| 13442 | + func_append base_compile " $lastarg" |
| 13443 | continue |
| 13444 | ;; |
| 13445 | |
| 13446 | @@ -1364,8 +2034,7 @@ func_mode_compile () |
| 13447 | esac # case $arg_mode |
| 13448 | |
| 13449 | # Aesthetically quote the previous argument. |
| 13450 | - func_quote_for_eval "$lastarg" |
| 13451 | - base_compile="$base_compile $func_quote_for_eval_result" |
| 13452 | + func_append_quoted base_compile "$lastarg" |
| 13453 | done # for arg |
| 13454 | |
| 13455 | case $arg_mode in |
| 13456 | @@ -1496,17 +2165,16 @@ compiler." |
| 13457 | $opt_dry_run || $RM $removelist |
| 13458 | exit $EXIT_FAILURE |
| 13459 | fi |
| 13460 | - removelist="$removelist $output_obj" |
| 13461 | + func_append removelist " $output_obj" |
| 13462 | $ECHO "$srcfile" > "$lockfile" |
| 13463 | fi |
| 13464 | |
| 13465 | $opt_dry_run || $RM $removelist |
| 13466 | - removelist="$removelist $lockfile" |
| 13467 | + func_append removelist " $lockfile" |
| 13468 | trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 |
| 13469 | |
| 13470 | - if test -n "$fix_srcfile_path"; then |
| 13471 | - eval "srcfile=\"$fix_srcfile_path\"" |
| 13472 | - fi |
| 13473 | + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 |
| 13474 | + srcfile=$func_to_tool_file_result |
| 13475 | func_quote_for_eval "$srcfile" |
| 13476 | qsrcfile=$func_quote_for_eval_result |
| 13477 | |
| 13478 | @@ -1526,7 +2194,7 @@ compiler." |
| 13479 | |
| 13480 | if test -z "$output_obj"; then |
| 13481 | # Place PIC objects in $objdir |
| 13482 | - command="$command -o $lobj" |
| 13483 | + func_append command " -o $lobj" |
| 13484 | fi |
| 13485 | |
| 13486 | func_show_eval_locale "$command" \ |
| 13487 | @@ -1573,11 +2241,11 @@ compiler." |
| 13488 | command="$base_compile $qsrcfile $pic_flag" |
| 13489 | fi |
| 13490 | if test "$compiler_c_o" = yes; then |
| 13491 | - command="$command -o $obj" |
| 13492 | + func_append command " -o $obj" |
| 13493 | fi |
| 13494 | |
| 13495 | # Suppress compiler output if we already did a PIC compilation. |
| 13496 | - command="$command$suppress_output" |
| 13497 | + func_append command "$suppress_output" |
| 13498 | func_show_eval_locale "$command" \ |
| 13499 | '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' |
| 13500 | |
| 13501 | @@ -1622,13 +2290,13 @@ compiler." |
| 13502 | } |
| 13503 | |
| 13504 | $opt_help || { |
| 13505 | - test "$mode" = compile && func_mode_compile ${1+"$@"} |
| 13506 | + test "$opt_mode" = compile && func_mode_compile ${1+"$@"} |
| 13507 | } |
| 13508 | |
| 13509 | func_mode_help () |
| 13510 | { |
| 13511 | # We need to display help for each of the modes. |
| 13512 | - case $mode in |
| 13513 | + case $opt_mode in |
| 13514 | "") |
| 13515 | # Generic help is extracted from the usage comments |
| 13516 | # at the start of this file. |
| 13517 | @@ -1659,8 +2327,8 @@ This mode accepts the following additional options: |
| 13518 | |
| 13519 | -o OUTPUT-FILE set the output file name to OUTPUT-FILE |
| 13520 | -no-suppress do not suppress compiler output for multiple passes |
| 13521 | - -prefer-pic try to building PIC objects only |
| 13522 | - -prefer-non-pic try to building non-PIC objects only |
| 13523 | + -prefer-pic try to build PIC objects only |
| 13524 | + -prefer-non-pic try to build non-PIC objects only |
| 13525 | -shared do not build a \`.o' file suitable for static linking |
| 13526 | -static only build a \`.o' file suitable for static linking |
| 13527 | -Wc,FLAG pass FLAG directly to the compiler |
| 13528 | @@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM." |
| 13529 | ;; |
| 13530 | |
| 13531 | *) |
| 13532 | - func_fatal_help "invalid operation mode \`$mode'" |
| 13533 | + func_fatal_help "invalid operation mode \`$opt_mode'" |
| 13534 | ;; |
| 13535 | esac |
| 13536 | |
| 13537 | @@ -1819,13 +2487,13 @@ if $opt_help; then |
| 13538 | else |
| 13539 | { |
| 13540 | func_help noexit |
| 13541 | - for mode in compile link execute install finish uninstall clean; do |
| 13542 | + for opt_mode in compile link execute install finish uninstall clean; do |
| 13543 | func_mode_help |
| 13544 | done |
| 13545 | } | sed -n '1p; 2,$s/^Usage:/ or: /p' |
| 13546 | { |
| 13547 | func_help noexit |
| 13548 | - for mode in compile link execute install finish uninstall clean; do |
| 13549 | + for opt_mode in compile link execute install finish uninstall clean; do |
| 13550 | echo |
| 13551 | func_mode_help |
| 13552 | done |
| 13553 | @@ -1854,13 +2522,16 @@ func_mode_execute () |
| 13554 | func_fatal_help "you must specify a COMMAND" |
| 13555 | |
| 13556 | # Handle -dlopen flags immediately. |
| 13557 | - for file in $execute_dlfiles; do |
| 13558 | + for file in $opt_dlopen; do |
| 13559 | test -f "$file" \ |
| 13560 | || func_fatal_help "\`$file' is not a file" |
| 13561 | |
| 13562 | dir= |
| 13563 | case $file in |
| 13564 | *.la) |
| 13565 | + func_resolve_sysroot "$file" |
| 13566 | + file=$func_resolve_sysroot_result |
| 13567 | + |
| 13568 | # Check to see that this really is a libtool archive. |
| 13569 | func_lalib_unsafe_p "$file" \ |
| 13570 | || func_fatal_help "\`$lib' is not a valid libtool archive" |
| 13571 | @@ -1882,7 +2553,7 @@ func_mode_execute () |
| 13572 | dir="$func_dirname_result" |
| 13573 | |
| 13574 | if test -f "$dir/$objdir/$dlname"; then |
| 13575 | - dir="$dir/$objdir" |
| 13576 | + func_append dir "/$objdir" |
| 13577 | else |
| 13578 | if test ! -f "$dir/$dlname"; then |
| 13579 | func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" |
| 13580 | @@ -1907,10 +2578,10 @@ func_mode_execute () |
| 13581 | test -n "$absdir" && dir="$absdir" |
| 13582 | |
| 13583 | # Now add the directory to shlibpath_var. |
| 13584 | - if eval test -z \"\$$shlibpath_var\"; then |
| 13585 | - eval $shlibpath_var=\$dir |
| 13586 | + if eval "test -z \"\$$shlibpath_var\""; then |
| 13587 | + eval "$shlibpath_var=\"\$dir\"" |
| 13588 | else |
| 13589 | - eval $shlibpath_var=\$dir:\$$shlibpath_var |
| 13590 | + eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" |
| 13591 | fi |
| 13592 | done |
| 13593 | |
| 13594 | @@ -1939,8 +2610,7 @@ func_mode_execute () |
| 13595 | ;; |
| 13596 | esac |
| 13597 | # Quote arguments (to preserve shell metacharacters). |
| 13598 | - func_quote_for_eval "$file" |
| 13599 | - args="$args $func_quote_for_eval_result" |
| 13600 | + func_append_quoted args "$file" |
| 13601 | done |
| 13602 | |
| 13603 | if test "X$opt_dry_run" = Xfalse; then |
| 13604 | @@ -1972,22 +2642,59 @@ func_mode_execute () |
| 13605 | fi |
| 13606 | } |
| 13607 | |
| 13608 | -test "$mode" = execute && func_mode_execute ${1+"$@"} |
| 13609 | +test "$opt_mode" = execute && func_mode_execute ${1+"$@"} |
| 13610 | |
| 13611 | |
| 13612 | # func_mode_finish arg... |
| 13613 | func_mode_finish () |
| 13614 | { |
| 13615 | $opt_debug |
| 13616 | - libdirs="$nonopt" |
| 13617 | + libs= |
| 13618 | + libdirs= |
| 13619 | admincmds= |
| 13620 | |
| 13621 | - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then |
| 13622 | - for dir |
| 13623 | - do |
| 13624 | - libdirs="$libdirs $dir" |
| 13625 | - done |
| 13626 | + for opt in "$nonopt" ${1+"$@"} |
| 13627 | + do |
| 13628 | + if test -d "$opt"; then |
| 13629 | + func_append libdirs " $opt" |
| 13630 | |
| 13631 | + elif test -f "$opt"; then |
| 13632 | + if func_lalib_unsafe_p "$opt"; then |
| 13633 | + func_append libs " $opt" |
| 13634 | + else |
| 13635 | + func_warning "\`$opt' is not a valid libtool archive" |
| 13636 | + fi |
| 13637 | + |
| 13638 | + else |
| 13639 | + func_fatal_error "invalid argument \`$opt'" |
| 13640 | + fi |
| 13641 | + done |
| 13642 | + |
| 13643 | + if test -n "$libs"; then |
| 13644 | + if test -n "$lt_sysroot"; then |
| 13645 | + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` |
| 13646 | + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" |
| 13647 | + else |
| 13648 | + sysroot_cmd= |
| 13649 | + fi |
| 13650 | + |
| 13651 | + # Remove sysroot references |
| 13652 | + if $opt_dry_run; then |
| 13653 | + for lib in $libs; do |
| 13654 | + echo "removing references to $lt_sysroot and \`=' prefixes from $lib" |
| 13655 | + done |
| 13656 | + else |
| 13657 | + tmpdir=`func_mktempdir` |
| 13658 | + for lib in $libs; do |
| 13659 | + sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ |
| 13660 | + > $tmpdir/tmp-la |
| 13661 | + mv -f $tmpdir/tmp-la $lib |
| 13662 | + done |
| 13663 | + ${RM}r "$tmpdir" |
| 13664 | + fi |
| 13665 | + fi |
| 13666 | + |
| 13667 | + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then |
| 13668 | for libdir in $libdirs; do |
| 13669 | if test -n "$finish_cmds"; then |
| 13670 | # Do each command in the finish commands. |
| 13671 | @@ -1997,7 +2704,7 @@ func_mode_finish () |
| 13672 | if test -n "$finish_eval"; then |
| 13673 | # Do the single finish_eval. |
| 13674 | eval cmds=\"$finish_eval\" |
| 13675 | - $opt_dry_run || eval "$cmds" || admincmds="$admincmds |
| 13676 | + $opt_dry_run || eval "$cmds" || func_append admincmds " |
| 13677 | $cmds" |
| 13678 | fi |
| 13679 | done |
| 13680 | @@ -2006,53 +2713,55 @@ func_mode_finish () |
| 13681 | # Exit here if they wanted silent mode. |
| 13682 | $opt_silent && exit $EXIT_SUCCESS |
| 13683 | |
| 13684 | - echo "----------------------------------------------------------------------" |
| 13685 | - echo "Libraries have been installed in:" |
| 13686 | - for libdir in $libdirs; do |
| 13687 | - $ECHO " $libdir" |
| 13688 | - done |
| 13689 | - echo |
| 13690 | - echo "If you ever happen to want to link against installed libraries" |
| 13691 | - echo "in a given directory, LIBDIR, you must either use libtool, and" |
| 13692 | - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" |
| 13693 | - echo "flag during linking and do at least one of the following:" |
| 13694 | - if test -n "$shlibpath_var"; then |
| 13695 | - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" |
| 13696 | - echo " during execution" |
| 13697 | - fi |
| 13698 | - if test -n "$runpath_var"; then |
| 13699 | - echo " - add LIBDIR to the \`$runpath_var' environment variable" |
| 13700 | - echo " during linking" |
| 13701 | - fi |
| 13702 | - if test -n "$hardcode_libdir_flag_spec"; then |
| 13703 | - libdir=LIBDIR |
| 13704 | - eval "flag=\"$hardcode_libdir_flag_spec\"" |
| 13705 | + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then |
| 13706 | + echo "----------------------------------------------------------------------" |
| 13707 | + echo "Libraries have been installed in:" |
| 13708 | + for libdir in $libdirs; do |
| 13709 | + $ECHO " $libdir" |
| 13710 | + done |
| 13711 | + echo |
| 13712 | + echo "If you ever happen to want to link against installed libraries" |
| 13713 | + echo "in a given directory, LIBDIR, you must either use libtool, and" |
| 13714 | + echo "specify the full pathname of the library, or use the \`-LLIBDIR'" |
| 13715 | + echo "flag during linking and do at least one of the following:" |
| 13716 | + if test -n "$shlibpath_var"; then |
| 13717 | + echo " - add LIBDIR to the \`$shlibpath_var' environment variable" |
| 13718 | + echo " during execution" |
| 13719 | + fi |
| 13720 | + if test -n "$runpath_var"; then |
| 13721 | + echo " - add LIBDIR to the \`$runpath_var' environment variable" |
| 13722 | + echo " during linking" |
| 13723 | + fi |
| 13724 | + if test -n "$hardcode_libdir_flag_spec"; then |
| 13725 | + libdir=LIBDIR |
| 13726 | + eval flag=\"$hardcode_libdir_flag_spec\" |
| 13727 | |
| 13728 | - $ECHO " - use the \`$flag' linker flag" |
| 13729 | - fi |
| 13730 | - if test -n "$admincmds"; then |
| 13731 | - $ECHO " - have your system administrator run these commands:$admincmds" |
| 13732 | - fi |
| 13733 | - if test -f /etc/ld.so.conf; then |
| 13734 | - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" |
| 13735 | - fi |
| 13736 | - echo |
| 13737 | + $ECHO " - use the \`$flag' linker flag" |
| 13738 | + fi |
| 13739 | + if test -n "$admincmds"; then |
| 13740 | + $ECHO " - have your system administrator run these commands:$admincmds" |
| 13741 | + fi |
| 13742 | + if test -f /etc/ld.so.conf; then |
| 13743 | + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" |
| 13744 | + fi |
| 13745 | + echo |
| 13746 | |
| 13747 | - echo "See any operating system documentation about shared libraries for" |
| 13748 | - case $host in |
| 13749 | - solaris2.[6789]|solaris2.1[0-9]) |
| 13750 | - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" |
| 13751 | - echo "pages." |
| 13752 | - ;; |
| 13753 | - *) |
| 13754 | - echo "more information, such as the ld(1) and ld.so(8) manual pages." |
| 13755 | - ;; |
| 13756 | - esac |
| 13757 | - echo "----------------------------------------------------------------------" |
| 13758 | + echo "See any operating system documentation about shared libraries for" |
| 13759 | + case $host in |
| 13760 | + solaris2.[6789]|solaris2.1[0-9]) |
| 13761 | + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" |
| 13762 | + echo "pages." |
| 13763 | + ;; |
| 13764 | + *) |
| 13765 | + echo "more information, such as the ld(1) and ld.so(8) manual pages." |
| 13766 | + ;; |
| 13767 | + esac |
| 13768 | + echo "----------------------------------------------------------------------" |
| 13769 | + fi |
| 13770 | exit $EXIT_SUCCESS |
| 13771 | } |
| 13772 | |
| 13773 | -test "$mode" = finish && func_mode_finish ${1+"$@"} |
| 13774 | +test "$opt_mode" = finish && func_mode_finish ${1+"$@"} |
| 13775 | |
| 13776 | |
| 13777 | # func_mode_install arg... |
| 13778 | @@ -2077,7 +2786,7 @@ func_mode_install () |
| 13779 | # The real first argument should be the name of the installation program. |
| 13780 | # Aesthetically quote it. |
| 13781 | func_quote_for_eval "$arg" |
| 13782 | - install_prog="$install_prog$func_quote_for_eval_result" |
| 13783 | + func_append install_prog "$func_quote_for_eval_result" |
| 13784 | install_shared_prog=$install_prog |
| 13785 | case " $install_prog " in |
| 13786 | *[\\\ /]cp\ *) install_cp=: ;; |
| 13787 | @@ -2097,7 +2806,7 @@ func_mode_install () |
| 13788 | do |
| 13789 | arg2= |
| 13790 | if test -n "$dest"; then |
| 13791 | - files="$files $dest" |
| 13792 | + func_append files " $dest" |
| 13793 | dest=$arg |
| 13794 | continue |
| 13795 | fi |
| 13796 | @@ -2135,11 +2844,11 @@ func_mode_install () |
| 13797 | |
| 13798 | # Aesthetically quote the argument. |
| 13799 | func_quote_for_eval "$arg" |
| 13800 | - install_prog="$install_prog $func_quote_for_eval_result" |
| 13801 | + func_append install_prog " $func_quote_for_eval_result" |
| 13802 | if test -n "$arg2"; then |
| 13803 | func_quote_for_eval "$arg2" |
| 13804 | fi |
| 13805 | - install_shared_prog="$install_shared_prog $func_quote_for_eval_result" |
| 13806 | + func_append install_shared_prog " $func_quote_for_eval_result" |
| 13807 | done |
| 13808 | |
| 13809 | test -z "$install_prog" && \ |
| 13810 | @@ -2151,7 +2860,7 @@ func_mode_install () |
| 13811 | if test -n "$install_override_mode" && $no_mode; then |
| 13812 | if $install_cp; then :; else |
| 13813 | func_quote_for_eval "$install_override_mode" |
| 13814 | - install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" |
| 13815 | + func_append install_shared_prog " -m $func_quote_for_eval_result" |
| 13816 | fi |
| 13817 | fi |
| 13818 | |
| 13819 | @@ -2209,10 +2918,13 @@ func_mode_install () |
| 13820 | case $file in |
| 13821 | *.$libext) |
| 13822 | # Do the static libraries later. |
| 13823 | - staticlibs="$staticlibs $file" |
| 13824 | + func_append staticlibs " $file" |
| 13825 | ;; |
| 13826 | |
| 13827 | *.la) |
| 13828 | + func_resolve_sysroot "$file" |
| 13829 | + file=$func_resolve_sysroot_result |
| 13830 | + |
| 13831 | # Check to see that this really is a libtool archive. |
| 13832 | func_lalib_unsafe_p "$file" \ |
| 13833 | || func_fatal_help "\`$file' is not a valid libtool archive" |
| 13834 | @@ -2226,23 +2938,30 @@ func_mode_install () |
| 13835 | if test "X$destdir" = "X$libdir"; then |
| 13836 | case "$current_libdirs " in |
| 13837 | *" $libdir "*) ;; |
| 13838 | - *) current_libdirs="$current_libdirs $libdir" ;; |
| 13839 | + *) func_append current_libdirs " $libdir" ;; |
| 13840 | esac |
| 13841 | else |
| 13842 | # Note the libdir as a future libdir. |
| 13843 | case "$future_libdirs " in |
| 13844 | *" $libdir "*) ;; |
| 13845 | - *) future_libdirs="$future_libdirs $libdir" ;; |
| 13846 | + *) func_append future_libdirs " $libdir" ;; |
| 13847 | esac |
| 13848 | fi |
| 13849 | |
| 13850 | func_dirname "$file" "/" "" |
| 13851 | dir="$func_dirname_result" |
| 13852 | - dir="$dir$objdir" |
| 13853 | + func_append dir "$objdir" |
| 13854 | |
| 13855 | if test -n "$relink_command"; then |
| 13856 | + # Strip any trailing slash from the destination. |
| 13857 | + func_stripname '' '/' "$libdir" |
| 13858 | + destlibdir=$func_stripname_result |
| 13859 | + |
| 13860 | + func_stripname '' '/' "$destdir" |
| 13861 | + s_destdir=$func_stripname_result |
| 13862 | + |
| 13863 | # Determine the prefix the user has applied to our future dir. |
| 13864 | - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` |
| 13865 | + inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` |
| 13866 | |
| 13867 | # Don't allow the user to place us outside of our expected |
| 13868 | # location b/c this prevents finding dependent libraries that |
| 13869 | @@ -2315,7 +3034,7 @@ func_mode_install () |
| 13870 | func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' |
| 13871 | |
| 13872 | # Maybe install the static library, too. |
| 13873 | - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" |
| 13874 | + test -n "$old_library" && func_append staticlibs " $dir/$old_library" |
| 13875 | ;; |
| 13876 | |
| 13877 | *.lo) |
| 13878 | @@ -2503,7 +3222,7 @@ func_mode_install () |
| 13879 | test -n "$future_libdirs" && \ |
| 13880 | func_warning "remember to run \`$progname --finish$future_libdirs'" |
| 13881 | |
| 13882 | - if test -n "$current_libdirs" && $opt_finish; then |
| 13883 | + if test -n "$current_libdirs"; then |
| 13884 | # Maybe just do a dry run. |
| 13885 | $opt_dry_run && current_libdirs=" -n$current_libdirs" |
| 13886 | exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' |
| 13887 | @@ -2512,7 +3231,7 @@ func_mode_install () |
| 13888 | fi |
| 13889 | } |
| 13890 | |
| 13891 | -test "$mode" = install && func_mode_install ${1+"$@"} |
| 13892 | +test "$opt_mode" = install && func_mode_install ${1+"$@"} |
| 13893 | |
| 13894 | |
| 13895 | # func_generate_dlsyms outputname originator pic_p |
| 13896 | @@ -2559,6 +3278,18 @@ extern \"C\" { |
| 13897 | #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" |
| 13898 | #endif |
| 13899 | |
| 13900 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 13901 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 13902 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 13903 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 13904 | +# define LT_DLSYM_CONST |
| 13905 | +#elif defined(__osf__) |
| 13906 | +/* This system does not cope well with relocations in const data. */ |
| 13907 | +# define LT_DLSYM_CONST |
| 13908 | +#else |
| 13909 | +# define LT_DLSYM_CONST const |
| 13910 | +#endif |
| 13911 | + |
| 13912 | /* External symbol declarations for the compiler. */\ |
| 13913 | " |
| 13914 | |
| 13915 | @@ -2570,21 +3301,22 @@ extern \"C\" { |
| 13916 | # Add our own program objects to the symbol list. |
| 13917 | progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` |
| 13918 | for progfile in $progfiles; do |
| 13919 | - func_verbose "extracting global C symbols from \`$progfile'" |
| 13920 | - $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" |
| 13921 | + func_to_tool_file "$progfile" func_convert_file_msys_to_w32 |
| 13922 | + func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" |
| 13923 | + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" |
| 13924 | done |
| 13925 | |
| 13926 | if test -n "$exclude_expsyms"; then |
| 13927 | $opt_dry_run || { |
| 13928 | - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T |
| 13929 | - $MV "$nlist"T "$nlist" |
| 13930 | + eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' |
| 13931 | + eval '$MV "$nlist"T "$nlist"' |
| 13932 | } |
| 13933 | fi |
| 13934 | |
| 13935 | if test -n "$export_symbols_regex"; then |
| 13936 | $opt_dry_run || { |
| 13937 | - $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T |
| 13938 | - $MV "$nlist"T "$nlist" |
| 13939 | + eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' |
| 13940 | + eval '$MV "$nlist"T "$nlist"' |
| 13941 | } |
| 13942 | fi |
| 13943 | |
| 13944 | @@ -2593,23 +3325,23 @@ extern \"C\" { |
| 13945 | export_symbols="$output_objdir/$outputname.exp" |
| 13946 | $opt_dry_run || { |
| 13947 | $RM $export_symbols |
| 13948 | - ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" |
| 13949 | + eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' |
| 13950 | case $host in |
| 13951 | *cygwin* | *mingw* | *cegcc* ) |
| 13952 | - echo EXPORTS > "$output_objdir/$outputname.def" |
| 13953 | - cat "$export_symbols" >> "$output_objdir/$outputname.def" |
| 13954 | + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' |
| 13955 | + eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' |
| 13956 | ;; |
| 13957 | esac |
| 13958 | } |
| 13959 | else |
| 13960 | $opt_dry_run || { |
| 13961 | - ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp" |
| 13962 | - $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T |
| 13963 | - $MV "$nlist"T "$nlist" |
| 13964 | + eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' |
| 13965 | + eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' |
| 13966 | + eval '$MV "$nlist"T "$nlist"' |
| 13967 | case $host in |
| 13968 | *cygwin* | *mingw* | *cegcc* ) |
| 13969 | - echo EXPORTS > "$output_objdir/$outputname.def" |
| 13970 | - cat "$nlist" >> "$output_objdir/$outputname.def" |
| 13971 | + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' |
| 13972 | + eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' |
| 13973 | ;; |
| 13974 | esac |
| 13975 | } |
| 13976 | @@ -2620,10 +3352,52 @@ extern \"C\" { |
| 13977 | func_verbose "extracting global C symbols from \`$dlprefile'" |
| 13978 | func_basename "$dlprefile" |
| 13979 | name="$func_basename_result" |
| 13980 | - $opt_dry_run || { |
| 13981 | - $ECHO ": $name " >> "$nlist" |
| 13982 | - eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" |
| 13983 | - } |
| 13984 | + case $host in |
| 13985 | + *cygwin* | *mingw* | *cegcc* ) |
| 13986 | + # if an import library, we need to obtain dlname |
| 13987 | + if func_win32_import_lib_p "$dlprefile"; then |
| 13988 | + func_tr_sh "$dlprefile" |
| 13989 | + eval "curr_lafile=\$libfile_$func_tr_sh_result" |
| 13990 | + dlprefile_dlbasename="" |
| 13991 | + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then |
| 13992 | + # Use subshell, to avoid clobbering current variable values |
| 13993 | + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` |
| 13994 | + if test -n "$dlprefile_dlname" ; then |
| 13995 | + func_basename "$dlprefile_dlname" |
| 13996 | + dlprefile_dlbasename="$func_basename_result" |
| 13997 | + else |
| 13998 | + # no lafile. user explicitly requested -dlpreopen <import library>. |
| 13999 | + $sharedlib_from_linklib_cmd "$dlprefile" |
| 14000 | + dlprefile_dlbasename=$sharedlib_from_linklib_result |
| 14001 | + fi |
| 14002 | + fi |
| 14003 | + $opt_dry_run || { |
| 14004 | + if test -n "$dlprefile_dlbasename" ; then |
| 14005 | + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' |
| 14006 | + else |
| 14007 | + func_warning "Could not compute DLL name from $name" |
| 14008 | + eval '$ECHO ": $name " >> "$nlist"' |
| 14009 | + fi |
| 14010 | + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 |
| 14011 | + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | |
| 14012 | + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" |
| 14013 | + } |
| 14014 | + else # not an import lib |
| 14015 | + $opt_dry_run || { |
| 14016 | + eval '$ECHO ": $name " >> "$nlist"' |
| 14017 | + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 |
| 14018 | + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" |
| 14019 | + } |
| 14020 | + fi |
| 14021 | + ;; |
| 14022 | + *) |
| 14023 | + $opt_dry_run || { |
| 14024 | + eval '$ECHO ": $name " >> "$nlist"' |
| 14025 | + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 |
| 14026 | + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" |
| 14027 | + } |
| 14028 | + ;; |
| 14029 | + esac |
| 14030 | done |
| 14031 | |
| 14032 | $opt_dry_run || { |
| 14033 | @@ -2661,26 +3435,9 @@ typedef struct { |
| 14034 | const char *name; |
| 14035 | void *address; |
| 14036 | } lt_dlsymlist; |
| 14037 | -" |
| 14038 | - case $host in |
| 14039 | - *cygwin* | *mingw* | *cegcc* ) |
| 14040 | - echo >> "$output_objdir/$my_dlsyms" "\ |
| 14041 | -/* DATA imports from DLLs on WIN32 con't be const, because |
| 14042 | - runtime relocations are performed -- see ld's documentation |
| 14043 | - on pseudo-relocs. */" |
| 14044 | - lt_dlsym_const= ;; |
| 14045 | - *osf5*) |
| 14046 | - echo >> "$output_objdir/$my_dlsyms" "\ |
| 14047 | -/* This system does not cope well with relocations in const data */" |
| 14048 | - lt_dlsym_const= ;; |
| 14049 | - *) |
| 14050 | - lt_dlsym_const=const ;; |
| 14051 | - esac |
| 14052 | - |
| 14053 | - echo >> "$output_objdir/$my_dlsyms" "\ |
| 14054 | -extern $lt_dlsym_const lt_dlsymlist |
| 14055 | +extern LT_DLSYM_CONST lt_dlsymlist |
| 14056 | lt_${my_prefix}_LTX_preloaded_symbols[]; |
| 14057 | -$lt_dlsym_const lt_dlsymlist |
| 14058 | +LT_DLSYM_CONST lt_dlsymlist |
| 14059 | lt_${my_prefix}_LTX_preloaded_symbols[] = |
| 14060 | {\ |
| 14061 | { \"$my_originator\", (void *) 0 }," |
| 14062 | @@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() { |
| 14063 | for arg in $LTCFLAGS; do |
| 14064 | case $arg in |
| 14065 | -pie | -fpie | -fPIE) ;; |
| 14066 | - *) symtab_cflags="$symtab_cflags $arg" ;; |
| 14067 | + *) func_append symtab_cflags " $arg" ;; |
| 14068 | esac |
| 14069 | done |
| 14070 | |
| 14071 | @@ -2796,9 +3553,11 @@ func_win32_libid () |
| 14072 | win32_libid_type="x86 archive import" |
| 14073 | ;; |
| 14074 | *ar\ archive*) # could be an import, or static |
| 14075 | - if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null | |
| 14076 | - $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then |
| 14077 | - win32_nmres=`$NM -f posix -A "$1" | |
| 14078 | + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. |
| 14079 | + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | |
| 14080 | + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then |
| 14081 | + func_to_tool_file "$1" func_convert_file_msys_to_w32 |
| 14082 | + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | |
| 14083 | $SED -n -e ' |
| 14084 | 1,100{ |
| 14085 | / I /{ |
| 14086 | @@ -2827,6 +3586,131 @@ func_win32_libid () |
| 14087 | $ECHO "$win32_libid_type" |
| 14088 | } |
| 14089 | |
| 14090 | +# func_cygming_dll_for_implib ARG |
| 14091 | +# |
| 14092 | +# Platform-specific function to extract the |
| 14093 | +# name of the DLL associated with the specified |
| 14094 | +# import library ARG. |
| 14095 | +# Invoked by eval'ing the libtool variable |
| 14096 | +# $sharedlib_from_linklib_cmd |
| 14097 | +# Result is available in the variable |
| 14098 | +# $sharedlib_from_linklib_result |
| 14099 | +func_cygming_dll_for_implib () |
| 14100 | +{ |
| 14101 | + $opt_debug |
| 14102 | + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` |
| 14103 | +} |
| 14104 | + |
| 14105 | +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs |
| 14106 | +# |
| 14107 | +# The is the core of a fallback implementation of a |
| 14108 | +# platform-specific function to extract the name of the |
| 14109 | +# DLL associated with the specified import library LIBNAME. |
| 14110 | +# |
| 14111 | +# SECTION_NAME is either .idata$6 or .idata$7, depending |
| 14112 | +# on the platform and compiler that created the implib. |
| 14113 | +# |
| 14114 | +# Echos the name of the DLL associated with the |
| 14115 | +# specified import library. |
| 14116 | +func_cygming_dll_for_implib_fallback_core () |
| 14117 | +{ |
| 14118 | + $opt_debug |
| 14119 | + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` |
| 14120 | + $OBJDUMP -s --section "$1" "$2" 2>/dev/null | |
| 14121 | + $SED '/^Contents of section '"$match_literal"':/{ |
| 14122 | + # Place marker at beginning of archive member dllname section |
| 14123 | + s/.*/====MARK====/ |
| 14124 | + p |
| 14125 | + d |
| 14126 | + } |
| 14127 | + # These lines can sometimes be longer than 43 characters, but |
| 14128 | + # are always uninteresting |
| 14129 | + /:[ ]*file format pe[i]\{,1\}-/d |
| 14130 | + /^In archive [^:]*:/d |
| 14131 | + # Ensure marker is printed |
| 14132 | + /^====MARK====/p |
| 14133 | + # Remove all lines with less than 43 characters |
| 14134 | + /^.\{43\}/!d |
| 14135 | + # From remaining lines, remove first 43 characters |
| 14136 | + s/^.\{43\}//' | |
| 14137 | + $SED -n ' |
| 14138 | + # Join marker and all lines until next marker into a single line |
| 14139 | + /^====MARK====/ b para |
| 14140 | + H |
| 14141 | + $ b para |
| 14142 | + b |
| 14143 | + :para |
| 14144 | + x |
| 14145 | + s/\n//g |
| 14146 | + # Remove the marker |
| 14147 | + s/^====MARK====// |
| 14148 | + # Remove trailing dots and whitespace |
| 14149 | + s/[\. \t]*$// |
| 14150 | + # Print |
| 14151 | + /./p' | |
| 14152 | + # we now have a list, one entry per line, of the stringified |
| 14153 | + # contents of the appropriate section of all members of the |
| 14154 | + # archive which possess that section. Heuristic: eliminate |
| 14155 | + # all those which have a first or second character that is |
| 14156 | + # a '.' (that is, objdump's representation of an unprintable |
| 14157 | + # character.) This should work for all archives with less than |
| 14158 | + # 0x302f exports -- but will fail for DLLs whose name actually |
| 14159 | + # begins with a literal '.' or a single character followed by |
| 14160 | + # a '.'. |
| 14161 | + # |
| 14162 | + # Of those that remain, print the first one. |
| 14163 | + $SED -e '/^\./d;/^.\./d;q' |
| 14164 | +} |
| 14165 | + |
| 14166 | +# func_cygming_gnu_implib_p ARG |
| 14167 | +# This predicate returns with zero status (TRUE) if |
| 14168 | +# ARG is a GNU/binutils-style import library. Returns |
| 14169 | +# with nonzero status (FALSE) otherwise. |
| 14170 | +func_cygming_gnu_implib_p () |
| 14171 | +{ |
| 14172 | + $opt_debug |
| 14173 | + func_to_tool_file "$1" func_convert_file_msys_to_w32 |
| 14174 | + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` |
| 14175 | + test -n "$func_cygming_gnu_implib_tmp" |
| 14176 | +} |
| 14177 | + |
| 14178 | +# func_cygming_ms_implib_p ARG |
| 14179 | +# This predicate returns with zero status (TRUE) if |
| 14180 | +# ARG is an MS-style import library. Returns |
| 14181 | +# with nonzero status (FALSE) otherwise. |
| 14182 | +func_cygming_ms_implib_p () |
| 14183 | +{ |
| 14184 | + $opt_debug |
| 14185 | + func_to_tool_file "$1" func_convert_file_msys_to_w32 |
| 14186 | + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` |
| 14187 | + test -n "$func_cygming_ms_implib_tmp" |
| 14188 | +} |
| 14189 | + |
| 14190 | +# func_cygming_dll_for_implib_fallback ARG |
| 14191 | +# Platform-specific function to extract the |
| 14192 | +# name of the DLL associated with the specified |
| 14193 | +# import library ARG. |
| 14194 | +# |
| 14195 | +# This fallback implementation is for use when $DLLTOOL |
| 14196 | +# does not support the --identify-strict option. |
| 14197 | +# Invoked by eval'ing the libtool variable |
| 14198 | +# $sharedlib_from_linklib_cmd |
| 14199 | +# Result is available in the variable |
| 14200 | +# $sharedlib_from_linklib_result |
| 14201 | +func_cygming_dll_for_implib_fallback () |
| 14202 | +{ |
| 14203 | + $opt_debug |
| 14204 | + if func_cygming_gnu_implib_p "$1" ; then |
| 14205 | + # binutils import library |
| 14206 | + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` |
| 14207 | + elif func_cygming_ms_implib_p "$1" ; then |
| 14208 | + # ms-generated import library |
| 14209 | + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` |
| 14210 | + else |
| 14211 | + # unknown |
| 14212 | + sharedlib_from_linklib_result="" |
| 14213 | + fi |
| 14214 | +} |
| 14215 | |
| 14216 | |
| 14217 | # func_extract_an_archive dir oldlib |
| 14218 | @@ -2917,7 +3801,7 @@ func_extract_archives () |
| 14219 | darwin_file= |
| 14220 | darwin_files= |
| 14221 | for darwin_file in $darwin_filelist; do |
| 14222 | - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` |
| 14223 | + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` |
| 14224 | $LIPO -create -output "$darwin_file" $darwin_files |
| 14225 | done # $darwin_filelist |
| 14226 | $RM -rf unfat-$$ |
| 14227 | @@ -2932,7 +3816,7 @@ func_extract_archives () |
| 14228 | func_extract_an_archive "$my_xdir" "$my_xabs" |
| 14229 | ;; |
| 14230 | esac |
| 14231 | - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` |
| 14232 | + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` |
| 14233 | done |
| 14234 | |
| 14235 | func_extract_archives_result="$my_oldobjs" |
| 14236 | @@ -3014,7 +3898,110 @@ func_fallback_echo () |
| 14237 | _LTECHO_EOF' |
| 14238 | } |
| 14239 | ECHO=\"$qECHO\" |
| 14240 | - fi\ |
| 14241 | + fi |
| 14242 | + |
| 14243 | +# Very basic option parsing. These options are (a) specific to |
| 14244 | +# the libtool wrapper, (b) are identical between the wrapper |
| 14245 | +# /script/ and the wrapper /executable/ which is used only on |
| 14246 | +# windows platforms, and (c) all begin with the string "--lt-" |
| 14247 | +# (application programs are unlikely to have options which match |
| 14248 | +# this pattern). |
| 14249 | +# |
| 14250 | +# There are only two supported options: --lt-debug and |
| 14251 | +# --lt-dump-script. There is, deliberately, no --lt-help. |
| 14252 | +# |
| 14253 | +# The first argument to this parsing function should be the |
| 14254 | +# script's $0 value, followed by "$@". |
| 14255 | +lt_option_debug= |
| 14256 | +func_parse_lt_options () |
| 14257 | +{ |
| 14258 | + lt_script_arg0=\$0 |
| 14259 | + shift |
| 14260 | + for lt_opt |
| 14261 | + do |
| 14262 | + case \"\$lt_opt\" in |
| 14263 | + --lt-debug) lt_option_debug=1 ;; |
| 14264 | + --lt-dump-script) |
| 14265 | + lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` |
| 14266 | + test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. |
| 14267 | + lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` |
| 14268 | + cat \"\$lt_dump_D/\$lt_dump_F\" |
| 14269 | + exit 0 |
| 14270 | + ;; |
| 14271 | + --lt-*) |
| 14272 | + \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 |
| 14273 | + exit 1 |
| 14274 | + ;; |
| 14275 | + esac |
| 14276 | + done |
| 14277 | + |
| 14278 | + # Print the debug banner immediately: |
| 14279 | + if test -n \"\$lt_option_debug\"; then |
| 14280 | + echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 |
| 14281 | + fi |
| 14282 | +} |
| 14283 | + |
| 14284 | +# Used when --lt-debug. Prints its arguments to stdout |
| 14285 | +# (redirection is the responsibility of the caller) |
| 14286 | +func_lt_dump_args () |
| 14287 | +{ |
| 14288 | + lt_dump_args_N=1; |
| 14289 | + for lt_arg |
| 14290 | + do |
| 14291 | + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" |
| 14292 | + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` |
| 14293 | + done |
| 14294 | +} |
| 14295 | + |
| 14296 | +# Core function for launching the target application |
| 14297 | +func_exec_program_core () |
| 14298 | +{ |
| 14299 | +" |
| 14300 | + case $host in |
| 14301 | + # Backslashes separate directories on plain windows |
| 14302 | + *-*-mingw | *-*-os2* | *-cegcc*) |
| 14303 | + $ECHO "\ |
| 14304 | + if test -n \"\$lt_option_debug\"; then |
| 14305 | + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 |
| 14306 | + func_lt_dump_args \${1+\"\$@\"} 1>&2 |
| 14307 | + fi |
| 14308 | + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} |
| 14309 | +" |
| 14310 | + ;; |
| 14311 | + |
| 14312 | + *) |
| 14313 | + $ECHO "\ |
| 14314 | + if test -n \"\$lt_option_debug\"; then |
| 14315 | + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 |
| 14316 | + func_lt_dump_args \${1+\"\$@\"} 1>&2 |
| 14317 | + fi |
| 14318 | + exec \"\$progdir/\$program\" \${1+\"\$@\"} |
| 14319 | +" |
| 14320 | + ;; |
| 14321 | + esac |
| 14322 | + $ECHO "\ |
| 14323 | + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 |
| 14324 | + exit 1 |
| 14325 | +} |
| 14326 | + |
| 14327 | +# A function to encapsulate launching the target application |
| 14328 | +# Strips options in the --lt-* namespace from \$@ and |
| 14329 | +# launches target application with the remaining arguments. |
| 14330 | +func_exec_program () |
| 14331 | +{ |
| 14332 | + for lt_wr_arg |
| 14333 | + do |
| 14334 | + case \$lt_wr_arg in |
| 14335 | + --lt-*) ;; |
| 14336 | + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; |
| 14337 | + esac |
| 14338 | + shift |
| 14339 | + done |
| 14340 | + func_exec_program_core \${1+\"\$@\"} |
| 14341 | +} |
| 14342 | + |
| 14343 | + # Parse options |
| 14344 | + func_parse_lt_options \"\$0\" \${1+\"\$@\"} |
| 14345 | |
| 14346 | # Find the directory that this script lives in. |
| 14347 | thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` |
| 14348 | @@ -3078,7 +4065,7 @@ _LTECHO_EOF' |
| 14349 | |
| 14350 | # relink executable if necessary |
| 14351 | if test -n \"\$relink_command\"; then |
| 14352 | - if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then : |
| 14353 | + if relink_command_output=\`eval \$relink_command 2>&1\`; then : |
| 14354 | else |
| 14355 | $ECHO \"\$relink_command_output\" >&2 |
| 14356 | $RM \"\$progdir/\$file\" |
| 14357 | @@ -3102,6 +4089,18 @@ _LTECHO_EOF' |
| 14358 | |
| 14359 | if test -f \"\$progdir/\$program\"; then" |
| 14360 | |
| 14361 | + # fixup the dll searchpath if we need to. |
| 14362 | + # |
| 14363 | + # Fix the DLL searchpath if we need to. Do this before prepending |
| 14364 | + # to shlibpath, because on Windows, both are PATH and uninstalled |
| 14365 | + # libraries must come first. |
| 14366 | + if test -n "$dllsearchpath"; then |
| 14367 | + $ECHO "\ |
| 14368 | + # Add the dll search path components to the executable PATH |
| 14369 | + PATH=$dllsearchpath:\$PATH |
| 14370 | +" |
| 14371 | + fi |
| 14372 | + |
| 14373 | # Export our shlibpath_var if we have one. |
| 14374 | if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then |
| 14375 | $ECHO "\ |
| 14376 | @@ -3116,35 +4115,10 @@ _LTECHO_EOF' |
| 14377 | " |
| 14378 | fi |
| 14379 | |
| 14380 | - # fixup the dll searchpath if we need to. |
| 14381 | - if test -n "$dllsearchpath"; then |
| 14382 | - $ECHO "\ |
| 14383 | - # Add the dll search path components to the executable PATH |
| 14384 | - PATH=$dllsearchpath:\$PATH |
| 14385 | -" |
| 14386 | - fi |
| 14387 | - |
| 14388 | $ECHO "\ |
| 14389 | if test \"\$libtool_execute_magic\" != \"$magic\"; then |
| 14390 | # Run the actual program with our arguments. |
| 14391 | -" |
| 14392 | - case $host in |
| 14393 | - # Backslashes separate directories on plain windows |
| 14394 | - *-*-mingw | *-*-os2* | *-cegcc*) |
| 14395 | - $ECHO "\ |
| 14396 | - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} |
| 14397 | -" |
| 14398 | - ;; |
| 14399 | - |
| 14400 | - *) |
| 14401 | - $ECHO "\ |
| 14402 | - exec \"\$progdir/\$program\" \${1+\"\$@\"} |
| 14403 | -" |
| 14404 | - ;; |
| 14405 | - esac |
| 14406 | - $ECHO "\ |
| 14407 | - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 |
| 14408 | - exit 1 |
| 14409 | + func_exec_program \${1+\"\$@\"} |
| 14410 | fi |
| 14411 | else |
| 14412 | # The program doesn't exist. |
| 14413 | @@ -3158,166 +4132,6 @@ fi\ |
| 14414 | } |
| 14415 | |
| 14416 | |
| 14417 | -# func_to_host_path arg |
| 14418 | -# |
| 14419 | -# Convert paths to host format when used with build tools. |
| 14420 | -# Intended for use with "native" mingw (where libtool itself |
| 14421 | -# is running under the msys shell), or in the following cross- |
| 14422 | -# build environments: |
| 14423 | -# $build $host |
| 14424 | -# mingw (msys) mingw [e.g. native] |
| 14425 | -# cygwin mingw |
| 14426 | -# *nix + wine mingw |
| 14427 | -# where wine is equipped with the `winepath' executable. |
| 14428 | -# In the native mingw case, the (msys) shell automatically |
| 14429 | -# converts paths for any non-msys applications it launches, |
| 14430 | -# but that facility isn't available from inside the cwrapper. |
| 14431 | -# Similar accommodations are necessary for $host mingw and |
| 14432 | -# $build cygwin. Calling this function does no harm for other |
| 14433 | -# $host/$build combinations not listed above. |
| 14434 | -# |
| 14435 | -# ARG is the path (on $build) that should be converted to |
| 14436 | -# the proper representation for $host. The result is stored |
| 14437 | -# in $func_to_host_path_result. |
| 14438 | -func_to_host_path () |
| 14439 | -{ |
| 14440 | - func_to_host_path_result="$1" |
| 14441 | - if test -n "$1"; then |
| 14442 | - case $host in |
| 14443 | - *mingw* ) |
| 14444 | - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' |
| 14445 | - case $build in |
| 14446 | - *mingw* ) # actually, msys |
| 14447 | - # awkward: cmd appends spaces to result |
| 14448 | - func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | |
| 14449 | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` |
| 14450 | - ;; |
| 14451 | - *cygwin* ) |
| 14452 | - func_to_host_path_result=`cygpath -w "$1" | |
| 14453 | - $SED -e "$lt_sed_naive_backslashify"` |
| 14454 | - ;; |
| 14455 | - * ) |
| 14456 | - # Unfortunately, winepath does not exit with a non-zero |
| 14457 | - # error code, so we are forced to check the contents of |
| 14458 | - # stdout. On the other hand, if the command is not |
| 14459 | - # found, the shell will set an exit code of 127 and print |
| 14460 | - # *an error message* to stdout. So we must check for both |
| 14461 | - # error code of zero AND non-empty stdout, which explains |
| 14462 | - # the odd construction: |
| 14463 | - func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` |
| 14464 | - if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then |
| 14465 | - func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | |
| 14466 | - $SED -e "$lt_sed_naive_backslashify"` |
| 14467 | - else |
| 14468 | - # Allow warning below. |
| 14469 | - func_to_host_path_result= |
| 14470 | - fi |
| 14471 | - ;; |
| 14472 | - esac |
| 14473 | - if test -z "$func_to_host_path_result" ; then |
| 14474 | - func_error "Could not determine host path corresponding to" |
| 14475 | - func_error " \`$1'" |
| 14476 | - func_error "Continuing, but uninstalled executables may not work." |
| 14477 | - # Fallback: |
| 14478 | - func_to_host_path_result="$1" |
| 14479 | - fi |
| 14480 | - ;; |
| 14481 | - esac |
| 14482 | - fi |
| 14483 | -} |
| 14484 | -# end: func_to_host_path |
| 14485 | - |
| 14486 | -# func_to_host_pathlist arg |
| 14487 | -# |
| 14488 | -# Convert pathlists to host format when used with build tools. |
| 14489 | -# See func_to_host_path(), above. This function supports the |
| 14490 | -# following $build/$host combinations (but does no harm for |
| 14491 | -# combinations not listed here): |
| 14492 | -# $build $host |
| 14493 | -# mingw (msys) mingw [e.g. native] |
| 14494 | -# cygwin mingw |
| 14495 | -# *nix + wine mingw |
| 14496 | -# |
| 14497 | -# Path separators are also converted from $build format to |
| 14498 | -# $host format. If ARG begins or ends with a path separator |
| 14499 | -# character, it is preserved (but converted to $host format) |
| 14500 | -# on output. |
| 14501 | -# |
| 14502 | -# ARG is a pathlist (on $build) that should be converted to |
| 14503 | -# the proper representation on $host. The result is stored |
| 14504 | -# in $func_to_host_pathlist_result. |
| 14505 | -func_to_host_pathlist () |
| 14506 | -{ |
| 14507 | - func_to_host_pathlist_result="$1" |
| 14508 | - if test -n "$1"; then |
| 14509 | - case $host in |
| 14510 | - *mingw* ) |
| 14511 | - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' |
| 14512 | - # Remove leading and trailing path separator characters from |
| 14513 | - # ARG. msys behavior is inconsistent here, cygpath turns them |
| 14514 | - # into '.;' and ';.', and winepath ignores them completely. |
| 14515 | - func_stripname : : "$1" |
| 14516 | - func_to_host_pathlist_tmp1=$func_stripname_result |
| 14517 | - case $build in |
| 14518 | - *mingw* ) # Actually, msys. |
| 14519 | - # Awkward: cmd appends spaces to result. |
| 14520 | - func_to_host_pathlist_result=` |
| 14521 | - ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | |
| 14522 | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` |
| 14523 | - ;; |
| 14524 | - *cygwin* ) |
| 14525 | - func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | |
| 14526 | - $SED -e "$lt_sed_naive_backslashify"` |
| 14527 | - ;; |
| 14528 | - * ) |
| 14529 | - # unfortunately, winepath doesn't convert pathlists |
| 14530 | - func_to_host_pathlist_result="" |
| 14531 | - func_to_host_pathlist_oldIFS=$IFS |
| 14532 | - IFS=: |
| 14533 | - for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do |
| 14534 | - IFS=$func_to_host_pathlist_oldIFS |
| 14535 | - if test -n "$func_to_host_pathlist_f" ; then |
| 14536 | - func_to_host_path "$func_to_host_pathlist_f" |
| 14537 | - if test -n "$func_to_host_path_result" ; then |
| 14538 | - if test -z "$func_to_host_pathlist_result" ; then |
| 14539 | - func_to_host_pathlist_result="$func_to_host_path_result" |
| 14540 | - else |
| 14541 | - func_append func_to_host_pathlist_result ";$func_to_host_path_result" |
| 14542 | - fi |
| 14543 | - fi |
| 14544 | - fi |
| 14545 | - done |
| 14546 | - IFS=$func_to_host_pathlist_oldIFS |
| 14547 | - ;; |
| 14548 | - esac |
| 14549 | - if test -z "$func_to_host_pathlist_result"; then |
| 14550 | - func_error "Could not determine the host path(s) corresponding to" |
| 14551 | - func_error " \`$1'" |
| 14552 | - func_error "Continuing, but uninstalled executables may not work." |
| 14553 | - # Fallback. This may break if $1 contains DOS-style drive |
| 14554 | - # specifications. The fix is not to complicate the expression |
| 14555 | - # below, but for the user to provide a working wine installation |
| 14556 | - # with winepath so that path translation in the cross-to-mingw |
| 14557 | - # case works properly. |
| 14558 | - lt_replace_pathsep_nix_to_dos="s|:|;|g" |
| 14559 | - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ |
| 14560 | - $SED -e "$lt_replace_pathsep_nix_to_dos"` |
| 14561 | - fi |
| 14562 | - # Now, add the leading and trailing path separators back |
| 14563 | - case "$1" in |
| 14564 | - :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" |
| 14565 | - ;; |
| 14566 | - esac |
| 14567 | - case "$1" in |
| 14568 | - *: ) func_append func_to_host_pathlist_result ";" |
| 14569 | - ;; |
| 14570 | - esac |
| 14571 | - ;; |
| 14572 | - esac |
| 14573 | - fi |
| 14574 | -} |
| 14575 | -# end: func_to_host_pathlist |
| 14576 | - |
| 14577 | # func_emit_cwrapperexe_src |
| 14578 | # emit the source code for a wrapper executable on stdout |
| 14579 | # Must ONLY be called from within func_mode_link because |
| 14580 | @@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src () |
| 14581 | |
| 14582 | This wrapper executable should never be moved out of the build directory. |
| 14583 | If it is, it will not operate correctly. |
| 14584 | - |
| 14585 | - Currently, it simply execs the wrapper *script* "$SHELL $output", |
| 14586 | - but could eventually absorb all of the scripts functionality and |
| 14587 | - exec $objdir/$outputname directly. |
| 14588 | */ |
| 14589 | EOF |
| 14590 | cat <<"EOF" |
| 14591 | @@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int); |
| 14592 | if (stale) { free ((void *) stale); stale = 0; } \ |
| 14593 | } while (0) |
| 14594 | |
| 14595 | -#undef LTWRAPPER_DEBUGPRINTF |
| 14596 | -#if defined LT_DEBUGWRAPPER |
| 14597 | -# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args |
| 14598 | -static void |
| 14599 | -ltwrapper_debugprintf (const char *fmt, ...) |
| 14600 | -{ |
| 14601 | - va_list args; |
| 14602 | - va_start (args, fmt); |
| 14603 | - (void) vfprintf (stderr, fmt, args); |
| 14604 | - va_end (args); |
| 14605 | -} |
| 14606 | +#if defined(LT_DEBUGWRAPPER) |
| 14607 | +static int lt_debug = 1; |
| 14608 | #else |
| 14609 | -# define LTWRAPPER_DEBUGPRINTF(args) |
| 14610 | +static int lt_debug = 0; |
| 14611 | #endif |
| 14612 | |
| 14613 | -const char *program_name = NULL; |
| 14614 | +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ |
| 14615 | |
| 14616 | void *xmalloc (size_t num); |
| 14617 | char *xstrdup (const char *string); |
| 14618 | @@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec); |
| 14619 | int make_executable (const char *path); |
| 14620 | int check_executable (const char *path); |
| 14621 | char *strendzap (char *str, const char *pat); |
| 14622 | -void lt_fatal (const char *message, ...); |
| 14623 | +void lt_debugprintf (const char *file, int line, const char *fmt, ...); |
| 14624 | +void lt_fatal (const char *file, int line, const char *message, ...); |
| 14625 | +static const char *nonnull (const char *s); |
| 14626 | +static const char *nonempty (const char *s); |
| 14627 | void lt_setenv (const char *name, const char *value); |
| 14628 | char *lt_extend_str (const char *orig_value, const char *add, int to_end); |
| 14629 | void lt_update_exe_path (const char *name, const char *value); |
| 14630 | @@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f); |
| 14631 | EOF |
| 14632 | |
| 14633 | cat <<EOF |
| 14634 | -const char * MAGIC_EXE = "$magic_exe"; |
| 14635 | +volatile const char * MAGIC_EXE = "$magic_exe"; |
| 14636 | const char * LIB_PATH_VARNAME = "$shlibpath_var"; |
| 14637 | EOF |
| 14638 | |
| 14639 | if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then |
| 14640 | - func_to_host_pathlist "$temp_rpath" |
| 14641 | + func_to_host_path "$temp_rpath" |
| 14642 | cat <<EOF |
| 14643 | -const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result"; |
| 14644 | +const char * LIB_PATH_VALUE = "$func_to_host_path_result"; |
| 14645 | EOF |
| 14646 | else |
| 14647 | cat <<"EOF" |
| 14648 | @@ -3513,10 +4317,10 @@ EOF |
| 14649 | fi |
| 14650 | |
| 14651 | if test -n "$dllsearchpath"; then |
| 14652 | - func_to_host_pathlist "$dllsearchpath:" |
| 14653 | + func_to_host_path "$dllsearchpath:" |
| 14654 | cat <<EOF |
| 14655 | const char * EXE_PATH_VARNAME = "PATH"; |
| 14656 | -const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result"; |
| 14657 | +const char * EXE_PATH_VALUE = "$func_to_host_path_result"; |
| 14658 | EOF |
| 14659 | else |
| 14660 | cat <<"EOF" |
| 14661 | @@ -3539,12 +4343,10 @@ EOF |
| 14662 | cat <<"EOF" |
| 14663 | |
| 14664 | #define LTWRAPPER_OPTION_PREFIX "--lt-" |
| 14665 | -#define LTWRAPPER_OPTION_PREFIX_LENGTH 5 |
| 14666 | |
| 14667 | -static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH; |
| 14668 | static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX; |
| 14669 | - |
| 14670 | static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script"; |
| 14671 | +static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug"; |
| 14672 | |
| 14673 | int |
| 14674 | main (int argc, char *argv[]) |
| 14675 | @@ -3561,10 +4363,13 @@ main (int argc, char *argv[]) |
| 14676 | int i; |
| 14677 | |
| 14678 | program_name = (char *) xstrdup (base_name (argv[0])); |
| 14679 | - LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0])); |
| 14680 | - LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name)); |
| 14681 | + newargz = XMALLOC (char *, argc + 1); |
| 14682 | |
| 14683 | - /* very simple arg parsing; don't want to rely on getopt */ |
| 14684 | + /* very simple arg parsing; don't want to rely on getopt |
| 14685 | + * also, copy all non cwrapper options to newargz, except |
| 14686 | + * argz[0], which is handled differently |
| 14687 | + */ |
| 14688 | + newargc=0; |
| 14689 | for (i = 1; i < argc; i++) |
| 14690 | { |
| 14691 | if (strcmp (argv[i], dumpscript_opt) == 0) |
| 14692 | @@ -3581,21 +4386,54 @@ EOF |
| 14693 | lt_dump_script (stdout); |
| 14694 | return 0; |
| 14695 | } |
| 14696 | + if (strcmp (argv[i], debug_opt) == 0) |
| 14697 | + { |
| 14698 | + lt_debug = 1; |
| 14699 | + continue; |
| 14700 | + } |
| 14701 | + if (strcmp (argv[i], ltwrapper_option_prefix) == 0) |
| 14702 | + { |
| 14703 | + /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX |
| 14704 | + namespace, but it is not one of the ones we know about and |
| 14705 | + have already dealt with, above (inluding dump-script), then |
| 14706 | + report an error. Otherwise, targets might begin to believe |
| 14707 | + they are allowed to use options in the LTWRAPPER_OPTION_PREFIX |
| 14708 | + namespace. The first time any user complains about this, we'll |
| 14709 | + need to make LTWRAPPER_OPTION_PREFIX a configure-time option |
| 14710 | + or a configure.ac-settable value. |
| 14711 | + */ |
| 14712 | + lt_fatal (__FILE__, __LINE__, |
| 14713 | + "unrecognized %s option: '%s'", |
| 14714 | + ltwrapper_option_prefix, argv[i]); |
| 14715 | + } |
| 14716 | + /* otherwise ... */ |
| 14717 | + newargz[++newargc] = xstrdup (argv[i]); |
| 14718 | } |
| 14719 | + newargz[++newargc] = NULL; |
| 14720 | + |
| 14721 | +EOF |
| 14722 | + cat <<EOF |
| 14723 | + /* The GNU banner must be the first non-error debug message */ |
| 14724 | + lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n"); |
| 14725 | +EOF |
| 14726 | + cat <<"EOF" |
| 14727 | + lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]); |
| 14728 | + lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name); |
| 14729 | |
| 14730 | - newargz = XMALLOC (char *, argc + 1); |
| 14731 | tmp_pathspec = find_executable (argv[0]); |
| 14732 | if (tmp_pathspec == NULL) |
| 14733 | - lt_fatal ("Couldn't find %s", argv[0]); |
| 14734 | - LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", |
| 14735 | - tmp_pathspec)); |
| 14736 | + lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]); |
| 14737 | + lt_debugprintf (__FILE__, __LINE__, |
| 14738 | + "(main) found exe (before symlink chase) at: %s\n", |
| 14739 | + tmp_pathspec); |
| 14740 | |
| 14741 | actual_cwrapper_path = chase_symlinks (tmp_pathspec); |
| 14742 | - LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n", |
| 14743 | - actual_cwrapper_path)); |
| 14744 | + lt_debugprintf (__FILE__, __LINE__, |
| 14745 | + "(main) found exe (after symlink chase) at: %s\n", |
| 14746 | + actual_cwrapper_path); |
| 14747 | XFREE (tmp_pathspec); |
| 14748 | |
| 14749 | - actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path)); |
| 14750 | + actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path)); |
| 14751 | strendzap (actual_cwrapper_path, actual_cwrapper_name); |
| 14752 | |
| 14753 | /* wrapper name transforms */ |
| 14754 | @@ -3613,8 +4451,9 @@ EOF |
| 14755 | target_name = tmp_pathspec; |
| 14756 | tmp_pathspec = 0; |
| 14757 | |
| 14758 | - LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n", |
| 14759 | - target_name)); |
| 14760 | + lt_debugprintf (__FILE__, __LINE__, |
| 14761 | + "(main) libtool target name: %s\n", |
| 14762 | + target_name); |
| 14763 | EOF |
| 14764 | |
| 14765 | cat <<EOF |
| 14766 | @@ -3664,35 +4503,19 @@ EOF |
| 14767 | |
| 14768 | lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */ |
| 14769 | lt_setenv ("DUALCASE", "1"); /* for MSK sh */ |
| 14770 | - lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); |
| 14771 | + /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must |
| 14772 | + be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath) |
| 14773 | + because on Windows, both *_VARNAMEs are PATH but uninstalled |
| 14774 | + libraries must come first. */ |
| 14775 | lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE); |
| 14776 | + lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); |
| 14777 | |
| 14778 | - newargc=0; |
| 14779 | - for (i = 1; i < argc; i++) |
| 14780 | - { |
| 14781 | - if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0) |
| 14782 | - { |
| 14783 | - /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX |
| 14784 | - namespace, but it is not one of the ones we know about and |
| 14785 | - have already dealt with, above (inluding dump-script), then |
| 14786 | - report an error. Otherwise, targets might begin to believe |
| 14787 | - they are allowed to use options in the LTWRAPPER_OPTION_PREFIX |
| 14788 | - namespace. The first time any user complains about this, we'll |
| 14789 | - need to make LTWRAPPER_OPTION_PREFIX a configure-time option |
| 14790 | - or a configure.ac-settable value. |
| 14791 | - */ |
| 14792 | - lt_fatal ("Unrecognized option in %s namespace: '%s'", |
| 14793 | - ltwrapper_option_prefix, argv[i]); |
| 14794 | - } |
| 14795 | - /* otherwise ... */ |
| 14796 | - newargz[++newargc] = xstrdup (argv[i]); |
| 14797 | - } |
| 14798 | - newargz[++newargc] = NULL; |
| 14799 | - |
| 14800 | - LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>"))); |
| 14801 | + lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", |
| 14802 | + nonnull (lt_argv_zero)); |
| 14803 | for (i = 0; i < newargc; i++) |
| 14804 | { |
| 14805 | - LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>"))); |
| 14806 | + lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", |
| 14807 | + i, nonnull (newargz[i])); |
| 14808 | } |
| 14809 | |
| 14810 | EOF |
| 14811 | @@ -3706,7 +4529,9 @@ EOF |
| 14812 | if (rval == -1) |
| 14813 | { |
| 14814 | /* failed to start process */ |
| 14815 | - LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); |
| 14816 | + lt_debugprintf (__FILE__, __LINE__, |
| 14817 | + "(main) failed to launch target \"%s\": %s\n", |
| 14818 | + lt_argv_zero, nonnull (strerror (errno))); |
| 14819 | return 127; |
| 14820 | } |
| 14821 | return rval; |
| 14822 | @@ -3728,7 +4553,7 @@ xmalloc (size_t num) |
| 14823 | { |
| 14824 | void *p = (void *) malloc (num); |
| 14825 | if (!p) |
| 14826 | - lt_fatal ("Memory exhausted"); |
| 14827 | + lt_fatal (__FILE__, __LINE__, "memory exhausted"); |
| 14828 | |
| 14829 | return p; |
| 14830 | } |
| 14831 | @@ -3762,8 +4587,8 @@ check_executable (const char *path) |
| 14832 | { |
| 14833 | struct stat st; |
| 14834 | |
| 14835 | - LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", |
| 14836 | - path ? (*path ? path : "EMPTY!") : "NULL!")); |
| 14837 | + lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", |
| 14838 | + nonempty (path)); |
| 14839 | if ((!path) || (!*path)) |
| 14840 | return 0; |
| 14841 | |
| 14842 | @@ -3780,8 +4605,8 @@ make_executable (const char *path) |
| 14843 | int rval = 0; |
| 14844 | struct stat st; |
| 14845 | |
| 14846 | - LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", |
| 14847 | - path ? (*path ? path : "EMPTY!") : "NULL!")); |
| 14848 | + lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", |
| 14849 | + nonempty (path)); |
| 14850 | if ((!path) || (!*path)) |
| 14851 | return 0; |
| 14852 | |
| 14853 | @@ -3807,8 +4632,8 @@ find_executable (const char *wrapper) |
| 14854 | int tmp_len; |
| 14855 | char *concat_name; |
| 14856 | |
| 14857 | - LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", |
| 14858 | - wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); |
| 14859 | + lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", |
| 14860 | + nonempty (wrapper)); |
| 14861 | |
| 14862 | if ((wrapper == NULL) || (*wrapper == '\0')) |
| 14863 | return NULL; |
| 14864 | @@ -3861,7 +4686,8 @@ find_executable (const char *wrapper) |
| 14865 | { |
| 14866 | /* empty path: current directory */ |
| 14867 | if (getcwd (tmp, LT_PATHMAX) == NULL) |
| 14868 | - lt_fatal ("getcwd failed"); |
| 14869 | + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", |
| 14870 | + nonnull (strerror (errno))); |
| 14871 | tmp_len = strlen (tmp); |
| 14872 | concat_name = |
| 14873 | XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); |
| 14874 | @@ -3886,7 +4712,8 @@ find_executable (const char *wrapper) |
| 14875 | } |
| 14876 | /* Relative path | not found in path: prepend cwd */ |
| 14877 | if (getcwd (tmp, LT_PATHMAX) == NULL) |
| 14878 | - lt_fatal ("getcwd failed"); |
| 14879 | + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", |
| 14880 | + nonnull (strerror (errno))); |
| 14881 | tmp_len = strlen (tmp); |
| 14882 | concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); |
| 14883 | memcpy (concat_name, tmp, tmp_len); |
| 14884 | @@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec) |
| 14885 | int has_symlinks = 0; |
| 14886 | while (strlen (tmp_pathspec) && !has_symlinks) |
| 14887 | { |
| 14888 | - LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", |
| 14889 | - tmp_pathspec)); |
| 14890 | + lt_debugprintf (__FILE__, __LINE__, |
| 14891 | + "checking path component for symlinks: %s\n", |
| 14892 | + tmp_pathspec); |
| 14893 | if (lstat (tmp_pathspec, &s) == 0) |
| 14894 | { |
| 14895 | if (S_ISLNK (s.st_mode) != 0) |
| 14896 | @@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec) |
| 14897 | } |
| 14898 | else |
| 14899 | { |
| 14900 | - char *errstr = strerror (errno); |
| 14901 | - lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); |
| 14902 | + lt_fatal (__FILE__, __LINE__, |
| 14903 | + "error accessing file \"%s\": %s", |
| 14904 | + tmp_pathspec, nonnull (strerror (errno))); |
| 14905 | } |
| 14906 | } |
| 14907 | XFREE (tmp_pathspec); |
| 14908 | @@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec) |
| 14909 | tmp_pathspec = realpath (pathspec, buf); |
| 14910 | if (tmp_pathspec == 0) |
| 14911 | { |
| 14912 | - lt_fatal ("Could not follow symlinks for %s", pathspec); |
| 14913 | + lt_fatal (__FILE__, __LINE__, |
| 14914 | + "could not follow symlinks for %s", pathspec); |
| 14915 | } |
| 14916 | return xstrdup (tmp_pathspec); |
| 14917 | #endif |
| 14918 | @@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat) |
| 14919 | return str; |
| 14920 | } |
| 14921 | |
| 14922 | +void |
| 14923 | +lt_debugprintf (const char *file, int line, const char *fmt, ...) |
| 14924 | +{ |
| 14925 | + va_list args; |
| 14926 | + if (lt_debug) |
| 14927 | + { |
| 14928 | + (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); |
| 14929 | + va_start (args, fmt); |
| 14930 | + (void) vfprintf (stderr, fmt, args); |
| 14931 | + va_end (args); |
| 14932 | + } |
| 14933 | +} |
| 14934 | + |
| 14935 | static void |
| 14936 | -lt_error_core (int exit_status, const char *mode, |
| 14937 | +lt_error_core (int exit_status, const char *file, |
| 14938 | + int line, const char *mode, |
| 14939 | const char *message, va_list ap) |
| 14940 | { |
| 14941 | - fprintf (stderr, "%s: %s: ", program_name, mode); |
| 14942 | + fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); |
| 14943 | vfprintf (stderr, message, ap); |
| 14944 | fprintf (stderr, ".\n"); |
| 14945 | |
| 14946 | @@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode, |
| 14947 | } |
| 14948 | |
| 14949 | void |
| 14950 | -lt_fatal (const char *message, ...) |
| 14951 | +lt_fatal (const char *file, int line, const char *message, ...) |
| 14952 | { |
| 14953 | va_list ap; |
| 14954 | va_start (ap, message); |
| 14955 | - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); |
| 14956 | + lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); |
| 14957 | va_end (ap); |
| 14958 | } |
| 14959 | |
| 14960 | +static const char * |
| 14961 | +nonnull (const char *s) |
| 14962 | +{ |
| 14963 | + return s ? s : "(null)"; |
| 14964 | +} |
| 14965 | + |
| 14966 | +static const char * |
| 14967 | +nonempty (const char *s) |
| 14968 | +{ |
| 14969 | + return (s && !*s) ? "(empty)" : nonnull (s); |
| 14970 | +} |
| 14971 | + |
| 14972 | void |
| 14973 | lt_setenv (const char *name, const char *value) |
| 14974 | { |
| 14975 | - LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", |
| 14976 | - (name ? name : "<NULL>"), |
| 14977 | - (value ? value : "<NULL>"))); |
| 14978 | + lt_debugprintf (__FILE__, __LINE__, |
| 14979 | + "(lt_setenv) setting '%s' to '%s'\n", |
| 14980 | + nonnull (name), nonnull (value)); |
| 14981 | { |
| 14982 | #ifdef HAVE_SETENV |
| 14983 | /* always make a copy, for consistency with !HAVE_SETENV */ |
| 14984 | @@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) |
| 14985 | void |
| 14986 | lt_update_exe_path (const char *name, const char *value) |
| 14987 | { |
| 14988 | - LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", |
| 14989 | - (name ? name : "<NULL>"), |
| 14990 | - (value ? value : "<NULL>"))); |
| 14991 | + lt_debugprintf (__FILE__, __LINE__, |
| 14992 | + "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", |
| 14993 | + nonnull (name), nonnull (value)); |
| 14994 | |
| 14995 | if (name && *name && value && *value) |
| 14996 | { |
| 14997 | @@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value) |
| 14998 | void |
| 14999 | lt_update_lib_path (const char *name, const char *value) |
| 15000 | { |
| 15001 | - LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", |
| 15002 | - (name ? name : "<NULL>"), |
| 15003 | - (value ? value : "<NULL>"))); |
| 15004 | + lt_debugprintf (__FILE__, __LINE__, |
| 15005 | + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", |
| 15006 | + nonnull (name), nonnull (value)); |
| 15007 | |
| 15008 | if (name && *name && value && *value) |
| 15009 | { |
| 15010 | @@ -4222,7 +5078,7 @@ EOF |
| 15011 | func_win32_import_lib_p () |
| 15012 | { |
| 15013 | $opt_debug |
| 15014 | - case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in |
| 15015 | + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in |
| 15016 | *import*) : ;; |
| 15017 | *) false ;; |
| 15018 | esac |
| 15019 | @@ -4401,9 +5257,9 @@ func_mode_link () |
| 15020 | ;; |
| 15021 | *) |
| 15022 | if test "$prev" = dlfiles; then |
| 15023 | - dlfiles="$dlfiles $arg" |
| 15024 | + func_append dlfiles " $arg" |
| 15025 | else |
| 15026 | - dlprefiles="$dlprefiles $arg" |
| 15027 | + func_append dlprefiles " $arg" |
| 15028 | fi |
| 15029 | prev= |
| 15030 | continue |
| 15031 | @@ -4427,7 +5283,7 @@ func_mode_link () |
| 15032 | *-*-darwin*) |
| 15033 | case "$deplibs " in |
| 15034 | *" $qarg.ltframework "*) ;; |
| 15035 | - *) deplibs="$deplibs $qarg.ltframework" # this is fixed later |
| 15036 | + *) func_append deplibs " $qarg.ltframework" # this is fixed later |
| 15037 | ;; |
| 15038 | esac |
| 15039 | ;; |
| 15040 | @@ -4446,7 +5302,7 @@ func_mode_link () |
| 15041 | moreargs= |
| 15042 | for fil in `cat "$save_arg"` |
| 15043 | do |
| 15044 | -# moreargs="$moreargs $fil" |
| 15045 | +# func_append moreargs " $fil" |
| 15046 | arg=$fil |
| 15047 | # A libtool-controlled object. |
| 15048 | |
| 15049 | @@ -4475,7 +5331,7 @@ func_mode_link () |
| 15050 | |
| 15051 | if test "$prev" = dlfiles; then |
| 15052 | if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then |
| 15053 | - dlfiles="$dlfiles $pic_object" |
| 15054 | + func_append dlfiles " $pic_object" |
| 15055 | prev= |
| 15056 | continue |
| 15057 | else |
| 15058 | @@ -4487,7 +5343,7 @@ func_mode_link () |
| 15059 | # CHECK ME: I think I busted this. -Ossama |
| 15060 | if test "$prev" = dlprefiles; then |
| 15061 | # Preload the old-style object. |
| 15062 | - dlprefiles="$dlprefiles $pic_object" |
| 15063 | + func_append dlprefiles " $pic_object" |
| 15064 | prev= |
| 15065 | fi |
| 15066 | |
| 15067 | @@ -4557,12 +5413,12 @@ func_mode_link () |
| 15068 | if test "$prev" = rpath; then |
| 15069 | case "$rpath " in |
| 15070 | *" $arg "*) ;; |
| 15071 | - *) rpath="$rpath $arg" ;; |
| 15072 | + *) func_append rpath " $arg" ;; |
| 15073 | esac |
| 15074 | else |
| 15075 | case "$xrpath " in |
| 15076 | *" $arg "*) ;; |
| 15077 | - *) xrpath="$xrpath $arg" ;; |
| 15078 | + *) func_append xrpath " $arg" ;; |
| 15079 | esac |
| 15080 | fi |
| 15081 | prev= |
| 15082 | @@ -4574,28 +5430,28 @@ func_mode_link () |
| 15083 | continue |
| 15084 | ;; |
| 15085 | weak) |
| 15086 | - weak_libs="$weak_libs $arg" |
| 15087 | + func_append weak_libs " $arg" |
| 15088 | prev= |
| 15089 | continue |
| 15090 | ;; |
| 15091 | xcclinker) |
| 15092 | - linker_flags="$linker_flags $qarg" |
| 15093 | - compiler_flags="$compiler_flags $qarg" |
| 15094 | + func_append linker_flags " $qarg" |
| 15095 | + func_append compiler_flags " $qarg" |
| 15096 | prev= |
| 15097 | func_append compile_command " $qarg" |
| 15098 | func_append finalize_command " $qarg" |
| 15099 | continue |
| 15100 | ;; |
| 15101 | xcompiler) |
| 15102 | - compiler_flags="$compiler_flags $qarg" |
| 15103 | + func_append compiler_flags " $qarg" |
| 15104 | prev= |
| 15105 | func_append compile_command " $qarg" |
| 15106 | func_append finalize_command " $qarg" |
| 15107 | continue |
| 15108 | ;; |
| 15109 | xlinker) |
| 15110 | - linker_flags="$linker_flags $qarg" |
| 15111 | - compiler_flags="$compiler_flags $wl$qarg" |
| 15112 | + func_append linker_flags " $qarg" |
| 15113 | + func_append compiler_flags " $wl$qarg" |
| 15114 | prev= |
| 15115 | func_append compile_command " $wl$qarg" |
| 15116 | func_append finalize_command " $wl$qarg" |
| 15117 | @@ -4686,15 +5542,16 @@ func_mode_link () |
| 15118 | ;; |
| 15119 | |
| 15120 | -L*) |
| 15121 | - func_stripname '-L' '' "$arg" |
| 15122 | - dir=$func_stripname_result |
| 15123 | - if test -z "$dir"; then |
| 15124 | + func_stripname "-L" '' "$arg" |
| 15125 | + if test -z "$func_stripname_result"; then |
| 15126 | if test "$#" -gt 0; then |
| 15127 | func_fatal_error "require no space between \`-L' and \`$1'" |
| 15128 | else |
| 15129 | func_fatal_error "need path for \`-L' option" |
| 15130 | fi |
| 15131 | fi |
| 15132 | + func_resolve_sysroot "$func_stripname_result" |
| 15133 | + dir=$func_resolve_sysroot_result |
| 15134 | # We need an absolute path. |
| 15135 | case $dir in |
| 15136 | [\\/]* | [A-Za-z]:[\\/]*) ;; |
| 15137 | @@ -4706,10 +5563,16 @@ func_mode_link () |
| 15138 | ;; |
| 15139 | esac |
| 15140 | case "$deplibs " in |
| 15141 | - *" -L$dir "*) ;; |
| 15142 | + *" -L$dir "* | *" $arg "*) |
| 15143 | + # Will only happen for absolute or sysroot arguments |
| 15144 | + ;; |
| 15145 | *) |
| 15146 | - deplibs="$deplibs -L$dir" |
| 15147 | - lib_search_path="$lib_search_path $dir" |
| 15148 | + # Preserve sysroot, but never include relative directories |
| 15149 | + case $dir in |
| 15150 | + [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; |
| 15151 | + *) func_append deplibs " -L$dir" ;; |
| 15152 | + esac |
| 15153 | + func_append lib_search_path " $dir" |
| 15154 | ;; |
| 15155 | esac |
| 15156 | case $host in |
| 15157 | @@ -4718,12 +5581,12 @@ func_mode_link () |
| 15158 | case :$dllsearchpath: in |
| 15159 | *":$dir:"*) ;; |
| 15160 | ::) dllsearchpath=$dir;; |
| 15161 | - *) dllsearchpath="$dllsearchpath:$dir";; |
| 15162 | + *) func_append dllsearchpath ":$dir";; |
| 15163 | esac |
| 15164 | case :$dllsearchpath: in |
| 15165 | *":$testbindir:"*) ;; |
| 15166 | ::) dllsearchpath=$testbindir;; |
| 15167 | - *) dllsearchpath="$dllsearchpath:$testbindir";; |
| 15168 | + *) func_append dllsearchpath ":$testbindir";; |
| 15169 | esac |
| 15170 | ;; |
| 15171 | esac |
| 15172 | @@ -4747,7 +5610,7 @@ func_mode_link () |
| 15173 | ;; |
| 15174 | *-*-rhapsody* | *-*-darwin1.[012]) |
| 15175 | # Rhapsody C and math libraries are in the System framework |
| 15176 | - deplibs="$deplibs System.ltframework" |
| 15177 | + func_append deplibs " System.ltframework" |
| 15178 | continue |
| 15179 | ;; |
| 15180 | *-*-sco3.2v5* | *-*-sco5v6*) |
| 15181 | @@ -4758,9 +5621,6 @@ func_mode_link () |
| 15182 | # Compiler inserts libc in the correct place for threads to work |
| 15183 | test "X$arg" = "X-lc" && continue |
| 15184 | ;; |
| 15185 | - *-*-linux*) |
| 15186 | - test "X$arg" = "X-lc" && continue |
| 15187 | - ;; |
| 15188 | esac |
| 15189 | elif test "X$arg" = "X-lc_r"; then |
| 15190 | case $host in |
| 15191 | @@ -4770,7 +5630,7 @@ func_mode_link () |
| 15192 | ;; |
| 15193 | esac |
| 15194 | fi |
| 15195 | - deplibs="$deplibs $arg" |
| 15196 | + func_append deplibs " $arg" |
| 15197 | continue |
| 15198 | ;; |
| 15199 | |
| 15200 | @@ -4782,8 +5642,8 @@ func_mode_link () |
| 15201 | # Tru64 UNIX uses -model [arg] to determine the layout of C++ |
| 15202 | # classes, name mangling, and exception handling. |
| 15203 | # Darwin uses the -arch flag to determine output architecture. |
| 15204 | - -model|-arch|-isysroot) |
| 15205 | - compiler_flags="$compiler_flags $arg" |
| 15206 | + -model|-arch|-isysroot|--sysroot) |
| 15207 | + func_append compiler_flags " $arg" |
| 15208 | func_append compile_command " $arg" |
| 15209 | func_append finalize_command " $arg" |
| 15210 | prev=xcompiler |
| 15211 | @@ -4791,12 +5651,12 @@ func_mode_link () |
| 15212 | ;; |
| 15213 | |
| 15214 | -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) |
| 15215 | - compiler_flags="$compiler_flags $arg" |
| 15216 | + func_append compiler_flags " $arg" |
| 15217 | func_append compile_command " $arg" |
| 15218 | func_append finalize_command " $arg" |
| 15219 | case "$new_inherited_linker_flags " in |
| 15220 | *" $arg "*) ;; |
| 15221 | - * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; |
| 15222 | + * ) func_append new_inherited_linker_flags " $arg" ;; |
| 15223 | esac |
| 15224 | continue |
| 15225 | ;; |
| 15226 | @@ -4863,13 +5723,17 @@ func_mode_link () |
| 15227 | # We need an absolute path. |
| 15228 | case $dir in |
| 15229 | [\\/]* | [A-Za-z]:[\\/]*) ;; |
| 15230 | + =*) |
| 15231 | + func_stripname '=' '' "$dir" |
| 15232 | + dir=$lt_sysroot$func_stripname_result |
| 15233 | + ;; |
| 15234 | *) |
| 15235 | func_fatal_error "only absolute run-paths are allowed" |
| 15236 | ;; |
| 15237 | esac |
| 15238 | case "$xrpath " in |
| 15239 | *" $dir "*) ;; |
| 15240 | - *) xrpath="$xrpath $dir" ;; |
| 15241 | + *) func_append xrpath " $dir" ;; |
| 15242 | esac |
| 15243 | continue |
| 15244 | ;; |
| 15245 | @@ -4922,8 +5786,8 @@ func_mode_link () |
| 15246 | for flag in $args; do |
| 15247 | IFS="$save_ifs" |
| 15248 | func_quote_for_eval "$flag" |
| 15249 | - arg="$arg $func_quote_for_eval_result" |
| 15250 | - compiler_flags="$compiler_flags $func_quote_for_eval_result" |
| 15251 | + func_append arg " $func_quote_for_eval_result" |
| 15252 | + func_append compiler_flags " $func_quote_for_eval_result" |
| 15253 | done |
| 15254 | IFS="$save_ifs" |
| 15255 | func_stripname ' ' '' "$arg" |
| 15256 | @@ -4938,9 +5802,9 @@ func_mode_link () |
| 15257 | for flag in $args; do |
| 15258 | IFS="$save_ifs" |
| 15259 | func_quote_for_eval "$flag" |
| 15260 | - arg="$arg $wl$func_quote_for_eval_result" |
| 15261 | - compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" |
| 15262 | - linker_flags="$linker_flags $func_quote_for_eval_result" |
| 15263 | + func_append arg " $wl$func_quote_for_eval_result" |
| 15264 | + func_append compiler_flags " $wl$func_quote_for_eval_result" |
| 15265 | + func_append linker_flags " $func_quote_for_eval_result" |
| 15266 | done |
| 15267 | IFS="$save_ifs" |
| 15268 | func_stripname ' ' '' "$arg" |
| 15269 | @@ -4968,24 +5832,27 @@ func_mode_link () |
| 15270 | arg="$func_quote_for_eval_result" |
| 15271 | ;; |
| 15272 | |
| 15273 | - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler |
| 15274 | - # -r[0-9][0-9]* specifies the processor on the SGI compiler |
| 15275 | - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler |
| 15276 | - # +DA*, +DD* enable 64-bit mode on the HP compiler |
| 15277 | - # -q* pass through compiler args for the IBM compiler |
| 15278 | - # -m*, -t[45]*, -txscale* pass through architecture-specific |
| 15279 | - # compiler args for GCC |
| 15280 | - # -F/path gives path to uninstalled frameworks, gcc on darwin |
| 15281 | - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC |
| 15282 | - # @file GCC response files |
| 15283 | - # -tp=* Portland pgcc target processor selection |
| 15284 | + # Flags to be passed through unchanged, with rationale: |
| 15285 | + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler |
| 15286 | + # -r[0-9][0-9]* specify processor for the SGI compiler |
| 15287 | + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler |
| 15288 | + # +DA*, +DD* enable 64-bit mode for the HP compiler |
| 15289 | + # -q* compiler args for the IBM compiler |
| 15290 | + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC |
| 15291 | + # -F/path path to uninstalled frameworks, gcc on darwin |
| 15292 | + # -p, -pg, --coverage, -fprofile-* profiling flags for GCC |
| 15293 | + # @file GCC response files |
| 15294 | + # -tp=* Portland pgcc target processor selection |
| 15295 | + # --sysroot=* for sysroot support |
| 15296 | + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization |
| 15297 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ |
| 15298 | - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) |
| 15299 | + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ |
| 15300 | + -O*|-flto*|-fwhopr*|-fuse-linker-plugin) |
| 15301 | func_quote_for_eval "$arg" |
| 15302 | arg="$func_quote_for_eval_result" |
| 15303 | func_append compile_command " $arg" |
| 15304 | func_append finalize_command " $arg" |
| 15305 | - compiler_flags="$compiler_flags $arg" |
| 15306 | + func_append compiler_flags " $arg" |
| 15307 | continue |
| 15308 | ;; |
| 15309 | |
| 15310 | @@ -4997,7 +5864,7 @@ func_mode_link () |
| 15311 | |
| 15312 | *.$objext) |
| 15313 | # A standard object. |
| 15314 | - objs="$objs $arg" |
| 15315 | + func_append objs " $arg" |
| 15316 | ;; |
| 15317 | |
| 15318 | *.lo) |
| 15319 | @@ -5028,7 +5895,7 @@ func_mode_link () |
| 15320 | |
| 15321 | if test "$prev" = dlfiles; then |
| 15322 | if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then |
| 15323 | - dlfiles="$dlfiles $pic_object" |
| 15324 | + func_append dlfiles " $pic_object" |
| 15325 | prev= |
| 15326 | continue |
| 15327 | else |
| 15328 | @@ -5040,7 +5907,7 @@ func_mode_link () |
| 15329 | # CHECK ME: I think I busted this. -Ossama |
| 15330 | if test "$prev" = dlprefiles; then |
| 15331 | # Preload the old-style object. |
| 15332 | - dlprefiles="$dlprefiles $pic_object" |
| 15333 | + func_append dlprefiles " $pic_object" |
| 15334 | prev= |
| 15335 | fi |
| 15336 | |
| 15337 | @@ -5085,24 +5952,25 @@ func_mode_link () |
| 15338 | |
| 15339 | *.$libext) |
| 15340 | # An archive. |
| 15341 | - deplibs="$deplibs $arg" |
| 15342 | - old_deplibs="$old_deplibs $arg" |
| 15343 | + func_append deplibs " $arg" |
| 15344 | + func_append old_deplibs " $arg" |
| 15345 | continue |
| 15346 | ;; |
| 15347 | |
| 15348 | *.la) |
| 15349 | # A libtool-controlled library. |
| 15350 | |
| 15351 | + func_resolve_sysroot "$arg" |
| 15352 | if test "$prev" = dlfiles; then |
| 15353 | # This library was specified with -dlopen. |
| 15354 | - dlfiles="$dlfiles $arg" |
| 15355 | + func_append dlfiles " $func_resolve_sysroot_result" |
| 15356 | prev= |
| 15357 | elif test "$prev" = dlprefiles; then |
| 15358 | # The library was specified with -dlpreopen. |
| 15359 | - dlprefiles="$dlprefiles $arg" |
| 15360 | + func_append dlprefiles " $func_resolve_sysroot_result" |
| 15361 | prev= |
| 15362 | else |
| 15363 | - deplibs="$deplibs $arg" |
| 15364 | + func_append deplibs " $func_resolve_sysroot_result" |
| 15365 | fi |
| 15366 | continue |
| 15367 | ;; |
| 15368 | @@ -5127,7 +5995,7 @@ func_mode_link () |
| 15369 | func_fatal_help "the \`$prevarg' option requires an argument" |
| 15370 | |
| 15371 | if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then |
| 15372 | - eval "arg=\"$export_dynamic_flag_spec\"" |
| 15373 | + eval arg=\"$export_dynamic_flag_spec\" |
| 15374 | func_append compile_command " $arg" |
| 15375 | func_append finalize_command " $arg" |
| 15376 | fi |
| 15377 | @@ -5144,11 +6012,13 @@ func_mode_link () |
| 15378 | else |
| 15379 | shlib_search_path= |
| 15380 | fi |
| 15381 | - eval "sys_lib_search_path=\"$sys_lib_search_path_spec\"" |
| 15382 | - eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"" |
| 15383 | + eval sys_lib_search_path=\"$sys_lib_search_path_spec\" |
| 15384 | + eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" |
| 15385 | |
| 15386 | func_dirname "$output" "/" "" |
| 15387 | output_objdir="$func_dirname_result$objdir" |
| 15388 | + func_to_tool_file "$output_objdir/" |
| 15389 | + tool_output_objdir=$func_to_tool_file_result |
| 15390 | # Create the object directory. |
| 15391 | func_mkdir_p "$output_objdir" |
| 15392 | |
| 15393 | @@ -5169,12 +6039,12 @@ func_mode_link () |
| 15394 | # Find all interdependent deplibs by searching for libraries |
| 15395 | # that are linked more than once (e.g. -la -lb -la) |
| 15396 | for deplib in $deplibs; do |
| 15397 | - if $opt_duplicate_deps ; then |
| 15398 | + if $opt_preserve_dup_deps ; then |
| 15399 | case "$libs " in |
| 15400 | - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
| 15401 | + *" $deplib "*) func_append specialdeplibs " $deplib" ;; |
| 15402 | esac |
| 15403 | fi |
| 15404 | - libs="$libs $deplib" |
| 15405 | + func_append libs " $deplib" |
| 15406 | done |
| 15407 | |
| 15408 | if test "$linkmode" = lib; then |
| 15409 | @@ -5187,9 +6057,9 @@ func_mode_link () |
| 15410 | if $opt_duplicate_compiler_generated_deps; then |
| 15411 | for pre_post_dep in $predeps $postdeps; do |
| 15412 | case "$pre_post_deps " in |
| 15413 | - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; |
| 15414 | + *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; |
| 15415 | esac |
| 15416 | - pre_post_deps="$pre_post_deps $pre_post_dep" |
| 15417 | + func_append pre_post_deps " $pre_post_dep" |
| 15418 | done |
| 15419 | fi |
| 15420 | pre_post_deps= |
| 15421 | @@ -5256,8 +6126,9 @@ func_mode_link () |
| 15422 | for lib in $dlprefiles; do |
| 15423 | # Ignore non-libtool-libs |
| 15424 | dependency_libs= |
| 15425 | + func_resolve_sysroot "$lib" |
| 15426 | case $lib in |
| 15427 | - *.la) func_source "$lib" ;; |
| 15428 | + *.la) func_source "$func_resolve_sysroot_result" ;; |
| 15429 | esac |
| 15430 | |
| 15431 | # Collect preopened libtool deplibs, except any this library |
| 15432 | @@ -5267,7 +6138,7 @@ func_mode_link () |
| 15433 | deplib_base=$func_basename_result |
| 15434 | case " $weak_libs " in |
| 15435 | *" $deplib_base "*) ;; |
| 15436 | - *) deplibs="$deplibs $deplib" ;; |
| 15437 | + *) func_append deplibs " $deplib" ;; |
| 15438 | esac |
| 15439 | done |
| 15440 | done |
| 15441 | @@ -5288,11 +6159,11 @@ func_mode_link () |
| 15442 | compile_deplibs="$deplib $compile_deplibs" |
| 15443 | finalize_deplibs="$deplib $finalize_deplibs" |
| 15444 | else |
| 15445 | - compiler_flags="$compiler_flags $deplib" |
| 15446 | + func_append compiler_flags " $deplib" |
| 15447 | if test "$linkmode" = lib ; then |
| 15448 | case "$new_inherited_linker_flags " in |
| 15449 | *" $deplib "*) ;; |
| 15450 | - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; |
| 15451 | + * ) func_append new_inherited_linker_flags " $deplib" ;; |
| 15452 | esac |
| 15453 | fi |
| 15454 | fi |
| 15455 | @@ -5377,7 +6248,7 @@ func_mode_link () |
| 15456 | if test "$linkmode" = lib ; then |
| 15457 | case "$new_inherited_linker_flags " in |
| 15458 | *" $deplib "*) ;; |
| 15459 | - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; |
| 15460 | + * ) func_append new_inherited_linker_flags " $deplib" ;; |
| 15461 | esac |
| 15462 | fi |
| 15463 | fi |
| 15464 | @@ -5390,7 +6261,8 @@ func_mode_link () |
| 15465 | test "$pass" = conv && continue |
| 15466 | newdependency_libs="$deplib $newdependency_libs" |
| 15467 | func_stripname '-L' '' "$deplib" |
| 15468 | - newlib_search_path="$newlib_search_path $func_stripname_result" |
| 15469 | + func_resolve_sysroot "$func_stripname_result" |
| 15470 | + func_append newlib_search_path " $func_resolve_sysroot_result" |
| 15471 | ;; |
| 15472 | prog) |
| 15473 | if test "$pass" = conv; then |
| 15474 | @@ -5404,7 +6276,8 @@ func_mode_link () |
| 15475 | finalize_deplibs="$deplib $finalize_deplibs" |
| 15476 | fi |
| 15477 | func_stripname '-L' '' "$deplib" |
| 15478 | - newlib_search_path="$newlib_search_path $func_stripname_result" |
| 15479 | + func_resolve_sysroot "$func_stripname_result" |
| 15480 | + func_append newlib_search_path " $func_resolve_sysroot_result" |
| 15481 | ;; |
| 15482 | *) |
| 15483 | func_warning "\`-L' is ignored for archives/objects" |
| 15484 | @@ -5415,17 +6288,21 @@ func_mode_link () |
| 15485 | -R*) |
| 15486 | if test "$pass" = link; then |
| 15487 | func_stripname '-R' '' "$deplib" |
| 15488 | - dir=$func_stripname_result |
| 15489 | + func_resolve_sysroot "$func_stripname_result" |
| 15490 | + dir=$func_resolve_sysroot_result |
| 15491 | # Make sure the xrpath contains only unique directories. |
| 15492 | case "$xrpath " in |
| 15493 | *" $dir "*) ;; |
| 15494 | - *) xrpath="$xrpath $dir" ;; |
| 15495 | + *) func_append xrpath " $dir" ;; |
| 15496 | esac |
| 15497 | fi |
| 15498 | deplibs="$deplib $deplibs" |
| 15499 | continue |
| 15500 | ;; |
| 15501 | - *.la) lib="$deplib" ;; |
| 15502 | + *.la) |
| 15503 | + func_resolve_sysroot "$deplib" |
| 15504 | + lib=$func_resolve_sysroot_result |
| 15505 | + ;; |
| 15506 | *.$libext) |
| 15507 | if test "$pass" = conv; then |
| 15508 | deplibs="$deplib $deplibs" |
| 15509 | @@ -5488,11 +6365,11 @@ func_mode_link () |
| 15510 | if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then |
| 15511 | # If there is no dlopen support or we're linking statically, |
| 15512 | # we need to preload. |
| 15513 | - newdlprefiles="$newdlprefiles $deplib" |
| 15514 | + func_append newdlprefiles " $deplib" |
| 15515 | compile_deplibs="$deplib $compile_deplibs" |
| 15516 | finalize_deplibs="$deplib $finalize_deplibs" |
| 15517 | else |
| 15518 | - newdlfiles="$newdlfiles $deplib" |
| 15519 | + func_append newdlfiles " $deplib" |
| 15520 | fi |
| 15521 | fi |
| 15522 | continue |
| 15523 | @@ -5538,7 +6415,7 @@ func_mode_link () |
| 15524 | for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do |
| 15525 | case " $new_inherited_linker_flags " in |
| 15526 | *" $tmp_inherited_linker_flag "*) ;; |
| 15527 | - *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; |
| 15528 | + *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; |
| 15529 | esac |
| 15530 | done |
| 15531 | fi |
| 15532 | @@ -5546,8 +6423,8 @@ func_mode_link () |
| 15533 | if test "$linkmode,$pass" = "lib,link" || |
| 15534 | test "$linkmode,$pass" = "prog,scan" || |
| 15535 | { test "$linkmode" != prog && test "$linkmode" != lib; }; then |
| 15536 | - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" |
| 15537 | - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" |
| 15538 | + test -n "$dlopen" && func_append dlfiles " $dlopen" |
| 15539 | + test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" |
| 15540 | fi |
| 15541 | |
| 15542 | if test "$pass" = conv; then |
| 15543 | @@ -5558,20 +6435,20 @@ func_mode_link () |
| 15544 | func_fatal_error "cannot find name of link library for \`$lib'" |
| 15545 | fi |
| 15546 | # It is a libtool convenience library, so add in its objects. |
| 15547 | - convenience="$convenience $ladir/$objdir/$old_library" |
| 15548 | - old_convenience="$old_convenience $ladir/$objdir/$old_library" |
| 15549 | + func_append convenience " $ladir/$objdir/$old_library" |
| 15550 | + func_append old_convenience " $ladir/$objdir/$old_library" |
| 15551 | elif test "$linkmode" != prog && test "$linkmode" != lib; then |
| 15552 | func_fatal_error "\`$lib' is not a convenience library" |
| 15553 | fi |
| 15554 | tmp_libs= |
| 15555 | for deplib in $dependency_libs; do |
| 15556 | deplibs="$deplib $deplibs" |
| 15557 | - if $opt_duplicate_deps ; then |
| 15558 | + if $opt_preserve_dup_deps ; then |
| 15559 | case "$tmp_libs " in |
| 15560 | - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
| 15561 | + *" $deplib "*) func_append specialdeplibs " $deplib" ;; |
| 15562 | esac |
| 15563 | fi |
| 15564 | - tmp_libs="$tmp_libs $deplib" |
| 15565 | + func_append tmp_libs " $deplib" |
| 15566 | done |
| 15567 | continue |
| 15568 | fi # $pass = conv |
| 15569 | @@ -5579,9 +6456,15 @@ func_mode_link () |
| 15570 | |
| 15571 | # Get the name of the library we link against. |
| 15572 | linklib= |
| 15573 | - for l in $old_library $library_names; do |
| 15574 | - linklib="$l" |
| 15575 | - done |
| 15576 | + if test -n "$old_library" && |
| 15577 | + { test "$prefer_static_libs" = yes || |
| 15578 | + test "$prefer_static_libs,$installed" = "built,no"; }; then |
| 15579 | + linklib=$old_library |
| 15580 | + else |
| 15581 | + for l in $old_library $library_names; do |
| 15582 | + linklib="$l" |
| 15583 | + done |
| 15584 | + fi |
| 15585 | if test -z "$linklib"; then |
| 15586 | func_fatal_error "cannot find name of link library for \`$lib'" |
| 15587 | fi |
| 15588 | @@ -5598,9 +6481,9 @@ func_mode_link () |
| 15589 | # statically, we need to preload. We also need to preload any |
| 15590 | # dependent libraries so libltdl's deplib preloader doesn't |
| 15591 | # bomb out in the load deplibs phase. |
| 15592 | - dlprefiles="$dlprefiles $lib $dependency_libs" |
| 15593 | + func_append dlprefiles " $lib $dependency_libs" |
| 15594 | else |
| 15595 | - newdlfiles="$newdlfiles $lib" |
| 15596 | + func_append newdlfiles " $lib" |
| 15597 | fi |
| 15598 | continue |
| 15599 | fi # $pass = dlopen |
| 15600 | @@ -5622,14 +6505,14 @@ func_mode_link () |
| 15601 | |
| 15602 | # Find the relevant object directory and library name. |
| 15603 | if test "X$installed" = Xyes; then |
| 15604 | - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then |
| 15605 | + if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then |
| 15606 | func_warning "library \`$lib' was moved." |
| 15607 | dir="$ladir" |
| 15608 | absdir="$abs_ladir" |
| 15609 | libdir="$abs_ladir" |
| 15610 | else |
| 15611 | - dir="$libdir" |
| 15612 | - absdir="$libdir" |
| 15613 | + dir="$lt_sysroot$libdir" |
| 15614 | + absdir="$lt_sysroot$libdir" |
| 15615 | fi |
| 15616 | test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes |
| 15617 | else |
| 15618 | @@ -5637,12 +6520,12 @@ func_mode_link () |
| 15619 | dir="$ladir" |
| 15620 | absdir="$abs_ladir" |
| 15621 | # Remove this search path later |
| 15622 | - notinst_path="$notinst_path $abs_ladir" |
| 15623 | + func_append notinst_path " $abs_ladir" |
| 15624 | else |
| 15625 | dir="$ladir/$objdir" |
| 15626 | absdir="$abs_ladir/$objdir" |
| 15627 | # Remove this search path later |
| 15628 | - notinst_path="$notinst_path $abs_ladir" |
| 15629 | + func_append notinst_path " $abs_ladir" |
| 15630 | fi |
| 15631 | fi # $installed = yes |
| 15632 | func_stripname 'lib' '.la' "$laname" |
| 15633 | @@ -5653,20 +6536,46 @@ func_mode_link () |
| 15634 | if test -z "$libdir" && test "$linkmode" = prog; then |
| 15635 | func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" |
| 15636 | fi |
| 15637 | - # Prefer using a static library (so that no silly _DYNAMIC symbols |
| 15638 | - # are required to link). |
| 15639 | - if test -n "$old_library"; then |
| 15640 | - newdlprefiles="$newdlprefiles $dir/$old_library" |
| 15641 | - # Keep a list of preopened convenience libraries to check |
| 15642 | - # that they are being used correctly in the link pass. |
| 15643 | - test -z "$libdir" && \ |
| 15644 | - dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" |
| 15645 | - # Otherwise, use the dlname, so that lt_dlopen finds it. |
| 15646 | - elif test -n "$dlname"; then |
| 15647 | - newdlprefiles="$newdlprefiles $dir/$dlname" |
| 15648 | - else |
| 15649 | - newdlprefiles="$newdlprefiles $dir/$linklib" |
| 15650 | - fi |
| 15651 | + case "$host" in |
| 15652 | + # special handling for platforms with PE-DLLs. |
| 15653 | + *cygwin* | *mingw* | *cegcc* ) |
| 15654 | + # Linker will automatically link against shared library if both |
| 15655 | + # static and shared are present. Therefore, ensure we extract |
| 15656 | + # symbols from the import library if a shared library is present |
| 15657 | + # (otherwise, the dlopen module name will be incorrect). We do |
| 15658 | + # this by putting the import library name into $newdlprefiles. |
| 15659 | + # We recover the dlopen module name by 'saving' the la file |
| 15660 | + # name in a special purpose variable, and (later) extracting the |
| 15661 | + # dlname from the la file. |
| 15662 | + if test -n "$dlname"; then |
| 15663 | + func_tr_sh "$dir/$linklib" |
| 15664 | + eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" |
| 15665 | + func_append newdlprefiles " $dir/$linklib" |
| 15666 | + else |
| 15667 | + func_append newdlprefiles " $dir/$old_library" |
| 15668 | + # Keep a list of preopened convenience libraries to check |
| 15669 | + # that they are being used correctly in the link pass. |
| 15670 | + test -z "$libdir" && \ |
| 15671 | + func_append dlpreconveniencelibs " $dir/$old_library" |
| 15672 | + fi |
| 15673 | + ;; |
| 15674 | + * ) |
| 15675 | + # Prefer using a static library (so that no silly _DYNAMIC symbols |
| 15676 | + # are required to link). |
| 15677 | + if test -n "$old_library"; then |
| 15678 | + func_append newdlprefiles " $dir/$old_library" |
| 15679 | + # Keep a list of preopened convenience libraries to check |
| 15680 | + # that they are being used correctly in the link pass. |
| 15681 | + test -z "$libdir" && \ |
| 15682 | + func_append dlpreconveniencelibs " $dir/$old_library" |
| 15683 | + # Otherwise, use the dlname, so that lt_dlopen finds it. |
| 15684 | + elif test -n "$dlname"; then |
| 15685 | + func_append newdlprefiles " $dir/$dlname" |
| 15686 | + else |
| 15687 | + func_append newdlprefiles " $dir/$linklib" |
| 15688 | + fi |
| 15689 | + ;; |
| 15690 | + esac |
| 15691 | fi # $pass = dlpreopen |
| 15692 | |
| 15693 | if test -z "$libdir"; then |
| 15694 | @@ -5684,7 +6593,7 @@ func_mode_link () |
| 15695 | |
| 15696 | |
| 15697 | if test "$linkmode" = prog && test "$pass" != link; then |
| 15698 | - newlib_search_path="$newlib_search_path $ladir" |
| 15699 | + func_append newlib_search_path " $ladir" |
| 15700 | deplibs="$lib $deplibs" |
| 15701 | |
| 15702 | linkalldeplibs=no |
| 15703 | @@ -5697,7 +6606,8 @@ func_mode_link () |
| 15704 | for deplib in $dependency_libs; do |
| 15705 | case $deplib in |
| 15706 | -L*) func_stripname '-L' '' "$deplib" |
| 15707 | - newlib_search_path="$newlib_search_path $func_stripname_result" |
| 15708 | + func_resolve_sysroot "$func_stripname_result" |
| 15709 | + func_append newlib_search_path " $func_resolve_sysroot_result" |
| 15710 | ;; |
| 15711 | esac |
| 15712 | # Need to link against all dependency_libs? |
| 15713 | @@ -5708,12 +6618,12 @@ func_mode_link () |
| 15714 | # or/and link against static libraries |
| 15715 | newdependency_libs="$deplib $newdependency_libs" |
| 15716 | fi |
| 15717 | - if $opt_duplicate_deps ; then |
| 15718 | + if $opt_preserve_dup_deps ; then |
| 15719 | case "$tmp_libs " in |
| 15720 | - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
| 15721 | + *" $deplib "*) func_append specialdeplibs " $deplib" ;; |
| 15722 | esac |
| 15723 | fi |
| 15724 | - tmp_libs="$tmp_libs $deplib" |
| 15725 | + func_append tmp_libs " $deplib" |
| 15726 | done # for deplib |
| 15727 | continue |
| 15728 | fi # $linkmode = prog... |
| 15729 | @@ -5728,7 +6638,7 @@ func_mode_link () |
| 15730 | # Make sure the rpath contains only unique directories. |
| 15731 | case "$temp_rpath:" in |
| 15732 | *"$absdir:"*) ;; |
| 15733 | - *) temp_rpath="$temp_rpath$absdir:" ;; |
| 15734 | + *) func_append temp_rpath "$absdir:" ;; |
| 15735 | esac |
| 15736 | fi |
| 15737 | |
| 15738 | @@ -5740,7 +6650,7 @@ func_mode_link () |
| 15739 | *) |
| 15740 | case "$compile_rpath " in |
| 15741 | *" $absdir "*) ;; |
| 15742 | - *) compile_rpath="$compile_rpath $absdir" |
| 15743 | + *) func_append compile_rpath " $absdir" ;; |
| 15744 | esac |
| 15745 | ;; |
| 15746 | esac |
| 15747 | @@ -5749,7 +6659,7 @@ func_mode_link () |
| 15748 | *) |
| 15749 | case "$finalize_rpath " in |
| 15750 | *" $libdir "*) ;; |
| 15751 | - *) finalize_rpath="$finalize_rpath $libdir" |
| 15752 | + *) func_append finalize_rpath " $libdir" ;; |
| 15753 | esac |
| 15754 | ;; |
| 15755 | esac |
| 15756 | @@ -5774,12 +6684,12 @@ func_mode_link () |
| 15757 | case $host in |
| 15758 | *cygwin* | *mingw* | *cegcc*) |
| 15759 | # No point in relinking DLLs because paths are not encoded |
| 15760 | - notinst_deplibs="$notinst_deplibs $lib" |
| 15761 | + func_append notinst_deplibs " $lib" |
| 15762 | need_relink=no |
| 15763 | ;; |
| 15764 | *) |
| 15765 | if test "$installed" = no; then |
| 15766 | - notinst_deplibs="$notinst_deplibs $lib" |
| 15767 | + func_append notinst_deplibs " $lib" |
| 15768 | need_relink=yes |
| 15769 | fi |
| 15770 | ;; |
| 15771 | @@ -5814,7 +6724,7 @@ func_mode_link () |
| 15772 | *) |
| 15773 | case "$compile_rpath " in |
| 15774 | *" $absdir "*) ;; |
| 15775 | - *) compile_rpath="$compile_rpath $absdir" |
| 15776 | + *) func_append compile_rpath " $absdir" ;; |
| 15777 | esac |
| 15778 | ;; |
| 15779 | esac |
| 15780 | @@ -5823,7 +6733,7 @@ func_mode_link () |
| 15781 | *) |
| 15782 | case "$finalize_rpath " in |
| 15783 | *" $libdir "*) ;; |
| 15784 | - *) finalize_rpath="$finalize_rpath $libdir" |
| 15785 | + *) func_append finalize_rpath " $libdir" ;; |
| 15786 | esac |
| 15787 | ;; |
| 15788 | esac |
| 15789 | @@ -5835,7 +6745,7 @@ func_mode_link () |
| 15790 | shift |
| 15791 | realname="$1" |
| 15792 | shift |
| 15793 | - eval "libname=\"$libname_spec\"" |
| 15794 | + libname=`eval "\\$ECHO \"$libname_spec\""` |
| 15795 | # use dlname if we got it. it's perfectly good, no? |
| 15796 | if test -n "$dlname"; then |
| 15797 | soname="$dlname" |
| 15798 | @@ -5848,7 +6758,7 @@ func_mode_link () |
| 15799 | versuffix="-$major" |
| 15800 | ;; |
| 15801 | esac |
| 15802 | - eval "soname=\"$soname_spec\"" |
| 15803 | + eval soname=\"$soname_spec\" |
| 15804 | else |
| 15805 | soname="$realname" |
| 15806 | fi |
| 15807 | @@ -5877,7 +6787,7 @@ func_mode_link () |
| 15808 | linklib=$newlib |
| 15809 | fi # test -n "$old_archive_from_expsyms_cmds" |
| 15810 | |
| 15811 | - if test "$linkmode" = prog || test "$mode" != relink; then |
| 15812 | + if test "$linkmode" = prog || test "$opt_mode" != relink; then |
| 15813 | add_shlibpath= |
| 15814 | add_dir= |
| 15815 | add= |
| 15816 | @@ -5933,7 +6843,7 @@ func_mode_link () |
| 15817 | if test -n "$inst_prefix_dir"; then |
| 15818 | case $libdir in |
| 15819 | [\\/]*) |
| 15820 | - add_dir="$add_dir -L$inst_prefix_dir$libdir" |
| 15821 | + func_append add_dir " -L$inst_prefix_dir$libdir" |
| 15822 | ;; |
| 15823 | esac |
| 15824 | fi |
| 15825 | @@ -5955,7 +6865,7 @@ func_mode_link () |
| 15826 | if test -n "$add_shlibpath"; then |
| 15827 | case :$compile_shlibpath: in |
| 15828 | *":$add_shlibpath:"*) ;; |
| 15829 | - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; |
| 15830 | + *) func_append compile_shlibpath "$add_shlibpath:" ;; |
| 15831 | esac |
| 15832 | fi |
| 15833 | if test "$linkmode" = prog; then |
| 15834 | @@ -5969,13 +6879,13 @@ func_mode_link () |
| 15835 | test "$hardcode_shlibpath_var" = yes; then |
| 15836 | case :$finalize_shlibpath: in |
| 15837 | *":$libdir:"*) ;; |
| 15838 | - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; |
| 15839 | + *) func_append finalize_shlibpath "$libdir:" ;; |
| 15840 | esac |
| 15841 | fi |
| 15842 | fi |
| 15843 | fi |
| 15844 | |
| 15845 | - if test "$linkmode" = prog || test "$mode" = relink; then |
| 15846 | + if test "$linkmode" = prog || test "$opt_mode" = relink; then |
| 15847 | add_shlibpath= |
| 15848 | add_dir= |
| 15849 | add= |
| 15850 | @@ -5989,7 +6899,7 @@ func_mode_link () |
| 15851 | elif test "$hardcode_shlibpath_var" = yes; then |
| 15852 | case :$finalize_shlibpath: in |
| 15853 | *":$libdir:"*) ;; |
| 15854 | - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; |
| 15855 | + *) func_append finalize_shlibpath "$libdir:" ;; |
| 15856 | esac |
| 15857 | add="-l$name" |
| 15858 | elif test "$hardcode_automatic" = yes; then |
| 15859 | @@ -6001,12 +6911,12 @@ func_mode_link () |
| 15860 | fi |
| 15861 | else |
| 15862 | # We cannot seem to hardcode it, guess we'll fake it. |
| 15863 | - add_dir="-L$libdir" |
| 15864 | + add_dir="-L$lt_sysroot$libdir" |
| 15865 | # Try looking first in the location we're being installed to. |
| 15866 | if test -n "$inst_prefix_dir"; then |
| 15867 | case $libdir in |
| 15868 | [\\/]*) |
| 15869 | - add_dir="$add_dir -L$inst_prefix_dir$libdir" |
| 15870 | + func_append add_dir " -L$inst_prefix_dir$libdir" |
| 15871 | ;; |
| 15872 | esac |
| 15873 | fi |
| 15874 | @@ -6083,27 +6993,33 @@ func_mode_link () |
| 15875 | temp_xrpath=$func_stripname_result |
| 15876 | case " $xrpath " in |
| 15877 | *" $temp_xrpath "*) ;; |
| 15878 | - *) xrpath="$xrpath $temp_xrpath";; |
| 15879 | + *) func_append xrpath " $temp_xrpath";; |
| 15880 | esac;; |
| 15881 | - *) temp_deplibs="$temp_deplibs $libdir";; |
| 15882 | + *) func_append temp_deplibs " $libdir";; |
| 15883 | esac |
| 15884 | done |
| 15885 | dependency_libs="$temp_deplibs" |
| 15886 | fi |
| 15887 | |
| 15888 | - newlib_search_path="$newlib_search_path $absdir" |
| 15889 | + func_append newlib_search_path " $absdir" |
| 15890 | # Link against this library |
| 15891 | test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" |
| 15892 | # ... and its dependency_libs |
| 15893 | tmp_libs= |
| 15894 | for deplib in $dependency_libs; do |
| 15895 | newdependency_libs="$deplib $newdependency_libs" |
| 15896 | - if $opt_duplicate_deps ; then |
| 15897 | + case $deplib in |
| 15898 | + -L*) func_stripname '-L' '' "$deplib" |
| 15899 | + func_resolve_sysroot "$func_stripname_result";; |
| 15900 | + *) func_resolve_sysroot "$deplib" ;; |
| 15901 | + esac |
| 15902 | + if $opt_preserve_dup_deps ; then |
| 15903 | case "$tmp_libs " in |
| 15904 | - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
| 15905 | + *" $func_resolve_sysroot_result "*) |
| 15906 | + func_append specialdeplibs " $func_resolve_sysroot_result" ;; |
| 15907 | esac |
| 15908 | fi |
| 15909 | - tmp_libs="$tmp_libs $deplib" |
| 15910 | + func_append tmp_libs " $func_resolve_sysroot_result" |
| 15911 | done |
| 15912 | |
| 15913 | if test "$link_all_deplibs" != no; then |
| 15914 | @@ -6113,8 +7029,10 @@ func_mode_link () |
| 15915 | case $deplib in |
| 15916 | -L*) path="$deplib" ;; |
| 15917 | *.la) |
| 15918 | + func_resolve_sysroot "$deplib" |
| 15919 | + deplib=$func_resolve_sysroot_result |
| 15920 | func_dirname "$deplib" "" "." |
| 15921 | - dir="$func_dirname_result" |
| 15922 | + dir=$func_dirname_result |
| 15923 | # We need an absolute path. |
| 15924 | case $dir in |
| 15925 | [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; |
| 15926 | @@ -6130,7 +7048,7 @@ func_mode_link () |
| 15927 | case $host in |
| 15928 | *-*-darwin*) |
| 15929 | depdepl= |
| 15930 | - deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` |
| 15931 | + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` |
| 15932 | if test -n "$deplibrary_names" ; then |
| 15933 | for tmp in $deplibrary_names ; do |
| 15934 | depdepl=$tmp |
| 15935 | @@ -6141,8 +7059,8 @@ func_mode_link () |
| 15936 | if test -z "$darwin_install_name"; then |
| 15937 | darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` |
| 15938 | fi |
| 15939 | - compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" |
| 15940 | - linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" |
| 15941 | + func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" |
| 15942 | + func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" |
| 15943 | path= |
| 15944 | fi |
| 15945 | fi |
| 15946 | @@ -6152,7 +7070,7 @@ func_mode_link () |
| 15947 | ;; |
| 15948 | esac |
| 15949 | else |
| 15950 | - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
| 15951 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
| 15952 | test -z "$libdir" && \ |
| 15953 | func_fatal_error "\`$deplib' is not a valid libtool archive" |
| 15954 | test "$absdir" != "$libdir" && \ |
| 15955 | @@ -6192,7 +7110,7 @@ func_mode_link () |
| 15956 | for dir in $newlib_search_path; do |
| 15957 | case "$lib_search_path " in |
| 15958 | *" $dir "*) ;; |
| 15959 | - *) lib_search_path="$lib_search_path $dir" ;; |
| 15960 | + *) func_append lib_search_path " $dir" ;; |
| 15961 | esac |
| 15962 | done |
| 15963 | newlib_search_path= |
| 15964 | @@ -6205,7 +7123,7 @@ func_mode_link () |
| 15965 | fi |
| 15966 | for var in $vars dependency_libs; do |
| 15967 | # Add libraries to $var in reverse order |
| 15968 | - eval tmp_libs=\$$var |
| 15969 | + eval tmp_libs=\"\$$var\" |
| 15970 | new_libs= |
| 15971 | for deplib in $tmp_libs; do |
| 15972 | # FIXME: Pedantically, this is the right thing to do, so |
| 15973 | @@ -6250,13 +7168,13 @@ func_mode_link () |
| 15974 | -L*) |
| 15975 | case " $tmp_libs " in |
| 15976 | *" $deplib "*) ;; |
| 15977 | - *) tmp_libs="$tmp_libs $deplib" ;; |
| 15978 | + *) func_append tmp_libs " $deplib" ;; |
| 15979 | esac |
| 15980 | ;; |
| 15981 | - *) tmp_libs="$tmp_libs $deplib" ;; |
| 15982 | + *) func_append tmp_libs " $deplib" ;; |
| 15983 | esac |
| 15984 | done |
| 15985 | - eval $var=\$tmp_libs |
| 15986 | + eval $var=\"$tmp_libs\" |
| 15987 | done # for var |
| 15988 | fi |
| 15989 | # Last step: remove runtime libs from dependency_libs |
| 15990 | @@ -6269,7 +7187,7 @@ func_mode_link () |
| 15991 | ;; |
| 15992 | esac |
| 15993 | if test -n "$i" ; then |
| 15994 | - tmp_libs="$tmp_libs $i" |
| 15995 | + func_append tmp_libs " $i" |
| 15996 | fi |
| 15997 | done |
| 15998 | dependency_libs=$tmp_libs |
| 15999 | @@ -6310,7 +7228,7 @@ func_mode_link () |
| 16000 | # Now set the variables for building old libraries. |
| 16001 | build_libtool_libs=no |
| 16002 | oldlibs="$output" |
| 16003 | - objs="$objs$old_deplibs" |
| 16004 | + func_append objs "$old_deplibs" |
| 16005 | ;; |
| 16006 | |
| 16007 | lib) |
| 16008 | @@ -6319,8 +7237,8 @@ func_mode_link () |
| 16009 | lib*) |
| 16010 | func_stripname 'lib' '.la' "$outputname" |
| 16011 | name=$func_stripname_result |
| 16012 | - eval "shared_ext=\"$shrext_cmds\"" |
| 16013 | - eval "libname=\"$libname_spec\"" |
| 16014 | + eval shared_ext=\"$shrext_cmds\" |
| 16015 | + eval libname=\"$libname_spec\" |
| 16016 | ;; |
| 16017 | *) |
| 16018 | test "$module" = no && \ |
| 16019 | @@ -6330,8 +7248,8 @@ func_mode_link () |
| 16020 | # Add the "lib" prefix for modules if required |
| 16021 | func_stripname '' '.la' "$outputname" |
| 16022 | name=$func_stripname_result |
| 16023 | - eval "shared_ext=\"$shrext_cmds\"" |
| 16024 | - eval "libname=\"$libname_spec\"" |
| 16025 | + eval shared_ext=\"$shrext_cmds\" |
| 16026 | + eval libname=\"$libname_spec\" |
| 16027 | else |
| 16028 | func_stripname '' '.la' "$outputname" |
| 16029 | libname=$func_stripname_result |
| 16030 | @@ -6346,7 +7264,7 @@ func_mode_link () |
| 16031 | echo |
| 16032 | $ECHO "*** Warning: Linking the shared library $output against the non-libtool" |
| 16033 | $ECHO "*** objects $objs is not portable!" |
| 16034 | - libobjs="$libobjs $objs" |
| 16035 | + func_append libobjs " $objs" |
| 16036 | fi |
| 16037 | fi |
| 16038 | |
| 16039 | @@ -6544,7 +7462,7 @@ func_mode_link () |
| 16040 | done |
| 16041 | |
| 16042 | # Make executables depend on our current version. |
| 16043 | - verstring="$verstring:${current}.0" |
| 16044 | + func_append verstring ":${current}.0" |
| 16045 | ;; |
| 16046 | |
| 16047 | qnx) |
| 16048 | @@ -6612,10 +7530,10 @@ func_mode_link () |
| 16049 | fi |
| 16050 | |
| 16051 | func_generate_dlsyms "$libname" "$libname" "yes" |
| 16052 | - libobjs="$libobjs $symfileobj" |
| 16053 | + func_append libobjs " $symfileobj" |
| 16054 | test "X$libobjs" = "X " && libobjs= |
| 16055 | |
| 16056 | - if test "$mode" != relink; then |
| 16057 | + if test "$opt_mode" != relink; then |
| 16058 | # Remove our outputs, but don't remove object files since they |
| 16059 | # may have been created when compiling PIC objects. |
| 16060 | removelist= |
| 16061 | @@ -6631,7 +7549,7 @@ func_mode_link () |
| 16062 | continue |
| 16063 | fi |
| 16064 | fi |
| 16065 | - removelist="$removelist $p" |
| 16066 | + func_append removelist " $p" |
| 16067 | ;; |
| 16068 | *) ;; |
| 16069 | esac |
| 16070 | @@ -6642,7 +7560,7 @@ func_mode_link () |
| 16071 | |
| 16072 | # Now set the variables for building old libraries. |
| 16073 | if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then |
| 16074 | - oldlibs="$oldlibs $output_objdir/$libname.$libext" |
| 16075 | + func_append oldlibs " $output_objdir/$libname.$libext" |
| 16076 | |
| 16077 | # Transform .lo files to .o files. |
| 16078 | oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` |
| 16079 | @@ -6659,10 +7577,11 @@ func_mode_link () |
| 16080 | # If the user specified any rpath flags, then add them. |
| 16081 | temp_xrpath= |
| 16082 | for libdir in $xrpath; do |
| 16083 | - temp_xrpath="$temp_xrpath -R$libdir" |
| 16084 | + func_replace_sysroot "$libdir" |
| 16085 | + func_append temp_xrpath " -R$func_replace_sysroot_result" |
| 16086 | case "$finalize_rpath " in |
| 16087 | *" $libdir "*) ;; |
| 16088 | - *) finalize_rpath="$finalize_rpath $libdir" ;; |
| 16089 | + *) func_append finalize_rpath " $libdir" ;; |
| 16090 | esac |
| 16091 | done |
| 16092 | if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then |
| 16093 | @@ -6676,7 +7595,7 @@ func_mode_link () |
| 16094 | for lib in $old_dlfiles; do |
| 16095 | case " $dlprefiles $dlfiles " in |
| 16096 | *" $lib "*) ;; |
| 16097 | - *) dlfiles="$dlfiles $lib" ;; |
| 16098 | + *) func_append dlfiles " $lib" ;; |
| 16099 | esac |
| 16100 | done |
| 16101 | |
| 16102 | @@ -6686,7 +7605,7 @@ func_mode_link () |
| 16103 | for lib in $old_dlprefiles; do |
| 16104 | case "$dlprefiles " in |
| 16105 | *" $lib "*) ;; |
| 16106 | - *) dlprefiles="$dlprefiles $lib" ;; |
| 16107 | + *) func_append dlprefiles " $lib" ;; |
| 16108 | esac |
| 16109 | done |
| 16110 | |
| 16111 | @@ -6698,7 +7617,7 @@ func_mode_link () |
| 16112 | ;; |
| 16113 | *-*-rhapsody* | *-*-darwin1.[012]) |
| 16114 | # Rhapsody C library is in the System framework |
| 16115 | - deplibs="$deplibs System.ltframework" |
| 16116 | + func_append deplibs " System.ltframework" |
| 16117 | ;; |
| 16118 | *-*-netbsd*) |
| 16119 | # Don't link with libc until the a.out ld.so is fixed. |
| 16120 | @@ -6715,7 +7634,7 @@ func_mode_link () |
| 16121 | *) |
| 16122 | # Add libc to deplibs on all other systems if necessary. |
| 16123 | if test "$build_libtool_need_lc" = "yes"; then |
| 16124 | - deplibs="$deplibs -lc" |
| 16125 | + func_append deplibs " -lc" |
| 16126 | fi |
| 16127 | ;; |
| 16128 | esac |
| 16129 | @@ -6764,18 +7683,18 @@ EOF |
| 16130 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
| 16131 | case " $predeps $postdeps " in |
| 16132 | *" $i "*) |
| 16133 | - newdeplibs="$newdeplibs $i" |
| 16134 | + func_append newdeplibs " $i" |
| 16135 | i="" |
| 16136 | ;; |
| 16137 | esac |
| 16138 | fi |
| 16139 | if test -n "$i" ; then |
| 16140 | - eval "libname=\"$libname_spec\"" |
| 16141 | - eval "deplib_matches=\"$library_names_spec\"" |
| 16142 | + libname=`eval "\\$ECHO \"$libname_spec\""` |
| 16143 | + deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` |
| 16144 | set dummy $deplib_matches; shift |
| 16145 | deplib_match=$1 |
| 16146 | if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then |
| 16147 | - newdeplibs="$newdeplibs $i" |
| 16148 | + func_append newdeplibs " $i" |
| 16149 | else |
| 16150 | droppeddeps=yes |
| 16151 | echo |
| 16152 | @@ -6789,7 +7708,7 @@ EOF |
| 16153 | fi |
| 16154 | ;; |
| 16155 | *) |
| 16156 | - newdeplibs="$newdeplibs $i" |
| 16157 | + func_append newdeplibs " $i" |
| 16158 | ;; |
| 16159 | esac |
| 16160 | done |
| 16161 | @@ -6807,18 +7726,18 @@ EOF |
| 16162 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
| 16163 | case " $predeps $postdeps " in |
| 16164 | *" $i "*) |
| 16165 | - newdeplibs="$newdeplibs $i" |
| 16166 | + func_append newdeplibs " $i" |
| 16167 | i="" |
| 16168 | ;; |
| 16169 | esac |
| 16170 | fi |
| 16171 | if test -n "$i" ; then |
| 16172 | - eval "libname=\"$libname_spec\"" |
| 16173 | - eval "deplib_matches=\"$library_names_spec\"" |
| 16174 | + libname=`eval "\\$ECHO \"$libname_spec\""` |
| 16175 | + deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` |
| 16176 | set dummy $deplib_matches; shift |
| 16177 | deplib_match=$1 |
| 16178 | if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then |
| 16179 | - newdeplibs="$newdeplibs $i" |
| 16180 | + func_append newdeplibs " $i" |
| 16181 | else |
| 16182 | droppeddeps=yes |
| 16183 | echo |
| 16184 | @@ -6840,7 +7759,7 @@ EOF |
| 16185 | fi |
| 16186 | ;; |
| 16187 | *) |
| 16188 | - newdeplibs="$newdeplibs $i" |
| 16189 | + func_append newdeplibs " $i" |
| 16190 | ;; |
| 16191 | esac |
| 16192 | done |
| 16193 | @@ -6857,15 +7776,27 @@ EOF |
| 16194 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
| 16195 | case " $predeps $postdeps " in |
| 16196 | *" $a_deplib "*) |
| 16197 | - newdeplibs="$newdeplibs $a_deplib" |
| 16198 | + func_append newdeplibs " $a_deplib" |
| 16199 | a_deplib="" |
| 16200 | ;; |
| 16201 | esac |
| 16202 | fi |
| 16203 | if test -n "$a_deplib" ; then |
| 16204 | - eval "libname=\"$libname_spec\"" |
| 16205 | + libname=`eval "\\$ECHO \"$libname_spec\""` |
| 16206 | + if test -n "$file_magic_glob"; then |
| 16207 | + libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` |
| 16208 | + else |
| 16209 | + libnameglob=$libname |
| 16210 | + fi |
| 16211 | + test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` |
| 16212 | for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do |
| 16213 | - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` |
| 16214 | + if test "$want_nocaseglob" = yes; then |
| 16215 | + shopt -s nocaseglob |
| 16216 | + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` |
| 16217 | + $nocaseglob |
| 16218 | + else |
| 16219 | + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` |
| 16220 | + fi |
| 16221 | for potent_lib in $potential_libs; do |
| 16222 | # Follow soft links. |
| 16223 | if ls -lLd "$potent_lib" 2>/dev/null | |
| 16224 | @@ -6885,10 +7816,10 @@ EOF |
| 16225 | *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; |
| 16226 | esac |
| 16227 | done |
| 16228 | - if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null | |
| 16229 | + if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | |
| 16230 | $SED -e 10q | |
| 16231 | $EGREP "$file_magic_regex" > /dev/null; then |
| 16232 | - newdeplibs="$newdeplibs $a_deplib" |
| 16233 | + func_append newdeplibs " $a_deplib" |
| 16234 | a_deplib="" |
| 16235 | break 2 |
| 16236 | fi |
| 16237 | @@ -6913,7 +7844,7 @@ EOF |
| 16238 | ;; |
| 16239 | *) |
| 16240 | # Add a -L argument. |
| 16241 | - newdeplibs="$newdeplibs $a_deplib" |
| 16242 | + func_append newdeplibs " $a_deplib" |
| 16243 | ;; |
| 16244 | esac |
| 16245 | done # Gone through all deplibs. |
| 16246 | @@ -6929,20 +7860,20 @@ EOF |
| 16247 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
| 16248 | case " $predeps $postdeps " in |
| 16249 | *" $a_deplib "*) |
| 16250 | - newdeplibs="$newdeplibs $a_deplib" |
| 16251 | + func_append newdeplibs " $a_deplib" |
| 16252 | a_deplib="" |
| 16253 | ;; |
| 16254 | esac |
| 16255 | fi |
| 16256 | if test -n "$a_deplib" ; then |
| 16257 | - eval "libname=\"$libname_spec\"" |
| 16258 | + libname=`eval "\\$ECHO \"$libname_spec\""` |
| 16259 | for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do |
| 16260 | potential_libs=`ls $i/$libname[.-]* 2>/dev/null` |
| 16261 | for potent_lib in $potential_libs; do |
| 16262 | potlib="$potent_lib" # see symlink-check above in file_magic test |
| 16263 | if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ |
| 16264 | $EGREP "$match_pattern_regex" > /dev/null; then |
| 16265 | - newdeplibs="$newdeplibs $a_deplib" |
| 16266 | + func_append newdeplibs " $a_deplib" |
| 16267 | a_deplib="" |
| 16268 | break 2 |
| 16269 | fi |
| 16270 | @@ -6967,7 +7898,7 @@ EOF |
| 16271 | ;; |
| 16272 | *) |
| 16273 | # Add a -L argument. |
| 16274 | - newdeplibs="$newdeplibs $a_deplib" |
| 16275 | + func_append newdeplibs " $a_deplib" |
| 16276 | ;; |
| 16277 | esac |
| 16278 | done # Gone through all deplibs. |
| 16279 | @@ -7071,7 +8002,7 @@ EOF |
| 16280 | *) |
| 16281 | case " $deplibs " in |
| 16282 | *" -L$path/$objdir "*) |
| 16283 | - new_libs="$new_libs -L$path/$objdir" ;; |
| 16284 | + func_append new_libs " -L$path/$objdir" ;; |
| 16285 | esac |
| 16286 | ;; |
| 16287 | esac |
| 16288 | @@ -7081,10 +8012,10 @@ EOF |
| 16289 | -L*) |
| 16290 | case " $new_libs " in |
| 16291 | *" $deplib "*) ;; |
| 16292 | - *) new_libs="$new_libs $deplib" ;; |
| 16293 | + *) func_append new_libs " $deplib" ;; |
| 16294 | esac |
| 16295 | ;; |
| 16296 | - *) new_libs="$new_libs $deplib" ;; |
| 16297 | + *) func_append new_libs " $deplib" ;; |
| 16298 | esac |
| 16299 | done |
| 16300 | deplibs="$new_libs" |
| 16301 | @@ -7101,10 +8032,12 @@ EOF |
| 16302 | hardcode_libdirs= |
| 16303 | dep_rpath= |
| 16304 | rpath="$finalize_rpath" |
| 16305 | - test "$mode" != relink && rpath="$compile_rpath$rpath" |
| 16306 | + test "$opt_mode" != relink && rpath="$compile_rpath$rpath" |
| 16307 | for libdir in $rpath; do |
| 16308 | if test -n "$hardcode_libdir_flag_spec"; then |
| 16309 | if test -n "$hardcode_libdir_separator"; then |
| 16310 | + func_replace_sysroot "$libdir" |
| 16311 | + libdir=$func_replace_sysroot_result |
| 16312 | if test -z "$hardcode_libdirs"; then |
| 16313 | hardcode_libdirs="$libdir" |
| 16314 | else |
| 16315 | @@ -7113,18 +8046,18 @@ EOF |
| 16316 | *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) |
| 16317 | ;; |
| 16318 | *) |
| 16319 | - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" |
| 16320 | + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" |
| 16321 | ;; |
| 16322 | esac |
| 16323 | fi |
| 16324 | else |
| 16325 | - eval "flag=\"$hardcode_libdir_flag_spec\"" |
| 16326 | - dep_rpath="$dep_rpath $flag" |
| 16327 | + eval flag=\"$hardcode_libdir_flag_spec\" |
| 16328 | + func_append dep_rpath " $flag" |
| 16329 | fi |
| 16330 | elif test -n "$runpath_var"; then |
| 16331 | case "$perm_rpath " in |
| 16332 | *" $libdir "*) ;; |
| 16333 | - *) perm_rpath="$perm_rpath $libdir" ;; |
| 16334 | + *) func_apped perm_rpath " $libdir" ;; |
| 16335 | esac |
| 16336 | fi |
| 16337 | done |
| 16338 | @@ -7133,40 +8066,38 @@ EOF |
| 16339 | test -n "$hardcode_libdirs"; then |
| 16340 | libdir="$hardcode_libdirs" |
| 16341 | if test -n "$hardcode_libdir_flag_spec_ld"; then |
| 16342 | - eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\"" |
| 16343 | + eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" |
| 16344 | else |
| 16345 | - eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" |
| 16346 | + eval dep_rpath=\"$hardcode_libdir_flag_spec\" |
| 16347 | fi |
| 16348 | fi |
| 16349 | if test -n "$runpath_var" && test -n "$perm_rpath"; then |
| 16350 | # We should set the runpath_var. |
| 16351 | rpath= |
| 16352 | for dir in $perm_rpath; do |
| 16353 | - rpath="$rpath$dir:" |
| 16354 | + func_append rpath "$dir:" |
| 16355 | done |
| 16356 | - eval $runpath_var=\$rpath\$$runpath_var |
| 16357 | - export $runpath_var |
| 16358 | + eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" |
| 16359 | fi |
| 16360 | test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" |
| 16361 | fi |
| 16362 | |
| 16363 | shlibpath="$finalize_shlibpath" |
| 16364 | - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" |
| 16365 | + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" |
| 16366 | if test -n "$shlibpath"; then |
| 16367 | - eval $shlibpath_var=\$shlibpath\$$shlibpath_var |
| 16368 | - export $shlibpath_var |
| 16369 | + eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" |
| 16370 | fi |
| 16371 | |
| 16372 | # Get the real and link names of the library. |
| 16373 | - eval "shared_ext=\"$shrext_cmds\"" |
| 16374 | - eval "library_names=\"$library_names_spec\"" |
| 16375 | + eval shared_ext=\"$shrext_cmds\" |
| 16376 | + eval library_names=\"$library_names_spec\" |
| 16377 | set dummy $library_names |
| 16378 | shift |
| 16379 | realname="$1" |
| 16380 | shift |
| 16381 | |
| 16382 | if test -n "$soname_spec"; then |
| 16383 | - eval "soname=\"$soname_spec\"" |
| 16384 | + eval soname=\"$soname_spec\" |
| 16385 | else |
| 16386 | soname="$realname" |
| 16387 | fi |
| 16388 | @@ -7178,7 +8109,7 @@ EOF |
| 16389 | linknames= |
| 16390 | for link |
| 16391 | do |
| 16392 | - linknames="$linknames $link" |
| 16393 | + func_append linknames " $link" |
| 16394 | done |
| 16395 | |
| 16396 | # Use standard objects if they are pic |
| 16397 | @@ -7189,7 +8120,7 @@ EOF |
| 16398 | if test -n "$export_symbols" && test -n "$include_expsyms"; then |
| 16399 | $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" |
| 16400 | export_symbols="$output_objdir/$libname.uexp" |
| 16401 | - delfiles="$delfiles $export_symbols" |
| 16402 | + func_append delfiles " $export_symbols" |
| 16403 | fi |
| 16404 | |
| 16405 | orig_export_symbols= |
| 16406 | @@ -7220,13 +8151,45 @@ EOF |
| 16407 | $opt_dry_run || $RM $export_symbols |
| 16408 | cmds=$export_symbols_cmds |
| 16409 | save_ifs="$IFS"; IFS='~' |
| 16410 | - for cmd in $cmds; do |
| 16411 | + for cmd1 in $cmds; do |
| 16412 | IFS="$save_ifs" |
| 16413 | - eval "cmd=\"$cmd\"" |
| 16414 | - func_len " $cmd" |
| 16415 | - len=$func_len_result |
| 16416 | - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then |
| 16417 | + # Take the normal branch if the nm_file_list_spec branch |
| 16418 | + # doesn't work or if tool conversion is not needed. |
| 16419 | + case $nm_file_list_spec~$to_tool_file_cmd in |
| 16420 | + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) |
| 16421 | + try_normal_branch=yes |
| 16422 | + eval cmd=\"$cmd1\" |
| 16423 | + func_len " $cmd" |
| 16424 | + len=$func_len_result |
| 16425 | + ;; |
| 16426 | + *) |
| 16427 | + try_normal_branch=no |
| 16428 | + ;; |
| 16429 | + esac |
| 16430 | + if test "$try_normal_branch" = yes \ |
| 16431 | + && { test "$len" -lt "$max_cmd_len" \ |
| 16432 | + || test "$max_cmd_len" -le -1; } |
| 16433 | + then |
| 16434 | + func_show_eval "$cmd" 'exit $?' |
| 16435 | + skipped_export=false |
| 16436 | + elif test -n "$nm_file_list_spec"; then |
| 16437 | + func_basename "$output" |
| 16438 | + output_la=$func_basename_result |
| 16439 | + save_libobjs=$libobjs |
| 16440 | + save_output=$output |
| 16441 | + output=${output_objdir}/${output_la}.nm |
| 16442 | + func_to_tool_file "$output" |
| 16443 | + libobjs=$nm_file_list_spec$func_to_tool_file_result |
| 16444 | + func_append delfiles " $output" |
| 16445 | + func_verbose "creating $NM input file list: $output" |
| 16446 | + for obj in $save_libobjs; do |
| 16447 | + func_to_tool_file "$obj" |
| 16448 | + $ECHO "$func_to_tool_file_result" |
| 16449 | + done > "$output" |
| 16450 | + eval cmd=\"$cmd1\" |
| 16451 | func_show_eval "$cmd" 'exit $?' |
| 16452 | + output=$save_output |
| 16453 | + libobjs=$save_libobjs |
| 16454 | skipped_export=false |
| 16455 | else |
| 16456 | # The command line is too long to execute in one step. |
| 16457 | @@ -7248,7 +8211,7 @@ EOF |
| 16458 | if test -n "$export_symbols" && test -n "$include_expsyms"; then |
| 16459 | tmp_export_symbols="$export_symbols" |
| 16460 | test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" |
| 16461 | - $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" |
| 16462 | + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' |
| 16463 | fi |
| 16464 | |
| 16465 | if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then |
| 16466 | @@ -7260,7 +8223,7 @@ EOF |
| 16467 | # global variables. join(1) would be nice here, but unfortunately |
| 16468 | # isn't a blessed tool. |
| 16469 | $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter |
| 16470 | - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" |
| 16471 | + func_append delfiles " $export_symbols $output_objdir/$libname.filter" |
| 16472 | export_symbols=$output_objdir/$libname.def |
| 16473 | $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols |
| 16474 | fi |
| 16475 | @@ -7270,7 +8233,7 @@ EOF |
| 16476 | case " $convenience " in |
| 16477 | *" $test_deplib "*) ;; |
| 16478 | *) |
| 16479 | - tmp_deplibs="$tmp_deplibs $test_deplib" |
| 16480 | + func_append tmp_deplibs " $test_deplib" |
| 16481 | ;; |
| 16482 | esac |
| 16483 | done |
| 16484 | @@ -7286,43 +8249,43 @@ EOF |
| 16485 | fi |
| 16486 | if test -n "$whole_archive_flag_spec"; then |
| 16487 | save_libobjs=$libobjs |
| 16488 | - eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" |
| 16489 | + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" |
| 16490 | test "X$libobjs" = "X " && libobjs= |
| 16491 | else |
| 16492 | gentop="$output_objdir/${outputname}x" |
| 16493 | - generated="$generated $gentop" |
| 16494 | + func_append generated " $gentop" |
| 16495 | |
| 16496 | func_extract_archives $gentop $convenience |
| 16497 | - libobjs="$libobjs $func_extract_archives_result" |
| 16498 | + func_append libobjs " $func_extract_archives_result" |
| 16499 | test "X$libobjs" = "X " && libobjs= |
| 16500 | fi |
| 16501 | fi |
| 16502 | |
| 16503 | if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then |
| 16504 | - eval "flag=\"$thread_safe_flag_spec\"" |
| 16505 | - linker_flags="$linker_flags $flag" |
| 16506 | + eval flag=\"$thread_safe_flag_spec\" |
| 16507 | + func_append linker_flags " $flag" |
| 16508 | fi |
| 16509 | |
| 16510 | # Make a backup of the uninstalled library when relinking |
| 16511 | - if test "$mode" = relink; then |
| 16512 | - $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $? |
| 16513 | + if test "$opt_mode" = relink; then |
| 16514 | + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? |
| 16515 | fi |
| 16516 | |
| 16517 | # Do each of the archive commands. |
| 16518 | if test "$module" = yes && test -n "$module_cmds" ; then |
| 16519 | if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then |
| 16520 | - eval "test_cmds=\"$module_expsym_cmds\"" |
| 16521 | + eval test_cmds=\"$module_expsym_cmds\" |
| 16522 | cmds=$module_expsym_cmds |
| 16523 | else |
| 16524 | - eval "test_cmds=\"$module_cmds\"" |
| 16525 | + eval test_cmds=\"$module_cmds\" |
| 16526 | cmds=$module_cmds |
| 16527 | fi |
| 16528 | else |
| 16529 | if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then |
| 16530 | - eval "test_cmds=\"$archive_expsym_cmds\"" |
| 16531 | + eval test_cmds=\"$archive_expsym_cmds\" |
| 16532 | cmds=$archive_expsym_cmds |
| 16533 | else |
| 16534 | - eval "test_cmds=\"$archive_cmds\"" |
| 16535 | + eval test_cmds=\"$archive_cmds\" |
| 16536 | cmds=$archive_cmds |
| 16537 | fi |
| 16538 | fi |
| 16539 | @@ -7366,10 +8329,13 @@ EOF |
| 16540 | echo 'INPUT (' > $output |
| 16541 | for obj in $save_libobjs |
| 16542 | do |
| 16543 | - $ECHO "$obj" >> $output |
| 16544 | + func_to_tool_file "$obj" |
| 16545 | + $ECHO "$func_to_tool_file_result" >> $output |
| 16546 | done |
| 16547 | echo ')' >> $output |
| 16548 | - delfiles="$delfiles $output" |
| 16549 | + func_append delfiles " $output" |
| 16550 | + func_to_tool_file "$output" |
| 16551 | + output=$func_to_tool_file_result |
| 16552 | elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then |
| 16553 | output=${output_objdir}/${output_la}.lnk |
| 16554 | func_verbose "creating linker input file list: $output" |
| 16555 | @@ -7383,15 +8349,17 @@ EOF |
| 16556 | fi |
| 16557 | for obj |
| 16558 | do |
| 16559 | - $ECHO "$obj" >> $output |
| 16560 | + func_to_tool_file "$obj" |
| 16561 | + $ECHO "$func_to_tool_file_result" >> $output |
| 16562 | done |
| 16563 | - delfiles="$delfiles $output" |
| 16564 | - output=$firstobj\"$file_list_spec$output\" |
| 16565 | + func_append delfiles " $output" |
| 16566 | + func_to_tool_file "$output" |
| 16567 | + output=$firstobj\"$file_list_spec$func_to_tool_file_result\" |
| 16568 | else |
| 16569 | if test -n "$save_libobjs"; then |
| 16570 | func_verbose "creating reloadable object files..." |
| 16571 | output=$output_objdir/$output_la-${k}.$objext |
| 16572 | - eval "test_cmds=\"$reload_cmds\"" |
| 16573 | + eval test_cmds=\"$reload_cmds\" |
| 16574 | func_len " $test_cmds" |
| 16575 | len0=$func_len_result |
| 16576 | len=$len0 |
| 16577 | @@ -7411,12 +8379,12 @@ EOF |
| 16578 | if test "$k" -eq 1 ; then |
| 16579 | # The first file doesn't have a previous command to add. |
| 16580 | reload_objs=$objlist |
| 16581 | - eval "concat_cmds=\"$reload_cmds\"" |
| 16582 | + eval concat_cmds=\"$reload_cmds\" |
| 16583 | else |
| 16584 | # All subsequent reloadable object files will link in |
| 16585 | # the last one created. |
| 16586 | reload_objs="$objlist $last_robj" |
| 16587 | - eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"" |
| 16588 | + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" |
| 16589 | fi |
| 16590 | last_robj=$output_objdir/$output_la-${k}.$objext |
| 16591 | func_arith $k + 1 |
| 16592 | @@ -7433,11 +8401,11 @@ EOF |
| 16593 | # files will link in the last one created. |
| 16594 | test -z "$concat_cmds" || concat_cmds=$concat_cmds~ |
| 16595 | reload_objs="$objlist $last_robj" |
| 16596 | - eval "concat_cmds=\"\${concat_cmds}$reload_cmds\"" |
| 16597 | + eval concat_cmds=\"\${concat_cmds}$reload_cmds\" |
| 16598 | if test -n "$last_robj"; then |
| 16599 | - eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"" |
| 16600 | + eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" |
| 16601 | fi |
| 16602 | - delfiles="$delfiles $output" |
| 16603 | + func_append delfiles " $output" |
| 16604 | |
| 16605 | else |
| 16606 | output= |
| 16607 | @@ -7450,9 +8418,9 @@ EOF |
| 16608 | libobjs=$output |
| 16609 | # Append the command to create the export file. |
| 16610 | test -z "$concat_cmds" || concat_cmds=$concat_cmds~ |
| 16611 | - eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\"" |
| 16612 | + eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" |
| 16613 | if test -n "$last_robj"; then |
| 16614 | - eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\"" |
| 16615 | + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" |
| 16616 | fi |
| 16617 | fi |
| 16618 | |
| 16619 | @@ -7471,7 +8439,7 @@ EOF |
| 16620 | lt_exit=$? |
| 16621 | |
| 16622 | # Restore the uninstalled library and exit |
| 16623 | - if test "$mode" = relink; then |
| 16624 | + if test "$opt_mode" = relink; then |
| 16625 | ( cd "$output_objdir" && \ |
| 16626 | $RM "${realname}T" && \ |
| 16627 | $MV "${realname}U" "$realname" ) |
| 16628 | @@ -7492,7 +8460,7 @@ EOF |
| 16629 | if test -n "$export_symbols" && test -n "$include_expsyms"; then |
| 16630 | tmp_export_symbols="$export_symbols" |
| 16631 | test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" |
| 16632 | - $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" |
| 16633 | + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' |
| 16634 | fi |
| 16635 | |
| 16636 | if test -n "$orig_export_symbols"; then |
| 16637 | @@ -7504,7 +8472,7 @@ EOF |
| 16638 | # global variables. join(1) would be nice here, but unfortunately |
| 16639 | # isn't a blessed tool. |
| 16640 | $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter |
| 16641 | - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" |
| 16642 | + func_append delfiles " $export_symbols $output_objdir/$libname.filter" |
| 16643 | export_symbols=$output_objdir/$libname.def |
| 16644 | $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols |
| 16645 | fi |
| 16646 | @@ -7515,7 +8483,7 @@ EOF |
| 16647 | output=$save_output |
| 16648 | |
| 16649 | if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then |
| 16650 | - eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" |
| 16651 | + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" |
| 16652 | test "X$libobjs" = "X " && libobjs= |
| 16653 | fi |
| 16654 | # Expand the library linking commands again to reset the |
| 16655 | @@ -7539,23 +8507,23 @@ EOF |
| 16656 | |
| 16657 | if test -n "$delfiles"; then |
| 16658 | # Append the command to remove temporary files to $cmds. |
| 16659 | - eval "cmds=\"\$cmds~\$RM $delfiles\"" |
| 16660 | + eval cmds=\"\$cmds~\$RM $delfiles\" |
| 16661 | fi |
| 16662 | |
| 16663 | # Add any objects from preloaded convenience libraries |
| 16664 | if test -n "$dlprefiles"; then |
| 16665 | gentop="$output_objdir/${outputname}x" |
| 16666 | - generated="$generated $gentop" |
| 16667 | + func_append generated " $gentop" |
| 16668 | |
| 16669 | func_extract_archives $gentop $dlprefiles |
| 16670 | - libobjs="$libobjs $func_extract_archives_result" |
| 16671 | + func_append libobjs " $func_extract_archives_result" |
| 16672 | test "X$libobjs" = "X " && libobjs= |
| 16673 | fi |
| 16674 | |
| 16675 | save_ifs="$IFS"; IFS='~' |
| 16676 | for cmd in $cmds; do |
| 16677 | IFS="$save_ifs" |
| 16678 | - eval "cmd=\"$cmd\"" |
| 16679 | + eval cmd=\"$cmd\" |
| 16680 | $opt_silent || { |
| 16681 | func_quote_for_expand "$cmd" |
| 16682 | eval "func_echo $func_quote_for_expand_result" |
| 16683 | @@ -7564,7 +8532,7 @@ EOF |
| 16684 | lt_exit=$? |
| 16685 | |
| 16686 | # Restore the uninstalled library and exit |
| 16687 | - if test "$mode" = relink; then |
| 16688 | + if test "$opt_mode" = relink; then |
| 16689 | ( cd "$output_objdir" && \ |
| 16690 | $RM "${realname}T" && \ |
| 16691 | $MV "${realname}U" "$realname" ) |
| 16692 | @@ -7576,8 +8544,8 @@ EOF |
| 16693 | IFS="$save_ifs" |
| 16694 | |
| 16695 | # Restore the uninstalled library and exit |
| 16696 | - if test "$mode" = relink; then |
| 16697 | - $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $? |
| 16698 | + if test "$opt_mode" = relink; then |
| 16699 | + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? |
| 16700 | |
| 16701 | if test -n "$convenience"; then |
| 16702 | if test -z "$whole_archive_flag_spec"; then |
| 16703 | @@ -7656,17 +8624,20 @@ EOF |
| 16704 | |
| 16705 | if test -n "$convenience"; then |
| 16706 | if test -n "$whole_archive_flag_spec"; then |
| 16707 | - eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\"" |
| 16708 | + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" |
| 16709 | reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` |
| 16710 | else |
| 16711 | gentop="$output_objdir/${obj}x" |
| 16712 | - generated="$generated $gentop" |
| 16713 | + func_append generated " $gentop" |
| 16714 | |
| 16715 | func_extract_archives $gentop $convenience |
| 16716 | reload_conv_objs="$reload_objs $func_extract_archives_result" |
| 16717 | fi |
| 16718 | fi |
| 16719 | |
| 16720 | + # If we're not building shared, we need to use non_pic_objs |
| 16721 | + test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" |
| 16722 | + |
| 16723 | # Create the old-style object. |
| 16724 | reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test |
| 16725 | |
| 16726 | @@ -7690,7 +8661,7 @@ EOF |
| 16727 | # Create an invalid libtool object if no PIC, so that we don't |
| 16728 | # accidentally link it into a program. |
| 16729 | # $show "echo timestamp > $libobj" |
| 16730 | - # $opt_dry_run || echo timestamp > $libobj || exit $? |
| 16731 | + # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? |
| 16732 | exit $EXIT_SUCCESS |
| 16733 | fi |
| 16734 | |
| 16735 | @@ -7740,8 +8711,8 @@ EOF |
| 16736 | if test "$tagname" = CXX ; then |
| 16737 | case ${MACOSX_DEPLOYMENT_TARGET-10.0} in |
| 16738 | 10.[0123]) |
| 16739 | - compile_command="$compile_command ${wl}-bind_at_load" |
| 16740 | - finalize_command="$finalize_command ${wl}-bind_at_load" |
| 16741 | + func_append compile_command " ${wl}-bind_at_load" |
| 16742 | + func_append finalize_command " ${wl}-bind_at_load" |
| 16743 | ;; |
| 16744 | esac |
| 16745 | fi |
| 16746 | @@ -7761,7 +8732,7 @@ EOF |
| 16747 | *) |
| 16748 | case " $compile_deplibs " in |
| 16749 | *" -L$path/$objdir "*) |
| 16750 | - new_libs="$new_libs -L$path/$objdir" ;; |
| 16751 | + func_append new_libs " -L$path/$objdir" ;; |
| 16752 | esac |
| 16753 | ;; |
| 16754 | esac |
| 16755 | @@ -7771,17 +8742,17 @@ EOF |
| 16756 | -L*) |
| 16757 | case " $new_libs " in |
| 16758 | *" $deplib "*) ;; |
| 16759 | - *) new_libs="$new_libs $deplib" ;; |
| 16760 | + *) func_append new_libs " $deplib" ;; |
| 16761 | esac |
| 16762 | ;; |
| 16763 | - *) new_libs="$new_libs $deplib" ;; |
| 16764 | + *) func_append new_libs " $deplib" ;; |
| 16765 | esac |
| 16766 | done |
| 16767 | compile_deplibs="$new_libs" |
| 16768 | |
| 16769 | |
| 16770 | - compile_command="$compile_command $compile_deplibs" |
| 16771 | - finalize_command="$finalize_command $finalize_deplibs" |
| 16772 | + func_append compile_command " $compile_deplibs" |
| 16773 | + func_append finalize_command " $finalize_deplibs" |
| 16774 | |
| 16775 | if test -n "$rpath$xrpath"; then |
| 16776 | # If the user specified any rpath flags, then add them. |
| 16777 | @@ -7789,7 +8760,7 @@ EOF |
| 16778 | # This is the magic to use -rpath. |
| 16779 | case "$finalize_rpath " in |
| 16780 | *" $libdir "*) ;; |
| 16781 | - *) finalize_rpath="$finalize_rpath $libdir" ;; |
| 16782 | + *) func_append finalize_rpath " $libdir" ;; |
| 16783 | esac |
| 16784 | done |
| 16785 | fi |
| 16786 | @@ -7808,18 +8779,18 @@ EOF |
| 16787 | *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) |
| 16788 | ;; |
| 16789 | *) |
| 16790 | - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" |
| 16791 | + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" |
| 16792 | ;; |
| 16793 | esac |
| 16794 | fi |
| 16795 | else |
| 16796 | - eval "flag=\"$hardcode_libdir_flag_spec\"" |
| 16797 | - rpath="$rpath $flag" |
| 16798 | + eval flag=\"$hardcode_libdir_flag_spec\" |
| 16799 | + func_append rpath " $flag" |
| 16800 | fi |
| 16801 | elif test -n "$runpath_var"; then |
| 16802 | case "$perm_rpath " in |
| 16803 | *" $libdir "*) ;; |
| 16804 | - *) perm_rpath="$perm_rpath $libdir" ;; |
| 16805 | + *) func_append perm_rpath " $libdir" ;; |
| 16806 | esac |
| 16807 | fi |
| 16808 | case $host in |
| 16809 | @@ -7828,12 +8799,12 @@ EOF |
| 16810 | case :$dllsearchpath: in |
| 16811 | *":$libdir:"*) ;; |
| 16812 | ::) dllsearchpath=$libdir;; |
| 16813 | - *) dllsearchpath="$dllsearchpath:$libdir";; |
| 16814 | + *) func_append dllsearchpath ":$libdir";; |
| 16815 | esac |
| 16816 | case :$dllsearchpath: in |
| 16817 | *":$testbindir:"*) ;; |
| 16818 | ::) dllsearchpath=$testbindir;; |
| 16819 | - *) dllsearchpath="$dllsearchpath:$testbindir";; |
| 16820 | + *) func_append dllsearchpath ":$testbindir";; |
| 16821 | esac |
| 16822 | ;; |
| 16823 | esac |
| 16824 | @@ -7842,7 +8813,7 @@ EOF |
| 16825 | if test -n "$hardcode_libdir_separator" && |
| 16826 | test -n "$hardcode_libdirs"; then |
| 16827 | libdir="$hardcode_libdirs" |
| 16828 | - eval "rpath=\" $hardcode_libdir_flag_spec\"" |
| 16829 | + eval rpath=\" $hardcode_libdir_flag_spec\" |
| 16830 | fi |
| 16831 | compile_rpath="$rpath" |
| 16832 | |
| 16833 | @@ -7859,18 +8830,18 @@ EOF |
| 16834 | *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) |
| 16835 | ;; |
| 16836 | *) |
| 16837 | - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" |
| 16838 | + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" |
| 16839 | ;; |
| 16840 | esac |
| 16841 | fi |
| 16842 | else |
| 16843 | - eval "flag=\"$hardcode_libdir_flag_spec\"" |
| 16844 | - rpath="$rpath $flag" |
| 16845 | + eval flag=\"$hardcode_libdir_flag_spec\" |
| 16846 | + func_append rpath " $flag" |
| 16847 | fi |
| 16848 | elif test -n "$runpath_var"; then |
| 16849 | case "$finalize_perm_rpath " in |
| 16850 | *" $libdir "*) ;; |
| 16851 | - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; |
| 16852 | + *) func_append finalize_perm_rpath " $libdir" ;; |
| 16853 | esac |
| 16854 | fi |
| 16855 | done |
| 16856 | @@ -7878,7 +8849,7 @@ EOF |
| 16857 | if test -n "$hardcode_libdir_separator" && |
| 16858 | test -n "$hardcode_libdirs"; then |
| 16859 | libdir="$hardcode_libdirs" |
| 16860 | - eval "rpath=\" $hardcode_libdir_flag_spec\"" |
| 16861 | + eval rpath=\" $hardcode_libdir_flag_spec\" |
| 16862 | fi |
| 16863 | finalize_rpath="$rpath" |
| 16864 | |
| 16865 | @@ -7921,6 +8892,12 @@ EOF |
| 16866 | exit_status=0 |
| 16867 | func_show_eval "$link_command" 'exit_status=$?' |
| 16868 | |
| 16869 | + if test -n "$postlink_cmds"; then |
| 16870 | + func_to_tool_file "$output" |
| 16871 | + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` |
| 16872 | + func_execute_cmds "$postlink_cmds" 'exit $?' |
| 16873 | + fi |
| 16874 | + |
| 16875 | # Delete the generated files. |
| 16876 | if test -f "$output_objdir/${outputname}S.${objext}"; then |
| 16877 | func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' |
| 16878 | @@ -7943,7 +8920,7 @@ EOF |
| 16879 | # We should set the runpath_var. |
| 16880 | rpath= |
| 16881 | for dir in $perm_rpath; do |
| 16882 | - rpath="$rpath$dir:" |
| 16883 | + func_append rpath "$dir:" |
| 16884 | done |
| 16885 | compile_var="$runpath_var=\"$rpath\$$runpath_var\" " |
| 16886 | fi |
| 16887 | @@ -7951,7 +8928,7 @@ EOF |
| 16888 | # We should set the runpath_var. |
| 16889 | rpath= |
| 16890 | for dir in $finalize_perm_rpath; do |
| 16891 | - rpath="$rpath$dir:" |
| 16892 | + func_append rpath "$dir:" |
| 16893 | done |
| 16894 | finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " |
| 16895 | fi |
| 16896 | @@ -7966,6 +8943,13 @@ EOF |
| 16897 | $opt_dry_run || $RM $output |
| 16898 | # Link the executable and exit |
| 16899 | func_show_eval "$link_command" 'exit $?' |
| 16900 | + |
| 16901 | + if test -n "$postlink_cmds"; then |
| 16902 | + func_to_tool_file "$output" |
| 16903 | + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` |
| 16904 | + func_execute_cmds "$postlink_cmds" 'exit $?' |
| 16905 | + fi |
| 16906 | + |
| 16907 | exit $EXIT_SUCCESS |
| 16908 | fi |
| 16909 | |
| 16910 | @@ -7999,6 +8983,12 @@ EOF |
| 16911 | |
| 16912 | func_show_eval "$link_command" 'exit $?' |
| 16913 | |
| 16914 | + if test -n "$postlink_cmds"; then |
| 16915 | + func_to_tool_file "$output_objdir/$outputname" |
| 16916 | + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` |
| 16917 | + func_execute_cmds "$postlink_cmds" 'exit $?' |
| 16918 | + fi |
| 16919 | + |
| 16920 | # Now create the wrapper script. |
| 16921 | func_verbose "creating $output" |
| 16922 | |
| 16923 | @@ -8096,7 +9086,7 @@ EOF |
| 16924 | else |
| 16925 | oldobjs="$old_deplibs $non_pic_objects" |
| 16926 | if test "$preload" = yes && test -f "$symfileobj"; then |
| 16927 | - oldobjs="$oldobjs $symfileobj" |
| 16928 | + func_append oldobjs " $symfileobj" |
| 16929 | fi |
| 16930 | fi |
| 16931 | addlibs="$old_convenience" |
| 16932 | @@ -8104,10 +9094,10 @@ EOF |
| 16933 | |
| 16934 | if test -n "$addlibs"; then |
| 16935 | gentop="$output_objdir/${outputname}x" |
| 16936 | - generated="$generated $gentop" |
| 16937 | + func_append generated " $gentop" |
| 16938 | |
| 16939 | func_extract_archives $gentop $addlibs |
| 16940 | - oldobjs="$oldobjs $func_extract_archives_result" |
| 16941 | + func_append oldobjs " $func_extract_archives_result" |
| 16942 | fi |
| 16943 | |
| 16944 | # Do each command in the archive commands. |
| 16945 | @@ -8118,10 +9108,10 @@ EOF |
| 16946 | # Add any objects from preloaded convenience libraries |
| 16947 | if test -n "$dlprefiles"; then |
| 16948 | gentop="$output_objdir/${outputname}x" |
| 16949 | - generated="$generated $gentop" |
| 16950 | + func_append generated " $gentop" |
| 16951 | |
| 16952 | func_extract_archives $gentop $dlprefiles |
| 16953 | - oldobjs="$oldobjs $func_extract_archives_result" |
| 16954 | + func_append oldobjs " $func_extract_archives_result" |
| 16955 | fi |
| 16956 | |
| 16957 | # POSIX demands no paths to be encoded in archives. We have |
| 16958 | @@ -8139,7 +9129,7 @@ EOF |
| 16959 | else |
| 16960 | echo "copying selected object files to avoid basename conflicts..." |
| 16961 | gentop="$output_objdir/${outputname}x" |
| 16962 | - generated="$generated $gentop" |
| 16963 | + func_append generated " $gentop" |
| 16964 | func_mkdir_p "$gentop" |
| 16965 | save_oldobjs=$oldobjs |
| 16966 | oldobjs= |
| 16967 | @@ -8163,18 +9153,28 @@ EOF |
| 16968 | esac |
| 16969 | done |
| 16970 | func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" |
| 16971 | - oldobjs="$oldobjs $gentop/$newobj" |
| 16972 | + func_append oldobjs " $gentop/$newobj" |
| 16973 | ;; |
| 16974 | - *) oldobjs="$oldobjs $obj" ;; |
| 16975 | + *) func_append oldobjs " $obj" ;; |
| 16976 | esac |
| 16977 | done |
| 16978 | fi |
| 16979 | - eval "cmds=\"$old_archive_cmds\"" |
| 16980 | + eval cmds=\"$old_archive_cmds\" |
| 16981 | |
| 16982 | func_len " $cmds" |
| 16983 | len=$func_len_result |
| 16984 | if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then |
| 16985 | cmds=$old_archive_cmds |
| 16986 | + elif test -n "$archiver_list_spec"; then |
| 16987 | + func_verbose "using command file archive linking..." |
| 16988 | + for obj in $oldobjs |
| 16989 | + do |
| 16990 | + func_to_tool_file "$obj" |
| 16991 | + $ECHO "$func_to_tool_file_result" |
| 16992 | + done > $output_objdir/$libname.libcmd |
| 16993 | + func_to_tool_file "$output_objdir/$libname.libcmd" |
| 16994 | + oldobjs=" $archiver_list_spec$func_to_tool_file_result" |
| 16995 | + cmds=$old_archive_cmds |
| 16996 | else |
| 16997 | # the command line is too long to link in one step, link in parts |
| 16998 | func_verbose "using piecewise archive linking..." |
| 16999 | @@ -8189,7 +9189,7 @@ EOF |
| 17000 | do |
| 17001 | last_oldobj=$obj |
| 17002 | done |
| 17003 | - eval "test_cmds=\"$old_archive_cmds\"" |
| 17004 | + eval test_cmds=\"$old_archive_cmds\" |
| 17005 | func_len " $test_cmds" |
| 17006 | len0=$func_len_result |
| 17007 | len=$len0 |
| 17008 | @@ -8208,7 +9208,7 @@ EOF |
| 17009 | RANLIB=$save_RANLIB |
| 17010 | fi |
| 17011 | test -z "$concat_cmds" || concat_cmds=$concat_cmds~ |
| 17012 | - eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\"" |
| 17013 | + eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" |
| 17014 | objlist= |
| 17015 | len=$len0 |
| 17016 | fi |
| 17017 | @@ -8216,9 +9216,9 @@ EOF |
| 17018 | RANLIB=$save_RANLIB |
| 17019 | oldobjs=$objlist |
| 17020 | if test "X$oldobjs" = "X" ; then |
| 17021 | - eval "cmds=\"\$concat_cmds\"" |
| 17022 | + eval cmds=\"\$concat_cmds\" |
| 17023 | else |
| 17024 | - eval "cmds=\"\$concat_cmds~\$old_archive_cmds\"" |
| 17025 | + eval cmds=\"\$concat_cmds~\$old_archive_cmds\" |
| 17026 | fi |
| 17027 | fi |
| 17028 | fi |
| 17029 | @@ -8268,12 +9268,23 @@ EOF |
| 17030 | *.la) |
| 17031 | func_basename "$deplib" |
| 17032 | name="$func_basename_result" |
| 17033 | - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
| 17034 | + func_resolve_sysroot "$deplib" |
| 17035 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` |
| 17036 | test -z "$libdir" && \ |
| 17037 | func_fatal_error "\`$deplib' is not a valid libtool archive" |
| 17038 | - newdependency_libs="$newdependency_libs $libdir/$name" |
| 17039 | + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" |
| 17040 | + ;; |
| 17041 | + -L*) |
| 17042 | + func_stripname -L '' "$deplib" |
| 17043 | + func_replace_sysroot "$func_stripname_result" |
| 17044 | + func_append newdependency_libs " -L$func_replace_sysroot_result" |
| 17045 | ;; |
| 17046 | - *) newdependency_libs="$newdependency_libs $deplib" ;; |
| 17047 | + -R*) |
| 17048 | + func_stripname -R '' "$deplib" |
| 17049 | + func_replace_sysroot "$func_stripname_result" |
| 17050 | + func_append newdependency_libs " -R$func_replace_sysroot_result" |
| 17051 | + ;; |
| 17052 | + *) func_append newdependency_libs " $deplib" ;; |
| 17053 | esac |
| 17054 | done |
| 17055 | dependency_libs="$newdependency_libs" |
| 17056 | @@ -8284,12 +9295,14 @@ EOF |
| 17057 | *.la) |
| 17058 | func_basename "$lib" |
| 17059 | name="$func_basename_result" |
| 17060 | - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` |
| 17061 | + func_resolve_sysroot "$lib" |
| 17062 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` |
| 17063 | + |
| 17064 | test -z "$libdir" && \ |
| 17065 | func_fatal_error "\`$lib' is not a valid libtool archive" |
| 17066 | - newdlfiles="$newdlfiles $libdir/$name" |
| 17067 | + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" |
| 17068 | ;; |
| 17069 | - *) newdlfiles="$newdlfiles $lib" ;; |
| 17070 | + *) func_append newdlfiles " $lib" ;; |
| 17071 | esac |
| 17072 | done |
| 17073 | dlfiles="$newdlfiles" |
| 17074 | @@ -8303,10 +9316,11 @@ EOF |
| 17075 | # the library: |
| 17076 | func_basename "$lib" |
| 17077 | name="$func_basename_result" |
| 17078 | - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` |
| 17079 | + func_resolve_sysroot "$lib" |
| 17080 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` |
| 17081 | test -z "$libdir" && \ |
| 17082 | func_fatal_error "\`$lib' is not a valid libtool archive" |
| 17083 | - newdlprefiles="$newdlprefiles $libdir/$name" |
| 17084 | + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" |
| 17085 | ;; |
| 17086 | esac |
| 17087 | done |
| 17088 | @@ -8318,7 +9332,7 @@ EOF |
| 17089 | [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; |
| 17090 | *) abs=`pwd`"/$lib" ;; |
| 17091 | esac |
| 17092 | - newdlfiles="$newdlfiles $abs" |
| 17093 | + func_append newdlfiles " $abs" |
| 17094 | done |
| 17095 | dlfiles="$newdlfiles" |
| 17096 | newdlprefiles= |
| 17097 | @@ -8327,7 +9341,7 @@ EOF |
| 17098 | [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; |
| 17099 | *) abs=`pwd`"/$lib" ;; |
| 17100 | esac |
| 17101 | - newdlprefiles="$newdlprefiles $abs" |
| 17102 | + func_append newdlprefiles " $abs" |
| 17103 | done |
| 17104 | dlprefiles="$newdlprefiles" |
| 17105 | fi |
| 17106 | @@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\"" |
| 17107 | exit $EXIT_SUCCESS |
| 17108 | } |
| 17109 | |
| 17110 | -{ test "$mode" = link || test "$mode" = relink; } && |
| 17111 | +{ test "$opt_mode" = link || test "$opt_mode" = relink; } && |
| 17112 | func_mode_link ${1+"$@"} |
| 17113 | |
| 17114 | |
| 17115 | @@ -8432,9 +9446,9 @@ func_mode_uninstall () |
| 17116 | for arg |
| 17117 | do |
| 17118 | case $arg in |
| 17119 | - -f) RM="$RM $arg"; rmforce=yes ;; |
| 17120 | - -*) RM="$RM $arg" ;; |
| 17121 | - *) files="$files $arg" ;; |
| 17122 | + -f) func_append RM " $arg"; rmforce=yes ;; |
| 17123 | + -*) func_append RM " $arg" ;; |
| 17124 | + *) func_append files " $arg" ;; |
| 17125 | esac |
| 17126 | done |
| 17127 | |
| 17128 | @@ -8443,24 +9457,23 @@ func_mode_uninstall () |
| 17129 | |
| 17130 | rmdirs= |
| 17131 | |
| 17132 | - origobjdir="$objdir" |
| 17133 | for file in $files; do |
| 17134 | func_dirname "$file" "" "." |
| 17135 | dir="$func_dirname_result" |
| 17136 | if test "X$dir" = X.; then |
| 17137 | - objdir="$origobjdir" |
| 17138 | + odir="$objdir" |
| 17139 | else |
| 17140 | - objdir="$dir/$origobjdir" |
| 17141 | + odir="$dir/$objdir" |
| 17142 | fi |
| 17143 | func_basename "$file" |
| 17144 | name="$func_basename_result" |
| 17145 | - test "$mode" = uninstall && objdir="$dir" |
| 17146 | + test "$opt_mode" = uninstall && odir="$dir" |
| 17147 | |
| 17148 | - # Remember objdir for removal later, being careful to avoid duplicates |
| 17149 | - if test "$mode" = clean; then |
| 17150 | + # Remember odir for removal later, being careful to avoid duplicates |
| 17151 | + if test "$opt_mode" = clean; then |
| 17152 | case " $rmdirs " in |
| 17153 | - *" $objdir "*) ;; |
| 17154 | - *) rmdirs="$rmdirs $objdir" ;; |
| 17155 | + *" $odir "*) ;; |
| 17156 | + *) func_append rmdirs " $odir" ;; |
| 17157 | esac |
| 17158 | fi |
| 17159 | |
| 17160 | @@ -8486,18 +9499,17 @@ func_mode_uninstall () |
| 17161 | |
| 17162 | # Delete the libtool libraries and symlinks. |
| 17163 | for n in $library_names; do |
| 17164 | - rmfiles="$rmfiles $objdir/$n" |
| 17165 | + func_append rmfiles " $odir/$n" |
| 17166 | done |
| 17167 | - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" |
| 17168 | + test -n "$old_library" && func_append rmfiles " $odir/$old_library" |
| 17169 | |
| 17170 | - case "$mode" in |
| 17171 | + case "$opt_mode" in |
| 17172 | clean) |
| 17173 | - case " $library_names " in |
| 17174 | - # " " in the beginning catches empty $dlname |
| 17175 | + case " $library_names " in |
| 17176 | *" $dlname "*) ;; |
| 17177 | - *) rmfiles="$rmfiles $objdir/$dlname" ;; |
| 17178 | + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; |
| 17179 | esac |
| 17180 | - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" |
| 17181 | + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" |
| 17182 | ;; |
| 17183 | uninstall) |
| 17184 | if test -n "$library_names"; then |
| 17185 | @@ -8525,19 +9537,19 @@ func_mode_uninstall () |
| 17186 | # Add PIC object to the list of files to remove. |
| 17187 | if test -n "$pic_object" && |
| 17188 | test "$pic_object" != none; then |
| 17189 | - rmfiles="$rmfiles $dir/$pic_object" |
| 17190 | + func_append rmfiles " $dir/$pic_object" |
| 17191 | fi |
| 17192 | |
| 17193 | # Add non-PIC object to the list of files to remove. |
| 17194 | if test -n "$non_pic_object" && |
| 17195 | test "$non_pic_object" != none; then |
| 17196 | - rmfiles="$rmfiles $dir/$non_pic_object" |
| 17197 | + func_append rmfiles " $dir/$non_pic_object" |
| 17198 | fi |
| 17199 | fi |
| 17200 | ;; |
| 17201 | |
| 17202 | *) |
| 17203 | - if test "$mode" = clean ; then |
| 17204 | + if test "$opt_mode" = clean ; then |
| 17205 | noexename=$name |
| 17206 | case $file in |
| 17207 | *.exe) |
| 17208 | @@ -8547,7 +9559,7 @@ func_mode_uninstall () |
| 17209 | noexename=$func_stripname_result |
| 17210 | # $file with .exe has already been added to rmfiles, |
| 17211 | # add $file without .exe |
| 17212 | - rmfiles="$rmfiles $file" |
| 17213 | + func_append rmfiles " $file" |
| 17214 | ;; |
| 17215 | esac |
| 17216 | # Do a test to see if this is a libtool program. |
| 17217 | @@ -8556,7 +9568,7 @@ func_mode_uninstall () |
| 17218 | func_ltwrapper_scriptname "$file" |
| 17219 | relink_command= |
| 17220 | func_source $func_ltwrapper_scriptname_result |
| 17221 | - rmfiles="$rmfiles $func_ltwrapper_scriptname_result" |
| 17222 | + func_append rmfiles " $func_ltwrapper_scriptname_result" |
| 17223 | else |
| 17224 | relink_command= |
| 17225 | func_source $dir/$noexename |
| 17226 | @@ -8564,12 +9576,12 @@ func_mode_uninstall () |
| 17227 | |
| 17228 | # note $name still contains .exe if it was in $file originally |
| 17229 | # as does the version of $file that was added into $rmfiles |
| 17230 | - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" |
| 17231 | + func_append rmfiles " $odir/$name $odir/${name}S.${objext}" |
| 17232 | if test "$fast_install" = yes && test -n "$relink_command"; then |
| 17233 | - rmfiles="$rmfiles $objdir/lt-$name" |
| 17234 | + func_append rmfiles " $odir/lt-$name" |
| 17235 | fi |
| 17236 | if test "X$noexename" != "X$name" ; then |
| 17237 | - rmfiles="$rmfiles $objdir/lt-${noexename}.c" |
| 17238 | + func_append rmfiles " $odir/lt-${noexename}.c" |
| 17239 | fi |
| 17240 | fi |
| 17241 | fi |
| 17242 | @@ -8577,7 +9589,6 @@ func_mode_uninstall () |
| 17243 | esac |
| 17244 | func_show_eval "$RM $rmfiles" 'exit_status=1' |
| 17245 | done |
| 17246 | - objdir="$origobjdir" |
| 17247 | |
| 17248 | # Try to remove the ${objdir}s in the directories where we deleted files |
| 17249 | for dir in $rmdirs; do |
| 17250 | @@ -8589,16 +9600,16 @@ func_mode_uninstall () |
| 17251 | exit $exit_status |
| 17252 | } |
| 17253 | |
| 17254 | -{ test "$mode" = uninstall || test "$mode" = clean; } && |
| 17255 | +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && |
| 17256 | func_mode_uninstall ${1+"$@"} |
| 17257 | |
| 17258 | -test -z "$mode" && { |
| 17259 | +test -z "$opt_mode" && { |
| 17260 | help="$generic_help" |
| 17261 | func_fatal_help "you must specify a MODE" |
| 17262 | } |
| 17263 | |
| 17264 | test -z "$exec_cmd" && \ |
| 17265 | - func_fatal_help "invalid operation mode \`$mode'" |
| 17266 | + func_fatal_help "invalid operation mode \`$opt_mode'" |
| 17267 | |
| 17268 | if test -n "$exec_cmd"; then |
| 17269 | eval exec "$exec_cmd" |
| 17270 | diff --git a/ltoptions.m4 b/ltoptions.m4 |
| 17271 | index 5ef12ced2a..17cfd51c0b 100644 |
| 17272 | --- a/ltoptions.m4 |
| 17273 | +++ b/ltoptions.m4 |
| 17274 | @@ -8,7 +8,7 @@ |
| 17275 | # unlimited permission to copy and/or distribute it, with or without |
| 17276 | # modifications, as long as this notice is preserved. |
| 17277 | |
| 17278 | -# serial 6 ltoptions.m4 |
| 17279 | +# serial 7 ltoptions.m4 |
| 17280 | |
| 17281 | # This is to help aclocal find these macros, as it can't see m4_define. |
| 17282 | AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) |
| 17283 | diff --git a/ltversion.m4 b/ltversion.m4 |
| 17284 | index bf87f77132..9c7b5d4118 100644 |
| 17285 | --- a/ltversion.m4 |
| 17286 | +++ b/ltversion.m4 |
| 17287 | @@ -7,17 +7,17 @@ |
| 17288 | # unlimited permission to copy and/or distribute it, with or without |
| 17289 | # modifications, as long as this notice is preserved. |
| 17290 | |
| 17291 | -# Generated from ltversion.in. |
| 17292 | +# @configure_input@ |
| 17293 | |
| 17294 | -# serial 3134 ltversion.m4 |
| 17295 | +# serial 3293 ltversion.m4 |
| 17296 | # This file is part of GNU Libtool |
| 17297 | |
| 17298 | -m4_define([LT_PACKAGE_VERSION], [2.2.7a]) |
| 17299 | -m4_define([LT_PACKAGE_REVISION], [1.3134]) |
| 17300 | +m4_define([LT_PACKAGE_VERSION], [2.4]) |
| 17301 | +m4_define([LT_PACKAGE_REVISION], [1.3293]) |
| 17302 | |
| 17303 | AC_DEFUN([LTVERSION_VERSION], |
| 17304 | -[macro_version='2.2.7a' |
| 17305 | -macro_revision='1.3134' |
| 17306 | +[macro_version='2.4' |
| 17307 | +macro_revision='1.3293' |
| 17308 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) |
| 17309 | _LT_DECL(, macro_revision, 0) |
| 17310 | ]) |
| 17311 | diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 |
| 17312 | index bf92b5e079..c573da90c5 100644 |
| 17313 | --- a/lt~obsolete.m4 |
| 17314 | +++ b/lt~obsolete.m4 |
| 17315 | @@ -7,7 +7,7 @@ |
| 17316 | # unlimited permission to copy and/or distribute it, with or without |
| 17317 | # modifications, as long as this notice is preserved. |
| 17318 | |
| 17319 | -# serial 4 lt~obsolete.m4 |
| 17320 | +# serial 5 lt~obsolete.m4 |
| 17321 | |
| 17322 | # These exist entirely to fool aclocal when bootstrapping libtool. |
| 17323 | # |
| 17324 | diff --git a/opcodes/configure b/opcodes/configure |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 17325 | index 4f29887098..2127d39288 100755 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 17326 | --- a/opcodes/configure |
| 17327 | +++ b/opcodes/configure |
| 17328 | @@ -650,6 +650,9 @@ OTOOL |
| 17329 | LIPO |
| 17330 | NMEDIT |
| 17331 | DSYMUTIL |
| 17332 | +MANIFEST_TOOL |
| 17333 | +ac_ct_AR |
| 17334 | +DLLTOOL |
| 17335 | OBJDUMP |
| 17336 | LN_S |
| 17337 | NM |
| 17338 | @@ -763,6 +766,7 @@ enable_static |
| 17339 | with_pic |
| 17340 | enable_fast_install |
| 17341 | with_gnu_ld |
| 17342 | +with_libtool_sysroot |
| 17343 | enable_libtool_lock |
| 17344 | enable_targets |
| 17345 | enable_werror |
| 17346 | @@ -1423,6 +1427,8 @@ Optional Packages: |
| 17347 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 17348 | both] |
| 17349 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 17350 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 17351 | + (or the compiler's sysroot if not specified). |
| 17352 | |
| 17353 | Some influential environment variables: |
| 17354 | CC C compiler command |
| 17355 | @@ -5115,8 +5121,8 @@ esac |
| 17356 | |
| 17357 | |
| 17358 | |
| 17359 | -macro_version='2.2.7a' |
| 17360 | -macro_revision='1.3134' |
| 17361 | +macro_version='2.4' |
| 17362 | +macro_revision='1.3293' |
| 17363 | |
| 17364 | |
| 17365 | |
| 17366 | @@ -5156,7 +5162,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 17367 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 17368 | $as_echo_n "checking how to print strings... " >&6; } |
| 17369 | # Test print first, because it will be a builtin if present. |
| 17370 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 17371 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 17372 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 17373 | ECHO='print -r --' |
| 17374 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 17375 | @@ -5842,8 +5848,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 17376 | # Try some XSI features |
| 17377 | xsi_shell=no |
| 17378 | ( _lt_dummy="a/b/c" |
| 17379 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 17380 | - = c,a/b,, \ |
| 17381 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 17382 | + = c,a/b,b/c, \ |
| 17383 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 17384 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 17385 | && xsi_shell=yes |
| 17386 | @@ -5892,6 +5898,80 @@ esac |
| 17387 | |
| 17388 | |
| 17389 | |
| 17390 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 17391 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 17392 | +if test "${lt_cv_to_host_file_cmd+set}" = set; then : |
| 17393 | + $as_echo_n "(cached) " >&6 |
| 17394 | +else |
| 17395 | + case $host in |
| 17396 | + *-*-mingw* ) |
| 17397 | + case $build in |
| 17398 | + *-*-mingw* ) # actually msys |
| 17399 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 17400 | + ;; |
| 17401 | + *-*-cygwin* ) |
| 17402 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 17403 | + ;; |
| 17404 | + * ) # otherwise, assume *nix |
| 17405 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 17406 | + ;; |
| 17407 | + esac |
| 17408 | + ;; |
| 17409 | + *-*-cygwin* ) |
| 17410 | + case $build in |
| 17411 | + *-*-mingw* ) # actually msys |
| 17412 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 17413 | + ;; |
| 17414 | + *-*-cygwin* ) |
| 17415 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 17416 | + ;; |
| 17417 | + * ) # otherwise, assume *nix |
| 17418 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 17419 | + ;; |
| 17420 | + esac |
| 17421 | + ;; |
| 17422 | + * ) # unhandled hosts (and "normal" native builds) |
| 17423 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 17424 | + ;; |
| 17425 | +esac |
| 17426 | + |
| 17427 | +fi |
| 17428 | + |
| 17429 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 17430 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 17431 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 17432 | + |
| 17433 | + |
| 17434 | + |
| 17435 | + |
| 17436 | + |
| 17437 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 17438 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 17439 | +if test "${lt_cv_to_tool_file_cmd+set}" = set; then : |
| 17440 | + $as_echo_n "(cached) " >&6 |
| 17441 | +else |
| 17442 | + #assume ordinary cross tools, or native build. |
| 17443 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 17444 | +case $host in |
| 17445 | + *-*-mingw* ) |
| 17446 | + case $build in |
| 17447 | + *-*-mingw* ) # actually msys |
| 17448 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 17449 | + ;; |
| 17450 | + esac |
| 17451 | + ;; |
| 17452 | +esac |
| 17453 | + |
| 17454 | +fi |
| 17455 | + |
| 17456 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 17457 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 17458 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 17459 | + |
| 17460 | + |
| 17461 | + |
| 17462 | + |
| 17463 | + |
| 17464 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 17465 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 17466 | if test "${lt_cv_ld_reload_flag+set}" = set; then : |
| 17467 | @@ -5908,6 +5988,11 @@ case $reload_flag in |
| 17468 | esac |
| 17469 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 17470 | case $host_os in |
| 17471 | + cygwin* | mingw* | pw32* | cegcc*) |
| 17472 | + if test "$GCC" != yes; then |
| 17473 | + reload_cmds=false |
| 17474 | + fi |
| 17475 | + ;; |
| 17476 | darwin*) |
| 17477 | if test "$GCC" = yes; then |
| 17478 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 17479 | @@ -6076,7 +6161,8 @@ mingw* | pw32*) |
| 17480 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 17481 | lt_cv_file_magic_cmd='func_win32_libid' |
| 17482 | else |
| 17483 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 17484 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 17485 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 17486 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 17487 | fi |
| 17488 | ;; |
| 17489 | @@ -6230,6 +6316,21 @@ esac |
| 17490 | fi |
| 17491 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 17492 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 17493 | + |
| 17494 | +file_magic_glob= |
| 17495 | +want_nocaseglob=no |
| 17496 | +if test "$build" = "$host"; then |
| 17497 | + case $host_os in |
| 17498 | + mingw* | pw32*) |
| 17499 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 17500 | + want_nocaseglob=yes |
| 17501 | + else |
| 17502 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 17503 | + fi |
| 17504 | + ;; |
| 17505 | + esac |
| 17506 | +fi |
| 17507 | + |
| 17508 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 17509 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 17510 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 17511 | @@ -6243,11 +6344,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 17512 | |
| 17513 | |
| 17514 | |
| 17515 | + |
| 17516 | + |
| 17517 | + |
| 17518 | + |
| 17519 | + |
| 17520 | + |
| 17521 | + |
| 17522 | + |
| 17523 | + |
| 17524 | + |
| 17525 | |
| 17526 | |
| 17527 | if test -n "$ac_tool_prefix"; then |
| 17528 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 17529 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 17530 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 17531 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 17532 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 17533 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 17534 | +if test "${ac_cv_prog_DLLTOOL+set}" = set; then : |
| 17535 | + $as_echo_n "(cached) " >&6 |
| 17536 | +else |
| 17537 | + if test -n "$DLLTOOL"; then |
| 17538 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 17539 | +else |
| 17540 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 17541 | +for as_dir in $PATH |
| 17542 | +do |
| 17543 | + IFS=$as_save_IFS |
| 17544 | + test -z "$as_dir" && as_dir=. |
| 17545 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 17546 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 17547 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 17548 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 17549 | + break 2 |
| 17550 | + fi |
| 17551 | +done |
| 17552 | + done |
| 17553 | +IFS=$as_save_IFS |
| 17554 | + |
| 17555 | +fi |
| 17556 | +fi |
| 17557 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 17558 | +if test -n "$DLLTOOL"; then |
| 17559 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 17560 | +$as_echo "$DLLTOOL" >&6; } |
| 17561 | +else |
| 17562 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 17563 | +$as_echo "no" >&6; } |
| 17564 | +fi |
| 17565 | + |
| 17566 | + |
| 17567 | +fi |
| 17568 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 17569 | + ac_ct_DLLTOOL=$DLLTOOL |
| 17570 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 17571 | +set dummy dlltool; ac_word=$2 |
| 17572 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 17573 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 17574 | +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : |
| 17575 | + $as_echo_n "(cached) " >&6 |
| 17576 | +else |
| 17577 | + if test -n "$ac_ct_DLLTOOL"; then |
| 17578 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 17579 | +else |
| 17580 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 17581 | +for as_dir in $PATH |
| 17582 | +do |
| 17583 | + IFS=$as_save_IFS |
| 17584 | + test -z "$as_dir" && as_dir=. |
| 17585 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 17586 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 17587 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 17588 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 17589 | + break 2 |
| 17590 | + fi |
| 17591 | +done |
| 17592 | + done |
| 17593 | +IFS=$as_save_IFS |
| 17594 | + |
| 17595 | +fi |
| 17596 | +fi |
| 17597 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 17598 | +if test -n "$ac_ct_DLLTOOL"; then |
| 17599 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 17600 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 17601 | +else |
| 17602 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 17603 | +$as_echo "no" >&6; } |
| 17604 | +fi |
| 17605 | + |
| 17606 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 17607 | + DLLTOOL="false" |
| 17608 | + else |
| 17609 | + case $cross_compiling:$ac_tool_warned in |
| 17610 | +yes:) |
| 17611 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 17612 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 17613 | +ac_tool_warned=yes ;; |
| 17614 | +esac |
| 17615 | + DLLTOOL=$ac_ct_DLLTOOL |
| 17616 | + fi |
| 17617 | +else |
| 17618 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 17619 | +fi |
| 17620 | + |
| 17621 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 17622 | + |
| 17623 | + |
| 17624 | + |
| 17625 | + |
| 17626 | + |
| 17627 | + |
| 17628 | + |
| 17629 | + |
| 17630 | + |
| 17631 | + |
| 17632 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 17633 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 17634 | +if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : |
| 17635 | + $as_echo_n "(cached) " >&6 |
| 17636 | +else |
| 17637 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 17638 | + |
| 17639 | +case $host_os in |
| 17640 | +cygwin* | mingw* | pw32* | cegcc*) |
| 17641 | + # two different shell functions defined in ltmain.sh |
| 17642 | + # decide which to use based on capabilities of $DLLTOOL |
| 17643 | + case `$DLLTOOL --help 2>&1` in |
| 17644 | + *--identify-strict*) |
| 17645 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 17646 | + ;; |
| 17647 | + *) |
| 17648 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 17649 | + ;; |
| 17650 | + esac |
| 17651 | + ;; |
| 17652 | +*) |
| 17653 | + # fallback: assume linklib IS sharedlib |
| 17654 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 17655 | + ;; |
| 17656 | +esac |
| 17657 | + |
| 17658 | +fi |
| 17659 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 17660 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 17661 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 17662 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 17663 | + |
| 17664 | + |
| 17665 | + |
| 17666 | + |
| 17667 | + |
| 17668 | + |
| 17669 | + |
| 17670 | +if test -n "$ac_tool_prefix"; then |
| 17671 | + for ac_prog in ar |
| 17672 | + do |
| 17673 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 17674 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 17675 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 17676 | $as_echo_n "checking for $ac_word... " >&6; } |
| 17677 | if test "${ac_cv_prog_AR+set}" = set; then : |
| 17678 | @@ -6263,7 +6517,7 @@ do |
| 17679 | test -z "$as_dir" && as_dir=. |
| 17680 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 17681 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 17682 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 17683 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 17684 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 17685 | break 2 |
| 17686 | fi |
| 17687 | @@ -6283,11 +6537,15 @@ $as_echo "no" >&6; } |
| 17688 | fi |
| 17689 | |
| 17690 | |
| 17691 | + test -n "$AR" && break |
| 17692 | + done |
| 17693 | fi |
| 17694 | -if test -z "$ac_cv_prog_AR"; then |
| 17695 | +if test -z "$AR"; then |
| 17696 | ac_ct_AR=$AR |
| 17697 | - # Extract the first word of "ar", so it can be a program name with args. |
| 17698 | -set dummy ar; ac_word=$2 |
| 17699 | + for ac_prog in ar |
| 17700 | +do |
| 17701 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 17702 | +set dummy $ac_prog; ac_word=$2 |
| 17703 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 17704 | $as_echo_n "checking for $ac_word... " >&6; } |
| 17705 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
| 17706 | @@ -6303,7 +6561,7 @@ do |
| 17707 | test -z "$as_dir" && as_dir=. |
| 17708 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 17709 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 17710 | - ac_cv_prog_ac_ct_AR="ar" |
| 17711 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 17712 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 17713 | break 2 |
| 17714 | fi |
| 17715 | @@ -6322,6 +6580,10 @@ else |
| 17716 | $as_echo "no" >&6; } |
| 17717 | fi |
| 17718 | |
| 17719 | + |
| 17720 | + test -n "$ac_ct_AR" && break |
| 17721 | +done |
| 17722 | + |
| 17723 | if test "x$ac_ct_AR" = x; then |
| 17724 | AR="false" |
| 17725 | else |
| 17726 | @@ -6333,16 +6595,72 @@ ac_tool_warned=yes ;; |
| 17727 | esac |
| 17728 | AR=$ac_ct_AR |
| 17729 | fi |
| 17730 | -else |
| 17731 | - AR="$ac_cv_prog_AR" |
| 17732 | fi |
| 17733 | |
| 17734 | -test -z "$AR" && AR=ar |
| 17735 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 17736 | +: ${AR=ar} |
| 17737 | +: ${AR_FLAGS=cru} |
| 17738 | + |
| 17739 | + |
| 17740 | + |
| 17741 | + |
| 17742 | + |
| 17743 | + |
| 17744 | + |
| 17745 | + |
| 17746 | + |
| 17747 | + |
| 17748 | + |
| 17749 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 17750 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 17751 | +if test "${lt_cv_ar_at_file+set}" = set; then : |
| 17752 | + $as_echo_n "(cached) " >&6 |
| 17753 | +else |
| 17754 | + lt_cv_ar_at_file=no |
| 17755 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 17756 | +/* end confdefs.h. */ |
| 17757 | + |
| 17758 | +int |
| 17759 | +main () |
| 17760 | +{ |
| 17761 | |
| 17762 | + ; |
| 17763 | + return 0; |
| 17764 | +} |
| 17765 | +_ACEOF |
| 17766 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 17767 | + echo conftest.$ac_objext > conftest.lst |
| 17768 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 17769 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 17770 | + (eval $lt_ar_try) 2>&5 |
| 17771 | + ac_status=$? |
| 17772 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 17773 | + test $ac_status = 0; } |
| 17774 | + if test "$ac_status" -eq 0; then |
| 17775 | + # Ensure the archiver fails upon bogus file names. |
| 17776 | + rm -f conftest.$ac_objext libconftest.a |
| 17777 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 17778 | + (eval $lt_ar_try) 2>&5 |
| 17779 | + ac_status=$? |
| 17780 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 17781 | + test $ac_status = 0; } |
| 17782 | + if test "$ac_status" -ne 0; then |
| 17783 | + lt_cv_ar_at_file=@ |
| 17784 | + fi |
| 17785 | + fi |
| 17786 | + rm -f conftest.* libconftest.a |
| 17787 | |
| 17788 | +fi |
| 17789 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 17790 | |
| 17791 | +fi |
| 17792 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 17793 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 17794 | |
| 17795 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 17796 | + archiver_list_spec= |
| 17797 | +else |
| 17798 | + archiver_list_spec=$lt_cv_ar_at_file |
| 17799 | +fi |
| 17800 | |
| 17801 | |
| 17802 | |
| 17803 | @@ -6684,8 +7002,8 @@ esac |
| 17804 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 17805 | |
| 17806 | # Transform an extracted symbol line into symbol name and symbol address |
| 17807 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 17808 | -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
| 17809 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 17810 | +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
| 17811 | |
| 17812 | # Handle CRLF in mingw tool chain |
| 17813 | opt_cr= |
| 17814 | @@ -6721,6 +7039,7 @@ for ac_symprfx in "" "_"; do |
| 17815 | else |
| 17816 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 17817 | fi |
| 17818 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 17819 | |
| 17820 | # Check to see that the pipe works correctly. |
| 17821 | pipe_works=no |
| 17822 | @@ -6762,6 +7081,18 @@ _LT_EOF |
| 17823 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 17824 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 17825 | cat <<_LT_EOF > conftest.$ac_ext |
| 17826 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 17827 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 17828 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 17829 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 17830 | +# define LT_DLSYM_CONST |
| 17831 | +#elif defined(__osf__) |
| 17832 | +/* This system does not cope well with relocations in const data. */ |
| 17833 | +# define LT_DLSYM_CONST |
| 17834 | +#else |
| 17835 | +# define LT_DLSYM_CONST const |
| 17836 | +#endif |
| 17837 | + |
| 17838 | #ifdef __cplusplus |
| 17839 | extern "C" { |
| 17840 | #endif |
| 17841 | @@ -6773,7 +7104,7 @@ _LT_EOF |
| 17842 | cat <<_LT_EOF >> conftest.$ac_ext |
| 17843 | |
| 17844 | /* The mapping between symbol names and symbols. */ |
| 17845 | -const struct { |
| 17846 | +LT_DLSYM_CONST struct { |
| 17847 | const char *name; |
| 17848 | void *address; |
| 17849 | } |
| 17850 | @@ -6799,8 +7130,8 @@ static const void *lt_preloaded_setup() { |
| 17851 | _LT_EOF |
| 17852 | # Now try linking the two files. |
| 17853 | mv conftest.$ac_objext conftstm.$ac_objext |
| 17854 | - lt_save_LIBS="$LIBS" |
| 17855 | - lt_save_CFLAGS="$CFLAGS" |
| 17856 | + lt_globsym_save_LIBS=$LIBS |
| 17857 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 17858 | LIBS="conftstm.$ac_objext" |
| 17859 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 17860 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 17861 | @@ -6810,8 +7141,8 @@ _LT_EOF |
| 17862 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 17863 | pipe_works=yes |
| 17864 | fi |
| 17865 | - LIBS="$lt_save_LIBS" |
| 17866 | - CFLAGS="$lt_save_CFLAGS" |
| 17867 | + LIBS=$lt_globsym_save_LIBS |
| 17868 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 17869 | else |
| 17870 | echo "cannot find nm_test_func in $nlist" >&5 |
| 17871 | fi |
| 17872 | @@ -6848,6 +7179,16 @@ else |
| 17873 | $as_echo "ok" >&6; } |
| 17874 | fi |
| 17875 | |
| 17876 | +# Response file support. |
| 17877 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 17878 | + nm_file_list_spec='@' |
| 17879 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 17880 | + nm_file_list_spec='@' |
| 17881 | +fi |
| 17882 | + |
| 17883 | + |
| 17884 | + |
| 17885 | + |
| 17886 | |
| 17887 | |
| 17888 | |
| 17889 | @@ -6864,6 +7205,45 @@ fi |
| 17890 | |
| 17891 | |
| 17892 | |
| 17893 | + |
| 17894 | + |
| 17895 | + |
| 17896 | + |
| 17897 | + |
| 17898 | + |
| 17899 | + |
| 17900 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 17901 | +$as_echo_n "checking for sysroot... " >&6; } |
| 17902 | + |
| 17903 | +# Check whether --with-libtool-sysroot was given. |
| 17904 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 17905 | + withval=$with_libtool_sysroot; |
| 17906 | +else |
| 17907 | + with_libtool_sysroot=no |
| 17908 | +fi |
| 17909 | + |
| 17910 | + |
| 17911 | +lt_sysroot= |
| 17912 | +case ${with_libtool_sysroot} in #( |
| 17913 | + yes) |
| 17914 | + if test "$GCC" = yes; then |
| 17915 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 17916 | + fi |
| 17917 | + ;; #( |
| 17918 | + /*) |
| 17919 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 17920 | + ;; #( |
| 17921 | + no|'') |
| 17922 | + ;; #( |
| 17923 | + *) |
| 17924 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 17925 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 17926 | + as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 |
| 17927 | + ;; |
| 17928 | +esac |
| 17929 | + |
| 17930 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 17931 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 17932 | |
| 17933 | |
| 17934 | |
| 17935 | @@ -7075,6 +7455,123 @@ esac |
| 17936 | |
| 17937 | need_locks="$enable_libtool_lock" |
| 17938 | |
| 17939 | +if test -n "$ac_tool_prefix"; then |
| 17940 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 17941 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 17942 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 17943 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 17944 | +if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : |
| 17945 | + $as_echo_n "(cached) " >&6 |
| 17946 | +else |
| 17947 | + if test -n "$MANIFEST_TOOL"; then |
| 17948 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 17949 | +else |
| 17950 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 17951 | +for as_dir in $PATH |
| 17952 | +do |
| 17953 | + IFS=$as_save_IFS |
| 17954 | + test -z "$as_dir" && as_dir=. |
| 17955 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 17956 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 17957 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 17958 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 17959 | + break 2 |
| 17960 | + fi |
| 17961 | +done |
| 17962 | + done |
| 17963 | +IFS=$as_save_IFS |
| 17964 | + |
| 17965 | +fi |
| 17966 | +fi |
| 17967 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 17968 | +if test -n "$MANIFEST_TOOL"; then |
| 17969 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 17970 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 17971 | +else |
| 17972 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 17973 | +$as_echo "no" >&6; } |
| 17974 | +fi |
| 17975 | + |
| 17976 | + |
| 17977 | +fi |
| 17978 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 17979 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 17980 | + # Extract the first word of "mt", so it can be a program name with args. |
| 17981 | +set dummy mt; ac_word=$2 |
| 17982 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 17983 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 17984 | +if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : |
| 17985 | + $as_echo_n "(cached) " >&6 |
| 17986 | +else |
| 17987 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 17988 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 17989 | +else |
| 17990 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 17991 | +for as_dir in $PATH |
| 17992 | +do |
| 17993 | + IFS=$as_save_IFS |
| 17994 | + test -z "$as_dir" && as_dir=. |
| 17995 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 17996 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 17997 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 17998 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 17999 | + break 2 |
| 18000 | + fi |
| 18001 | +done |
| 18002 | + done |
| 18003 | +IFS=$as_save_IFS |
| 18004 | + |
| 18005 | +fi |
| 18006 | +fi |
| 18007 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 18008 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 18009 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 18010 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 18011 | +else |
| 18012 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 18013 | +$as_echo "no" >&6; } |
| 18014 | +fi |
| 18015 | + |
| 18016 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 18017 | + MANIFEST_TOOL=":" |
| 18018 | + else |
| 18019 | + case $cross_compiling:$ac_tool_warned in |
| 18020 | +yes:) |
| 18021 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 18022 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 18023 | +ac_tool_warned=yes ;; |
| 18024 | +esac |
| 18025 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 18026 | + fi |
| 18027 | +else |
| 18028 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 18029 | +fi |
| 18030 | + |
| 18031 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 18032 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 18033 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 18034 | +if test "${lt_cv_path_mainfest_tool+set}" = set; then : |
| 18035 | + $as_echo_n "(cached) " >&6 |
| 18036 | +else |
| 18037 | + lt_cv_path_mainfest_tool=no |
| 18038 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 18039 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 18040 | + cat conftest.err >&5 |
| 18041 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 18042 | + lt_cv_path_mainfest_tool=yes |
| 18043 | + fi |
| 18044 | + rm -f conftest* |
| 18045 | +fi |
| 18046 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 18047 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 18048 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 18049 | + MANIFEST_TOOL=: |
| 18050 | +fi |
| 18051 | + |
| 18052 | + |
| 18053 | + |
| 18054 | + |
| 18055 | + |
| 18056 | |
| 18057 | case $host_os in |
| 18058 | rhapsody* | darwin*) |
| 18059 | @@ -7638,6 +8135,8 @@ _LT_EOF |
| 18060 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 18061 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 18062 | $AR cru libconftest.a conftest.o 2>&5 |
| 18063 | + echo "$RANLIB libconftest.a" >&5 |
| 18064 | + $RANLIB libconftest.a 2>&5 |
| 18065 | cat > conftest.c << _LT_EOF |
| 18066 | int main() { return 0;} |
| 18067 | _LT_EOF |
| 18068 | @@ -7803,7 +8302,8 @@ fi |
| 18069 | LIBTOOL_DEPS="$ltmain" |
| 18070 | |
| 18071 | # Always use our own libtool. |
| 18072 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
| 18073 | +LIBTOOL='$(SHELL) $(top_builddir)' |
| 18074 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" |
| 18075 | |
| 18076 | |
| 18077 | |
| 18078 | @@ -7892,7 +8392,7 @@ aix3*) |
| 18079 | esac |
| 18080 | |
| 18081 | # Global variables: |
| 18082 | -ofile=libtool |
| 18083 | +ofile=${host_alias}-libtool |
| 18084 | can_build_shared=yes |
| 18085 | |
| 18086 | # All known linkers require a `.a' archive for static linking (except MSVC, |
| 18087 | @@ -8190,8 +8690,6 @@ fi |
| 18088 | lt_prog_compiler_pic= |
| 18089 | lt_prog_compiler_static= |
| 18090 | |
| 18091 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 18092 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 18093 | |
| 18094 | if test "$GCC" = yes; then |
| 18095 | lt_prog_compiler_wl='-Wl,' |
| 18096 | @@ -8357,6 +8855,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 18097 | lt_prog_compiler_pic='--shared' |
| 18098 | lt_prog_compiler_static='--static' |
| 18099 | ;; |
| 18100 | + nagfor*) |
| 18101 | + # NAG Fortran compiler |
| 18102 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 18103 | + lt_prog_compiler_pic='-PIC' |
| 18104 | + lt_prog_compiler_static='-Bstatic' |
| 18105 | + ;; |
| 18106 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 18107 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 18108 | # which looks to be a dead project) |
| 18109 | @@ -8419,7 +8923,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 18110 | lt_prog_compiler_pic='-KPIC' |
| 18111 | lt_prog_compiler_static='-Bstatic' |
| 18112 | case $cc_basename in |
| 18113 | - f77* | f90* | f95*) |
| 18114 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 18115 | lt_prog_compiler_wl='-Qoption ld ';; |
| 18116 | *) |
| 18117 | lt_prog_compiler_wl='-Wl,';; |
| 18118 | @@ -8476,13 +8980,17 @@ case $host_os in |
| 18119 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 18120 | ;; |
| 18121 | esac |
| 18122 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 18123 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 18124 | - |
| 18125 | - |
| 18126 | - |
| 18127 | - |
| 18128 | |
| 18129 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 18130 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 18131 | +if test "${lt_cv_prog_compiler_pic+set}" = set; then : |
| 18132 | + $as_echo_n "(cached) " >&6 |
| 18133 | +else |
| 18134 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 18135 | +fi |
| 18136 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 18137 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 18138 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 18139 | |
| 18140 | # |
| 18141 | # Check to make sure the PIC flag actually works. |
| 18142 | @@ -8543,6 +9051,11 @@ fi |
| 18143 | |
| 18144 | |
| 18145 | |
| 18146 | + |
| 18147 | + |
| 18148 | + |
| 18149 | + |
| 18150 | + |
| 18151 | # |
| 18152 | # Check to make sure the static flag actually works. |
| 18153 | # |
| 18154 | @@ -8893,7 +9406,8 @@ _LT_EOF |
| 18155 | allow_undefined_flag=unsupported |
| 18156 | always_export_symbols=no |
| 18157 | enable_shared_with_static_runtimes=yes |
| 18158 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 18159 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' |
| 18160 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 18161 | |
| 18162 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 18163 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 18164 | @@ -8992,12 +9506,12 @@ _LT_EOF |
| 18165 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 18166 | hardcode_libdir_flag_spec= |
| 18167 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 18168 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 18169 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 18170 | if test "x$supports_anon_versioning" = xyes; then |
| 18171 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 18172 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 18173 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 18174 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 18175 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 18176 | fi |
| 18177 | ;; |
| 18178 | esac |
| 18179 | @@ -9011,8 +9525,8 @@ _LT_EOF |
| 18180 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 18181 | wlarc= |
| 18182 | else |
| 18183 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 18184 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 18185 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 18186 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 18187 | fi |
| 18188 | ;; |
| 18189 | |
| 18190 | @@ -9030,8 +9544,8 @@ _LT_EOF |
| 18191 | |
| 18192 | _LT_EOF |
| 18193 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 18194 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 18195 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 18196 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 18197 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 18198 | else |
| 18199 | ld_shlibs=no |
| 18200 | fi |
| 18201 | @@ -9077,8 +9591,8 @@ _LT_EOF |
| 18202 | |
| 18203 | *) |
| 18204 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 18205 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 18206 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 18207 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 18208 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 18209 | else |
| 18210 | ld_shlibs=no |
| 18211 | fi |
| 18212 | @@ -9208,7 +9722,13 @@ _LT_EOF |
| 18213 | allow_undefined_flag='-berok' |
| 18214 | # Determine the default libpath from the value encoded in an |
| 18215 | # empty executable. |
| 18216 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 18217 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 18218 | + aix_libpath=$lt_cv_aix_libpath |
| 18219 | +else |
| 18220 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 18221 | + $as_echo_n "(cached) " >&6 |
| 18222 | +else |
| 18223 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 18224 | /* end confdefs.h. */ |
| 18225 | |
| 18226 | int |
| 18227 | @@ -9221,22 +9741,29 @@ main () |
| 18228 | _ACEOF |
| 18229 | if ac_fn_c_try_link "$LINENO"; then : |
| 18230 | |
| 18231 | -lt_aix_libpath_sed=' |
| 18232 | - /Import File Strings/,/^$/ { |
| 18233 | - /^0/ { |
| 18234 | - s/^0 *\(.*\)$/\1/ |
| 18235 | - p |
| 18236 | - } |
| 18237 | - }' |
| 18238 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18239 | -# Check for a 64-bit object if we didn't find anything. |
| 18240 | -if test -z "$aix_libpath"; then |
| 18241 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18242 | -fi |
| 18243 | + lt_aix_libpath_sed=' |
| 18244 | + /Import File Strings/,/^$/ { |
| 18245 | + /^0/ { |
| 18246 | + s/^0 *\([^ ]*\) *$/\1/ |
| 18247 | + p |
| 18248 | + } |
| 18249 | + }' |
| 18250 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18251 | + # Check for a 64-bit object if we didn't find anything. |
| 18252 | + if test -z "$lt_cv_aix_libpath_"; then |
| 18253 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18254 | + fi |
| 18255 | fi |
| 18256 | rm -f core conftest.err conftest.$ac_objext \ |
| 18257 | conftest$ac_exeext conftest.$ac_ext |
| 18258 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18259 | + if test -z "$lt_cv_aix_libpath_"; then |
| 18260 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 18261 | + fi |
| 18262 | + |
| 18263 | +fi |
| 18264 | + |
| 18265 | + aix_libpath=$lt_cv_aix_libpath_ |
| 18266 | +fi |
| 18267 | |
| 18268 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 18269 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
| 18270 | @@ -9248,7 +9775,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18271 | else |
| 18272 | # Determine the default libpath from the value encoded in an |
| 18273 | # empty executable. |
| 18274 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 18275 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 18276 | + aix_libpath=$lt_cv_aix_libpath |
| 18277 | +else |
| 18278 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 18279 | + $as_echo_n "(cached) " >&6 |
| 18280 | +else |
| 18281 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 18282 | /* end confdefs.h. */ |
| 18283 | |
| 18284 | int |
| 18285 | @@ -9261,22 +9794,29 @@ main () |
| 18286 | _ACEOF |
| 18287 | if ac_fn_c_try_link "$LINENO"; then : |
| 18288 | |
| 18289 | -lt_aix_libpath_sed=' |
| 18290 | - /Import File Strings/,/^$/ { |
| 18291 | - /^0/ { |
| 18292 | - s/^0 *\(.*\)$/\1/ |
| 18293 | - p |
| 18294 | - } |
| 18295 | - }' |
| 18296 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18297 | -# Check for a 64-bit object if we didn't find anything. |
| 18298 | -if test -z "$aix_libpath"; then |
| 18299 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18300 | -fi |
| 18301 | + lt_aix_libpath_sed=' |
| 18302 | + /Import File Strings/,/^$/ { |
| 18303 | + /^0/ { |
| 18304 | + s/^0 *\([^ ]*\) *$/\1/ |
| 18305 | + p |
| 18306 | + } |
| 18307 | + }' |
| 18308 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18309 | + # Check for a 64-bit object if we didn't find anything. |
| 18310 | + if test -z "$lt_cv_aix_libpath_"; then |
| 18311 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18312 | + fi |
| 18313 | fi |
| 18314 | rm -f core conftest.err conftest.$ac_objext \ |
| 18315 | conftest$ac_exeext conftest.$ac_ext |
| 18316 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18317 | + if test -z "$lt_cv_aix_libpath_"; then |
| 18318 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 18319 | + fi |
| 18320 | + |
| 18321 | +fi |
| 18322 | + |
| 18323 | + aix_libpath=$lt_cv_aix_libpath_ |
| 18324 | +fi |
| 18325 | |
| 18326 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 18327 | # Warning - without using the other run time loading flags, |
| 18328 | @@ -9321,20 +9861,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18329 | # Microsoft Visual C++. |
| 18330 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 18331 | # no search path for DLLs. |
| 18332 | - hardcode_libdir_flag_spec=' ' |
| 18333 | - allow_undefined_flag=unsupported |
| 18334 | - # Tell ltmain to make .lib files, not .a files. |
| 18335 | - libext=lib |
| 18336 | - # Tell ltmain to make .dll files, not .so files. |
| 18337 | - shrext_cmds=".dll" |
| 18338 | - # FIXME: Setting linknames here is a bad hack. |
| 18339 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 18340 | - # The linker will automatically build a .lib file if we build a DLL. |
| 18341 | - old_archive_from_new_cmds='true' |
| 18342 | - # FIXME: Should let the user specify the lib program. |
| 18343 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 18344 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 18345 | - enable_shared_with_static_runtimes=yes |
| 18346 | + case $cc_basename in |
| 18347 | + cl*) |
| 18348 | + # Native MSVC |
| 18349 | + hardcode_libdir_flag_spec=' ' |
| 18350 | + allow_undefined_flag=unsupported |
| 18351 | + always_export_symbols=yes |
| 18352 | + file_list_spec='@' |
| 18353 | + # Tell ltmain to make .lib files, not .a files. |
| 18354 | + libext=lib |
| 18355 | + # Tell ltmain to make .dll files, not .so files. |
| 18356 | + shrext_cmds=".dll" |
| 18357 | + # FIXME: Setting linknames here is a bad hack. |
| 18358 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 18359 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 18360 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 18361 | + else |
| 18362 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 18363 | + fi~ |
| 18364 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 18365 | + linknames=' |
| 18366 | + # The linker will not automatically build a static lib if we build a DLL. |
| 18367 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 18368 | + enable_shared_with_static_runtimes=yes |
| 18369 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 18370 | + # Don't use ranlib |
| 18371 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 18372 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 18373 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 18374 | + case $lt_outputfile in |
| 18375 | + *.exe|*.EXE) ;; |
| 18376 | + *) |
| 18377 | + lt_outputfile="$lt_outputfile.exe" |
| 18378 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 18379 | + ;; |
| 18380 | + esac~ |
| 18381 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 18382 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 18383 | + $RM "$lt_outputfile.manifest"; |
| 18384 | + fi' |
| 18385 | + ;; |
| 18386 | + *) |
| 18387 | + # Assume MSVC wrapper |
| 18388 | + hardcode_libdir_flag_spec=' ' |
| 18389 | + allow_undefined_flag=unsupported |
| 18390 | + # Tell ltmain to make .lib files, not .a files. |
| 18391 | + libext=lib |
| 18392 | + # Tell ltmain to make .dll files, not .so files. |
| 18393 | + shrext_cmds=".dll" |
| 18394 | + # FIXME: Setting linknames here is a bad hack. |
| 18395 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 18396 | + # The linker will automatically build a .lib file if we build a DLL. |
| 18397 | + old_archive_from_new_cmds='true' |
| 18398 | + # FIXME: Should let the user specify the lib program. |
| 18399 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 18400 | + enable_shared_with_static_runtimes=yes |
| 18401 | + ;; |
| 18402 | + esac |
| 18403 | ;; |
| 18404 | |
| 18405 | darwin* | rhapsody*) |
| 18406 | @@ -9395,7 +9978,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18407 | |
| 18408 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 18409 | freebsd* | dragonfly*) |
| 18410 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 18411 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 18412 | hardcode_libdir_flag_spec='-R$libdir' |
| 18413 | hardcode_direct=yes |
| 18414 | hardcode_shlibpath_var=no |
| 18415 | @@ -9403,7 +9986,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18416 | |
| 18417 | hpux9*) |
| 18418 | if test "$GCC" = yes; then |
| 18419 | - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 18420 | + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 18421 | else |
| 18422 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 18423 | fi |
| 18424 | @@ -9419,7 +10002,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18425 | |
| 18426 | hpux10*) |
| 18427 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 18428 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 18429 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 18430 | else |
| 18431 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 18432 | fi |
| 18433 | @@ -9443,10 +10026,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18434 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 18435 | ;; |
| 18436 | ia64*) |
| 18437 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 18438 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 18439 | ;; |
| 18440 | *) |
| 18441 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 18442 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 18443 | ;; |
| 18444 | esac |
| 18445 | else |
| 18446 | @@ -9525,23 +10108,36 @@ fi |
| 18447 | |
| 18448 | irix5* | irix6* | nonstopux*) |
| 18449 | if test "$GCC" = yes; then |
| 18450 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 18451 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 18452 | # Try to use the -exported_symbol ld option, if it does not |
| 18453 | # work, assume that -exports_file does not work either and |
| 18454 | # implicitly export all symbols. |
| 18455 | - save_LDFLAGS="$LDFLAGS" |
| 18456 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 18457 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 18458 | + # This should be the same for all languages, so no per-tag cache variable. |
| 18459 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 18460 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 18461 | +if test "${lt_cv_irix_exported_symbol+set}" = set; then : |
| 18462 | + $as_echo_n "(cached) " >&6 |
| 18463 | +else |
| 18464 | + save_LDFLAGS="$LDFLAGS" |
| 18465 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 18466 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 18467 | /* end confdefs.h. */ |
| 18468 | -int foo(void) {} |
| 18469 | +int foo (void) { return 0; } |
| 18470 | _ACEOF |
| 18471 | if ac_fn_c_try_link "$LINENO"; then : |
| 18472 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 18473 | - |
| 18474 | + lt_cv_irix_exported_symbol=yes |
| 18475 | +else |
| 18476 | + lt_cv_irix_exported_symbol=no |
| 18477 | fi |
| 18478 | rm -f core conftest.err conftest.$ac_objext \ |
| 18479 | conftest$ac_exeext conftest.$ac_ext |
| 18480 | - LDFLAGS="$save_LDFLAGS" |
| 18481 | + LDFLAGS="$save_LDFLAGS" |
| 18482 | +fi |
| 18483 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 18484 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 18485 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 18486 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 18487 | + fi |
| 18488 | else |
| 18489 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
| 18490 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
| 18491 | @@ -9626,7 +10222,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 18492 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 18493 | if test "$GCC" = yes; then |
| 18494 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 18495 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 18496 | + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 18497 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 18498 | else |
| 18499 | allow_undefined_flag=' -expect_unresolved \*' |
| 18500 | @@ -9645,9 +10241,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 18501 | no_undefined_flag=' -z defs' |
| 18502 | if test "$GCC" = yes; then |
| 18503 | wlarc='${wl}' |
| 18504 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 18505 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 18506 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 18507 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 18508 | + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 18509 | else |
| 18510 | case `$CC -V 2>&1` in |
| 18511 | *"Compilers 5.0"*) |
| 18512 | @@ -10223,8 +10819,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 18513 | need_version=no |
| 18514 | need_lib_prefix=no |
| 18515 | |
| 18516 | - case $GCC,$host_os in |
| 18517 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 18518 | + case $GCC,$cc_basename in |
| 18519 | + yes,*) |
| 18520 | + # gcc |
| 18521 | library_names_spec='$libname.dll.a' |
| 18522 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 18523 | postinstall_cmds='base_file=`basename \${file}`~ |
| 18524 | @@ -10257,13 +10854,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 18525 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 18526 | ;; |
| 18527 | esac |
| 18528 | + dynamic_linker='Win32 ld.exe' |
| 18529 | + ;; |
| 18530 | + |
| 18531 | + *,cl*) |
| 18532 | + # Native MSVC |
| 18533 | + libname_spec='$name' |
| 18534 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 18535 | + library_names_spec='${libname}.dll.lib' |
| 18536 | + |
| 18537 | + case $build_os in |
| 18538 | + mingw*) |
| 18539 | + sys_lib_search_path_spec= |
| 18540 | + lt_save_ifs=$IFS |
| 18541 | + IFS=';' |
| 18542 | + for lt_path in $LIB |
| 18543 | + do |
| 18544 | + IFS=$lt_save_ifs |
| 18545 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 18546 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 18547 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 18548 | + done |
| 18549 | + IFS=$lt_save_ifs |
| 18550 | + # Convert to MSYS style. |
| 18551 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 18552 | + ;; |
| 18553 | + cygwin*) |
| 18554 | + # Convert to unix form, then to dos form, then back to unix form |
| 18555 | + # but this time dos style (no spaces!) so that the unix form looks |
| 18556 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 18557 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 18558 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 18559 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 18560 | + ;; |
| 18561 | + *) |
| 18562 | + sys_lib_search_path_spec="$LIB" |
| 18563 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 18564 | + # It is most probably a Windows format PATH. |
| 18565 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 18566 | + else |
| 18567 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 18568 | + fi |
| 18569 | + # FIXME: find the short name or the path components, as spaces are |
| 18570 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 18571 | + ;; |
| 18572 | + esac |
| 18573 | + |
| 18574 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 18575 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 18576 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 18577 | + dldir=$destdir/`dirname \$dlpath`~ |
| 18578 | + test -d \$dldir || mkdir -p \$dldir~ |
| 18579 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 18580 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 18581 | + dlpath=$dir/\$dldll~ |
| 18582 | + $RM \$dlpath' |
| 18583 | + shlibpath_overrides_runpath=yes |
| 18584 | + dynamic_linker='Win32 link.exe' |
| 18585 | ;; |
| 18586 | |
| 18587 | *) |
| 18588 | + # Assume MSVC wrapper |
| 18589 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 18590 | + dynamic_linker='Win32 ld.exe' |
| 18591 | ;; |
| 18592 | esac |
| 18593 | - dynamic_linker='Win32 ld.exe' |
| 18594 | # FIXME: first we should search . and the directory the executable is in |
| 18595 | shlibpath_var=PATH |
| 18596 | ;; |
| 18597 | @@ -10355,7 +11010,7 @@ haiku*) |
| 18598 | soname_spec='${libname}${release}${shared_ext}$major' |
| 18599 | shlibpath_var=LIBRARY_PATH |
| 18600 | shlibpath_overrides_runpath=yes |
| 18601 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' |
| 18602 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
| 18603 | hardcode_into_libs=yes |
| 18604 | ;; |
| 18605 | |
| 18606 | @@ -11195,10 +11850,10 @@ else |
| 18607 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 18608 | correspondingly for the symbols needed. */ |
| 18609 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 18610 | -void fnord () __attribute__((visibility("default"))); |
| 18611 | +int fnord () __attribute__((visibility("default"))); |
| 18612 | #endif |
| 18613 | |
| 18614 | -void fnord () { int i=42; } |
| 18615 | +int fnord () { return 42; } |
| 18616 | int main () |
| 18617 | { |
| 18618 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 18619 | @@ -11301,10 +11956,10 @@ else |
| 18620 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 18621 | correspondingly for the symbols needed. */ |
| 18622 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 18623 | -void fnord () __attribute__((visibility("default"))); |
| 18624 | +int fnord () __attribute__((visibility("default"))); |
| 18625 | #endif |
| 18626 | |
| 18627 | -void fnord () { int i=42; } |
| 18628 | +int fnord () { return 42; } |
| 18629 | int main () |
| 18630 | { |
| 18631 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 18632 | @@ -12543,7 +13198,7 @@ if test "$enable_shared" = "yes"; then |
| 18633 | # since libbfd may not pull in the entirety of libiberty. |
| 18634 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` |
| 18635 | if test -n "$x"; then |
| 18636 | - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" |
| 18637 | + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" |
| 18638 | fi |
| 18639 | |
| 18640 | case "${host}" in |
| 18641 | @@ -13520,13 +14175,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
| 18642 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 18643 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 18644 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 18645 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 18646 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 18647 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 18648 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 18649 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 18650 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 18651 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 18652 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 18653 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 18654 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 18655 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 18656 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 18657 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 18658 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 18659 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 18660 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 18661 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
| 18662 | @@ -13541,14 +14203,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
| 18663 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 18664 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 18665 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 18666 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 18667 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 18668 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 18669 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 18670 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 18671 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 18672 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 18673 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 18674 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 18675 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 18676 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 18677 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 18678 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 18679 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 18680 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
| 18681 | @@ -13581,12 +14246,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
| 18682 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 18683 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 18684 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 18685 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 18686 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 18687 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 18688 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 18689 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 18690 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 18691 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 18692 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 18693 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 18694 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 18695 | @@ -13641,8 +14306,13 @@ reload_flag \ |
| 18696 | OBJDUMP \ |
| 18697 | deplibs_check_method \ |
| 18698 | file_magic_cmd \ |
| 18699 | +file_magic_glob \ |
| 18700 | +want_nocaseglob \ |
| 18701 | +DLLTOOL \ |
| 18702 | +sharedlib_from_linklib_cmd \ |
| 18703 | AR \ |
| 18704 | AR_FLAGS \ |
| 18705 | +archiver_list_spec \ |
| 18706 | STRIP \ |
| 18707 | RANLIB \ |
| 18708 | CC \ |
| 18709 | @@ -13652,12 +14322,14 @@ lt_cv_sys_global_symbol_pipe \ |
| 18710 | lt_cv_sys_global_symbol_to_cdecl \ |
| 18711 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 18712 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 18713 | +nm_file_list_spec \ |
| 18714 | lt_prog_compiler_no_builtin_flag \ |
| 18715 | -lt_prog_compiler_wl \ |
| 18716 | lt_prog_compiler_pic \ |
| 18717 | +lt_prog_compiler_wl \ |
| 18718 | lt_prog_compiler_static \ |
| 18719 | lt_cv_prog_compiler_c_o \ |
| 18720 | need_locks \ |
| 18721 | +MANIFEST_TOOL \ |
| 18722 | DSYMUTIL \ |
| 18723 | NMEDIT \ |
| 18724 | LIPO \ |
| 18725 | @@ -13673,7 +14345,6 @@ no_undefined_flag \ |
| 18726 | hardcode_libdir_flag_spec \ |
| 18727 | hardcode_libdir_flag_spec_ld \ |
| 18728 | hardcode_libdir_separator \ |
| 18729 | -fix_srcfile_path \ |
| 18730 | exclude_expsyms \ |
| 18731 | include_expsyms \ |
| 18732 | file_list_spec \ |
| 18733 | @@ -13709,6 +14380,7 @@ module_cmds \ |
| 18734 | module_expsym_cmds \ |
| 18735 | export_symbols_cmds \ |
| 18736 | prelink_cmds \ |
| 18737 | +postlink_cmds \ |
| 18738 | postinstall_cmds \ |
| 18739 | postuninstall_cmds \ |
| 18740 | finish_cmds \ |
| 18741 | @@ -14465,7 +15137,8 @@ $as_echo X"$file" | |
| 18742 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 18743 | # |
| 18744 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 18745 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 18746 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 18747 | +# Inc. |
| 18748 | # Written by Gordon Matzigkeit, 1996 |
| 18749 | # |
| 18750 | # This file is part of GNU Libtool. |
| 18751 | @@ -14568,19 +15241,42 @@ SP2NL=$lt_lt_SP2NL |
| 18752 | # turn newlines into spaces. |
| 18753 | NL2SP=$lt_lt_NL2SP |
| 18754 | |
| 18755 | +# convert \$build file names to \$host format. |
| 18756 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 18757 | + |
| 18758 | +# convert \$build files to toolchain format. |
| 18759 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 18760 | + |
| 18761 | # An object symbol dumper. |
| 18762 | OBJDUMP=$lt_OBJDUMP |
| 18763 | |
| 18764 | # Method to check whether dependent libraries are shared objects. |
| 18765 | deplibs_check_method=$lt_deplibs_check_method |
| 18766 | |
| 18767 | -# Command to use when deplibs_check_method == "file_magic". |
| 18768 | +# Command to use when deplibs_check_method = "file_magic". |
| 18769 | file_magic_cmd=$lt_file_magic_cmd |
| 18770 | |
| 18771 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 18772 | +file_magic_glob=$lt_file_magic_glob |
| 18773 | + |
| 18774 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 18775 | +want_nocaseglob=$lt_want_nocaseglob |
| 18776 | + |
| 18777 | +# DLL creation program. |
| 18778 | +DLLTOOL=$lt_DLLTOOL |
| 18779 | + |
| 18780 | +# Command to associate shared and link libraries. |
| 18781 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 18782 | + |
| 18783 | # The archiver. |
| 18784 | AR=$lt_AR |
| 18785 | + |
| 18786 | +# Flags to create an archive. |
| 18787 | AR_FLAGS=$lt_AR_FLAGS |
| 18788 | |
| 18789 | +# How to feed a file listing to the archiver. |
| 18790 | +archiver_list_spec=$lt_archiver_list_spec |
| 18791 | + |
| 18792 | # A symbol stripping program. |
| 18793 | STRIP=$lt_STRIP |
| 18794 | |
| 18795 | @@ -14610,6 +15306,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
| 18796 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 18797 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 18798 | |
| 18799 | +# Specify filename containing input files for \$NM. |
| 18800 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 18801 | + |
| 18802 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 18803 | +lt_sysroot=$lt_sysroot |
| 18804 | + |
| 18805 | # The name of the directory that contains temporary libtool files. |
| 18806 | objdir=$objdir |
| 18807 | |
| 18808 | @@ -14619,6 +15321,9 @@ MAGIC_CMD=$MAGIC_CMD |
| 18809 | # Must we lock files when doing compilation? |
| 18810 | need_locks=$lt_need_locks |
| 18811 | |
| 18812 | +# Manifest tool. |
| 18813 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 18814 | + |
| 18815 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 18816 | DSYMUTIL=$lt_DSYMUTIL |
| 18817 | |
| 18818 | @@ -14733,12 +15438,12 @@ with_gcc=$GCC |
| 18819 | # Compiler flag to turn off builtin functions. |
| 18820 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 18821 | |
| 18822 | -# How to pass a linker flag through the compiler. |
| 18823 | -wl=$lt_lt_prog_compiler_wl |
| 18824 | - |
| 18825 | # Additional compiler flags for building library objects. |
| 18826 | pic_flag=$lt_lt_prog_compiler_pic |
| 18827 | |
| 18828 | +# How to pass a linker flag through the compiler. |
| 18829 | +wl=$lt_lt_prog_compiler_wl |
| 18830 | + |
| 18831 | # Compiler flag to prevent dynamic linking. |
| 18832 | link_static_flag=$lt_lt_prog_compiler_static |
| 18833 | |
| 18834 | @@ -14825,9 +15530,6 @@ inherit_rpath=$inherit_rpath |
| 18835 | # Whether libtool must link a program against all its dependency libraries. |
| 18836 | link_all_deplibs=$link_all_deplibs |
| 18837 | |
| 18838 | -# Fix the shell variable \$srcfile for the compiler. |
| 18839 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 18840 | - |
| 18841 | # Set to "yes" if exported symbols are required. |
| 18842 | always_export_symbols=$always_export_symbols |
| 18843 | |
| 18844 | @@ -14843,6 +15545,9 @@ include_expsyms=$lt_include_expsyms |
| 18845 | # Commands necessary for linking programs (against libraries) with templates. |
| 18846 | prelink_cmds=$lt_prelink_cmds |
| 18847 | |
| 18848 | +# Commands necessary for finishing linking programs. |
| 18849 | +postlink_cmds=$lt_postlink_cmds |
| 18850 | + |
| 18851 | # Specify filename containing input files. |
| 18852 | file_list_spec=$lt_file_list_spec |
| 18853 | |
| 18854 | @@ -14875,210 +15580,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
| 18855 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 18856 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 18857 | # is reportedly fixed, but why not run on old versions too? |
| 18858 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 18859 | - || (rm -f "$cfgfile"; exit 1) |
| 18860 | - |
| 18861 | - case $xsi_shell in |
| 18862 | - yes) |
| 18863 | - cat << \_LT_EOF >> "$cfgfile" |
| 18864 | - |
| 18865 | -# func_dirname file append nondir_replacement |
| 18866 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 18867 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 18868 | -func_dirname () |
| 18869 | -{ |
| 18870 | - case ${1} in |
| 18871 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 18872 | - * ) func_dirname_result="${3}" ;; |
| 18873 | - esac |
| 18874 | -} |
| 18875 | - |
| 18876 | -# func_basename file |
| 18877 | -func_basename () |
| 18878 | -{ |
| 18879 | - func_basename_result="${1##*/}" |
| 18880 | -} |
| 18881 | - |
| 18882 | -# func_dirname_and_basename file append nondir_replacement |
| 18883 | -# perform func_basename and func_dirname in a single function |
| 18884 | -# call: |
| 18885 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 18886 | -# add APPEND to the result, otherwise set result |
| 18887 | -# to NONDIR_REPLACEMENT. |
| 18888 | -# value returned in "$func_dirname_result" |
| 18889 | -# basename: Compute filename of FILE. |
| 18890 | -# value retuned in "$func_basename_result" |
| 18891 | -# Implementation must be kept synchronized with func_dirname |
| 18892 | -# and func_basename. For efficiency, we do not delegate to |
| 18893 | -# those functions but instead duplicate the functionality here. |
| 18894 | -func_dirname_and_basename () |
| 18895 | -{ |
| 18896 | - case ${1} in |
| 18897 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 18898 | - * ) func_dirname_result="${3}" ;; |
| 18899 | - esac |
| 18900 | - func_basename_result="${1##*/}" |
| 18901 | -} |
| 18902 | - |
| 18903 | -# func_stripname prefix suffix name |
| 18904 | -# strip PREFIX and SUFFIX off of NAME. |
| 18905 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 18906 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 18907 | -# dot (in which case that matches only a dot). |
| 18908 | -func_stripname () |
| 18909 | -{ |
| 18910 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 18911 | - # positional parameters, so assign one to ordinary parameter first. |
| 18912 | - func_stripname_result=${3} |
| 18913 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 18914 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 18915 | -} |
| 18916 | - |
| 18917 | -# func_opt_split |
| 18918 | -func_opt_split () |
| 18919 | -{ |
| 18920 | - func_opt_split_opt=${1%%=*} |
| 18921 | - func_opt_split_arg=${1#*=} |
| 18922 | -} |
| 18923 | - |
| 18924 | -# func_lo2o object |
| 18925 | -func_lo2o () |
| 18926 | -{ |
| 18927 | - case ${1} in |
| 18928 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 18929 | - *) func_lo2o_result=${1} ;; |
| 18930 | - esac |
| 18931 | -} |
| 18932 | - |
| 18933 | -# func_xform libobj-or-source |
| 18934 | -func_xform () |
| 18935 | -{ |
| 18936 | - func_xform_result=${1%.*}.lo |
| 18937 | -} |
| 18938 | - |
| 18939 | -# func_arith arithmetic-term... |
| 18940 | -func_arith () |
| 18941 | -{ |
| 18942 | - func_arith_result=$(( $* )) |
| 18943 | -} |
| 18944 | - |
| 18945 | -# func_len string |
| 18946 | -# STRING may not start with a hyphen. |
| 18947 | -func_len () |
| 18948 | -{ |
| 18949 | - func_len_result=${#1} |
| 18950 | -} |
| 18951 | - |
| 18952 | -_LT_EOF |
| 18953 | - ;; |
| 18954 | - *) # Bourne compatible functions. |
| 18955 | - cat << \_LT_EOF >> "$cfgfile" |
| 18956 | - |
| 18957 | -# func_dirname file append nondir_replacement |
| 18958 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 18959 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 18960 | -func_dirname () |
| 18961 | -{ |
| 18962 | - # Extract subdirectory from the argument. |
| 18963 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 18964 | - if test "X$func_dirname_result" = "X${1}"; then |
| 18965 | - func_dirname_result="${3}" |
| 18966 | - else |
| 18967 | - func_dirname_result="$func_dirname_result${2}" |
| 18968 | - fi |
| 18969 | -} |
| 18970 | - |
| 18971 | -# func_basename file |
| 18972 | -func_basename () |
| 18973 | -{ |
| 18974 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 18975 | -} |
| 18976 | - |
| 18977 | - |
| 18978 | -# func_stripname prefix suffix name |
| 18979 | -# strip PREFIX and SUFFIX off of NAME. |
| 18980 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 18981 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 18982 | -# dot (in which case that matches only a dot). |
| 18983 | -# func_strip_suffix prefix name |
| 18984 | -func_stripname () |
| 18985 | -{ |
| 18986 | - case ${2} in |
| 18987 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 18988 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 18989 | - esac |
| 18990 | -} |
| 18991 | - |
| 18992 | -# sed scripts: |
| 18993 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 18994 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 18995 | - |
| 18996 | -# func_opt_split |
| 18997 | -func_opt_split () |
| 18998 | -{ |
| 18999 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 19000 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 19001 | -} |
| 19002 | - |
| 19003 | -# func_lo2o object |
| 19004 | -func_lo2o () |
| 19005 | -{ |
| 19006 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 19007 | -} |
| 19008 | - |
| 19009 | -# func_xform libobj-or-source |
| 19010 | -func_xform () |
| 19011 | -{ |
| 19012 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 19013 | -} |
| 19014 | - |
| 19015 | -# func_arith arithmetic-term... |
| 19016 | -func_arith () |
| 19017 | -{ |
| 19018 | - func_arith_result=`expr "$@"` |
| 19019 | -} |
| 19020 | - |
| 19021 | -# func_len string |
| 19022 | -# STRING may not start with a hyphen. |
| 19023 | -func_len () |
| 19024 | -{ |
| 19025 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 19026 | -} |
| 19027 | - |
| 19028 | -_LT_EOF |
| 19029 | -esac |
| 19030 | - |
| 19031 | -case $lt_shell_append in |
| 19032 | - yes) |
| 19033 | - cat << \_LT_EOF >> "$cfgfile" |
| 19034 | - |
| 19035 | -# func_append var value |
| 19036 | -# Append VALUE to the end of shell variable VAR. |
| 19037 | -func_append () |
| 19038 | -{ |
| 19039 | - eval "$1+=\$2" |
| 19040 | -} |
| 19041 | -_LT_EOF |
| 19042 | - ;; |
| 19043 | - *) |
| 19044 | - cat << \_LT_EOF >> "$cfgfile" |
| 19045 | - |
| 19046 | -# func_append var value |
| 19047 | -# Append VALUE to the end of shell variable VAR. |
| 19048 | -func_append () |
| 19049 | -{ |
| 19050 | - eval "$1=\$$1\$2" |
| 19051 | -} |
| 19052 | - |
| 19053 | -_LT_EOF |
| 19054 | - ;; |
| 19055 | - esac |
| 19056 | - |
| 19057 | - |
| 19058 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 19059 | - || (rm -f "$cfgfile"; exit 1) |
| 19060 | - |
| 19061 | - mv -f "$cfgfile" "$ofile" || |
| 19062 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 19063 | + || (rm -f "$cfgfile"; exit 1) |
| 19064 | + |
| 19065 | + if test x"$xsi_shell" = xyes; then |
| 19066 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 19067 | +func_dirname ()\ |
| 19068 | +{\ |
| 19069 | +\ case ${1} in\ |
| 19070 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 19071 | +\ * ) func_dirname_result="${3}" ;;\ |
| 19072 | +\ esac\ |
| 19073 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19074 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19075 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19076 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19077 | + |
| 19078 | + |
| 19079 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 19080 | +func_basename ()\ |
| 19081 | +{\ |
| 19082 | +\ func_basename_result="${1##*/}"\ |
| 19083 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19084 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19085 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19086 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19087 | + |
| 19088 | + |
| 19089 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 19090 | +func_dirname_and_basename ()\ |
| 19091 | +{\ |
| 19092 | +\ case ${1} in\ |
| 19093 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 19094 | +\ * ) func_dirname_result="${3}" ;;\ |
| 19095 | +\ esac\ |
| 19096 | +\ func_basename_result="${1##*/}"\ |
| 19097 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19098 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19099 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19100 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19101 | + |
| 19102 | + |
| 19103 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 19104 | +func_stripname ()\ |
| 19105 | +{\ |
| 19106 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 19107 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 19108 | +\ func_stripname_result=${3}\ |
| 19109 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 19110 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 19111 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19112 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19113 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19114 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19115 | + |
| 19116 | + |
| 19117 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 19118 | +func_split_long_opt ()\ |
| 19119 | +{\ |
| 19120 | +\ func_split_long_opt_name=${1%%=*}\ |
| 19121 | +\ func_split_long_opt_arg=${1#*=}\ |
| 19122 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19123 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19124 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19125 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19126 | + |
| 19127 | + |
| 19128 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 19129 | +func_split_short_opt ()\ |
| 19130 | +{\ |
| 19131 | +\ func_split_short_opt_arg=${1#??}\ |
| 19132 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 19133 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19134 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19135 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19136 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19137 | + |
| 19138 | + |
| 19139 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 19140 | +func_lo2o ()\ |
| 19141 | +{\ |
| 19142 | +\ case ${1} in\ |
| 19143 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 19144 | +\ *) func_lo2o_result=${1} ;;\ |
| 19145 | +\ esac\ |
| 19146 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19147 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19148 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19149 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19150 | + |
| 19151 | + |
| 19152 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 19153 | +func_xform ()\ |
| 19154 | +{\ |
| 19155 | + func_xform_result=${1%.*}.lo\ |
| 19156 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19157 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19158 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19159 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19160 | + |
| 19161 | + |
| 19162 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 19163 | +func_arith ()\ |
| 19164 | +{\ |
| 19165 | + func_arith_result=$(( $* ))\ |
| 19166 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19167 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19168 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19169 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19170 | + |
| 19171 | + |
| 19172 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 19173 | +func_len ()\ |
| 19174 | +{\ |
| 19175 | + func_len_result=${#1}\ |
| 19176 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19177 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19178 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19179 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19180 | + |
| 19181 | +fi |
| 19182 | + |
| 19183 | +if test x"$lt_shell_append" = xyes; then |
| 19184 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 19185 | +func_append ()\ |
| 19186 | +{\ |
| 19187 | + eval "${1}+=\\${2}"\ |
| 19188 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19189 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19190 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19191 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19192 | + |
| 19193 | + |
| 19194 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 19195 | +func_append_quoted ()\ |
| 19196 | +{\ |
| 19197 | +\ func_quote_for_eval "${2}"\ |
| 19198 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 19199 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19200 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19201 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19202 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19203 | + |
| 19204 | + |
| 19205 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 19206 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 19207 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19208 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19209 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 19210 | +else |
| 19211 | + # Save a `func_append' function call even when '+=' is not available |
| 19212 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 19213 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19214 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19215 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 19216 | +fi |
| 19217 | + |
| 19218 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 19219 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 19220 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 19221 | +fi |
| 19222 | + |
| 19223 | + |
| 19224 | + mv -f "$cfgfile" "$ofile" || |
| 19225 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 19226 | chmod +x "$ofile" |
| 19227 | |
| 19228 | diff --git a/opcodes/configure.ac b/opcodes/configure.ac |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 19229 | index b07f3f3629..5a32d9b1fc 100644 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 19230 | --- a/opcodes/configure.ac |
| 19231 | +++ b/opcodes/configure.ac |
| 19232 | @@ -167,7 +167,7 @@ changequote(,)dnl |
| 19233 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` |
| 19234 | changequote([,])dnl |
| 19235 | if test -n "$x"; then |
| 19236 | - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" |
| 19237 | + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" |
| 19238 | fi |
| 19239 | |
| 19240 | case "${host}" in |
| 19241 | diff --git a/zlib/configure b/zlib/configure |
| 19242 | index dc2d9ed383..ed9a492f5c 100755 |
| 19243 | --- a/zlib/configure |
| 19244 | +++ b/zlib/configure |
| 19245 | @@ -614,8 +614,11 @@ OTOOL |
| 19246 | LIPO |
| 19247 | NMEDIT |
| 19248 | DSYMUTIL |
| 19249 | +MANIFEST_TOOL |
| 19250 | RANLIB |
| 19251 | +ac_ct_AR |
| 19252 | AR |
| 19253 | +DLLTOOL |
| 19254 | OBJDUMP |
| 19255 | LN_S |
| 19256 | NM |
| 19257 | @@ -737,6 +740,7 @@ enable_static |
| 19258 | with_pic |
| 19259 | enable_fast_install |
| 19260 | with_gnu_ld |
| 19261 | +with_libtool_sysroot |
| 19262 | enable_libtool_lock |
| 19263 | enable_host_shared |
| 19264 | ' |
| 19265 | @@ -1385,6 +1389,8 @@ Optional Packages: |
| 19266 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 19267 | both] |
| 19268 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 19269 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 19270 | + (or the compiler's sysroot if not specified). |
| 19271 | |
| 19272 | Some influential environment variables: |
| 19273 | CC C compiler command |
| 19274 | @@ -3910,8 +3916,8 @@ esac |
| 19275 | |
| 19276 | |
| 19277 | |
| 19278 | -macro_version='2.2.7a' |
| 19279 | -macro_revision='1.3134' |
| 19280 | +macro_version='2.4' |
| 19281 | +macro_revision='1.3293' |
| 19282 | |
| 19283 | |
| 19284 | |
| 19285 | @@ -3951,7 +3957,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 19286 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 19287 | $as_echo_n "checking how to print strings... " >&6; } |
| 19288 | # Test print first, because it will be a builtin if present. |
| 19289 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 19290 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 19291 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 19292 | ECHO='print -r --' |
| 19293 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 19294 | @@ -4767,8 +4773,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 19295 | # Try some XSI features |
| 19296 | xsi_shell=no |
| 19297 | ( _lt_dummy="a/b/c" |
| 19298 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 19299 | - = c,a/b,, \ |
| 19300 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 19301 | + = c,a/b,b/c, \ |
| 19302 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 19303 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 19304 | && xsi_shell=yes |
| 19305 | @@ -4817,6 +4823,80 @@ esac |
| 19306 | |
| 19307 | |
| 19308 | |
| 19309 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 19310 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 19311 | +if test "${lt_cv_to_host_file_cmd+set}" = set; then : |
| 19312 | + $as_echo_n "(cached) " >&6 |
| 19313 | +else |
| 19314 | + case $host in |
| 19315 | + *-*-mingw* ) |
| 19316 | + case $build in |
| 19317 | + *-*-mingw* ) # actually msys |
| 19318 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 19319 | + ;; |
| 19320 | + *-*-cygwin* ) |
| 19321 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 19322 | + ;; |
| 19323 | + * ) # otherwise, assume *nix |
| 19324 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 19325 | + ;; |
| 19326 | + esac |
| 19327 | + ;; |
| 19328 | + *-*-cygwin* ) |
| 19329 | + case $build in |
| 19330 | + *-*-mingw* ) # actually msys |
| 19331 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 19332 | + ;; |
| 19333 | + *-*-cygwin* ) |
| 19334 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 19335 | + ;; |
| 19336 | + * ) # otherwise, assume *nix |
| 19337 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 19338 | + ;; |
| 19339 | + esac |
| 19340 | + ;; |
| 19341 | + * ) # unhandled hosts (and "normal" native builds) |
| 19342 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 19343 | + ;; |
| 19344 | +esac |
| 19345 | + |
| 19346 | +fi |
| 19347 | + |
| 19348 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 19349 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 19350 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 19351 | + |
| 19352 | + |
| 19353 | + |
| 19354 | + |
| 19355 | + |
| 19356 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 19357 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 19358 | +if test "${lt_cv_to_tool_file_cmd+set}" = set; then : |
| 19359 | + $as_echo_n "(cached) " >&6 |
| 19360 | +else |
| 19361 | + #assume ordinary cross tools, or native build. |
| 19362 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 19363 | +case $host in |
| 19364 | + *-*-mingw* ) |
| 19365 | + case $build in |
| 19366 | + *-*-mingw* ) # actually msys |
| 19367 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 19368 | + ;; |
| 19369 | + esac |
| 19370 | + ;; |
| 19371 | +esac |
| 19372 | + |
| 19373 | +fi |
| 19374 | + |
| 19375 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 19376 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 19377 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 19378 | + |
| 19379 | + |
| 19380 | + |
| 19381 | + |
| 19382 | + |
| 19383 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 19384 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 19385 | if test "${lt_cv_ld_reload_flag+set}" = set; then : |
| 19386 | @@ -4833,6 +4913,11 @@ case $reload_flag in |
| 19387 | esac |
| 19388 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 19389 | case $host_os in |
| 19390 | + cygwin* | mingw* | pw32* | cegcc*) |
| 19391 | + if test "$GCC" != yes; then |
| 19392 | + reload_cmds=false |
| 19393 | + fi |
| 19394 | + ;; |
| 19395 | darwin*) |
| 19396 | if test "$GCC" = yes; then |
| 19397 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 19398 | @@ -5001,7 +5086,8 @@ mingw* | pw32*) |
| 19399 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 19400 | lt_cv_file_magic_cmd='func_win32_libid' |
| 19401 | else |
| 19402 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 19403 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 19404 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 19405 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 19406 | fi |
| 19407 | ;; |
| 19408 | @@ -5155,6 +5241,21 @@ esac |
| 19409 | fi |
| 19410 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 19411 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 19412 | + |
| 19413 | +file_magic_glob= |
| 19414 | +want_nocaseglob=no |
| 19415 | +if test "$build" = "$host"; then |
| 19416 | + case $host_os in |
| 19417 | + mingw* | pw32*) |
| 19418 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 19419 | + want_nocaseglob=yes |
| 19420 | + else |
| 19421 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 19422 | + fi |
| 19423 | + ;; |
| 19424 | + esac |
| 19425 | +fi |
| 19426 | + |
| 19427 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 19428 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 19429 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 19430 | @@ -5168,11 +5269,165 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 19431 | |
| 19432 | |
| 19433 | |
| 19434 | + |
| 19435 | + |
| 19436 | + |
| 19437 | + |
| 19438 | + |
| 19439 | + |
| 19440 | + |
| 19441 | + |
| 19442 | + |
| 19443 | + |
| 19444 | |
| 19445 | |
| 19446 | if test -n "$ac_tool_prefix"; then |
| 19447 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 19448 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 19449 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 19450 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 19451 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 19452 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 19453 | +if test "${ac_cv_prog_DLLTOOL+set}" = set; then : |
| 19454 | + $as_echo_n "(cached) " >&6 |
| 19455 | +else |
| 19456 | + if test -n "$DLLTOOL"; then |
| 19457 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 19458 | +else |
| 19459 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 19460 | +for as_dir in $PATH |
| 19461 | +do |
| 19462 | + IFS=$as_save_IFS |
| 19463 | + test -z "$as_dir" && as_dir=. |
| 19464 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 19465 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 19466 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 19467 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 19468 | + break 2 |
| 19469 | + fi |
| 19470 | +done |
| 19471 | + done |
| 19472 | +IFS=$as_save_IFS |
| 19473 | + |
| 19474 | +fi |
| 19475 | +fi |
| 19476 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 19477 | +if test -n "$DLLTOOL"; then |
| 19478 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 19479 | +$as_echo "$DLLTOOL" >&6; } |
| 19480 | +else |
| 19481 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 19482 | +$as_echo "no" >&6; } |
| 19483 | +fi |
| 19484 | + |
| 19485 | + |
| 19486 | +fi |
| 19487 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 19488 | + ac_ct_DLLTOOL=$DLLTOOL |
| 19489 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 19490 | +set dummy dlltool; ac_word=$2 |
| 19491 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 19492 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 19493 | +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : |
| 19494 | + $as_echo_n "(cached) " >&6 |
| 19495 | +else |
| 19496 | + if test -n "$ac_ct_DLLTOOL"; then |
| 19497 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 19498 | +else |
| 19499 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 19500 | +for as_dir in $PATH |
| 19501 | +do |
| 19502 | + IFS=$as_save_IFS |
| 19503 | + test -z "$as_dir" && as_dir=. |
| 19504 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 19505 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 19506 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 19507 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 19508 | + break 2 |
| 19509 | + fi |
| 19510 | +done |
| 19511 | + done |
| 19512 | +IFS=$as_save_IFS |
| 19513 | + |
| 19514 | +fi |
| 19515 | +fi |
| 19516 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 19517 | +if test -n "$ac_ct_DLLTOOL"; then |
| 19518 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 19519 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 19520 | +else |
| 19521 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 19522 | +$as_echo "no" >&6; } |
| 19523 | +fi |
| 19524 | + |
| 19525 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 19526 | + DLLTOOL="false" |
| 19527 | + else |
| 19528 | + case $cross_compiling:$ac_tool_warned in |
| 19529 | +yes:) |
| 19530 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 19531 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 19532 | +ac_tool_warned=yes ;; |
| 19533 | +esac |
| 19534 | + DLLTOOL=$ac_ct_DLLTOOL |
| 19535 | + fi |
| 19536 | +else |
| 19537 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 19538 | +fi |
| 19539 | + |
| 19540 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 19541 | + |
| 19542 | + |
| 19543 | + |
| 19544 | + |
| 19545 | + |
| 19546 | + |
| 19547 | + |
| 19548 | + |
| 19549 | + |
| 19550 | + |
| 19551 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 19552 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 19553 | +if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : |
| 19554 | + $as_echo_n "(cached) " >&6 |
| 19555 | +else |
| 19556 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 19557 | + |
| 19558 | +case $host_os in |
| 19559 | +cygwin* | mingw* | pw32* | cegcc*) |
| 19560 | + # two different shell functions defined in ltmain.sh |
| 19561 | + # decide which to use based on capabilities of $DLLTOOL |
| 19562 | + case `$DLLTOOL --help 2>&1` in |
| 19563 | + *--identify-strict*) |
| 19564 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 19565 | + ;; |
| 19566 | + *) |
| 19567 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 19568 | + ;; |
| 19569 | + esac |
| 19570 | + ;; |
| 19571 | +*) |
| 19572 | + # fallback: assume linklib IS sharedlib |
| 19573 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 19574 | + ;; |
| 19575 | +esac |
| 19576 | + |
| 19577 | +fi |
| 19578 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 19579 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 19580 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 19581 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 19582 | + |
| 19583 | + |
| 19584 | + |
| 19585 | + |
| 19586 | + |
| 19587 | + |
| 19588 | + |
| 19589 | + |
| 19590 | +if test -n "$ac_tool_prefix"; then |
| 19591 | + for ac_prog in ar |
| 19592 | + do |
| 19593 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 19594 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 19595 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 19596 | $as_echo_n "checking for $ac_word... " >&6; } |
| 19597 | if test "${ac_cv_prog_AR+set}" = set; then : |
| 19598 | @@ -5188,7 +5443,7 @@ do |
| 19599 | test -z "$as_dir" && as_dir=. |
| 19600 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 19601 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 19602 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 19603 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 19604 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 19605 | break 2 |
| 19606 | fi |
| 19607 | @@ -5208,11 +5463,15 @@ $as_echo "no" >&6; } |
| 19608 | fi |
| 19609 | |
| 19610 | |
| 19611 | + test -n "$AR" && break |
| 19612 | + done |
| 19613 | fi |
| 19614 | -if test -z "$ac_cv_prog_AR"; then |
| 19615 | +if test -z "$AR"; then |
| 19616 | ac_ct_AR=$AR |
| 19617 | - # Extract the first word of "ar", so it can be a program name with args. |
| 19618 | -set dummy ar; ac_word=$2 |
| 19619 | + for ac_prog in ar |
| 19620 | +do |
| 19621 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 19622 | +set dummy $ac_prog; ac_word=$2 |
| 19623 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 19624 | $as_echo_n "checking for $ac_word... " >&6; } |
| 19625 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
| 19626 | @@ -5228,7 +5487,7 @@ do |
| 19627 | test -z "$as_dir" && as_dir=. |
| 19628 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 19629 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 19630 | - ac_cv_prog_ac_ct_AR="ar" |
| 19631 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 19632 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 19633 | break 2 |
| 19634 | fi |
| 19635 | @@ -5247,6 +5506,10 @@ else |
| 19636 | $as_echo "no" >&6; } |
| 19637 | fi |
| 19638 | |
| 19639 | + |
| 19640 | + test -n "$ac_ct_AR" && break |
| 19641 | +done |
| 19642 | + |
| 19643 | if test "x$ac_ct_AR" = x; then |
| 19644 | AR="false" |
| 19645 | else |
| 19646 | @@ -5258,16 +5521,72 @@ ac_tool_warned=yes ;; |
| 19647 | esac |
| 19648 | AR=$ac_ct_AR |
| 19649 | fi |
| 19650 | -else |
| 19651 | - AR="$ac_cv_prog_AR" |
| 19652 | fi |
| 19653 | |
| 19654 | -test -z "$AR" && AR=ar |
| 19655 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 19656 | +: ${AR=ar} |
| 19657 | +: ${AR_FLAGS=cru} |
| 19658 | + |
| 19659 | + |
| 19660 | + |
| 19661 | + |
| 19662 | + |
| 19663 | + |
| 19664 | + |
| 19665 | + |
| 19666 | + |
| 19667 | + |
| 19668 | + |
| 19669 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 19670 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 19671 | +if test "${lt_cv_ar_at_file+set}" = set; then : |
| 19672 | + $as_echo_n "(cached) " >&6 |
| 19673 | +else |
| 19674 | + lt_cv_ar_at_file=no |
| 19675 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 19676 | +/* end confdefs.h. */ |
| 19677 | + |
| 19678 | +int |
| 19679 | +main () |
| 19680 | +{ |
| 19681 | |
| 19682 | + ; |
| 19683 | + return 0; |
| 19684 | +} |
| 19685 | +_ACEOF |
| 19686 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 19687 | + echo conftest.$ac_objext > conftest.lst |
| 19688 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 19689 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 19690 | + (eval $lt_ar_try) 2>&5 |
| 19691 | + ac_status=$? |
| 19692 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 19693 | + test $ac_status = 0; } |
| 19694 | + if test "$ac_status" -eq 0; then |
| 19695 | + # Ensure the archiver fails upon bogus file names. |
| 19696 | + rm -f conftest.$ac_objext libconftest.a |
| 19697 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 19698 | + (eval $lt_ar_try) 2>&5 |
| 19699 | + ac_status=$? |
| 19700 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 19701 | + test $ac_status = 0; } |
| 19702 | + if test "$ac_status" -ne 0; then |
| 19703 | + lt_cv_ar_at_file=@ |
| 19704 | + fi |
| 19705 | + fi |
| 19706 | + rm -f conftest.* libconftest.a |
| 19707 | |
| 19708 | +fi |
| 19709 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 19710 | |
| 19711 | +fi |
| 19712 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 19713 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 19714 | |
| 19715 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 19716 | + archiver_list_spec= |
| 19717 | +else |
| 19718 | + archiver_list_spec=$lt_cv_ar_at_file |
| 19719 | +fi |
| 19720 | |
| 19721 | |
| 19722 | |
| 19723 | @@ -5609,8 +5928,8 @@ esac |
| 19724 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 19725 | |
| 19726 | # Transform an extracted symbol line into symbol name and symbol address |
| 19727 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 19728 | -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
| 19729 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 19730 | +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
| 19731 | |
| 19732 | # Handle CRLF in mingw tool chain |
| 19733 | opt_cr= |
| 19734 | @@ -5646,6 +5965,7 @@ for ac_symprfx in "" "_"; do |
| 19735 | else |
| 19736 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 19737 | fi |
| 19738 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 19739 | |
| 19740 | # Check to see that the pipe works correctly. |
| 19741 | pipe_works=no |
| 19742 | @@ -5687,6 +6007,18 @@ _LT_EOF |
| 19743 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 19744 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 19745 | cat <<_LT_EOF > conftest.$ac_ext |
| 19746 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 19747 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 19748 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 19749 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 19750 | +# define LT_DLSYM_CONST |
| 19751 | +#elif defined(__osf__) |
| 19752 | +/* This system does not cope well with relocations in const data. */ |
| 19753 | +# define LT_DLSYM_CONST |
| 19754 | +#else |
| 19755 | +# define LT_DLSYM_CONST const |
| 19756 | +#endif |
| 19757 | + |
| 19758 | #ifdef __cplusplus |
| 19759 | extern "C" { |
| 19760 | #endif |
| 19761 | @@ -5698,7 +6030,7 @@ _LT_EOF |
| 19762 | cat <<_LT_EOF >> conftest.$ac_ext |
| 19763 | |
| 19764 | /* The mapping between symbol names and symbols. */ |
| 19765 | -const struct { |
| 19766 | +LT_DLSYM_CONST struct { |
| 19767 | const char *name; |
| 19768 | void *address; |
| 19769 | } |
| 19770 | @@ -5724,8 +6056,8 @@ static const void *lt_preloaded_setup() { |
| 19771 | _LT_EOF |
| 19772 | # Now try linking the two files. |
| 19773 | mv conftest.$ac_objext conftstm.$ac_objext |
| 19774 | - lt_save_LIBS="$LIBS" |
| 19775 | - lt_save_CFLAGS="$CFLAGS" |
| 19776 | + lt_globsym_save_LIBS=$LIBS |
| 19777 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 19778 | LIBS="conftstm.$ac_objext" |
| 19779 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 19780 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 19781 | @@ -5735,8 +6067,8 @@ _LT_EOF |
| 19782 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 19783 | pipe_works=yes |
| 19784 | fi |
| 19785 | - LIBS="$lt_save_LIBS" |
| 19786 | - CFLAGS="$lt_save_CFLAGS" |
| 19787 | + LIBS=$lt_globsym_save_LIBS |
| 19788 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 19789 | else |
| 19790 | echo "cannot find nm_test_func in $nlist" >&5 |
| 19791 | fi |
| 19792 | @@ -5773,6 +6105,19 @@ else |
| 19793 | $as_echo "ok" >&6; } |
| 19794 | fi |
| 19795 | |
| 19796 | +# Response file support. |
| 19797 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 19798 | + nm_file_list_spec='@' |
| 19799 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 19800 | + nm_file_list_spec='@' |
| 19801 | +fi |
| 19802 | + |
| 19803 | + |
| 19804 | + |
| 19805 | + |
| 19806 | + |
| 19807 | + |
| 19808 | + |
| 19809 | |
| 19810 | |
| 19811 | |
| 19812 | @@ -5790,6 +6135,41 @@ fi |
| 19813 | |
| 19814 | |
| 19815 | |
| 19816 | + |
| 19817 | + |
| 19818 | + |
| 19819 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 19820 | +$as_echo_n "checking for sysroot... " >&6; } |
| 19821 | + |
| 19822 | +# Check whether --with-libtool-sysroot was given. |
| 19823 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 19824 | + withval=$with_libtool_sysroot; |
| 19825 | +else |
| 19826 | + with_libtool_sysroot=no |
| 19827 | +fi |
| 19828 | + |
| 19829 | + |
| 19830 | +lt_sysroot= |
| 19831 | +case ${with_libtool_sysroot} in #( |
| 19832 | + yes) |
| 19833 | + if test "$GCC" = yes; then |
| 19834 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 19835 | + fi |
| 19836 | + ;; #( |
| 19837 | + /*) |
| 19838 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 19839 | + ;; #( |
| 19840 | + no|'') |
| 19841 | + ;; #( |
| 19842 | + *) |
| 19843 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 19844 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 19845 | + as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 |
| 19846 | + ;; |
| 19847 | +esac |
| 19848 | + |
| 19849 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 19850 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 19851 | |
| 19852 | |
| 19853 | |
| 19854 | @@ -6004,6 +6384,123 @@ esac |
| 19855 | |
| 19856 | need_locks="$enable_libtool_lock" |
| 19857 | |
| 19858 | +if test -n "$ac_tool_prefix"; then |
| 19859 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 19860 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 19861 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 19862 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 19863 | +if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : |
| 19864 | + $as_echo_n "(cached) " >&6 |
| 19865 | +else |
| 19866 | + if test -n "$MANIFEST_TOOL"; then |
| 19867 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 19868 | +else |
| 19869 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 19870 | +for as_dir in $PATH |
| 19871 | +do |
| 19872 | + IFS=$as_save_IFS |
| 19873 | + test -z "$as_dir" && as_dir=. |
| 19874 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 19875 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 19876 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 19877 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 19878 | + break 2 |
| 19879 | + fi |
| 19880 | +done |
| 19881 | + done |
| 19882 | +IFS=$as_save_IFS |
| 19883 | + |
| 19884 | +fi |
| 19885 | +fi |
| 19886 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 19887 | +if test -n "$MANIFEST_TOOL"; then |
| 19888 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 19889 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 19890 | +else |
| 19891 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 19892 | +$as_echo "no" >&6; } |
| 19893 | +fi |
| 19894 | + |
| 19895 | + |
| 19896 | +fi |
| 19897 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 19898 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 19899 | + # Extract the first word of "mt", so it can be a program name with args. |
| 19900 | +set dummy mt; ac_word=$2 |
| 19901 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 19902 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 19903 | +if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : |
| 19904 | + $as_echo_n "(cached) " >&6 |
| 19905 | +else |
| 19906 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 19907 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 19908 | +else |
| 19909 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 19910 | +for as_dir in $PATH |
| 19911 | +do |
| 19912 | + IFS=$as_save_IFS |
| 19913 | + test -z "$as_dir" && as_dir=. |
| 19914 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 19915 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 19916 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 19917 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 19918 | + break 2 |
| 19919 | + fi |
| 19920 | +done |
| 19921 | + done |
| 19922 | +IFS=$as_save_IFS |
| 19923 | + |
| 19924 | +fi |
| 19925 | +fi |
| 19926 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 19927 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 19928 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 19929 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 19930 | +else |
| 19931 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 19932 | +$as_echo "no" >&6; } |
| 19933 | +fi |
| 19934 | + |
| 19935 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 19936 | + MANIFEST_TOOL=":" |
| 19937 | + else |
| 19938 | + case $cross_compiling:$ac_tool_warned in |
| 19939 | +yes:) |
| 19940 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 19941 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 19942 | +ac_tool_warned=yes ;; |
| 19943 | +esac |
| 19944 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 19945 | + fi |
| 19946 | +else |
| 19947 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 19948 | +fi |
| 19949 | + |
| 19950 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 19951 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 19952 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 19953 | +if test "${lt_cv_path_mainfest_tool+set}" = set; then : |
| 19954 | + $as_echo_n "(cached) " >&6 |
| 19955 | +else |
| 19956 | + lt_cv_path_mainfest_tool=no |
| 19957 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 19958 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 19959 | + cat conftest.err >&5 |
| 19960 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 19961 | + lt_cv_path_mainfest_tool=yes |
| 19962 | + fi |
| 19963 | + rm -f conftest* |
| 19964 | +fi |
| 19965 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 19966 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 19967 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 19968 | + MANIFEST_TOOL=: |
| 19969 | +fi |
| 19970 | + |
| 19971 | + |
| 19972 | + |
| 19973 | + |
| 19974 | + |
| 19975 | |
| 19976 | case $host_os in |
| 19977 | rhapsody* | darwin*) |
| 19978 | @@ -6570,6 +7067,8 @@ _LT_EOF |
| 19979 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 19980 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 19981 | $AR cru libconftest.a conftest.o 2>&5 |
| 19982 | + echo "$RANLIB libconftest.a" >&5 |
| 19983 | + $RANLIB libconftest.a 2>&5 |
| 19984 | cat > conftest.c << _LT_EOF |
| 19985 | int main() { return 0;} |
| 19986 | _LT_EOF |
| 19987 | @@ -7033,7 +7532,8 @@ fi |
| 19988 | LIBTOOL_DEPS="$ltmain" |
| 19989 | |
| 19990 | # Always use our own libtool. |
| 19991 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
| 19992 | +LIBTOOL='$(SHELL) $(top_builddir)' |
| 19993 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" |
| 19994 | |
| 19995 | |
| 19996 | |
| 19997 | @@ -7122,7 +7622,7 @@ aix3*) |
| 19998 | esac |
| 19999 | |
| 20000 | # Global variables: |
| 20001 | -ofile=libtool |
| 20002 | +ofile=${host_alias}-libtool |
| 20003 | can_build_shared=yes |
| 20004 | |
| 20005 | # All known linkers require a `.a' archive for static linking (except MSVC, |
| 20006 | @@ -7420,8 +7920,6 @@ fi |
| 20007 | lt_prog_compiler_pic= |
| 20008 | lt_prog_compiler_static= |
| 20009 | |
| 20010 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 20011 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 20012 | |
| 20013 | if test "$GCC" = yes; then |
| 20014 | lt_prog_compiler_wl='-Wl,' |
| 20015 | @@ -7587,6 +8085,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 20016 | lt_prog_compiler_pic='--shared' |
| 20017 | lt_prog_compiler_static='--static' |
| 20018 | ;; |
| 20019 | + nagfor*) |
| 20020 | + # NAG Fortran compiler |
| 20021 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 20022 | + lt_prog_compiler_pic='-PIC' |
| 20023 | + lt_prog_compiler_static='-Bstatic' |
| 20024 | + ;; |
| 20025 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 20026 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 20027 | # which looks to be a dead project) |
| 20028 | @@ -7649,7 +8153,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 20029 | lt_prog_compiler_pic='-KPIC' |
| 20030 | lt_prog_compiler_static='-Bstatic' |
| 20031 | case $cc_basename in |
| 20032 | - f77* | f90* | f95*) |
| 20033 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 20034 | lt_prog_compiler_wl='-Qoption ld ';; |
| 20035 | *) |
| 20036 | lt_prog_compiler_wl='-Wl,';; |
| 20037 | @@ -7706,13 +8210,17 @@ case $host_os in |
| 20038 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 20039 | ;; |
| 20040 | esac |
| 20041 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 20042 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 20043 | - |
| 20044 | - |
| 20045 | - |
| 20046 | - |
| 20047 | |
| 20048 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 20049 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 20050 | +if test "${lt_cv_prog_compiler_pic+set}" = set; then : |
| 20051 | + $as_echo_n "(cached) " >&6 |
| 20052 | +else |
| 20053 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 20054 | +fi |
| 20055 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 20056 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 20057 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 20058 | |
| 20059 | # |
| 20060 | # Check to make sure the PIC flag actually works. |
| 20061 | @@ -7773,6 +8281,11 @@ fi |
| 20062 | |
| 20063 | |
| 20064 | |
| 20065 | + |
| 20066 | + |
| 20067 | + |
| 20068 | + |
| 20069 | + |
| 20070 | # |
| 20071 | # Check to make sure the static flag actually works. |
| 20072 | # |
| 20073 | @@ -8123,7 +8636,8 @@ _LT_EOF |
| 20074 | allow_undefined_flag=unsupported |
| 20075 | always_export_symbols=no |
| 20076 | enable_shared_with_static_runtimes=yes |
| 20077 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 20078 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' |
| 20079 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 20080 | |
| 20081 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 20082 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 20083 | @@ -8222,12 +8736,12 @@ _LT_EOF |
| 20084 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 20085 | hardcode_libdir_flag_spec= |
| 20086 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 20087 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 20088 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 20089 | if test "x$supports_anon_versioning" = xyes; then |
| 20090 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 20091 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 20092 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 20093 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 20094 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 20095 | fi |
| 20096 | ;; |
| 20097 | esac |
| 20098 | @@ -8241,8 +8755,8 @@ _LT_EOF |
| 20099 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 20100 | wlarc= |
| 20101 | else |
| 20102 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 20103 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 20104 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 20105 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 20106 | fi |
| 20107 | ;; |
| 20108 | |
| 20109 | @@ -8260,8 +8774,8 @@ _LT_EOF |
| 20110 | |
| 20111 | _LT_EOF |
| 20112 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 20113 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 20114 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 20115 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 20116 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 20117 | else |
| 20118 | ld_shlibs=no |
| 20119 | fi |
| 20120 | @@ -8307,8 +8821,8 @@ _LT_EOF |
| 20121 | |
| 20122 | *) |
| 20123 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 20124 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 20125 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 20126 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 20127 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 20128 | else |
| 20129 | ld_shlibs=no |
| 20130 | fi |
| 20131 | @@ -8438,7 +8952,13 @@ _LT_EOF |
| 20132 | allow_undefined_flag='-berok' |
| 20133 | # Determine the default libpath from the value encoded in an |
| 20134 | # empty executable. |
| 20135 | - if test x$gcc_no_link = xyes; then |
| 20136 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 20137 | + aix_libpath=$lt_cv_aix_libpath |
| 20138 | +else |
| 20139 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 20140 | + $as_echo_n "(cached) " >&6 |
| 20141 | +else |
| 20142 | + if test x$gcc_no_link = xyes; then |
| 20143 | as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 |
| 20144 | fi |
| 20145 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 20146 | @@ -8454,22 +8974,29 @@ main () |
| 20147 | _ACEOF |
| 20148 | if ac_fn_c_try_link "$LINENO"; then : |
| 20149 | |
| 20150 | -lt_aix_libpath_sed=' |
| 20151 | - /Import File Strings/,/^$/ { |
| 20152 | - /^0/ { |
| 20153 | - s/^0 *\(.*\)$/\1/ |
| 20154 | - p |
| 20155 | - } |
| 20156 | - }' |
| 20157 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 20158 | -# Check for a 64-bit object if we didn't find anything. |
| 20159 | -if test -z "$aix_libpath"; then |
| 20160 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 20161 | -fi |
| 20162 | + lt_aix_libpath_sed=' |
| 20163 | + /Import File Strings/,/^$/ { |
| 20164 | + /^0/ { |
| 20165 | + s/^0 *\([^ ]*\) *$/\1/ |
| 20166 | + p |
| 20167 | + } |
| 20168 | + }' |
| 20169 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 20170 | + # Check for a 64-bit object if we didn't find anything. |
| 20171 | + if test -z "$lt_cv_aix_libpath_"; then |
| 20172 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 20173 | + fi |
| 20174 | fi |
| 20175 | rm -f core conftest.err conftest.$ac_objext \ |
| 20176 | conftest$ac_exeext conftest.$ac_ext |
| 20177 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 20178 | + if test -z "$lt_cv_aix_libpath_"; then |
| 20179 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 20180 | + fi |
| 20181 | + |
| 20182 | +fi |
| 20183 | + |
| 20184 | + aix_libpath=$lt_cv_aix_libpath_ |
| 20185 | +fi |
| 20186 | |
| 20187 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 20188 | archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
| 20189 | @@ -8481,7 +9008,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 20190 | else |
| 20191 | # Determine the default libpath from the value encoded in an |
| 20192 | # empty executable. |
| 20193 | - if test x$gcc_no_link = xyes; then |
| 20194 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 20195 | + aix_libpath=$lt_cv_aix_libpath |
| 20196 | +else |
| 20197 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 20198 | + $as_echo_n "(cached) " >&6 |
| 20199 | +else |
| 20200 | + if test x$gcc_no_link = xyes; then |
| 20201 | as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 |
| 20202 | fi |
| 20203 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 20204 | @@ -8497,22 +9030,29 @@ main () |
| 20205 | _ACEOF |
| 20206 | if ac_fn_c_try_link "$LINENO"; then : |
| 20207 | |
| 20208 | -lt_aix_libpath_sed=' |
| 20209 | - /Import File Strings/,/^$/ { |
| 20210 | - /^0/ { |
| 20211 | - s/^0 *\(.*\)$/\1/ |
| 20212 | - p |
| 20213 | - } |
| 20214 | - }' |
| 20215 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 20216 | -# Check for a 64-bit object if we didn't find anything. |
| 20217 | -if test -z "$aix_libpath"; then |
| 20218 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 20219 | -fi |
| 20220 | + lt_aix_libpath_sed=' |
| 20221 | + /Import File Strings/,/^$/ { |
| 20222 | + /^0/ { |
| 20223 | + s/^0 *\([^ ]*\) *$/\1/ |
| 20224 | + p |
| 20225 | + } |
| 20226 | + }' |
| 20227 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 20228 | + # Check for a 64-bit object if we didn't find anything. |
| 20229 | + if test -z "$lt_cv_aix_libpath_"; then |
| 20230 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 20231 | + fi |
| 20232 | fi |
| 20233 | rm -f core conftest.err conftest.$ac_objext \ |
| 20234 | conftest$ac_exeext conftest.$ac_ext |
| 20235 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 20236 | + if test -z "$lt_cv_aix_libpath_"; then |
| 20237 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 20238 | + fi |
| 20239 | + |
| 20240 | +fi |
| 20241 | + |
| 20242 | + aix_libpath=$lt_cv_aix_libpath_ |
| 20243 | +fi |
| 20244 | |
| 20245 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 20246 | # Warning - without using the other run time loading flags, |
| 20247 | @@ -8557,20 +9097,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 20248 | # Microsoft Visual C++. |
| 20249 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 20250 | # no search path for DLLs. |
| 20251 | - hardcode_libdir_flag_spec=' ' |
| 20252 | - allow_undefined_flag=unsupported |
| 20253 | - # Tell ltmain to make .lib files, not .a files. |
| 20254 | - libext=lib |
| 20255 | - # Tell ltmain to make .dll files, not .so files. |
| 20256 | - shrext_cmds=".dll" |
| 20257 | - # FIXME: Setting linknames here is a bad hack. |
| 20258 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 20259 | - # The linker will automatically build a .lib file if we build a DLL. |
| 20260 | - old_archive_from_new_cmds='true' |
| 20261 | - # FIXME: Should let the user specify the lib program. |
| 20262 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 20263 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 20264 | - enable_shared_with_static_runtimes=yes |
| 20265 | + case $cc_basename in |
| 20266 | + cl*) |
| 20267 | + # Native MSVC |
| 20268 | + hardcode_libdir_flag_spec=' ' |
| 20269 | + allow_undefined_flag=unsupported |
| 20270 | + always_export_symbols=yes |
| 20271 | + file_list_spec='@' |
| 20272 | + # Tell ltmain to make .lib files, not .a files. |
| 20273 | + libext=lib |
| 20274 | + # Tell ltmain to make .dll files, not .so files. |
| 20275 | + shrext_cmds=".dll" |
| 20276 | + # FIXME: Setting linknames here is a bad hack. |
| 20277 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 20278 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 20279 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 20280 | + else |
| 20281 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 20282 | + fi~ |
| 20283 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 20284 | + linknames=' |
| 20285 | + # The linker will not automatically build a static lib if we build a DLL. |
| 20286 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 20287 | + enable_shared_with_static_runtimes=yes |
| 20288 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 20289 | + # Don't use ranlib |
| 20290 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 20291 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 20292 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 20293 | + case $lt_outputfile in |
| 20294 | + *.exe|*.EXE) ;; |
| 20295 | + *) |
| 20296 | + lt_outputfile="$lt_outputfile.exe" |
| 20297 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 20298 | + ;; |
| 20299 | + esac~ |
| 20300 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 20301 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 20302 | + $RM "$lt_outputfile.manifest"; |
| 20303 | + fi' |
| 20304 | + ;; |
| 20305 | + *) |
| 20306 | + # Assume MSVC wrapper |
| 20307 | + hardcode_libdir_flag_spec=' ' |
| 20308 | + allow_undefined_flag=unsupported |
| 20309 | + # Tell ltmain to make .lib files, not .a files. |
| 20310 | + libext=lib |
| 20311 | + # Tell ltmain to make .dll files, not .so files. |
| 20312 | + shrext_cmds=".dll" |
| 20313 | + # FIXME: Setting linknames here is a bad hack. |
| 20314 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 20315 | + # The linker will automatically build a .lib file if we build a DLL. |
| 20316 | + old_archive_from_new_cmds='true' |
| 20317 | + # FIXME: Should let the user specify the lib program. |
| 20318 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 20319 | + enable_shared_with_static_runtimes=yes |
| 20320 | + ;; |
| 20321 | + esac |
| 20322 | ;; |
| 20323 | |
| 20324 | darwin* | rhapsody*) |
| 20325 | @@ -8631,7 +9214,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 20326 | |
| 20327 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 20328 | freebsd* | dragonfly*) |
| 20329 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 20330 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 20331 | hardcode_libdir_flag_spec='-R$libdir' |
| 20332 | hardcode_direct=yes |
| 20333 | hardcode_shlibpath_var=no |
| 20334 | @@ -8639,7 +9222,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 20335 | |
| 20336 | hpux9*) |
| 20337 | if test "$GCC" = yes; then |
| 20338 | - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 20339 | + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 20340 | else |
| 20341 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
| 20342 | fi |
| 20343 | @@ -8655,7 +9238,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 20344 | |
| 20345 | hpux10*) |
| 20346 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 20347 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 20348 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 20349 | else |
| 20350 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 20351 | fi |
| 20352 | @@ -8679,10 +9262,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 20353 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 20354 | ;; |
| 20355 | ia64*) |
| 20356 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 20357 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 20358 | ;; |
| 20359 | *) |
| 20360 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 20361 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 20362 | ;; |
| 20363 | esac |
| 20364 | else |
| 20365 | @@ -8761,26 +9344,39 @@ fi |
| 20366 | |
| 20367 | irix5* | irix6* | nonstopux*) |
| 20368 | if test "$GCC" = yes; then |
| 20369 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 20370 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 20371 | # Try to use the -exported_symbol ld option, if it does not |
| 20372 | # work, assume that -exports_file does not work either and |
| 20373 | # implicitly export all symbols. |
| 20374 | - save_LDFLAGS="$LDFLAGS" |
| 20375 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 20376 | - if test x$gcc_no_link = xyes; then |
| 20377 | + # This should be the same for all languages, so no per-tag cache variable. |
| 20378 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 20379 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 20380 | +if test "${lt_cv_irix_exported_symbol+set}" = set; then : |
| 20381 | + $as_echo_n "(cached) " >&6 |
| 20382 | +else |
| 20383 | + save_LDFLAGS="$LDFLAGS" |
| 20384 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 20385 | + if test x$gcc_no_link = xyes; then |
| 20386 | as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 |
| 20387 | fi |
| 20388 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 20389 | /* end confdefs.h. */ |
| 20390 | -int foo(void) {} |
| 20391 | +int foo (void) { return 0; } |
| 20392 | _ACEOF |
| 20393 | if ac_fn_c_try_link "$LINENO"; then : |
| 20394 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 20395 | - |
| 20396 | + lt_cv_irix_exported_symbol=yes |
| 20397 | +else |
| 20398 | + lt_cv_irix_exported_symbol=no |
| 20399 | fi |
| 20400 | rm -f core conftest.err conftest.$ac_objext \ |
| 20401 | conftest$ac_exeext conftest.$ac_ext |
| 20402 | - LDFLAGS="$save_LDFLAGS" |
| 20403 | + LDFLAGS="$save_LDFLAGS" |
| 20404 | +fi |
| 20405 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 20406 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 20407 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 20408 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
| 20409 | + fi |
| 20410 | else |
| 20411 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
| 20412 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
| 20413 | @@ -8865,7 +9461,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 20414 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 20415 | if test "$GCC" = yes; then |
| 20416 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 20417 | - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 20418 | + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
| 20419 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 20420 | else |
| 20421 | allow_undefined_flag=' -expect_unresolved \*' |
| 20422 | @@ -8884,9 +9480,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 20423 | no_undefined_flag=' -z defs' |
| 20424 | if test "$GCC" = yes; then |
| 20425 | wlarc='${wl}' |
| 20426 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 20427 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 20428 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 20429 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 20430 | + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 20431 | else |
| 20432 | case `$CC -V 2>&1` in |
| 20433 | *"Compilers 5.0"*) |
| 20434 | @@ -9462,8 +10058,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 20435 | need_version=no |
| 20436 | need_lib_prefix=no |
| 20437 | |
| 20438 | - case $GCC,$host_os in |
| 20439 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 20440 | + case $GCC,$cc_basename in |
| 20441 | + yes,*) |
| 20442 | + # gcc |
| 20443 | library_names_spec='$libname.dll.a' |
| 20444 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 20445 | postinstall_cmds='base_file=`basename \${file}`~ |
| 20446 | @@ -9496,13 +10093,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 20447 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 20448 | ;; |
| 20449 | esac |
| 20450 | + dynamic_linker='Win32 ld.exe' |
| 20451 | + ;; |
| 20452 | + |
| 20453 | + *,cl*) |
| 20454 | + # Native MSVC |
| 20455 | + libname_spec='$name' |
| 20456 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 20457 | + library_names_spec='${libname}.dll.lib' |
| 20458 | + |
| 20459 | + case $build_os in |
| 20460 | + mingw*) |
| 20461 | + sys_lib_search_path_spec= |
| 20462 | + lt_save_ifs=$IFS |
| 20463 | + IFS=';' |
| 20464 | + for lt_path in $LIB |
| 20465 | + do |
| 20466 | + IFS=$lt_save_ifs |
| 20467 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 20468 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 20469 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 20470 | + done |
| 20471 | + IFS=$lt_save_ifs |
| 20472 | + # Convert to MSYS style. |
| 20473 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 20474 | + ;; |
| 20475 | + cygwin*) |
| 20476 | + # Convert to unix form, then to dos form, then back to unix form |
| 20477 | + # but this time dos style (no spaces!) so that the unix form looks |
| 20478 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 20479 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 20480 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 20481 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 20482 | + ;; |
| 20483 | + *) |
| 20484 | + sys_lib_search_path_spec="$LIB" |
| 20485 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 20486 | + # It is most probably a Windows format PATH. |
| 20487 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 20488 | + else |
| 20489 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 20490 | + fi |
| 20491 | + # FIXME: find the short name or the path components, as spaces are |
| 20492 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 20493 | + ;; |
| 20494 | + esac |
| 20495 | + |
| 20496 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 20497 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 20498 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 20499 | + dldir=$destdir/`dirname \$dlpath`~ |
| 20500 | + test -d \$dldir || mkdir -p \$dldir~ |
| 20501 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 20502 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 20503 | + dlpath=$dir/\$dldll~ |
| 20504 | + $RM \$dlpath' |
| 20505 | + shlibpath_overrides_runpath=yes |
| 20506 | + dynamic_linker='Win32 link.exe' |
| 20507 | ;; |
| 20508 | |
| 20509 | *) |
| 20510 | + # Assume MSVC wrapper |
| 20511 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 20512 | + dynamic_linker='Win32 ld.exe' |
| 20513 | ;; |
| 20514 | esac |
| 20515 | - dynamic_linker='Win32 ld.exe' |
| 20516 | # FIXME: first we should search . and the directory the executable is in |
| 20517 | shlibpath_var=PATH |
| 20518 | ;; |
| 20519 | @@ -9594,7 +10249,7 @@ haiku*) |
| 20520 | soname_spec='${libname}${release}${shared_ext}$major' |
| 20521 | shlibpath_var=LIBRARY_PATH |
| 20522 | shlibpath_overrides_runpath=yes |
| 20523 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' |
| 20524 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
| 20525 | hardcode_into_libs=yes |
| 20526 | ;; |
| 20527 | |
| 20528 | @@ -10452,10 +11107,10 @@ else |
| 20529 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 20530 | correspondingly for the symbols needed. */ |
| 20531 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 20532 | -void fnord () __attribute__((visibility("default"))); |
| 20533 | +int fnord () __attribute__((visibility("default"))); |
| 20534 | #endif |
| 20535 | |
| 20536 | -void fnord () { int i=42; } |
| 20537 | +int fnord () { return 42; } |
| 20538 | int main () |
| 20539 | { |
| 20540 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 20541 | @@ -10558,10 +11213,10 @@ else |
| 20542 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 20543 | correspondingly for the symbols needed. */ |
| 20544 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 20545 | -void fnord () __attribute__((visibility("default"))); |
| 20546 | +int fnord () __attribute__((visibility("default"))); |
| 20547 | #endif |
| 20548 | |
| 20549 | -void fnord () { int i=42; } |
| 20550 | +int fnord () { return 42; } |
| 20551 | int main () |
| 20552 | { |
| 20553 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 20554 | @@ -11992,13 +12647,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
| 20555 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 20556 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 20557 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 20558 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 20559 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 20560 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 20561 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 20562 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 20563 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 20564 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 20565 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 20566 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 20567 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 20568 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 20569 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 20570 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 20571 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 20572 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 20573 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 20574 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
| 20575 | @@ -12013,14 +12675,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
| 20576 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 20577 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 20578 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 20579 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 20580 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 20581 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 20582 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 20583 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 20584 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 20585 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 20586 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 20587 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 20588 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 20589 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 20590 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 20591 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 20592 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 20593 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
| 20594 | @@ -12053,12 +12718,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
| 20595 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 20596 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 20597 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 20598 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 20599 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 20600 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 20601 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 20602 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 20603 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 20604 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 20605 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 20606 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 20607 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 20608 | @@ -12113,8 +12778,13 @@ reload_flag \ |
| 20609 | OBJDUMP \ |
| 20610 | deplibs_check_method \ |
| 20611 | file_magic_cmd \ |
| 20612 | +file_magic_glob \ |
| 20613 | +want_nocaseglob \ |
| 20614 | +DLLTOOL \ |
| 20615 | +sharedlib_from_linklib_cmd \ |
| 20616 | AR \ |
| 20617 | AR_FLAGS \ |
| 20618 | +archiver_list_spec \ |
| 20619 | STRIP \ |
| 20620 | RANLIB \ |
| 20621 | CC \ |
| 20622 | @@ -12124,12 +12794,14 @@ lt_cv_sys_global_symbol_pipe \ |
| 20623 | lt_cv_sys_global_symbol_to_cdecl \ |
| 20624 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 20625 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 20626 | +nm_file_list_spec \ |
| 20627 | lt_prog_compiler_no_builtin_flag \ |
| 20628 | -lt_prog_compiler_wl \ |
| 20629 | lt_prog_compiler_pic \ |
| 20630 | +lt_prog_compiler_wl \ |
| 20631 | lt_prog_compiler_static \ |
| 20632 | lt_cv_prog_compiler_c_o \ |
| 20633 | need_locks \ |
| 20634 | +MANIFEST_TOOL \ |
| 20635 | DSYMUTIL \ |
| 20636 | NMEDIT \ |
| 20637 | LIPO \ |
| 20638 | @@ -12145,7 +12817,6 @@ no_undefined_flag \ |
| 20639 | hardcode_libdir_flag_spec \ |
| 20640 | hardcode_libdir_flag_spec_ld \ |
| 20641 | hardcode_libdir_separator \ |
| 20642 | -fix_srcfile_path \ |
| 20643 | exclude_expsyms \ |
| 20644 | include_expsyms \ |
| 20645 | file_list_spec \ |
| 20646 | @@ -12181,6 +12852,7 @@ module_cmds \ |
| 20647 | module_expsym_cmds \ |
| 20648 | export_symbols_cmds \ |
| 20649 | prelink_cmds \ |
| 20650 | +postlink_cmds \ |
| 20651 | postinstall_cmds \ |
| 20652 | postuninstall_cmds \ |
| 20653 | finish_cmds \ |
| 20654 | @@ -12770,7 +13442,8 @@ $as_echo X"$file" | |
| 20655 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 20656 | # |
| 20657 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 20658 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 20659 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 20660 | +# Inc. |
| 20661 | # Written by Gordon Matzigkeit, 1996 |
| 20662 | # |
| 20663 | # This file is part of GNU Libtool. |
| 20664 | @@ -12873,19 +13546,42 @@ SP2NL=$lt_lt_SP2NL |
| 20665 | # turn newlines into spaces. |
| 20666 | NL2SP=$lt_lt_NL2SP |
| 20667 | |
| 20668 | +# convert \$build file names to \$host format. |
| 20669 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 20670 | + |
| 20671 | +# convert \$build files to toolchain format. |
| 20672 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 20673 | + |
| 20674 | # An object symbol dumper. |
| 20675 | OBJDUMP=$lt_OBJDUMP |
| 20676 | |
| 20677 | # Method to check whether dependent libraries are shared objects. |
| 20678 | deplibs_check_method=$lt_deplibs_check_method |
| 20679 | |
| 20680 | -# Command to use when deplibs_check_method == "file_magic". |
| 20681 | +# Command to use when deplibs_check_method = "file_magic". |
| 20682 | file_magic_cmd=$lt_file_magic_cmd |
| 20683 | |
| 20684 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 20685 | +file_magic_glob=$lt_file_magic_glob |
| 20686 | + |
| 20687 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 20688 | +want_nocaseglob=$lt_want_nocaseglob |
| 20689 | + |
| 20690 | +# DLL creation program. |
| 20691 | +DLLTOOL=$lt_DLLTOOL |
| 20692 | + |
| 20693 | +# Command to associate shared and link libraries. |
| 20694 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 20695 | + |
| 20696 | # The archiver. |
| 20697 | AR=$lt_AR |
| 20698 | + |
| 20699 | +# Flags to create an archive. |
| 20700 | AR_FLAGS=$lt_AR_FLAGS |
| 20701 | |
| 20702 | +# How to feed a file listing to the archiver. |
| 20703 | +archiver_list_spec=$lt_archiver_list_spec |
| 20704 | + |
| 20705 | # A symbol stripping program. |
| 20706 | STRIP=$lt_STRIP |
| 20707 | |
| 20708 | @@ -12915,6 +13611,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
| 20709 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 20710 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 20711 | |
| 20712 | +# Specify filename containing input files for \$NM. |
| 20713 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 20714 | + |
| 20715 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 20716 | +lt_sysroot=$lt_sysroot |
| 20717 | + |
| 20718 | # The name of the directory that contains temporary libtool files. |
| 20719 | objdir=$objdir |
| 20720 | |
| 20721 | @@ -12924,6 +13626,9 @@ MAGIC_CMD=$MAGIC_CMD |
| 20722 | # Must we lock files when doing compilation? |
| 20723 | need_locks=$lt_need_locks |
| 20724 | |
| 20725 | +# Manifest tool. |
| 20726 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 20727 | + |
| 20728 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 20729 | DSYMUTIL=$lt_DSYMUTIL |
| 20730 | |
| 20731 | @@ -13038,12 +13743,12 @@ with_gcc=$GCC |
| 20732 | # Compiler flag to turn off builtin functions. |
| 20733 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 20734 | |
| 20735 | -# How to pass a linker flag through the compiler. |
| 20736 | -wl=$lt_lt_prog_compiler_wl |
| 20737 | - |
| 20738 | # Additional compiler flags for building library objects. |
| 20739 | pic_flag=$lt_lt_prog_compiler_pic |
| 20740 | |
| 20741 | +# How to pass a linker flag through the compiler. |
| 20742 | +wl=$lt_lt_prog_compiler_wl |
| 20743 | + |
| 20744 | # Compiler flag to prevent dynamic linking. |
| 20745 | link_static_flag=$lt_lt_prog_compiler_static |
| 20746 | |
| 20747 | @@ -13130,9 +13835,6 @@ inherit_rpath=$inherit_rpath |
| 20748 | # Whether libtool must link a program against all its dependency libraries. |
| 20749 | link_all_deplibs=$link_all_deplibs |
| 20750 | |
| 20751 | -# Fix the shell variable \$srcfile for the compiler. |
| 20752 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 20753 | - |
| 20754 | # Set to "yes" if exported symbols are required. |
| 20755 | always_export_symbols=$always_export_symbols |
| 20756 | |
| 20757 | @@ -13148,6 +13850,9 @@ include_expsyms=$lt_include_expsyms |
| 20758 | # Commands necessary for linking programs (against libraries) with templates. |
| 20759 | prelink_cmds=$lt_prelink_cmds |
| 20760 | |
| 20761 | +# Commands necessary for finishing linking programs. |
| 20762 | +postlink_cmds=$lt_postlink_cmds |
| 20763 | + |
| 20764 | # Specify filename containing input files. |
| 20765 | file_list_spec=$lt_file_list_spec |
| 20766 | |
| 20767 | @@ -13180,210 +13885,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
| 20768 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 20769 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 20770 | # is reportedly fixed, but why not run on old versions too? |
| 20771 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 20772 | - || (rm -f "$cfgfile"; exit 1) |
| 20773 | - |
| 20774 | - case $xsi_shell in |
| 20775 | - yes) |
| 20776 | - cat << \_LT_EOF >> "$cfgfile" |
| 20777 | - |
| 20778 | -# func_dirname file append nondir_replacement |
| 20779 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 20780 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 20781 | -func_dirname () |
| 20782 | -{ |
| 20783 | - case ${1} in |
| 20784 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 20785 | - * ) func_dirname_result="${3}" ;; |
| 20786 | - esac |
| 20787 | -} |
| 20788 | - |
| 20789 | -# func_basename file |
| 20790 | -func_basename () |
| 20791 | -{ |
| 20792 | - func_basename_result="${1##*/}" |
| 20793 | -} |
| 20794 | - |
| 20795 | -# func_dirname_and_basename file append nondir_replacement |
| 20796 | -# perform func_basename and func_dirname in a single function |
| 20797 | -# call: |
| 20798 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 20799 | -# add APPEND to the result, otherwise set result |
| 20800 | -# to NONDIR_REPLACEMENT. |
| 20801 | -# value returned in "$func_dirname_result" |
| 20802 | -# basename: Compute filename of FILE. |
| 20803 | -# value retuned in "$func_basename_result" |
| 20804 | -# Implementation must be kept synchronized with func_dirname |
| 20805 | -# and func_basename. For efficiency, we do not delegate to |
| 20806 | -# those functions but instead duplicate the functionality here. |
| 20807 | -func_dirname_and_basename () |
| 20808 | -{ |
| 20809 | - case ${1} in |
| 20810 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 20811 | - * ) func_dirname_result="${3}" ;; |
| 20812 | - esac |
| 20813 | - func_basename_result="${1##*/}" |
| 20814 | -} |
| 20815 | - |
| 20816 | -# func_stripname prefix suffix name |
| 20817 | -# strip PREFIX and SUFFIX off of NAME. |
| 20818 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 20819 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 20820 | -# dot (in which case that matches only a dot). |
| 20821 | -func_stripname () |
| 20822 | -{ |
| 20823 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 20824 | - # positional parameters, so assign one to ordinary parameter first. |
| 20825 | - func_stripname_result=${3} |
| 20826 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 20827 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 20828 | -} |
| 20829 | - |
| 20830 | -# func_opt_split |
| 20831 | -func_opt_split () |
| 20832 | -{ |
| 20833 | - func_opt_split_opt=${1%%=*} |
| 20834 | - func_opt_split_arg=${1#*=} |
| 20835 | -} |
| 20836 | - |
| 20837 | -# func_lo2o object |
| 20838 | -func_lo2o () |
| 20839 | -{ |
| 20840 | - case ${1} in |
| 20841 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 20842 | - *) func_lo2o_result=${1} ;; |
| 20843 | - esac |
| 20844 | -} |
| 20845 | - |
| 20846 | -# func_xform libobj-or-source |
| 20847 | -func_xform () |
| 20848 | -{ |
| 20849 | - func_xform_result=${1%.*}.lo |
| 20850 | -} |
| 20851 | - |
| 20852 | -# func_arith arithmetic-term... |
| 20853 | -func_arith () |
| 20854 | -{ |
| 20855 | - func_arith_result=$(( $* )) |
| 20856 | -} |
| 20857 | - |
| 20858 | -# func_len string |
| 20859 | -# STRING may not start with a hyphen. |
| 20860 | -func_len () |
| 20861 | -{ |
| 20862 | - func_len_result=${#1} |
| 20863 | -} |
| 20864 | - |
| 20865 | -_LT_EOF |
| 20866 | - ;; |
| 20867 | - *) # Bourne compatible functions. |
| 20868 | - cat << \_LT_EOF >> "$cfgfile" |
| 20869 | - |
| 20870 | -# func_dirname file append nondir_replacement |
| 20871 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 20872 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 20873 | -func_dirname () |
| 20874 | -{ |
| 20875 | - # Extract subdirectory from the argument. |
| 20876 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 20877 | - if test "X$func_dirname_result" = "X${1}"; then |
| 20878 | - func_dirname_result="${3}" |
| 20879 | - else |
| 20880 | - func_dirname_result="$func_dirname_result${2}" |
| 20881 | - fi |
| 20882 | -} |
| 20883 | - |
| 20884 | -# func_basename file |
| 20885 | -func_basename () |
| 20886 | -{ |
| 20887 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 20888 | -} |
| 20889 | - |
| 20890 | - |
| 20891 | -# func_stripname prefix suffix name |
| 20892 | -# strip PREFIX and SUFFIX off of NAME. |
| 20893 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 20894 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 20895 | -# dot (in which case that matches only a dot). |
| 20896 | -# func_strip_suffix prefix name |
| 20897 | -func_stripname () |
| 20898 | -{ |
| 20899 | - case ${2} in |
| 20900 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 20901 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 20902 | - esac |
| 20903 | -} |
| 20904 | - |
| 20905 | -# sed scripts: |
| 20906 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 20907 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 20908 | - |
| 20909 | -# func_opt_split |
| 20910 | -func_opt_split () |
| 20911 | -{ |
| 20912 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 20913 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 20914 | -} |
| 20915 | - |
| 20916 | -# func_lo2o object |
| 20917 | -func_lo2o () |
| 20918 | -{ |
| 20919 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 20920 | -} |
| 20921 | - |
| 20922 | -# func_xform libobj-or-source |
| 20923 | -func_xform () |
| 20924 | -{ |
| 20925 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 20926 | -} |
| 20927 | - |
| 20928 | -# func_arith arithmetic-term... |
| 20929 | -func_arith () |
| 20930 | -{ |
| 20931 | - func_arith_result=`expr "$@"` |
| 20932 | -} |
| 20933 | - |
| 20934 | -# func_len string |
| 20935 | -# STRING may not start with a hyphen. |
| 20936 | -func_len () |
| 20937 | -{ |
| 20938 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 20939 | -} |
| 20940 | - |
| 20941 | -_LT_EOF |
| 20942 | -esac |
| 20943 | - |
| 20944 | -case $lt_shell_append in |
| 20945 | - yes) |
| 20946 | - cat << \_LT_EOF >> "$cfgfile" |
| 20947 | - |
| 20948 | -# func_append var value |
| 20949 | -# Append VALUE to the end of shell variable VAR. |
| 20950 | -func_append () |
| 20951 | -{ |
| 20952 | - eval "$1+=\$2" |
| 20953 | -} |
| 20954 | -_LT_EOF |
| 20955 | - ;; |
| 20956 | - *) |
| 20957 | - cat << \_LT_EOF >> "$cfgfile" |
| 20958 | - |
| 20959 | -# func_append var value |
| 20960 | -# Append VALUE to the end of shell variable VAR. |
| 20961 | -func_append () |
| 20962 | -{ |
| 20963 | - eval "$1=\$$1\$2" |
| 20964 | -} |
| 20965 | - |
| 20966 | -_LT_EOF |
| 20967 | - ;; |
| 20968 | - esac |
| 20969 | - |
| 20970 | - |
| 20971 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 20972 | - || (rm -f "$cfgfile"; exit 1) |
| 20973 | - |
| 20974 | - mv -f "$cfgfile" "$ofile" || |
| 20975 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 20976 | + || (rm -f "$cfgfile"; exit 1) |
| 20977 | + |
| 20978 | + if test x"$xsi_shell" = xyes; then |
| 20979 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 20980 | +func_dirname ()\ |
| 20981 | +{\ |
| 20982 | +\ case ${1} in\ |
| 20983 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 20984 | +\ * ) func_dirname_result="${3}" ;;\ |
| 20985 | +\ esac\ |
| 20986 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 20987 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 20988 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 20989 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 20990 | + |
| 20991 | + |
| 20992 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 20993 | +func_basename ()\ |
| 20994 | +{\ |
| 20995 | +\ func_basename_result="${1##*/}"\ |
| 20996 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 20997 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 20998 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 20999 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21000 | + |
| 21001 | + |
| 21002 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 21003 | +func_dirname_and_basename ()\ |
| 21004 | +{\ |
| 21005 | +\ case ${1} in\ |
| 21006 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 21007 | +\ * ) func_dirname_result="${3}" ;;\ |
| 21008 | +\ esac\ |
| 21009 | +\ func_basename_result="${1##*/}"\ |
| 21010 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21011 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21012 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21013 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21014 | + |
| 21015 | + |
| 21016 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 21017 | +func_stripname ()\ |
| 21018 | +{\ |
| 21019 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 21020 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 21021 | +\ func_stripname_result=${3}\ |
| 21022 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 21023 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 21024 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21025 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21026 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21027 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21028 | + |
| 21029 | + |
| 21030 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 21031 | +func_split_long_opt ()\ |
| 21032 | +{\ |
| 21033 | +\ func_split_long_opt_name=${1%%=*}\ |
| 21034 | +\ func_split_long_opt_arg=${1#*=}\ |
| 21035 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21036 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21037 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21038 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21039 | + |
| 21040 | + |
| 21041 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 21042 | +func_split_short_opt ()\ |
| 21043 | +{\ |
| 21044 | +\ func_split_short_opt_arg=${1#??}\ |
| 21045 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 21046 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21047 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21048 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21049 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21050 | + |
| 21051 | + |
| 21052 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 21053 | +func_lo2o ()\ |
| 21054 | +{\ |
| 21055 | +\ case ${1} in\ |
| 21056 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 21057 | +\ *) func_lo2o_result=${1} ;;\ |
| 21058 | +\ esac\ |
| 21059 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21060 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21061 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21062 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21063 | + |
| 21064 | + |
| 21065 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 21066 | +func_xform ()\ |
| 21067 | +{\ |
| 21068 | + func_xform_result=${1%.*}.lo\ |
| 21069 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21070 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21071 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21072 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21073 | + |
| 21074 | + |
| 21075 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 21076 | +func_arith ()\ |
| 21077 | +{\ |
| 21078 | + func_arith_result=$(( $* ))\ |
| 21079 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21080 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21081 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21082 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21083 | + |
| 21084 | + |
| 21085 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 21086 | +func_len ()\ |
| 21087 | +{\ |
| 21088 | + func_len_result=${#1}\ |
| 21089 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21090 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21091 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21092 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21093 | + |
| 21094 | +fi |
| 21095 | + |
| 21096 | +if test x"$lt_shell_append" = xyes; then |
| 21097 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 21098 | +func_append ()\ |
| 21099 | +{\ |
| 21100 | + eval "${1}+=\\${2}"\ |
| 21101 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21102 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21103 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21104 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21105 | + |
| 21106 | + |
| 21107 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 21108 | +func_append_quoted ()\ |
| 21109 | +{\ |
| 21110 | +\ func_quote_for_eval "${2}"\ |
| 21111 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 21112 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21113 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21114 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21115 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21116 | + |
| 21117 | + |
| 21118 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 21119 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 21120 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21121 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21122 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 21123 | +else |
| 21124 | + # Save a `func_append' function call even when '+=' is not available |
| 21125 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 21126 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21127 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21128 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 21129 | +fi |
| 21130 | + |
| 21131 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 21132 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 21133 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 21134 | +fi |
| 21135 | + |
| 21136 | + |
| 21137 | + mv -f "$cfgfile" "$ofile" || |
| 21138 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 21139 | chmod +x "$ofile" |
| 21140 | |
| 21141 | -- |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 21142 | 2.16.1 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 21143 | |