Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From da70f0876cdd8ed703d9ed1524212ccfefb09ef3 Mon Sep 17 00:00:00 2001 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3 | Date: Sun, 14 Feb 2016 17:04:07 +0000 |
| 4 | Subject: [PATCH 06/14] Use libtool 2.4 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 6 | get libtool sysroot support |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 7 | |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 9 | --- |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 10 | Upstream-Status: Pending |
| 11 | |
| 12 | bfd/configure | 1322 +++++++++++++++++------ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 13 | bfd/configure.ac | 2 +- |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 14 | binutils/configure | 1320 +++++++++++++++++------ |
| 15 | configure | 4 +- |
| 16 | gas/configure | 1320 +++++++++++++++++------ |
| 17 | gprof/configure | 1325 +++++++++++++++++------ |
| 18 | ld/configure | 1695 +++++++++++++++++++++-------- |
| 19 | libtool.m4 | 1080 +++++++++++++------ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 20 | ltmain.sh | 2925 +++++++++++++++++++++++++++++++++----------------- |
| 21 | ltoptions.m4 | 2 +- |
| 22 | ltversion.m4 | 12 +- |
| 23 | lt~obsolete.m4 | 2 +- |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 24 | opcodes/configure | 1322 +++++++++++++++++------ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 25 | opcodes/configure.ac | 2 +- |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 26 | zlib/configure | 1320 +++++++++++++++++------ |
| 27 | 15 files changed, 9944 insertions(+), 3709 deletions(-) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 28 | |
| 29 | diff --git a/bfd/configure b/bfd/configure |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 30 | index 7411c6d..eae743e 100755 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 31 | --- a/bfd/configure |
| 32 | +++ b/bfd/configure |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 33 | @@ -670,6 +670,9 @@ OTOOL |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 34 | LIPO |
| 35 | NMEDIT |
| 36 | DSYMUTIL |
| 37 | +MANIFEST_TOOL |
| 38 | +ac_ct_AR |
| 39 | +DLLTOOL |
| 40 | OBJDUMP |
| 41 | LN_S |
| 42 | NM |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 43 | @@ -782,6 +785,7 @@ enable_static |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 44 | with_pic |
| 45 | enable_fast_install |
| 46 | with_gnu_ld |
| 47 | +with_libtool_sysroot |
| 48 | enable_libtool_lock |
| 49 | enable_plugins |
| 50 | enable_largefile |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 51 | @@ -1458,6 +1462,8 @@ Optional Packages: |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 52 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 53 | both] |
| 54 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 55 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 56 | + (or the compiler's sysroot if not specified). |
| 57 | --with-mmap try using mmap for BFD input files if available |
| 58 | --with-separate-debug-dir=DIR |
| 59 | Look for global separate debug info in DIR |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 60 | @@ -5388,8 +5394,8 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 61 | |
| 62 | |
| 63 | |
| 64 | -macro_version='2.2.7a' |
| 65 | -macro_revision='1.3134' |
| 66 | +macro_version='2.4' |
| 67 | +macro_revision='1.3293' |
| 68 | |
| 69 | |
| 70 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 71 | @@ -5429,7 +5435,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 72 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 73 | $as_echo_n "checking how to print strings... " >&6; } |
| 74 | # Test print first, because it will be a builtin if present. |
| 75 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 76 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 77 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 78 | ECHO='print -r --' |
| 79 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 80 | @@ -6115,8 +6121,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 81 | # Try some XSI features |
| 82 | xsi_shell=no |
| 83 | ( _lt_dummy="a/b/c" |
| 84 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 85 | - = c,a/b,, \ |
| 86 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 87 | + = c,a/b,b/c, \ |
| 88 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 89 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 90 | && xsi_shell=yes |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 91 | @@ -6165,6 +6171,80 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 92 | |
| 93 | |
| 94 | |
| 95 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 96 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 97 | +if test "${lt_cv_to_host_file_cmd+set}" = set; then : |
| 98 | + $as_echo_n "(cached) " >&6 |
| 99 | +else |
| 100 | + case $host in |
| 101 | + *-*-mingw* ) |
| 102 | + case $build in |
| 103 | + *-*-mingw* ) # actually msys |
| 104 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 105 | + ;; |
| 106 | + *-*-cygwin* ) |
| 107 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 108 | + ;; |
| 109 | + * ) # otherwise, assume *nix |
| 110 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 111 | + ;; |
| 112 | + esac |
| 113 | + ;; |
| 114 | + *-*-cygwin* ) |
| 115 | + case $build in |
| 116 | + *-*-mingw* ) # actually msys |
| 117 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 118 | + ;; |
| 119 | + *-*-cygwin* ) |
| 120 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 121 | + ;; |
| 122 | + * ) # otherwise, assume *nix |
| 123 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 124 | + ;; |
| 125 | + esac |
| 126 | + ;; |
| 127 | + * ) # unhandled hosts (and "normal" native builds) |
| 128 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 129 | + ;; |
| 130 | +esac |
| 131 | + |
| 132 | +fi |
| 133 | + |
| 134 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 135 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 136 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 137 | + |
| 138 | + |
| 139 | + |
| 140 | + |
| 141 | + |
| 142 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 143 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 144 | +if test "${lt_cv_to_tool_file_cmd+set}" = set; then : |
| 145 | + $as_echo_n "(cached) " >&6 |
| 146 | +else |
| 147 | + #assume ordinary cross tools, or native build. |
| 148 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 149 | +case $host in |
| 150 | + *-*-mingw* ) |
| 151 | + case $build in |
| 152 | + *-*-mingw* ) # actually msys |
| 153 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 154 | + ;; |
| 155 | + esac |
| 156 | + ;; |
| 157 | +esac |
| 158 | + |
| 159 | +fi |
| 160 | + |
| 161 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 162 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 163 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 164 | + |
| 165 | + |
| 166 | + |
| 167 | + |
| 168 | + |
| 169 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 170 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 171 | if test "${lt_cv_ld_reload_flag+set}" = set; then : |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 172 | @@ -6181,6 +6261,11 @@ case $reload_flag in |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 173 | esac |
| 174 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 175 | case $host_os in |
| 176 | + cygwin* | mingw* | pw32* | cegcc*) |
| 177 | + if test "$GCC" != yes; then |
| 178 | + reload_cmds=false |
| 179 | + fi |
| 180 | + ;; |
| 181 | darwin*) |
| 182 | if test "$GCC" = yes; then |
| 183 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 184 | @@ -6349,7 +6434,8 @@ mingw* | pw32*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 185 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 186 | lt_cv_file_magic_cmd='func_win32_libid' |
| 187 | else |
| 188 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 189 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 190 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 191 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 192 | fi |
| 193 | ;; |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 194 | @@ -6503,6 +6589,21 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 195 | fi |
| 196 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 197 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 198 | + |
| 199 | +file_magic_glob= |
| 200 | +want_nocaseglob=no |
| 201 | +if test "$build" = "$host"; then |
| 202 | + case $host_os in |
| 203 | + mingw* | pw32*) |
| 204 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 205 | + want_nocaseglob=yes |
| 206 | + else |
| 207 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 208 | + fi |
| 209 | + ;; |
| 210 | + esac |
| 211 | +fi |
| 212 | + |
| 213 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 214 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 215 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 216 | @@ -6518,9 +6619,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 217 | |
| 218 | |
| 219 | |
| 220 | + |
| 221 | + |
| 222 | + |
| 223 | + |
| 224 | + |
| 225 | + |
| 226 | + |
| 227 | + |
| 228 | + |
| 229 | + |
| 230 | if test -n "$ac_tool_prefix"; then |
| 231 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 232 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 233 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 234 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 235 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 236 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 237 | +if test "${ac_cv_prog_DLLTOOL+set}" = set; then : |
| 238 | + $as_echo_n "(cached) " >&6 |
| 239 | +else |
| 240 | + if test -n "$DLLTOOL"; then |
| 241 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 242 | +else |
| 243 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 244 | +for as_dir in $PATH |
| 245 | +do |
| 246 | + IFS=$as_save_IFS |
| 247 | + test -z "$as_dir" && as_dir=. |
| 248 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 249 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 250 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 251 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 252 | + break 2 |
| 253 | + fi |
| 254 | +done |
| 255 | + done |
| 256 | +IFS=$as_save_IFS |
| 257 | + |
| 258 | +fi |
| 259 | +fi |
| 260 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 261 | +if test -n "$DLLTOOL"; then |
| 262 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 263 | +$as_echo "$DLLTOOL" >&6; } |
| 264 | +else |
| 265 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 266 | +$as_echo "no" >&6; } |
| 267 | +fi |
| 268 | + |
| 269 | + |
| 270 | +fi |
| 271 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 272 | + ac_ct_DLLTOOL=$DLLTOOL |
| 273 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 274 | +set dummy dlltool; ac_word=$2 |
| 275 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 276 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 277 | +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : |
| 278 | + $as_echo_n "(cached) " >&6 |
| 279 | +else |
| 280 | + if test -n "$ac_ct_DLLTOOL"; then |
| 281 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 282 | +else |
| 283 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 284 | +for as_dir in $PATH |
| 285 | +do |
| 286 | + IFS=$as_save_IFS |
| 287 | + test -z "$as_dir" && as_dir=. |
| 288 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 289 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 290 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 291 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 292 | + break 2 |
| 293 | + fi |
| 294 | +done |
| 295 | + done |
| 296 | +IFS=$as_save_IFS |
| 297 | + |
| 298 | +fi |
| 299 | +fi |
| 300 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 301 | +if test -n "$ac_ct_DLLTOOL"; then |
| 302 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 303 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 304 | +else |
| 305 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 306 | +$as_echo "no" >&6; } |
| 307 | +fi |
| 308 | + |
| 309 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 310 | + DLLTOOL="false" |
| 311 | + else |
| 312 | + case $cross_compiling:$ac_tool_warned in |
| 313 | +yes:) |
| 314 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 315 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 316 | +ac_tool_warned=yes ;; |
| 317 | +esac |
| 318 | + DLLTOOL=$ac_ct_DLLTOOL |
| 319 | + fi |
| 320 | +else |
| 321 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 322 | +fi |
| 323 | + |
| 324 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 325 | + |
| 326 | + |
| 327 | + |
| 328 | + |
| 329 | + |
| 330 | + |
| 331 | + |
| 332 | + |
| 333 | + |
| 334 | + |
| 335 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 336 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 337 | +if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : |
| 338 | + $as_echo_n "(cached) " >&6 |
| 339 | +else |
| 340 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 341 | + |
| 342 | +case $host_os in |
| 343 | +cygwin* | mingw* | pw32* | cegcc*) |
| 344 | + # two different shell functions defined in ltmain.sh |
| 345 | + # decide which to use based on capabilities of $DLLTOOL |
| 346 | + case `$DLLTOOL --help 2>&1` in |
| 347 | + *--identify-strict*) |
| 348 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 349 | + ;; |
| 350 | + *) |
| 351 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 352 | + ;; |
| 353 | + esac |
| 354 | + ;; |
| 355 | +*) |
| 356 | + # fallback: assume linklib IS sharedlib |
| 357 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 358 | + ;; |
| 359 | +esac |
| 360 | + |
| 361 | +fi |
| 362 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 363 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 364 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 365 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 366 | + |
| 367 | + |
| 368 | + |
| 369 | + |
| 370 | + |
| 371 | + |
| 372 | + |
| 373 | +if test -n "$ac_tool_prefix"; then |
| 374 | + for ac_prog in ar |
| 375 | + do |
| 376 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 377 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 378 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 379 | $as_echo_n "checking for $ac_word... " >&6; } |
| 380 | if test "${ac_cv_prog_AR+set}" = set; then : |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 381 | @@ -6536,7 +6790,7 @@ do |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 382 | test -z "$as_dir" && as_dir=. |
| 383 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 384 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 385 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 386 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 387 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 388 | break 2 |
| 389 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 390 | @@ -6556,11 +6810,15 @@ $as_echo "no" >&6; } |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 391 | fi |
| 392 | |
| 393 | |
| 394 | + test -n "$AR" && break |
| 395 | + done |
| 396 | fi |
| 397 | -if test -z "$ac_cv_prog_AR"; then |
| 398 | +if test -z "$AR"; then |
| 399 | ac_ct_AR=$AR |
| 400 | - # Extract the first word of "ar", so it can be a program name with args. |
| 401 | -set dummy ar; ac_word=$2 |
| 402 | + for ac_prog in ar |
| 403 | +do |
| 404 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 405 | +set dummy $ac_prog; ac_word=$2 |
| 406 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 407 | $as_echo_n "checking for $ac_word... " >&6; } |
| 408 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 409 | @@ -6576,7 +6834,7 @@ do |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 410 | test -z "$as_dir" && as_dir=. |
| 411 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 412 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 413 | - ac_cv_prog_ac_ct_AR="ar" |
| 414 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 415 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 416 | break 2 |
| 417 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 418 | @@ -6595,6 +6853,10 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 419 | $as_echo "no" >&6; } |
| 420 | fi |
| 421 | |
| 422 | + |
| 423 | + test -n "$ac_ct_AR" && break |
| 424 | +done |
| 425 | + |
| 426 | if test "x$ac_ct_AR" = x; then |
| 427 | AR="false" |
| 428 | else |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 429 | @@ -6606,16 +6868,72 @@ ac_tool_warned=yes ;; |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 430 | esac |
| 431 | AR=$ac_ct_AR |
| 432 | fi |
| 433 | -else |
| 434 | - AR="$ac_cv_prog_AR" |
| 435 | fi |
| 436 | |
| 437 | -test -z "$AR" && AR=ar |
| 438 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 439 | +: ${AR=ar} |
| 440 | +: ${AR_FLAGS=cru} |
| 441 | + |
| 442 | + |
| 443 | + |
| 444 | + |
| 445 | + |
| 446 | + |
| 447 | + |
| 448 | + |
| 449 | + |
| 450 | + |
| 451 | + |
| 452 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 453 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 454 | +if test "${lt_cv_ar_at_file+set}" = set; then : |
| 455 | + $as_echo_n "(cached) " >&6 |
| 456 | +else |
| 457 | + lt_cv_ar_at_file=no |
| 458 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 459 | +/* end confdefs.h. */ |
| 460 | + |
| 461 | +int |
| 462 | +main () |
| 463 | +{ |
| 464 | |
| 465 | + ; |
| 466 | + return 0; |
| 467 | +} |
| 468 | +_ACEOF |
| 469 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 470 | + echo conftest.$ac_objext > conftest.lst |
| 471 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 472 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 473 | + (eval $lt_ar_try) 2>&5 |
| 474 | + ac_status=$? |
| 475 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 476 | + test $ac_status = 0; } |
| 477 | + if test "$ac_status" -eq 0; then |
| 478 | + # Ensure the archiver fails upon bogus file names. |
| 479 | + rm -f conftest.$ac_objext libconftest.a |
| 480 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 481 | + (eval $lt_ar_try) 2>&5 |
| 482 | + ac_status=$? |
| 483 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 484 | + test $ac_status = 0; } |
| 485 | + if test "$ac_status" -ne 0; then |
| 486 | + lt_cv_ar_at_file=@ |
| 487 | + fi |
| 488 | + fi |
| 489 | + rm -f conftest.* libconftest.a |
| 490 | |
| 491 | +fi |
| 492 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 493 | |
| 494 | +fi |
| 495 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 496 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 497 | |
| 498 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 499 | + archiver_list_spec= |
| 500 | +else |
| 501 | + archiver_list_spec=$lt_cv_ar_at_file |
| 502 | +fi |
| 503 | |
| 504 | |
| 505 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 506 | @@ -6957,8 +7275,8 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 507 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 508 | |
| 509 | # Transform an extracted symbol line into symbol name and symbol address |
| 510 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 511 | -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'" |
| 512 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 513 | +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'" |
| 514 | |
| 515 | # Handle CRLF in mingw tool chain |
| 516 | opt_cr= |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 517 | @@ -6994,6 +7312,7 @@ for ac_symprfx in "" "_"; do |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 518 | else |
| 519 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 520 | fi |
| 521 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 522 | |
| 523 | # Check to see that the pipe works correctly. |
| 524 | pipe_works=no |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 525 | @@ -7035,6 +7354,18 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 526 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 527 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 528 | cat <<_LT_EOF > conftest.$ac_ext |
| 529 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 530 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 531 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 532 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 533 | +# define LT_DLSYM_CONST |
| 534 | +#elif defined(__osf__) |
| 535 | +/* This system does not cope well with relocations in const data. */ |
| 536 | +# define LT_DLSYM_CONST |
| 537 | +#else |
| 538 | +# define LT_DLSYM_CONST const |
| 539 | +#endif |
| 540 | + |
| 541 | #ifdef __cplusplus |
| 542 | extern "C" { |
| 543 | #endif |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 544 | @@ -7046,7 +7377,7 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 545 | cat <<_LT_EOF >> conftest.$ac_ext |
| 546 | |
| 547 | /* The mapping between symbol names and symbols. */ |
| 548 | -const struct { |
| 549 | +LT_DLSYM_CONST struct { |
| 550 | const char *name; |
| 551 | void *address; |
| 552 | } |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 553 | @@ -7072,8 +7403,8 @@ static const void *lt_preloaded_setup() { |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 554 | _LT_EOF |
| 555 | # Now try linking the two files. |
| 556 | mv conftest.$ac_objext conftstm.$ac_objext |
| 557 | - lt_save_LIBS="$LIBS" |
| 558 | - lt_save_CFLAGS="$CFLAGS" |
| 559 | + lt_globsym_save_LIBS=$LIBS |
| 560 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 561 | LIBS="conftstm.$ac_objext" |
| 562 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 563 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 564 | @@ -7083,8 +7414,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 565 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 566 | pipe_works=yes |
| 567 | fi |
| 568 | - LIBS="$lt_save_LIBS" |
| 569 | - CFLAGS="$lt_save_CFLAGS" |
| 570 | + LIBS=$lt_globsym_save_LIBS |
| 571 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 572 | else |
| 573 | echo "cannot find nm_test_func in $nlist" >&5 |
| 574 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 575 | @@ -7121,6 +7452,16 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 576 | $as_echo "ok" >&6; } |
| 577 | fi |
| 578 | |
| 579 | +# Response file support. |
| 580 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 581 | + nm_file_list_spec='@' |
| 582 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 583 | + nm_file_list_spec='@' |
| 584 | +fi |
| 585 | + |
| 586 | + |
| 587 | + |
| 588 | + |
| 589 | |
| 590 | |
| 591 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 592 | @@ -7142,6 +7483,45 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 593 | |
| 594 | |
| 595 | |
| 596 | + |
| 597 | + |
| 598 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 599 | +$as_echo_n "checking for sysroot... " >&6; } |
| 600 | + |
| 601 | +# Check whether --with-libtool-sysroot was given. |
| 602 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 603 | + withval=$with_libtool_sysroot; |
| 604 | +else |
| 605 | + with_libtool_sysroot=no |
| 606 | +fi |
| 607 | + |
| 608 | + |
| 609 | +lt_sysroot= |
| 610 | +case ${with_libtool_sysroot} in #( |
| 611 | + yes) |
| 612 | + if test "$GCC" = yes; then |
| 613 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 614 | + fi |
| 615 | + ;; #( |
| 616 | + /*) |
| 617 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 618 | + ;; #( |
| 619 | + no|'') |
| 620 | + ;; #( |
| 621 | + *) |
| 622 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 623 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 624 | + as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 |
| 625 | + ;; |
| 626 | +esac |
| 627 | + |
| 628 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 629 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 630 | + |
| 631 | + |
| 632 | + |
| 633 | + |
| 634 | + |
| 635 | # Check whether --enable-libtool-lock was given. |
| 636 | if test "${enable_libtool_lock+set}" = set; then : |
| 637 | enableval=$enable_libtool_lock; |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 638 | @@ -7348,6 +7728,123 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 639 | |
| 640 | need_locks="$enable_libtool_lock" |
| 641 | |
| 642 | +if test -n "$ac_tool_prefix"; then |
| 643 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 644 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 645 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 646 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 647 | +if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : |
| 648 | + $as_echo_n "(cached) " >&6 |
| 649 | +else |
| 650 | + if test -n "$MANIFEST_TOOL"; then |
| 651 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 652 | +else |
| 653 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 654 | +for as_dir in $PATH |
| 655 | +do |
| 656 | + IFS=$as_save_IFS |
| 657 | + test -z "$as_dir" && as_dir=. |
| 658 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 659 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 660 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 661 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 662 | + break 2 |
| 663 | + fi |
| 664 | +done |
| 665 | + done |
| 666 | +IFS=$as_save_IFS |
| 667 | + |
| 668 | +fi |
| 669 | +fi |
| 670 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 671 | +if test -n "$MANIFEST_TOOL"; then |
| 672 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 673 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 674 | +else |
| 675 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 676 | +$as_echo "no" >&6; } |
| 677 | +fi |
| 678 | + |
| 679 | + |
| 680 | +fi |
| 681 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 682 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 683 | + # Extract the first word of "mt", so it can be a program name with args. |
| 684 | +set dummy mt; ac_word=$2 |
| 685 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 686 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 687 | +if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : |
| 688 | + $as_echo_n "(cached) " >&6 |
| 689 | +else |
| 690 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 691 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 692 | +else |
| 693 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 694 | +for as_dir in $PATH |
| 695 | +do |
| 696 | + IFS=$as_save_IFS |
| 697 | + test -z "$as_dir" && as_dir=. |
| 698 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 699 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 700 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 701 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 702 | + break 2 |
| 703 | + fi |
| 704 | +done |
| 705 | + done |
| 706 | +IFS=$as_save_IFS |
| 707 | + |
| 708 | +fi |
| 709 | +fi |
| 710 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 711 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 712 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 713 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 714 | +else |
| 715 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 716 | +$as_echo "no" >&6; } |
| 717 | +fi |
| 718 | + |
| 719 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 720 | + MANIFEST_TOOL=":" |
| 721 | + else |
| 722 | + case $cross_compiling:$ac_tool_warned in |
| 723 | +yes:) |
| 724 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 725 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 726 | +ac_tool_warned=yes ;; |
| 727 | +esac |
| 728 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 729 | + fi |
| 730 | +else |
| 731 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 732 | +fi |
| 733 | + |
| 734 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 735 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 736 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 737 | +if test "${lt_cv_path_mainfest_tool+set}" = set; then : |
| 738 | + $as_echo_n "(cached) " >&6 |
| 739 | +else |
| 740 | + lt_cv_path_mainfest_tool=no |
| 741 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 742 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 743 | + cat conftest.err >&5 |
| 744 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 745 | + lt_cv_path_mainfest_tool=yes |
| 746 | + fi |
| 747 | + rm -f conftest* |
| 748 | +fi |
| 749 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 750 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 751 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 752 | + MANIFEST_TOOL=: |
| 753 | +fi |
| 754 | + |
| 755 | + |
| 756 | + |
| 757 | + |
| 758 | + |
| 759 | |
| 760 | case $host_os in |
| 761 | rhapsody* | darwin*) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 762 | @@ -7911,6 +8408,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 763 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 764 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 765 | $AR cru libconftest.a conftest.o 2>&5 |
| 766 | + echo "$RANLIB libconftest.a" >&5 |
| 767 | + $RANLIB libconftest.a 2>&5 |
| 768 | cat > conftest.c << _LT_EOF |
| 769 | int main() { return 0;} |
| 770 | _LT_EOF |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 771 | @@ -8075,7 +8574,8 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 772 | LIBTOOL_DEPS="$ltmain" |
| 773 | |
| 774 | # Always use our own libtool. |
| 775 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
| 776 | +LIBTOOL='$(SHELL) $(top_builddir)' |
| 777 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" |
| 778 | |
| 779 | |
| 780 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 781 | @@ -8164,7 +8664,7 @@ aix3*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 782 | esac |
| 783 | |
| 784 | # Global variables: |
| 785 | -ofile=libtool |
| 786 | +ofile=${host_alias}-libtool |
| 787 | can_build_shared=yes |
| 788 | |
| 789 | # All known linkers require a `.a' archive for static linking (except MSVC, |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 790 | @@ -8462,8 +8962,6 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 791 | lt_prog_compiler_pic= |
| 792 | lt_prog_compiler_static= |
| 793 | |
| 794 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 795 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 796 | |
| 797 | if test "$GCC" = yes; then |
| 798 | lt_prog_compiler_wl='-Wl,' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 799 | @@ -8629,6 +9127,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 800 | lt_prog_compiler_pic='--shared' |
| 801 | lt_prog_compiler_static='--static' |
| 802 | ;; |
| 803 | + nagfor*) |
| 804 | + # NAG Fortran compiler |
| 805 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 806 | + lt_prog_compiler_pic='-PIC' |
| 807 | + lt_prog_compiler_static='-Bstatic' |
| 808 | + ;; |
| 809 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 810 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 811 | # which looks to be a dead project) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 812 | @@ -8691,7 +9195,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 813 | lt_prog_compiler_pic='-KPIC' |
| 814 | lt_prog_compiler_static='-Bstatic' |
| 815 | case $cc_basename in |
| 816 | - f77* | f90* | f95*) |
| 817 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 818 | lt_prog_compiler_wl='-Qoption ld ';; |
| 819 | *) |
| 820 | lt_prog_compiler_wl='-Wl,';; |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 821 | @@ -8748,13 +9252,17 @@ case $host_os in |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 822 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 823 | ;; |
| 824 | esac |
| 825 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 826 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 827 | - |
| 828 | - |
| 829 | - |
| 830 | - |
| 831 | |
| 832 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 833 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 834 | +if test "${lt_cv_prog_compiler_pic+set}" = set; then : |
| 835 | + $as_echo_n "(cached) " >&6 |
| 836 | +else |
| 837 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 838 | +fi |
| 839 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 840 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 841 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 842 | |
| 843 | # |
| 844 | # Check to make sure the PIC flag actually works. |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 845 | @@ -8815,6 +9323,11 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 846 | |
| 847 | |
| 848 | |
| 849 | + |
| 850 | + |
| 851 | + |
| 852 | + |
| 853 | + |
| 854 | # |
| 855 | # Check to make sure the static flag actually works. |
| 856 | # |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 857 | @@ -9165,7 +9678,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 858 | allow_undefined_flag=unsupported |
| 859 | always_export_symbols=no |
| 860 | enable_shared_with_static_runtimes=yes |
| 861 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 862 | + 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' |
| 863 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 864 | |
| 865 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 866 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 867 | @@ -9264,12 +9778,12 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 868 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 869 | hardcode_libdir_flag_spec= |
| 870 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 871 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 872 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 873 | if test "x$supports_anon_versioning" = xyes; then |
| 874 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 875 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 876 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 877 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 878 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 879 | fi |
| 880 | ;; |
| 881 | esac |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 882 | @@ -9283,8 +9797,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 883 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 884 | wlarc= |
| 885 | else |
| 886 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 887 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 888 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 889 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 890 | fi |
| 891 | ;; |
| 892 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 893 | @@ -9302,8 +9816,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 894 | |
| 895 | _LT_EOF |
| 896 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 897 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 898 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 899 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 900 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 901 | else |
| 902 | ld_shlibs=no |
| 903 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 904 | @@ -9349,8 +9863,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 905 | |
| 906 | *) |
| 907 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 908 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 909 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 910 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 911 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 912 | else |
| 913 | ld_shlibs=no |
| 914 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 915 | @@ -9480,7 +9994,13 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 916 | allow_undefined_flag='-berok' |
| 917 | # Determine the default libpath from the value encoded in an |
| 918 | # empty executable. |
| 919 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 920 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 921 | + aix_libpath=$lt_cv_aix_libpath |
| 922 | +else |
| 923 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 924 | + $as_echo_n "(cached) " >&6 |
| 925 | +else |
| 926 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 927 | /* end confdefs.h. */ |
| 928 | |
| 929 | int |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 930 | @@ -9493,22 +10013,29 @@ main () |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 931 | _ACEOF |
| 932 | if ac_fn_c_try_link "$LINENO"; then : |
| 933 | |
| 934 | -lt_aix_libpath_sed=' |
| 935 | - /Import File Strings/,/^$/ { |
| 936 | - /^0/ { |
| 937 | - s/^0 *\(.*\)$/\1/ |
| 938 | - p |
| 939 | - } |
| 940 | - }' |
| 941 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 942 | -# Check for a 64-bit object if we didn't find anything. |
| 943 | -if test -z "$aix_libpath"; then |
| 944 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 945 | -fi |
| 946 | + lt_aix_libpath_sed=' |
| 947 | + /Import File Strings/,/^$/ { |
| 948 | + /^0/ { |
| 949 | + s/^0 *\([^ ]*\) *$/\1/ |
| 950 | + p |
| 951 | + } |
| 952 | + }' |
| 953 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 954 | + # Check for a 64-bit object if we didn't find anything. |
| 955 | + if test -z "$lt_cv_aix_libpath_"; then |
| 956 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 957 | + fi |
| 958 | fi |
| 959 | rm -f core conftest.err conftest.$ac_objext \ |
| 960 | conftest$ac_exeext conftest.$ac_ext |
| 961 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 962 | + if test -z "$lt_cv_aix_libpath_"; then |
| 963 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 964 | + fi |
| 965 | + |
| 966 | +fi |
| 967 | + |
| 968 | + aix_libpath=$lt_cv_aix_libpath_ |
| 969 | +fi |
| 970 | |
| 971 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 972 | 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" |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 973 | @@ -9520,7 +10047,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 974 | else |
| 975 | # Determine the default libpath from the value encoded in an |
| 976 | # empty executable. |
| 977 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 978 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 979 | + aix_libpath=$lt_cv_aix_libpath |
| 980 | +else |
| 981 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 982 | + $as_echo_n "(cached) " >&6 |
| 983 | +else |
| 984 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 985 | /* end confdefs.h. */ |
| 986 | |
| 987 | int |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 988 | @@ -9533,22 +10066,29 @@ main () |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 989 | _ACEOF |
| 990 | if ac_fn_c_try_link "$LINENO"; then : |
| 991 | |
| 992 | -lt_aix_libpath_sed=' |
| 993 | - /Import File Strings/,/^$/ { |
| 994 | - /^0/ { |
| 995 | - s/^0 *\(.*\)$/\1/ |
| 996 | - p |
| 997 | - } |
| 998 | - }' |
| 999 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 1000 | -# Check for a 64-bit object if we didn't find anything. |
| 1001 | -if test -z "$aix_libpath"; then |
| 1002 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 1003 | -fi |
| 1004 | + lt_aix_libpath_sed=' |
| 1005 | + /Import File Strings/,/^$/ { |
| 1006 | + /^0/ { |
| 1007 | + s/^0 *\([^ ]*\) *$/\1/ |
| 1008 | + p |
| 1009 | + } |
| 1010 | + }' |
| 1011 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 1012 | + # Check for a 64-bit object if we didn't find anything. |
| 1013 | + if test -z "$lt_cv_aix_libpath_"; then |
| 1014 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 1015 | + fi |
| 1016 | fi |
| 1017 | rm -f core conftest.err conftest.$ac_objext \ |
| 1018 | conftest$ac_exeext conftest.$ac_ext |
| 1019 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 1020 | + if test -z "$lt_cv_aix_libpath_"; then |
| 1021 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 1022 | + fi |
| 1023 | + |
| 1024 | +fi |
| 1025 | + |
| 1026 | + aix_libpath=$lt_cv_aix_libpath_ |
| 1027 | +fi |
| 1028 | |
| 1029 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 1030 | # Warning - without using the other run time loading flags, |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1031 | @@ -9593,20 +10133,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1032 | # Microsoft Visual C++. |
| 1033 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 1034 | # no search path for DLLs. |
| 1035 | - hardcode_libdir_flag_spec=' ' |
| 1036 | - allow_undefined_flag=unsupported |
| 1037 | - # Tell ltmain to make .lib files, not .a files. |
| 1038 | - libext=lib |
| 1039 | - # Tell ltmain to make .dll files, not .so files. |
| 1040 | - shrext_cmds=".dll" |
| 1041 | - # FIXME: Setting linknames here is a bad hack. |
| 1042 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 1043 | - # The linker will automatically build a .lib file if we build a DLL. |
| 1044 | - old_archive_from_new_cmds='true' |
| 1045 | - # FIXME: Should let the user specify the lib program. |
| 1046 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 1047 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 1048 | - enable_shared_with_static_runtimes=yes |
| 1049 | + case $cc_basename in |
| 1050 | + cl*) |
| 1051 | + # Native MSVC |
| 1052 | + hardcode_libdir_flag_spec=' ' |
| 1053 | + allow_undefined_flag=unsupported |
| 1054 | + always_export_symbols=yes |
| 1055 | + file_list_spec='@' |
| 1056 | + # Tell ltmain to make .lib files, not .a files. |
| 1057 | + libext=lib |
| 1058 | + # Tell ltmain to make .dll files, not .so files. |
| 1059 | + shrext_cmds=".dll" |
| 1060 | + # FIXME: Setting linknames here is a bad hack. |
| 1061 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 1062 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 1063 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 1064 | + else |
| 1065 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 1066 | + fi~ |
| 1067 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 1068 | + linknames=' |
| 1069 | + # The linker will not automatically build a static lib if we build a DLL. |
| 1070 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 1071 | + enable_shared_with_static_runtimes=yes |
| 1072 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 1073 | + # Don't use ranlib |
| 1074 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 1075 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 1076 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 1077 | + case $lt_outputfile in |
| 1078 | + *.exe|*.EXE) ;; |
| 1079 | + *) |
| 1080 | + lt_outputfile="$lt_outputfile.exe" |
| 1081 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 1082 | + ;; |
| 1083 | + esac~ |
| 1084 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 1085 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 1086 | + $RM "$lt_outputfile.manifest"; |
| 1087 | + fi' |
| 1088 | + ;; |
| 1089 | + *) |
| 1090 | + # Assume MSVC wrapper |
| 1091 | + hardcode_libdir_flag_spec=' ' |
| 1092 | + allow_undefined_flag=unsupported |
| 1093 | + # Tell ltmain to make .lib files, not .a files. |
| 1094 | + libext=lib |
| 1095 | + # Tell ltmain to make .dll files, not .so files. |
| 1096 | + shrext_cmds=".dll" |
| 1097 | + # FIXME: Setting linknames here is a bad hack. |
| 1098 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 1099 | + # The linker will automatically build a .lib file if we build a DLL. |
| 1100 | + old_archive_from_new_cmds='true' |
| 1101 | + # FIXME: Should let the user specify the lib program. |
| 1102 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 1103 | + enable_shared_with_static_runtimes=yes |
| 1104 | + ;; |
| 1105 | + esac |
| 1106 | ;; |
| 1107 | |
| 1108 | darwin* | rhapsody*) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1109 | @@ -9667,7 +10250,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1110 | |
| 1111 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 1112 | freebsd* | dragonfly*) |
| 1113 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 1114 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 1115 | hardcode_libdir_flag_spec='-R$libdir' |
| 1116 | hardcode_direct=yes |
| 1117 | hardcode_shlibpath_var=no |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1118 | @@ -9675,7 +10258,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1119 | |
| 1120 | hpux9*) |
| 1121 | if test "$GCC" = yes; then |
| 1122 | - 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' |
| 1123 | + 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' |
| 1124 | else |
| 1125 | 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' |
| 1126 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1127 | @@ -9691,7 +10274,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1128 | |
| 1129 | hpux10*) |
| 1130 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 1131 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 1132 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 1133 | else |
| 1134 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 1135 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1136 | @@ -9715,10 +10298,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1137 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 1138 | ;; |
| 1139 | ia64*) |
| 1140 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 1141 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 1142 | ;; |
| 1143 | *) |
| 1144 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 1145 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 1146 | ;; |
| 1147 | esac |
| 1148 | else |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1149 | @@ -9797,23 +10380,36 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1150 | |
| 1151 | irix5* | irix6* | nonstopux*) |
| 1152 | if test "$GCC" = yes; then |
| 1153 | - 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' |
| 1154 | + 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' |
| 1155 | # Try to use the -exported_symbol ld option, if it does not |
| 1156 | # work, assume that -exports_file does not work either and |
| 1157 | # implicitly export all symbols. |
| 1158 | - save_LDFLAGS="$LDFLAGS" |
| 1159 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 1160 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 1161 | + # This should be the same for all languages, so no per-tag cache variable. |
| 1162 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 1163 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 1164 | +if test "${lt_cv_irix_exported_symbol+set}" = set; then : |
| 1165 | + $as_echo_n "(cached) " >&6 |
| 1166 | +else |
| 1167 | + save_LDFLAGS="$LDFLAGS" |
| 1168 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 1169 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 1170 | /* end confdefs.h. */ |
| 1171 | -int foo(void) {} |
| 1172 | +int foo (void) { return 0; } |
| 1173 | _ACEOF |
| 1174 | if ac_fn_c_try_link "$LINENO"; then : |
| 1175 | - 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' |
| 1176 | - |
| 1177 | + lt_cv_irix_exported_symbol=yes |
| 1178 | +else |
| 1179 | + lt_cv_irix_exported_symbol=no |
| 1180 | fi |
| 1181 | rm -f core conftest.err conftest.$ac_objext \ |
| 1182 | conftest$ac_exeext conftest.$ac_ext |
| 1183 | - LDFLAGS="$save_LDFLAGS" |
| 1184 | + LDFLAGS="$save_LDFLAGS" |
| 1185 | +fi |
| 1186 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 1187 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 1188 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 1189 | + 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' |
| 1190 | + fi |
| 1191 | else |
| 1192 | 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' |
| 1193 | 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' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1194 | @@ -9898,7 +10494,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1195 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 1196 | if test "$GCC" = yes; then |
| 1197 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 1198 | - 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' |
| 1199 | + 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' |
| 1200 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 1201 | else |
| 1202 | allow_undefined_flag=' -expect_unresolved \*' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1203 | @@ -9917,9 +10513,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1204 | no_undefined_flag=' -z defs' |
| 1205 | if test "$GCC" = yes; then |
| 1206 | wlarc='${wl}' |
| 1207 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 1208 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 1209 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 1210 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 1211 | + $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' |
| 1212 | else |
| 1213 | case `$CC -V 2>&1` in |
| 1214 | *"Compilers 5.0"*) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1215 | @@ -10495,8 +11091,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1216 | need_version=no |
| 1217 | need_lib_prefix=no |
| 1218 | |
| 1219 | - case $GCC,$host_os in |
| 1220 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 1221 | + case $GCC,$cc_basename in |
| 1222 | + yes,*) |
| 1223 | + # gcc |
| 1224 | library_names_spec='$libname.dll.a' |
| 1225 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 1226 | postinstall_cmds='base_file=`basename \${file}`~ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1227 | @@ -10529,13 +11126,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1228 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 1229 | ;; |
| 1230 | esac |
| 1231 | + dynamic_linker='Win32 ld.exe' |
| 1232 | + ;; |
| 1233 | + |
| 1234 | + *,cl*) |
| 1235 | + # Native MSVC |
| 1236 | + libname_spec='$name' |
| 1237 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 1238 | + library_names_spec='${libname}.dll.lib' |
| 1239 | + |
| 1240 | + case $build_os in |
| 1241 | + mingw*) |
| 1242 | + sys_lib_search_path_spec= |
| 1243 | + lt_save_ifs=$IFS |
| 1244 | + IFS=';' |
| 1245 | + for lt_path in $LIB |
| 1246 | + do |
| 1247 | + IFS=$lt_save_ifs |
| 1248 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 1249 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 1250 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 1251 | + done |
| 1252 | + IFS=$lt_save_ifs |
| 1253 | + # Convert to MSYS style. |
| 1254 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 1255 | + ;; |
| 1256 | + cygwin*) |
| 1257 | + # Convert to unix form, then to dos form, then back to unix form |
| 1258 | + # but this time dos style (no spaces!) so that the unix form looks |
| 1259 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 1260 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 1261 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 1262 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 1263 | + ;; |
| 1264 | + *) |
| 1265 | + sys_lib_search_path_spec="$LIB" |
| 1266 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 1267 | + # It is most probably a Windows format PATH. |
| 1268 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 1269 | + else |
| 1270 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 1271 | + fi |
| 1272 | + # FIXME: find the short name or the path components, as spaces are |
| 1273 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 1274 | + ;; |
| 1275 | + esac |
| 1276 | + |
| 1277 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 1278 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 1279 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 1280 | + dldir=$destdir/`dirname \$dlpath`~ |
| 1281 | + test -d \$dldir || mkdir -p \$dldir~ |
| 1282 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 1283 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 1284 | + dlpath=$dir/\$dldll~ |
| 1285 | + $RM \$dlpath' |
| 1286 | + shlibpath_overrides_runpath=yes |
| 1287 | + dynamic_linker='Win32 link.exe' |
| 1288 | ;; |
| 1289 | |
| 1290 | *) |
| 1291 | + # Assume MSVC wrapper |
| 1292 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 1293 | + dynamic_linker='Win32 ld.exe' |
| 1294 | ;; |
| 1295 | esac |
| 1296 | - dynamic_linker='Win32 ld.exe' |
| 1297 | # FIXME: first we should search . and the directory the executable is in |
| 1298 | shlibpath_var=PATH |
| 1299 | ;; |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1300 | @@ -10627,7 +11282,7 @@ haiku*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1301 | soname_spec='${libname}${release}${shared_ext}$major' |
| 1302 | shlibpath_var=LIBRARY_PATH |
| 1303 | shlibpath_overrides_runpath=yes |
| 1304 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' |
| 1305 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
| 1306 | hardcode_into_libs=yes |
| 1307 | ;; |
| 1308 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1309 | @@ -11423,7 +12078,7 @@ else |
| 1310 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 1311 | lt_status=$lt_dlunknown |
| 1312 | cat > conftest.$ac_ext <<_LT_EOF |
| 1313 | -#line 11426 "configure" |
| 1314 | +#line $LINENO "configure" |
| 1315 | #include "confdefs.h" |
| 1316 | |
| 1317 | #if HAVE_DLFCN_H |
| 1318 | @@ -11467,10 +12122,10 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1319 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 1320 | correspondingly for the symbols needed. */ |
| 1321 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 1322 | -void fnord () __attribute__((visibility("default"))); |
| 1323 | +int fnord () __attribute__((visibility("default"))); |
| 1324 | #endif |
| 1325 | |
| 1326 | -void fnord () { int i=42; } |
| 1327 | +int fnord () { return 42; } |
| 1328 | int main () |
| 1329 | { |
| 1330 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1331 | @@ -11529,7 +12184,7 @@ else |
| 1332 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 1333 | lt_status=$lt_dlunknown |
| 1334 | cat > conftest.$ac_ext <<_LT_EOF |
| 1335 | -#line 11532 "configure" |
| 1336 | +#line $LINENO "configure" |
| 1337 | #include "confdefs.h" |
| 1338 | |
| 1339 | #if HAVE_DLFCN_H |
| 1340 | @@ -11573,10 +12228,10 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1341 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 1342 | correspondingly for the symbols needed. */ |
| 1343 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 1344 | -void fnord () __attribute__((visibility("default"))); |
| 1345 | +int fnord () __attribute__((visibility("default"))); |
| 1346 | #endif |
| 1347 | |
| 1348 | -void fnord () { int i=42; } |
| 1349 | +int fnord () { return 42; } |
| 1350 | int main () |
| 1351 | { |
| 1352 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1353 | @@ -15121,7 +15776,7 @@ SHARED_LDFLAGS= |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1354 | if test "$enable_shared" = "yes"; then |
| 1355 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` |
| 1356 | if test -n "$x"; then |
| 1357 | - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" |
| 1358 | + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" |
| 1359 | fi |
| 1360 | |
| 1361 | # More hacks to build DLLs on Windows. |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1362 | @@ -16746,13 +17401,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1363 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 1364 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 1365 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 1366 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 1367 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 1368 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 1369 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 1370 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 1371 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 1372 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 1373 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 1374 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 1375 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 1376 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 1377 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 1378 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 1379 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 1380 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 1381 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 1382 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1383 | @@ -16767,14 +17429,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1384 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 1385 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 1386 | 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"`' |
| 1387 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 1388 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 1389 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 1390 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 1391 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 1392 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 1393 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 1394 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 1395 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 1396 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 1397 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 1398 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 1399 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 1400 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 1401 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1402 | @@ -16807,12 +17472,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1403 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 1404 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 1405 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 1406 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 1407 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 1408 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 1409 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 1410 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 1411 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 1412 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 1413 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 1414 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 1415 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1416 | @@ -16867,8 +17532,13 @@ reload_flag \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1417 | OBJDUMP \ |
| 1418 | deplibs_check_method \ |
| 1419 | file_magic_cmd \ |
| 1420 | +file_magic_glob \ |
| 1421 | +want_nocaseglob \ |
| 1422 | +DLLTOOL \ |
| 1423 | +sharedlib_from_linklib_cmd \ |
| 1424 | AR \ |
| 1425 | AR_FLAGS \ |
| 1426 | +archiver_list_spec \ |
| 1427 | STRIP \ |
| 1428 | RANLIB \ |
| 1429 | CC \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1430 | @@ -16878,12 +17548,14 @@ lt_cv_sys_global_symbol_pipe \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1431 | lt_cv_sys_global_symbol_to_cdecl \ |
| 1432 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 1433 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 1434 | +nm_file_list_spec \ |
| 1435 | lt_prog_compiler_no_builtin_flag \ |
| 1436 | -lt_prog_compiler_wl \ |
| 1437 | lt_prog_compiler_pic \ |
| 1438 | +lt_prog_compiler_wl \ |
| 1439 | lt_prog_compiler_static \ |
| 1440 | lt_cv_prog_compiler_c_o \ |
| 1441 | need_locks \ |
| 1442 | +MANIFEST_TOOL \ |
| 1443 | DSYMUTIL \ |
| 1444 | NMEDIT \ |
| 1445 | LIPO \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1446 | @@ -16899,7 +17571,6 @@ no_undefined_flag \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1447 | hardcode_libdir_flag_spec \ |
| 1448 | hardcode_libdir_flag_spec_ld \ |
| 1449 | hardcode_libdir_separator \ |
| 1450 | -fix_srcfile_path \ |
| 1451 | exclude_expsyms \ |
| 1452 | include_expsyms \ |
| 1453 | file_list_spec \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1454 | @@ -16935,6 +17606,7 @@ module_cmds \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1455 | module_expsym_cmds \ |
| 1456 | export_symbols_cmds \ |
| 1457 | prelink_cmds \ |
| 1458 | +postlink_cmds \ |
| 1459 | postinstall_cmds \ |
| 1460 | postuninstall_cmds \ |
| 1461 | finish_cmds \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1462 | @@ -17714,7 +18386,8 @@ $as_echo X"$file" | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1463 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 1464 | # |
| 1465 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 1466 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 1467 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 1468 | +# Inc. |
| 1469 | # Written by Gordon Matzigkeit, 1996 |
| 1470 | # |
| 1471 | # This file is part of GNU Libtool. |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1472 | @@ -17817,19 +18490,42 @@ SP2NL=$lt_lt_SP2NL |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1473 | # turn newlines into spaces. |
| 1474 | NL2SP=$lt_lt_NL2SP |
| 1475 | |
| 1476 | +# convert \$build file names to \$host format. |
| 1477 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 1478 | + |
| 1479 | +# convert \$build files to toolchain format. |
| 1480 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 1481 | + |
| 1482 | # An object symbol dumper. |
| 1483 | OBJDUMP=$lt_OBJDUMP |
| 1484 | |
| 1485 | # Method to check whether dependent libraries are shared objects. |
| 1486 | deplibs_check_method=$lt_deplibs_check_method |
| 1487 | |
| 1488 | -# Command to use when deplibs_check_method == "file_magic". |
| 1489 | +# Command to use when deplibs_check_method = "file_magic". |
| 1490 | file_magic_cmd=$lt_file_magic_cmd |
| 1491 | |
| 1492 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 1493 | +file_magic_glob=$lt_file_magic_glob |
| 1494 | + |
| 1495 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 1496 | +want_nocaseglob=$lt_want_nocaseglob |
| 1497 | + |
| 1498 | +# DLL creation program. |
| 1499 | +DLLTOOL=$lt_DLLTOOL |
| 1500 | + |
| 1501 | +# Command to associate shared and link libraries. |
| 1502 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 1503 | + |
| 1504 | # The archiver. |
| 1505 | AR=$lt_AR |
| 1506 | + |
| 1507 | +# Flags to create an archive. |
| 1508 | AR_FLAGS=$lt_AR_FLAGS |
| 1509 | |
| 1510 | +# How to feed a file listing to the archiver. |
| 1511 | +archiver_list_spec=$lt_archiver_list_spec |
| 1512 | + |
| 1513 | # A symbol stripping program. |
| 1514 | STRIP=$lt_STRIP |
| 1515 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1516 | @@ -17859,6 +18555,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1517 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 1518 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 1519 | |
| 1520 | +# Specify filename containing input files for \$NM. |
| 1521 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 1522 | + |
| 1523 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 1524 | +lt_sysroot=$lt_sysroot |
| 1525 | + |
| 1526 | # The name of the directory that contains temporary libtool files. |
| 1527 | objdir=$objdir |
| 1528 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1529 | @@ -17868,6 +18570,9 @@ MAGIC_CMD=$MAGIC_CMD |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1530 | # Must we lock files when doing compilation? |
| 1531 | need_locks=$lt_need_locks |
| 1532 | |
| 1533 | +# Manifest tool. |
| 1534 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 1535 | + |
| 1536 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 1537 | DSYMUTIL=$lt_DSYMUTIL |
| 1538 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1539 | @@ -17982,12 +18687,12 @@ with_gcc=$GCC |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1540 | # Compiler flag to turn off builtin functions. |
| 1541 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 1542 | |
| 1543 | -# How to pass a linker flag through the compiler. |
| 1544 | -wl=$lt_lt_prog_compiler_wl |
| 1545 | - |
| 1546 | # Additional compiler flags for building library objects. |
| 1547 | pic_flag=$lt_lt_prog_compiler_pic |
| 1548 | |
| 1549 | +# How to pass a linker flag through the compiler. |
| 1550 | +wl=$lt_lt_prog_compiler_wl |
| 1551 | + |
| 1552 | # Compiler flag to prevent dynamic linking. |
| 1553 | link_static_flag=$lt_lt_prog_compiler_static |
| 1554 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1555 | @@ -18074,9 +18779,6 @@ inherit_rpath=$inherit_rpath |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1556 | # Whether libtool must link a program against all its dependency libraries. |
| 1557 | link_all_deplibs=$link_all_deplibs |
| 1558 | |
| 1559 | -# Fix the shell variable \$srcfile for the compiler. |
| 1560 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 1561 | - |
| 1562 | # Set to "yes" if exported symbols are required. |
| 1563 | always_export_symbols=$always_export_symbols |
| 1564 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1565 | @@ -18092,6 +18794,9 @@ include_expsyms=$lt_include_expsyms |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1566 | # Commands necessary for linking programs (against libraries) with templates. |
| 1567 | prelink_cmds=$lt_prelink_cmds |
| 1568 | |
| 1569 | +# Commands necessary for finishing linking programs. |
| 1570 | +postlink_cmds=$lt_postlink_cmds |
| 1571 | + |
| 1572 | # Specify filename containing input files. |
| 1573 | file_list_spec=$lt_file_list_spec |
| 1574 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1575 | @@ -18124,210 +18829,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1576 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 1577 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 1578 | # is reportedly fixed, but why not run on old versions too? |
| 1579 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 1580 | - || (rm -f "$cfgfile"; exit 1) |
| 1581 | - |
| 1582 | - case $xsi_shell in |
| 1583 | - yes) |
| 1584 | - cat << \_LT_EOF >> "$cfgfile" |
| 1585 | - |
| 1586 | -# func_dirname file append nondir_replacement |
| 1587 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 1588 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 1589 | -func_dirname () |
| 1590 | -{ |
| 1591 | - case ${1} in |
| 1592 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 1593 | - * ) func_dirname_result="${3}" ;; |
| 1594 | - esac |
| 1595 | -} |
| 1596 | - |
| 1597 | -# func_basename file |
| 1598 | -func_basename () |
| 1599 | -{ |
| 1600 | - func_basename_result="${1##*/}" |
| 1601 | -} |
| 1602 | - |
| 1603 | -# func_dirname_and_basename file append nondir_replacement |
| 1604 | -# perform func_basename and func_dirname in a single function |
| 1605 | -# call: |
| 1606 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 1607 | -# add APPEND to the result, otherwise set result |
| 1608 | -# to NONDIR_REPLACEMENT. |
| 1609 | -# value returned in "$func_dirname_result" |
| 1610 | -# basename: Compute filename of FILE. |
| 1611 | -# value retuned in "$func_basename_result" |
| 1612 | -# Implementation must be kept synchronized with func_dirname |
| 1613 | -# and func_basename. For efficiency, we do not delegate to |
| 1614 | -# those functions but instead duplicate the functionality here. |
| 1615 | -func_dirname_and_basename () |
| 1616 | -{ |
| 1617 | - case ${1} in |
| 1618 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 1619 | - * ) func_dirname_result="${3}" ;; |
| 1620 | - esac |
| 1621 | - func_basename_result="${1##*/}" |
| 1622 | -} |
| 1623 | - |
| 1624 | -# func_stripname prefix suffix name |
| 1625 | -# strip PREFIX and SUFFIX off of NAME. |
| 1626 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 1627 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 1628 | -# dot (in which case that matches only a dot). |
| 1629 | -func_stripname () |
| 1630 | -{ |
| 1631 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 1632 | - # positional parameters, so assign one to ordinary parameter first. |
| 1633 | - func_stripname_result=${3} |
| 1634 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 1635 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 1636 | -} |
| 1637 | - |
| 1638 | -# func_opt_split |
| 1639 | -func_opt_split () |
| 1640 | -{ |
| 1641 | - func_opt_split_opt=${1%%=*} |
| 1642 | - func_opt_split_arg=${1#*=} |
| 1643 | -} |
| 1644 | - |
| 1645 | -# func_lo2o object |
| 1646 | -func_lo2o () |
| 1647 | -{ |
| 1648 | - case ${1} in |
| 1649 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 1650 | - *) func_lo2o_result=${1} ;; |
| 1651 | - esac |
| 1652 | -} |
| 1653 | - |
| 1654 | -# func_xform libobj-or-source |
| 1655 | -func_xform () |
| 1656 | -{ |
| 1657 | - func_xform_result=${1%.*}.lo |
| 1658 | -} |
| 1659 | - |
| 1660 | -# func_arith arithmetic-term... |
| 1661 | -func_arith () |
| 1662 | -{ |
| 1663 | - func_arith_result=$(( $* )) |
| 1664 | -} |
| 1665 | - |
| 1666 | -# func_len string |
| 1667 | -# STRING may not start with a hyphen. |
| 1668 | -func_len () |
| 1669 | -{ |
| 1670 | - func_len_result=${#1} |
| 1671 | -} |
| 1672 | - |
| 1673 | -_LT_EOF |
| 1674 | - ;; |
| 1675 | - *) # Bourne compatible functions. |
| 1676 | - cat << \_LT_EOF >> "$cfgfile" |
| 1677 | - |
| 1678 | -# func_dirname file append nondir_replacement |
| 1679 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 1680 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 1681 | -func_dirname () |
| 1682 | -{ |
| 1683 | - # Extract subdirectory from the argument. |
| 1684 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 1685 | - if test "X$func_dirname_result" = "X${1}"; then |
| 1686 | - func_dirname_result="${3}" |
| 1687 | - else |
| 1688 | - func_dirname_result="$func_dirname_result${2}" |
| 1689 | - fi |
| 1690 | -} |
| 1691 | - |
| 1692 | -# func_basename file |
| 1693 | -func_basename () |
| 1694 | -{ |
| 1695 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 1696 | -} |
| 1697 | - |
| 1698 | - |
| 1699 | -# func_stripname prefix suffix name |
| 1700 | -# strip PREFIX and SUFFIX off of NAME. |
| 1701 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 1702 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 1703 | -# dot (in which case that matches only a dot). |
| 1704 | -# func_strip_suffix prefix name |
| 1705 | -func_stripname () |
| 1706 | -{ |
| 1707 | - case ${2} in |
| 1708 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 1709 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 1710 | - esac |
| 1711 | -} |
| 1712 | - |
| 1713 | -# sed scripts: |
| 1714 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 1715 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 1716 | - |
| 1717 | -# func_opt_split |
| 1718 | -func_opt_split () |
| 1719 | -{ |
| 1720 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 1721 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 1722 | -} |
| 1723 | - |
| 1724 | -# func_lo2o object |
| 1725 | -func_lo2o () |
| 1726 | -{ |
| 1727 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 1728 | -} |
| 1729 | - |
| 1730 | -# func_xform libobj-or-source |
| 1731 | -func_xform () |
| 1732 | -{ |
| 1733 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 1734 | -} |
| 1735 | - |
| 1736 | -# func_arith arithmetic-term... |
| 1737 | -func_arith () |
| 1738 | -{ |
| 1739 | - func_arith_result=`expr "$@"` |
| 1740 | -} |
| 1741 | - |
| 1742 | -# func_len string |
| 1743 | -# STRING may not start with a hyphen. |
| 1744 | -func_len () |
| 1745 | -{ |
| 1746 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 1747 | -} |
| 1748 | - |
| 1749 | -_LT_EOF |
| 1750 | -esac |
| 1751 | - |
| 1752 | -case $lt_shell_append in |
| 1753 | - yes) |
| 1754 | - cat << \_LT_EOF >> "$cfgfile" |
| 1755 | - |
| 1756 | -# func_append var value |
| 1757 | -# Append VALUE to the end of shell variable VAR. |
| 1758 | -func_append () |
| 1759 | -{ |
| 1760 | - eval "$1+=\$2" |
| 1761 | -} |
| 1762 | -_LT_EOF |
| 1763 | - ;; |
| 1764 | - *) |
| 1765 | - cat << \_LT_EOF >> "$cfgfile" |
| 1766 | - |
| 1767 | -# func_append var value |
| 1768 | -# Append VALUE to the end of shell variable VAR. |
| 1769 | -func_append () |
| 1770 | -{ |
| 1771 | - eval "$1=\$$1\$2" |
| 1772 | -} |
| 1773 | - |
| 1774 | -_LT_EOF |
| 1775 | - ;; |
| 1776 | - esac |
| 1777 | - |
| 1778 | - |
| 1779 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 1780 | - || (rm -f "$cfgfile"; exit 1) |
| 1781 | - |
| 1782 | - mv -f "$cfgfile" "$ofile" || |
| 1783 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 1784 | + || (rm -f "$cfgfile"; exit 1) |
| 1785 | + |
| 1786 | + if test x"$xsi_shell" = xyes; then |
| 1787 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 1788 | +func_dirname ()\ |
| 1789 | +{\ |
| 1790 | +\ case ${1} in\ |
| 1791 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 1792 | +\ * ) func_dirname_result="${3}" ;;\ |
| 1793 | +\ esac\ |
| 1794 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1795 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1796 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1797 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1798 | + |
| 1799 | + |
| 1800 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 1801 | +func_basename ()\ |
| 1802 | +{\ |
| 1803 | +\ func_basename_result="${1##*/}"\ |
| 1804 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1805 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1806 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1807 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1808 | + |
| 1809 | + |
| 1810 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 1811 | +func_dirname_and_basename ()\ |
| 1812 | +{\ |
| 1813 | +\ case ${1} in\ |
| 1814 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 1815 | +\ * ) func_dirname_result="${3}" ;;\ |
| 1816 | +\ esac\ |
| 1817 | +\ func_basename_result="${1##*/}"\ |
| 1818 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1819 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1820 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1821 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1822 | + |
| 1823 | + |
| 1824 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 1825 | +func_stripname ()\ |
| 1826 | +{\ |
| 1827 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 1828 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 1829 | +\ func_stripname_result=${3}\ |
| 1830 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 1831 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 1832 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1833 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1834 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1835 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1836 | + |
| 1837 | + |
| 1838 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 1839 | +func_split_long_opt ()\ |
| 1840 | +{\ |
| 1841 | +\ func_split_long_opt_name=${1%%=*}\ |
| 1842 | +\ func_split_long_opt_arg=${1#*=}\ |
| 1843 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1844 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1845 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1846 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1847 | + |
| 1848 | + |
| 1849 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 1850 | +func_split_short_opt ()\ |
| 1851 | +{\ |
| 1852 | +\ func_split_short_opt_arg=${1#??}\ |
| 1853 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 1854 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1855 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1856 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1857 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1858 | + |
| 1859 | + |
| 1860 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 1861 | +func_lo2o ()\ |
| 1862 | +{\ |
| 1863 | +\ case ${1} in\ |
| 1864 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 1865 | +\ *) func_lo2o_result=${1} ;;\ |
| 1866 | +\ esac\ |
| 1867 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1868 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1869 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1870 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1871 | + |
| 1872 | + |
| 1873 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 1874 | +func_xform ()\ |
| 1875 | +{\ |
| 1876 | + func_xform_result=${1%.*}.lo\ |
| 1877 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1878 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1879 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1880 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1881 | + |
| 1882 | + |
| 1883 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 1884 | +func_arith ()\ |
| 1885 | +{\ |
| 1886 | + func_arith_result=$(( $* ))\ |
| 1887 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1888 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1889 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1890 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1891 | + |
| 1892 | + |
| 1893 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 1894 | +func_len ()\ |
| 1895 | +{\ |
| 1896 | + func_len_result=${#1}\ |
| 1897 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1898 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1899 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1900 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1901 | + |
| 1902 | +fi |
| 1903 | + |
| 1904 | +if test x"$lt_shell_append" = xyes; then |
| 1905 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 1906 | +func_append ()\ |
| 1907 | +{\ |
| 1908 | + eval "${1}+=\\${2}"\ |
| 1909 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1910 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1911 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1912 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1913 | + |
| 1914 | + |
| 1915 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 1916 | +func_append_quoted ()\ |
| 1917 | +{\ |
| 1918 | +\ func_quote_for_eval "${2}"\ |
| 1919 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 1920 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 1921 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1922 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1923 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 1924 | + |
| 1925 | + |
| 1926 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 1927 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 1928 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1929 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1930 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 1931 | +else |
| 1932 | + # Save a `func_append' function call even when '+=' is not available |
| 1933 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 1934 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 1935 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 1936 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 1937 | +fi |
| 1938 | + |
| 1939 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 1940 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 1941 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 1942 | +fi |
| 1943 | + |
| 1944 | + |
| 1945 | + mv -f "$cfgfile" "$ofile" || |
| 1946 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 1947 | chmod +x "$ofile" |
| 1948 | |
| 1949 | diff --git a/bfd/configure.ac b/bfd/configure.ac |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1950 | index 6f5e85f..44bd02c 100644 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1951 | --- a/bfd/configure.ac |
| 1952 | +++ b/bfd/configure.ac |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1953 | @@ -567,7 +567,7 @@ changequote(,)dnl |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1954 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` |
| 1955 | changequote([,])dnl |
| 1956 | if test -n "$x"; then |
| 1957 | - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" |
| 1958 | + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" |
| 1959 | fi |
| 1960 | |
| 1961 | # More hacks to build DLLs on Windows. |
| 1962 | diff --git a/binutils/configure b/binutils/configure |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1963 | index d4f3e1e..a6df5bb 100755 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1964 | --- a/binutils/configure |
| 1965 | +++ b/binutils/configure |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1966 | @@ -657,8 +657,11 @@ OTOOL |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1967 | LIPO |
| 1968 | NMEDIT |
| 1969 | DSYMUTIL |
| 1970 | +MANIFEST_TOOL |
| 1971 | RANLIB |
| 1972 | +ac_ct_AR |
| 1973 | AR |
| 1974 | +DLLTOOL |
| 1975 | OBJDUMP |
| 1976 | LN_S |
| 1977 | NM |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1978 | @@ -769,6 +772,7 @@ enable_static |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1979 | with_pic |
| 1980 | enable_fast_install |
| 1981 | with_gnu_ld |
| 1982 | +with_libtool_sysroot |
| 1983 | enable_libtool_lock |
| 1984 | enable_plugins |
| 1985 | enable_largefile |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1986 | @@ -1441,6 +1445,8 @@ Optional Packages: |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1987 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 1988 | both] |
| 1989 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 1990 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 1991 | + (or the compiler's sysroot if not specified). |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1992 | --with-system-zlib use installed libz |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1993 | --with-gnu-ld assume the C compiler uses GNU ld default=no |
| 1994 | --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1995 | @@ -5155,8 +5161,8 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1996 | |
| 1997 | |
| 1998 | |
| 1999 | -macro_version='2.2.7a' |
| 2000 | -macro_revision='1.3134' |
| 2001 | +macro_version='2.4' |
| 2002 | +macro_revision='1.3293' |
| 2003 | |
| 2004 | |
| 2005 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2006 | @@ -5196,7 +5202,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2007 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 2008 | $as_echo_n "checking how to print strings... " >&6; } |
| 2009 | # Test print first, because it will be a builtin if present. |
| 2010 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 2011 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 2012 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 2013 | ECHO='print -r --' |
| 2014 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2015 | @@ -5882,8 +5888,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2016 | # Try some XSI features |
| 2017 | xsi_shell=no |
| 2018 | ( _lt_dummy="a/b/c" |
| 2019 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 2020 | - = c,a/b,, \ |
| 2021 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 2022 | + = c,a/b,b/c, \ |
| 2023 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 2024 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 2025 | && xsi_shell=yes |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2026 | @@ -5932,6 +5938,80 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2027 | |
| 2028 | |
| 2029 | |
| 2030 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 2031 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 2032 | +if test "${lt_cv_to_host_file_cmd+set}" = set; then : |
| 2033 | + $as_echo_n "(cached) " >&6 |
| 2034 | +else |
| 2035 | + case $host in |
| 2036 | + *-*-mingw* ) |
| 2037 | + case $build in |
| 2038 | + *-*-mingw* ) # actually msys |
| 2039 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 2040 | + ;; |
| 2041 | + *-*-cygwin* ) |
| 2042 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 2043 | + ;; |
| 2044 | + * ) # otherwise, assume *nix |
| 2045 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 2046 | + ;; |
| 2047 | + esac |
| 2048 | + ;; |
| 2049 | + *-*-cygwin* ) |
| 2050 | + case $build in |
| 2051 | + *-*-mingw* ) # actually msys |
| 2052 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 2053 | + ;; |
| 2054 | + *-*-cygwin* ) |
| 2055 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 2056 | + ;; |
| 2057 | + * ) # otherwise, assume *nix |
| 2058 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 2059 | + ;; |
| 2060 | + esac |
| 2061 | + ;; |
| 2062 | + * ) # unhandled hosts (and "normal" native builds) |
| 2063 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 2064 | + ;; |
| 2065 | +esac |
| 2066 | + |
| 2067 | +fi |
| 2068 | + |
| 2069 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 2070 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 2071 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 2072 | + |
| 2073 | + |
| 2074 | + |
| 2075 | + |
| 2076 | + |
| 2077 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 2078 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 2079 | +if test "${lt_cv_to_tool_file_cmd+set}" = set; then : |
| 2080 | + $as_echo_n "(cached) " >&6 |
| 2081 | +else |
| 2082 | + #assume ordinary cross tools, or native build. |
| 2083 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 2084 | +case $host in |
| 2085 | + *-*-mingw* ) |
| 2086 | + case $build in |
| 2087 | + *-*-mingw* ) # actually msys |
| 2088 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 2089 | + ;; |
| 2090 | + esac |
| 2091 | + ;; |
| 2092 | +esac |
| 2093 | + |
| 2094 | +fi |
| 2095 | + |
| 2096 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 2097 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 2098 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 2099 | + |
| 2100 | + |
| 2101 | + |
| 2102 | + |
| 2103 | + |
| 2104 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 2105 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 2106 | if test "${lt_cv_ld_reload_flag+set}" = set; then : |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2107 | @@ -5948,6 +6028,11 @@ case $reload_flag in |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2108 | esac |
| 2109 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 2110 | case $host_os in |
| 2111 | + cygwin* | mingw* | pw32* | cegcc*) |
| 2112 | + if test "$GCC" != yes; then |
| 2113 | + reload_cmds=false |
| 2114 | + fi |
| 2115 | + ;; |
| 2116 | darwin*) |
| 2117 | if test "$GCC" = yes; then |
| 2118 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2119 | @@ -6116,7 +6201,8 @@ mingw* | pw32*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2120 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 2121 | lt_cv_file_magic_cmd='func_win32_libid' |
| 2122 | else |
| 2123 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 2124 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 2125 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 2126 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 2127 | fi |
| 2128 | ;; |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2129 | @@ -6270,6 +6356,21 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2130 | fi |
| 2131 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 2132 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 2133 | + |
| 2134 | +file_magic_glob= |
| 2135 | +want_nocaseglob=no |
| 2136 | +if test "$build" = "$host"; then |
| 2137 | + case $host_os in |
| 2138 | + mingw* | pw32*) |
| 2139 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 2140 | + want_nocaseglob=yes |
| 2141 | + else |
| 2142 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 2143 | + fi |
| 2144 | + ;; |
| 2145 | + esac |
| 2146 | +fi |
| 2147 | + |
| 2148 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 2149 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 2150 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2151 | @@ -6285,9 +6386,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2152 | |
| 2153 | |
| 2154 | |
| 2155 | + |
| 2156 | + |
| 2157 | + |
| 2158 | + |
| 2159 | + |
| 2160 | + |
| 2161 | + |
| 2162 | + |
| 2163 | + |
| 2164 | + |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2165 | +if test -n "$ac_tool_prefix"; then |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2166 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 2167 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 2168 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 2169 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 2170 | +if test "${ac_cv_prog_DLLTOOL+set}" = set; then : |
| 2171 | + $as_echo_n "(cached) " >&6 |
| 2172 | +else |
| 2173 | + if test -n "$DLLTOOL"; then |
| 2174 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 2175 | +else |
| 2176 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 2177 | +for as_dir in $PATH |
| 2178 | +do |
| 2179 | + IFS=$as_save_IFS |
| 2180 | + test -z "$as_dir" && as_dir=. |
| 2181 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 2182 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 2183 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 2184 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2185 | + break 2 |
| 2186 | + fi |
| 2187 | +done |
| 2188 | + done |
| 2189 | +IFS=$as_save_IFS |
| 2190 | + |
| 2191 | +fi |
| 2192 | +fi |
| 2193 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 2194 | +if test -n "$DLLTOOL"; then |
| 2195 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 2196 | +$as_echo "$DLLTOOL" >&6; } |
| 2197 | +else |
| 2198 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 2199 | +$as_echo "no" >&6; } |
| 2200 | +fi |
| 2201 | + |
| 2202 | + |
| 2203 | +fi |
| 2204 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 2205 | + ac_ct_DLLTOOL=$DLLTOOL |
| 2206 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 2207 | +set dummy dlltool; ac_word=$2 |
| 2208 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 2209 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 2210 | +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : |
| 2211 | + $as_echo_n "(cached) " >&6 |
| 2212 | +else |
| 2213 | + if test -n "$ac_ct_DLLTOOL"; then |
| 2214 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 2215 | +else |
| 2216 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 2217 | +for as_dir in $PATH |
| 2218 | +do |
| 2219 | + IFS=$as_save_IFS |
| 2220 | + test -z "$as_dir" && as_dir=. |
| 2221 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 2222 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 2223 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 2224 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2225 | + break 2 |
| 2226 | + fi |
| 2227 | +done |
| 2228 | + done |
| 2229 | +IFS=$as_save_IFS |
| 2230 | + |
| 2231 | +fi |
| 2232 | +fi |
| 2233 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 2234 | +if test -n "$ac_ct_DLLTOOL"; then |
| 2235 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 2236 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 2237 | +else |
| 2238 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 2239 | +$as_echo "no" >&6; } |
| 2240 | +fi |
| 2241 | + |
| 2242 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 2243 | + DLLTOOL="false" |
| 2244 | + else |
| 2245 | + case $cross_compiling:$ac_tool_warned in |
| 2246 | +yes:) |
| 2247 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 2248 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 2249 | +ac_tool_warned=yes ;; |
| 2250 | +esac |
| 2251 | + DLLTOOL=$ac_ct_DLLTOOL |
| 2252 | + fi |
| 2253 | +else |
| 2254 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 2255 | +fi |
| 2256 | + |
| 2257 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 2258 | + |
| 2259 | + |
| 2260 | + |
| 2261 | + |
| 2262 | + |
| 2263 | + |
| 2264 | + |
| 2265 | + |
| 2266 | + |
| 2267 | + |
| 2268 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 2269 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 2270 | +if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : |
| 2271 | + $as_echo_n "(cached) " >&6 |
| 2272 | +else |
| 2273 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 2274 | + |
| 2275 | +case $host_os in |
| 2276 | +cygwin* | mingw* | pw32* | cegcc*) |
| 2277 | + # two different shell functions defined in ltmain.sh |
| 2278 | + # decide which to use based on capabilities of $DLLTOOL |
| 2279 | + case `$DLLTOOL --help 2>&1` in |
| 2280 | + *--identify-strict*) |
| 2281 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 2282 | + ;; |
| 2283 | + *) |
| 2284 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 2285 | + ;; |
| 2286 | + esac |
| 2287 | + ;; |
| 2288 | +*) |
| 2289 | + # fallback: assume linklib IS sharedlib |
| 2290 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 2291 | + ;; |
| 2292 | +esac |
| 2293 | + |
| 2294 | +fi |
| 2295 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 2296 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 2297 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 2298 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 2299 | + |
| 2300 | + |
| 2301 | + |
| 2302 | + |
| 2303 | + |
| 2304 | + |
| 2305 | + |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2306 | if test -n "$ac_tool_prefix"; then |
| 2307 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 2308 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2309 | + for ac_prog in ar |
| 2310 | + do |
| 2311 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 2312 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 2313 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 2314 | $as_echo_n "checking for $ac_word... " >&6; } |
| 2315 | if test "${ac_cv_prog_AR+set}" = set; then : |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2316 | @@ -6303,7 +6557,7 @@ do |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2317 | test -z "$as_dir" && as_dir=. |
| 2318 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 2319 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 2320 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 2321 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 2322 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2323 | break 2 |
| 2324 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2325 | @@ -6323,11 +6577,15 @@ $as_echo "no" >&6; } |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2326 | fi |
| 2327 | |
| 2328 | |
| 2329 | + test -n "$AR" && break |
| 2330 | + done |
| 2331 | fi |
| 2332 | -if test -z "$ac_cv_prog_AR"; then |
| 2333 | +if test -z "$AR"; then |
| 2334 | ac_ct_AR=$AR |
| 2335 | - # Extract the first word of "ar", so it can be a program name with args. |
| 2336 | -set dummy ar; ac_word=$2 |
| 2337 | + for ac_prog in ar |
| 2338 | +do |
| 2339 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 2340 | +set dummy $ac_prog; ac_word=$2 |
| 2341 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 2342 | $as_echo_n "checking for $ac_word... " >&6; } |
| 2343 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2344 | @@ -6343,7 +6601,7 @@ do |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2345 | test -z "$as_dir" && as_dir=. |
| 2346 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 2347 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 2348 | - ac_cv_prog_ac_ct_AR="ar" |
| 2349 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 2350 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2351 | break 2 |
| 2352 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2353 | @@ -6362,6 +6620,10 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2354 | $as_echo "no" >&6; } |
| 2355 | fi |
| 2356 | |
| 2357 | + |
| 2358 | + test -n "$ac_ct_AR" && break |
| 2359 | +done |
| 2360 | + |
| 2361 | if test "x$ac_ct_AR" = x; then |
| 2362 | AR="false" |
| 2363 | else |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2364 | @@ -6373,12 +6635,10 @@ ac_tool_warned=yes ;; |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2365 | esac |
| 2366 | AR=$ac_ct_AR |
| 2367 | fi |
| 2368 | -else |
| 2369 | - AR="$ac_cv_prog_AR" |
| 2370 | fi |
| 2371 | |
| 2372 | -test -z "$AR" && AR=ar |
| 2373 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 2374 | +: ${AR=ar} |
| 2375 | +: ${AR_FLAGS=cru} |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2376 | |
| 2377 | |
| 2378 | |
| 2379 | @@ -6390,6 +6650,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 2380 | |
| 2381 | |
| 2382 | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2383 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 2384 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 2385 | +if test "${lt_cv_ar_at_file+set}" = set; then : |
| 2386 | + $as_echo_n "(cached) " >&6 |
| 2387 | +else |
| 2388 | + lt_cv_ar_at_file=no |
| 2389 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 2390 | +/* end confdefs.h. */ |
| 2391 | + |
| 2392 | +int |
| 2393 | +main () |
| 2394 | +{ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2395 | + |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2396 | + ; |
| 2397 | + return 0; |
| 2398 | +} |
| 2399 | +_ACEOF |
| 2400 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 2401 | + echo conftest.$ac_objext > conftest.lst |
| 2402 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 2403 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 2404 | + (eval $lt_ar_try) 2>&5 |
| 2405 | + ac_status=$? |
| 2406 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 2407 | + test $ac_status = 0; } |
| 2408 | + if test "$ac_status" -eq 0; then |
| 2409 | + # Ensure the archiver fails upon bogus file names. |
| 2410 | + rm -f conftest.$ac_objext libconftest.a |
| 2411 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 2412 | + (eval $lt_ar_try) 2>&5 |
| 2413 | + ac_status=$? |
| 2414 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 2415 | + test $ac_status = 0; } |
| 2416 | + if test "$ac_status" -ne 0; then |
| 2417 | + lt_cv_ar_at_file=@ |
| 2418 | + fi |
| 2419 | + fi |
| 2420 | + rm -f conftest.* libconftest.a |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2421 | + |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2422 | +fi |
| 2423 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2424 | + |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2425 | +fi |
| 2426 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 2427 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2428 | + |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2429 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 2430 | + archiver_list_spec= |
| 2431 | +else |
| 2432 | + archiver_list_spec=$lt_cv_ar_at_file |
| 2433 | +fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2434 | + |
| 2435 | + |
| 2436 | + |
| 2437 | + |
| 2438 | + |
| 2439 | + |
| 2440 | + |
| 2441 | if test -n "$ac_tool_prefix"; then |
| 2442 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
| 2443 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
| 2444 | @@ -6724,8 +7042,8 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2445 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 2446 | |
| 2447 | # Transform an extracted symbol line into symbol name and symbol address |
| 2448 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 2449 | -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'" |
| 2450 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 2451 | +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'" |
| 2452 | |
| 2453 | # Handle CRLF in mingw tool chain |
| 2454 | opt_cr= |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2455 | @@ -6761,6 +7079,7 @@ for ac_symprfx in "" "_"; do |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2456 | else |
| 2457 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 2458 | fi |
| 2459 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 2460 | |
| 2461 | # Check to see that the pipe works correctly. |
| 2462 | pipe_works=no |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2463 | @@ -6802,6 +7121,18 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2464 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 2465 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 2466 | cat <<_LT_EOF > conftest.$ac_ext |
| 2467 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 2468 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 2469 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 2470 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 2471 | +# define LT_DLSYM_CONST |
| 2472 | +#elif defined(__osf__) |
| 2473 | +/* This system does not cope well with relocations in const data. */ |
| 2474 | +# define LT_DLSYM_CONST |
| 2475 | +#else |
| 2476 | +# define LT_DLSYM_CONST const |
| 2477 | +#endif |
| 2478 | + |
| 2479 | #ifdef __cplusplus |
| 2480 | extern "C" { |
| 2481 | #endif |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2482 | @@ -6813,7 +7144,7 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2483 | cat <<_LT_EOF >> conftest.$ac_ext |
| 2484 | |
| 2485 | /* The mapping between symbol names and symbols. */ |
| 2486 | -const struct { |
| 2487 | +LT_DLSYM_CONST struct { |
| 2488 | const char *name; |
| 2489 | void *address; |
| 2490 | } |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2491 | @@ -6839,8 +7170,8 @@ static const void *lt_preloaded_setup() { |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2492 | _LT_EOF |
| 2493 | # Now try linking the two files. |
| 2494 | mv conftest.$ac_objext conftstm.$ac_objext |
| 2495 | - lt_save_LIBS="$LIBS" |
| 2496 | - lt_save_CFLAGS="$CFLAGS" |
| 2497 | + lt_globsym_save_LIBS=$LIBS |
| 2498 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 2499 | LIBS="conftstm.$ac_objext" |
| 2500 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 2501 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2502 | @@ -6850,8 +7181,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2503 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 2504 | pipe_works=yes |
| 2505 | fi |
| 2506 | - LIBS="$lt_save_LIBS" |
| 2507 | - CFLAGS="$lt_save_CFLAGS" |
| 2508 | + LIBS=$lt_globsym_save_LIBS |
| 2509 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 2510 | else |
| 2511 | echo "cannot find nm_test_func in $nlist" >&5 |
| 2512 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2513 | @@ -6888,6 +7219,21 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2514 | $as_echo "ok" >&6; } |
| 2515 | fi |
| 2516 | |
| 2517 | +# Response file support. |
| 2518 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 2519 | + nm_file_list_spec='@' |
| 2520 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 2521 | + nm_file_list_spec='@' |
| 2522 | +fi |
| 2523 | + |
| 2524 | + |
| 2525 | + |
| 2526 | + |
| 2527 | + |
| 2528 | + |
| 2529 | + |
| 2530 | + |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2531 | + |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2532 | |
| 2533 | |
| 2534 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2535 | @@ -6906,6 +7252,40 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2536 | |
| 2537 | |
| 2538 | |
| 2539 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 2540 | +$as_echo_n "checking for sysroot... " >&6; } |
| 2541 | + |
| 2542 | +# Check whether --with-libtool-sysroot was given. |
| 2543 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 2544 | + withval=$with_libtool_sysroot; |
| 2545 | +else |
| 2546 | + with_libtool_sysroot=no |
| 2547 | +fi |
| 2548 | + |
| 2549 | + |
| 2550 | +lt_sysroot= |
| 2551 | +case ${with_libtool_sysroot} in #( |
| 2552 | + yes) |
| 2553 | + if test "$GCC" = yes; then |
| 2554 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 2555 | + fi |
| 2556 | + ;; #( |
| 2557 | + /*) |
| 2558 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 2559 | + ;; #( |
| 2560 | + no|'') |
| 2561 | + ;; #( |
| 2562 | + *) |
| 2563 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 2564 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 2565 | + as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 |
| 2566 | + ;; |
| 2567 | +esac |
| 2568 | + |
| 2569 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 2570 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 2571 | + |
| 2572 | + |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2573 | |
| 2574 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2575 | |
| 2576 | @@ -7115,6 +7495,123 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2577 | |
| 2578 | need_locks="$enable_libtool_lock" |
| 2579 | |
| 2580 | +if test -n "$ac_tool_prefix"; then |
| 2581 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 2582 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 2583 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 2584 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 2585 | +if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : |
| 2586 | + $as_echo_n "(cached) " >&6 |
| 2587 | +else |
| 2588 | + if test -n "$MANIFEST_TOOL"; then |
| 2589 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 2590 | +else |
| 2591 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 2592 | +for as_dir in $PATH |
| 2593 | +do |
| 2594 | + IFS=$as_save_IFS |
| 2595 | + test -z "$as_dir" && as_dir=. |
| 2596 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 2597 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 2598 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 2599 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2600 | + break 2 |
| 2601 | + fi |
| 2602 | +done |
| 2603 | + done |
| 2604 | +IFS=$as_save_IFS |
| 2605 | + |
| 2606 | +fi |
| 2607 | +fi |
| 2608 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 2609 | +if test -n "$MANIFEST_TOOL"; then |
| 2610 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 2611 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 2612 | +else |
| 2613 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 2614 | +$as_echo "no" >&6; } |
| 2615 | +fi |
| 2616 | + |
| 2617 | + |
| 2618 | +fi |
| 2619 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 2620 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 2621 | + # Extract the first word of "mt", so it can be a program name with args. |
| 2622 | +set dummy mt; ac_word=$2 |
| 2623 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 2624 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 2625 | +if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : |
| 2626 | + $as_echo_n "(cached) " >&6 |
| 2627 | +else |
| 2628 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 2629 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 2630 | +else |
| 2631 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 2632 | +for as_dir in $PATH |
| 2633 | +do |
| 2634 | + IFS=$as_save_IFS |
| 2635 | + test -z "$as_dir" && as_dir=. |
| 2636 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 2637 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 2638 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 2639 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2640 | + break 2 |
| 2641 | + fi |
| 2642 | +done |
| 2643 | + done |
| 2644 | +IFS=$as_save_IFS |
| 2645 | + |
| 2646 | +fi |
| 2647 | +fi |
| 2648 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 2649 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 2650 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 2651 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 2652 | +else |
| 2653 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 2654 | +$as_echo "no" >&6; } |
| 2655 | +fi |
| 2656 | + |
| 2657 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 2658 | + MANIFEST_TOOL=":" |
| 2659 | + else |
| 2660 | + case $cross_compiling:$ac_tool_warned in |
| 2661 | +yes:) |
| 2662 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 2663 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 2664 | +ac_tool_warned=yes ;; |
| 2665 | +esac |
| 2666 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 2667 | + fi |
| 2668 | +else |
| 2669 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 2670 | +fi |
| 2671 | + |
| 2672 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 2673 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 2674 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 2675 | +if test "${lt_cv_path_mainfest_tool+set}" = set; then : |
| 2676 | + $as_echo_n "(cached) " >&6 |
| 2677 | +else |
| 2678 | + lt_cv_path_mainfest_tool=no |
| 2679 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 2680 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 2681 | + cat conftest.err >&5 |
| 2682 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 2683 | + lt_cv_path_mainfest_tool=yes |
| 2684 | + fi |
| 2685 | + rm -f conftest* |
| 2686 | +fi |
| 2687 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 2688 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 2689 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 2690 | + MANIFEST_TOOL=: |
| 2691 | +fi |
| 2692 | + |
| 2693 | + |
| 2694 | + |
| 2695 | + |
| 2696 | + |
| 2697 | |
| 2698 | case $host_os in |
| 2699 | rhapsody* | darwin*) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2700 | @@ -7678,6 +8175,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2701 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 2702 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 2703 | $AR cru libconftest.a conftest.o 2>&5 |
| 2704 | + echo "$RANLIB libconftest.a" >&5 |
| 2705 | + $RANLIB libconftest.a 2>&5 |
| 2706 | cat > conftest.c << _LT_EOF |
| 2707 | int main() { return 0;} |
| 2708 | _LT_EOF |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2709 | @@ -7873,7 +8372,8 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2710 | LIBTOOL_DEPS="$ltmain" |
| 2711 | |
| 2712 | # Always use our own libtool. |
| 2713 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
| 2714 | +LIBTOOL='$(SHELL) $(top_builddir)' |
| 2715 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" |
| 2716 | |
| 2717 | |
| 2718 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2719 | @@ -7962,7 +8462,7 @@ aix3*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2720 | esac |
| 2721 | |
| 2722 | # Global variables: |
| 2723 | -ofile=libtool |
| 2724 | +ofile=${host_alias}-libtool |
| 2725 | can_build_shared=yes |
| 2726 | |
| 2727 | # All known linkers require a `.a' archive for static linking (except MSVC, |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2728 | @@ -8260,8 +8760,6 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2729 | lt_prog_compiler_pic= |
| 2730 | lt_prog_compiler_static= |
| 2731 | |
| 2732 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 2733 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 2734 | |
| 2735 | if test "$GCC" = yes; then |
| 2736 | lt_prog_compiler_wl='-Wl,' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2737 | @@ -8427,6 +8925,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2738 | lt_prog_compiler_pic='--shared' |
| 2739 | lt_prog_compiler_static='--static' |
| 2740 | ;; |
| 2741 | + nagfor*) |
| 2742 | + # NAG Fortran compiler |
| 2743 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 2744 | + lt_prog_compiler_pic='-PIC' |
| 2745 | + lt_prog_compiler_static='-Bstatic' |
| 2746 | + ;; |
| 2747 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 2748 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 2749 | # which looks to be a dead project) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2750 | @@ -8489,7 +8993,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2751 | lt_prog_compiler_pic='-KPIC' |
| 2752 | lt_prog_compiler_static='-Bstatic' |
| 2753 | case $cc_basename in |
| 2754 | - f77* | f90* | f95*) |
| 2755 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 2756 | lt_prog_compiler_wl='-Qoption ld ';; |
| 2757 | *) |
| 2758 | lt_prog_compiler_wl='-Wl,';; |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2759 | @@ -8546,13 +9050,17 @@ case $host_os in |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2760 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 2761 | ;; |
| 2762 | esac |
| 2763 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 2764 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 2765 | - |
| 2766 | - |
| 2767 | - |
| 2768 | - |
| 2769 | |
| 2770 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 2771 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 2772 | +if test "${lt_cv_prog_compiler_pic+set}" = set; then : |
| 2773 | + $as_echo_n "(cached) " >&6 |
| 2774 | +else |
| 2775 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 2776 | +fi |
| 2777 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 2778 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 2779 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 2780 | |
| 2781 | # |
| 2782 | # Check to make sure the PIC flag actually works. |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2783 | @@ -8613,6 +9121,11 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2784 | |
| 2785 | |
| 2786 | |
| 2787 | + |
| 2788 | + |
| 2789 | + |
| 2790 | + |
| 2791 | + |
| 2792 | # |
| 2793 | # Check to make sure the static flag actually works. |
| 2794 | # |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2795 | @@ -8963,7 +9476,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2796 | allow_undefined_flag=unsupported |
| 2797 | always_export_symbols=no |
| 2798 | enable_shared_with_static_runtimes=yes |
| 2799 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 2800 | + 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' |
| 2801 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 2802 | |
| 2803 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 2804 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2805 | @@ -9062,12 +9576,12 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2806 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 2807 | hardcode_libdir_flag_spec= |
| 2808 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 2809 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 2810 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 2811 | if test "x$supports_anon_versioning" = xyes; then |
| 2812 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 2813 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 2814 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 2815 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 2816 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 2817 | fi |
| 2818 | ;; |
| 2819 | esac |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2820 | @@ -9081,8 +9595,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2821 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 2822 | wlarc= |
| 2823 | else |
| 2824 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 2825 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 2826 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 2827 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 2828 | fi |
| 2829 | ;; |
| 2830 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2831 | @@ -9100,8 +9614,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2832 | |
| 2833 | _LT_EOF |
| 2834 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 2835 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 2836 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 2837 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 2838 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 2839 | else |
| 2840 | ld_shlibs=no |
| 2841 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2842 | @@ -9147,8 +9661,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2843 | |
| 2844 | *) |
| 2845 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 2846 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 2847 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 2848 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 2849 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 2850 | else |
| 2851 | ld_shlibs=no |
| 2852 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2853 | @@ -9278,7 +9792,13 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2854 | allow_undefined_flag='-berok' |
| 2855 | # Determine the default libpath from the value encoded in an |
| 2856 | # empty executable. |
| 2857 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 2858 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 2859 | + aix_libpath=$lt_cv_aix_libpath |
| 2860 | +else |
| 2861 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 2862 | + $as_echo_n "(cached) " >&6 |
| 2863 | +else |
| 2864 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 2865 | /* end confdefs.h. */ |
| 2866 | |
| 2867 | int |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2868 | @@ -9291,22 +9811,29 @@ main () |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2869 | _ACEOF |
| 2870 | if ac_fn_c_try_link "$LINENO"; then : |
| 2871 | |
| 2872 | -lt_aix_libpath_sed=' |
| 2873 | - /Import File Strings/,/^$/ { |
| 2874 | - /^0/ { |
| 2875 | - s/^0 *\(.*\)$/\1/ |
| 2876 | - p |
| 2877 | - } |
| 2878 | - }' |
| 2879 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 2880 | -# Check for a 64-bit object if we didn't find anything. |
| 2881 | -if test -z "$aix_libpath"; then |
| 2882 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 2883 | -fi |
| 2884 | + lt_aix_libpath_sed=' |
| 2885 | + /Import File Strings/,/^$/ { |
| 2886 | + /^0/ { |
| 2887 | + s/^0 *\([^ ]*\) *$/\1/ |
| 2888 | + p |
| 2889 | + } |
| 2890 | + }' |
| 2891 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 2892 | + # Check for a 64-bit object if we didn't find anything. |
| 2893 | + if test -z "$lt_cv_aix_libpath_"; then |
| 2894 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 2895 | + fi |
| 2896 | fi |
| 2897 | rm -f core conftest.err conftest.$ac_objext \ |
| 2898 | conftest$ac_exeext conftest.$ac_ext |
| 2899 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 2900 | + if test -z "$lt_cv_aix_libpath_"; then |
| 2901 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 2902 | + fi |
| 2903 | + |
| 2904 | +fi |
| 2905 | + |
| 2906 | + aix_libpath=$lt_cv_aix_libpath_ |
| 2907 | +fi |
| 2908 | |
| 2909 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 2910 | 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" |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2911 | @@ -9318,7 +9845,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2912 | else |
| 2913 | # Determine the default libpath from the value encoded in an |
| 2914 | # empty executable. |
| 2915 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 2916 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 2917 | + aix_libpath=$lt_cv_aix_libpath |
| 2918 | +else |
| 2919 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 2920 | + $as_echo_n "(cached) " >&6 |
| 2921 | +else |
| 2922 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 2923 | /* end confdefs.h. */ |
| 2924 | |
| 2925 | int |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2926 | @@ -9331,22 +9864,29 @@ main () |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2927 | _ACEOF |
| 2928 | if ac_fn_c_try_link "$LINENO"; then : |
| 2929 | |
| 2930 | -lt_aix_libpath_sed=' |
| 2931 | - /Import File Strings/,/^$/ { |
| 2932 | - /^0/ { |
| 2933 | - s/^0 *\(.*\)$/\1/ |
| 2934 | - p |
| 2935 | - } |
| 2936 | - }' |
| 2937 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 2938 | -# Check for a 64-bit object if we didn't find anything. |
| 2939 | -if test -z "$aix_libpath"; then |
| 2940 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 2941 | -fi |
| 2942 | + lt_aix_libpath_sed=' |
| 2943 | + /Import File Strings/,/^$/ { |
| 2944 | + /^0/ { |
| 2945 | + s/^0 *\([^ ]*\) *$/\1/ |
| 2946 | + p |
| 2947 | + } |
| 2948 | + }' |
| 2949 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 2950 | + # Check for a 64-bit object if we didn't find anything. |
| 2951 | + if test -z "$lt_cv_aix_libpath_"; then |
| 2952 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 2953 | + fi |
| 2954 | fi |
| 2955 | rm -f core conftest.err conftest.$ac_objext \ |
| 2956 | conftest$ac_exeext conftest.$ac_ext |
| 2957 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 2958 | + if test -z "$lt_cv_aix_libpath_"; then |
| 2959 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 2960 | + fi |
| 2961 | + |
| 2962 | +fi |
| 2963 | + |
| 2964 | + aix_libpath=$lt_cv_aix_libpath_ |
| 2965 | +fi |
| 2966 | |
| 2967 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 2968 | # Warning - without using the other run time loading flags, |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2969 | @@ -9391,20 +9931,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2970 | # Microsoft Visual C++. |
| 2971 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 2972 | # no search path for DLLs. |
| 2973 | - hardcode_libdir_flag_spec=' ' |
| 2974 | - allow_undefined_flag=unsupported |
| 2975 | - # Tell ltmain to make .lib files, not .a files. |
| 2976 | - libext=lib |
| 2977 | - # Tell ltmain to make .dll files, not .so files. |
| 2978 | - shrext_cmds=".dll" |
| 2979 | - # FIXME: Setting linknames here is a bad hack. |
| 2980 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 2981 | - # The linker will automatically build a .lib file if we build a DLL. |
| 2982 | - old_archive_from_new_cmds='true' |
| 2983 | - # FIXME: Should let the user specify the lib program. |
| 2984 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 2985 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 2986 | - enable_shared_with_static_runtimes=yes |
| 2987 | + case $cc_basename in |
| 2988 | + cl*) |
| 2989 | + # Native MSVC |
| 2990 | + hardcode_libdir_flag_spec=' ' |
| 2991 | + allow_undefined_flag=unsupported |
| 2992 | + always_export_symbols=yes |
| 2993 | + file_list_spec='@' |
| 2994 | + # Tell ltmain to make .lib files, not .a files. |
| 2995 | + libext=lib |
| 2996 | + # Tell ltmain to make .dll files, not .so files. |
| 2997 | + shrext_cmds=".dll" |
| 2998 | + # FIXME: Setting linknames here is a bad hack. |
| 2999 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 3000 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 3001 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 3002 | + else |
| 3003 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 3004 | + fi~ |
| 3005 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 3006 | + linknames=' |
| 3007 | + # The linker will not automatically build a static lib if we build a DLL. |
| 3008 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 3009 | + enable_shared_with_static_runtimes=yes |
| 3010 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 3011 | + # Don't use ranlib |
| 3012 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 3013 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 3014 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 3015 | + case $lt_outputfile in |
| 3016 | + *.exe|*.EXE) ;; |
| 3017 | + *) |
| 3018 | + lt_outputfile="$lt_outputfile.exe" |
| 3019 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 3020 | + ;; |
| 3021 | + esac~ |
| 3022 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 3023 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 3024 | + $RM "$lt_outputfile.manifest"; |
| 3025 | + fi' |
| 3026 | + ;; |
| 3027 | + *) |
| 3028 | + # Assume MSVC wrapper |
| 3029 | + hardcode_libdir_flag_spec=' ' |
| 3030 | + allow_undefined_flag=unsupported |
| 3031 | + # Tell ltmain to make .lib files, not .a files. |
| 3032 | + libext=lib |
| 3033 | + # Tell ltmain to make .dll files, not .so files. |
| 3034 | + shrext_cmds=".dll" |
| 3035 | + # FIXME: Setting linknames here is a bad hack. |
| 3036 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 3037 | + # The linker will automatically build a .lib file if we build a DLL. |
| 3038 | + old_archive_from_new_cmds='true' |
| 3039 | + # FIXME: Should let the user specify the lib program. |
| 3040 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 3041 | + enable_shared_with_static_runtimes=yes |
| 3042 | + ;; |
| 3043 | + esac |
| 3044 | ;; |
| 3045 | |
| 3046 | darwin* | rhapsody*) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3047 | @@ -9465,7 +10048,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3048 | |
| 3049 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 3050 | freebsd* | dragonfly*) |
| 3051 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 3052 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 3053 | hardcode_libdir_flag_spec='-R$libdir' |
| 3054 | hardcode_direct=yes |
| 3055 | hardcode_shlibpath_var=no |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3056 | @@ -9473,7 +10056,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3057 | |
| 3058 | hpux9*) |
| 3059 | if test "$GCC" = yes; then |
| 3060 | - 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' |
| 3061 | + 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' |
| 3062 | else |
| 3063 | 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' |
| 3064 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3065 | @@ -9489,7 +10072,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3066 | |
| 3067 | hpux10*) |
| 3068 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 3069 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 3070 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 3071 | else |
| 3072 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 3073 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3074 | @@ -9513,10 +10096,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3075 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 3076 | ;; |
| 3077 | ia64*) |
| 3078 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 3079 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 3080 | ;; |
| 3081 | *) |
| 3082 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 3083 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 3084 | ;; |
| 3085 | esac |
| 3086 | else |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3087 | @@ -9595,23 +10178,36 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3088 | |
| 3089 | irix5* | irix6* | nonstopux*) |
| 3090 | if test "$GCC" = yes; then |
| 3091 | - 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' |
| 3092 | + 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' |
| 3093 | # Try to use the -exported_symbol ld option, if it does not |
| 3094 | # work, assume that -exports_file does not work either and |
| 3095 | # implicitly export all symbols. |
| 3096 | - save_LDFLAGS="$LDFLAGS" |
| 3097 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 3098 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 3099 | + # This should be the same for all languages, so no per-tag cache variable. |
| 3100 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 3101 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 3102 | +if test "${lt_cv_irix_exported_symbol+set}" = set; then : |
| 3103 | + $as_echo_n "(cached) " >&6 |
| 3104 | +else |
| 3105 | + save_LDFLAGS="$LDFLAGS" |
| 3106 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 3107 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 3108 | /* end confdefs.h. */ |
| 3109 | -int foo(void) {} |
| 3110 | +int foo (void) { return 0; } |
| 3111 | _ACEOF |
| 3112 | if ac_fn_c_try_link "$LINENO"; then : |
| 3113 | - 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' |
| 3114 | - |
| 3115 | + lt_cv_irix_exported_symbol=yes |
| 3116 | +else |
| 3117 | + lt_cv_irix_exported_symbol=no |
| 3118 | fi |
| 3119 | rm -f core conftest.err conftest.$ac_objext \ |
| 3120 | conftest$ac_exeext conftest.$ac_ext |
| 3121 | - LDFLAGS="$save_LDFLAGS" |
| 3122 | + LDFLAGS="$save_LDFLAGS" |
| 3123 | +fi |
| 3124 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 3125 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 3126 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 3127 | + 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' |
| 3128 | + fi |
| 3129 | else |
| 3130 | 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' |
| 3131 | 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' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3132 | @@ -9696,7 +10292,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3133 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 3134 | if test "$GCC" = yes; then |
| 3135 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 3136 | - 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' |
| 3137 | + 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' |
| 3138 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 3139 | else |
| 3140 | allow_undefined_flag=' -expect_unresolved \*' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3141 | @@ -9715,9 +10311,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3142 | no_undefined_flag=' -z defs' |
| 3143 | if test "$GCC" = yes; then |
| 3144 | wlarc='${wl}' |
| 3145 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 3146 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 3147 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 3148 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 3149 | + $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' |
| 3150 | else |
| 3151 | case `$CC -V 2>&1` in |
| 3152 | *"Compilers 5.0"*) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3153 | @@ -10293,8 +10889,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3154 | need_version=no |
| 3155 | need_lib_prefix=no |
| 3156 | |
| 3157 | - case $GCC,$host_os in |
| 3158 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 3159 | + case $GCC,$cc_basename in |
| 3160 | + yes,*) |
| 3161 | + # gcc |
| 3162 | library_names_spec='$libname.dll.a' |
| 3163 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 3164 | postinstall_cmds='base_file=`basename \${file}`~ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3165 | @@ -10327,13 +10924,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3166 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 3167 | ;; |
| 3168 | esac |
| 3169 | + dynamic_linker='Win32 ld.exe' |
| 3170 | + ;; |
| 3171 | + |
| 3172 | + *,cl*) |
| 3173 | + # Native MSVC |
| 3174 | + libname_spec='$name' |
| 3175 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 3176 | + library_names_spec='${libname}.dll.lib' |
| 3177 | + |
| 3178 | + case $build_os in |
| 3179 | + mingw*) |
| 3180 | + sys_lib_search_path_spec= |
| 3181 | + lt_save_ifs=$IFS |
| 3182 | + IFS=';' |
| 3183 | + for lt_path in $LIB |
| 3184 | + do |
| 3185 | + IFS=$lt_save_ifs |
| 3186 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 3187 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 3188 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 3189 | + done |
| 3190 | + IFS=$lt_save_ifs |
| 3191 | + # Convert to MSYS style. |
| 3192 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 3193 | + ;; |
| 3194 | + cygwin*) |
| 3195 | + # Convert to unix form, then to dos form, then back to unix form |
| 3196 | + # but this time dos style (no spaces!) so that the unix form looks |
| 3197 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 3198 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 3199 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 3200 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 3201 | + ;; |
| 3202 | + *) |
| 3203 | + sys_lib_search_path_spec="$LIB" |
| 3204 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 3205 | + # It is most probably a Windows format PATH. |
| 3206 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 3207 | + else |
| 3208 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 3209 | + fi |
| 3210 | + # FIXME: find the short name or the path components, as spaces are |
| 3211 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 3212 | + ;; |
| 3213 | + esac |
| 3214 | + |
| 3215 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 3216 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 3217 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 3218 | + dldir=$destdir/`dirname \$dlpath`~ |
| 3219 | + test -d \$dldir || mkdir -p \$dldir~ |
| 3220 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 3221 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 3222 | + dlpath=$dir/\$dldll~ |
| 3223 | + $RM \$dlpath' |
| 3224 | + shlibpath_overrides_runpath=yes |
| 3225 | + dynamic_linker='Win32 link.exe' |
| 3226 | ;; |
| 3227 | |
| 3228 | *) |
| 3229 | + # Assume MSVC wrapper |
| 3230 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 3231 | + dynamic_linker='Win32 ld.exe' |
| 3232 | ;; |
| 3233 | esac |
| 3234 | - dynamic_linker='Win32 ld.exe' |
| 3235 | # FIXME: first we should search . and the directory the executable is in |
| 3236 | shlibpath_var=PATH |
| 3237 | ;; |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3238 | @@ -10425,7 +11080,7 @@ haiku*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3239 | soname_spec='${libname}${release}${shared_ext}$major' |
| 3240 | shlibpath_var=LIBRARY_PATH |
| 3241 | shlibpath_overrides_runpath=yes |
| 3242 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' |
| 3243 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
| 3244 | hardcode_into_libs=yes |
| 3245 | ;; |
| 3246 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3247 | @@ -11221,7 +11876,7 @@ else |
| 3248 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 3249 | lt_status=$lt_dlunknown |
| 3250 | cat > conftest.$ac_ext <<_LT_EOF |
| 3251 | -#line 11224 "configure" |
| 3252 | +#line $LINENO "configure" |
| 3253 | #include "confdefs.h" |
| 3254 | |
| 3255 | #if HAVE_DLFCN_H |
| 3256 | @@ -11265,10 +11920,10 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3257 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 3258 | correspondingly for the symbols needed. */ |
| 3259 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 3260 | -void fnord () __attribute__((visibility("default"))); |
| 3261 | +int fnord () __attribute__((visibility("default"))); |
| 3262 | #endif |
| 3263 | |
| 3264 | -void fnord () { int i=42; } |
| 3265 | +int fnord () { return 42; } |
| 3266 | int main () |
| 3267 | { |
| 3268 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3269 | @@ -11327,7 +11982,7 @@ else |
| 3270 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 3271 | lt_status=$lt_dlunknown |
| 3272 | cat > conftest.$ac_ext <<_LT_EOF |
| 3273 | -#line 11330 "configure" |
| 3274 | +#line $LINENO "configure" |
| 3275 | #include "confdefs.h" |
| 3276 | |
| 3277 | #if HAVE_DLFCN_H |
| 3278 | @@ -11371,10 +12026,10 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3279 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 3280 | correspondingly for the symbols needed. */ |
| 3281 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 3282 | -void fnord () __attribute__((visibility("default"))); |
| 3283 | +int fnord () __attribute__((visibility("default"))); |
| 3284 | #endif |
| 3285 | |
| 3286 | -void fnord () { int i=42; } |
| 3287 | +int fnord () { return 42; } |
| 3288 | int main () |
| 3289 | { |
| 3290 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3291 | @@ -15355,13 +16010,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3292 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 3293 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 3294 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 3295 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 3296 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 3297 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 3298 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 3299 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 3300 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 3301 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 3302 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 3303 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 3304 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 3305 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 3306 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 3307 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 3308 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 3309 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 3310 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 3311 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3312 | @@ -15376,14 +16038,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3313 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 3314 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 3315 | 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"`' |
| 3316 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 3317 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 3318 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 3319 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 3320 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 3321 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 3322 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 3323 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 3324 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 3325 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 3326 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 3327 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 3328 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 3329 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 3330 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3331 | @@ -15416,12 +16081,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3332 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 3333 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 3334 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 3335 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 3336 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 3337 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 3338 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 3339 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 3340 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 3341 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 3342 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 3343 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 3344 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3345 | @@ -15476,8 +16141,13 @@ reload_flag \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3346 | OBJDUMP \ |
| 3347 | deplibs_check_method \ |
| 3348 | file_magic_cmd \ |
| 3349 | +file_magic_glob \ |
| 3350 | +want_nocaseglob \ |
| 3351 | +DLLTOOL \ |
| 3352 | +sharedlib_from_linklib_cmd \ |
| 3353 | AR \ |
| 3354 | AR_FLAGS \ |
| 3355 | +archiver_list_spec \ |
| 3356 | STRIP \ |
| 3357 | RANLIB \ |
| 3358 | CC \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3359 | @@ -15487,12 +16157,14 @@ lt_cv_sys_global_symbol_pipe \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3360 | lt_cv_sys_global_symbol_to_cdecl \ |
| 3361 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 3362 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 3363 | +nm_file_list_spec \ |
| 3364 | lt_prog_compiler_no_builtin_flag \ |
| 3365 | -lt_prog_compiler_wl \ |
| 3366 | lt_prog_compiler_pic \ |
| 3367 | +lt_prog_compiler_wl \ |
| 3368 | lt_prog_compiler_static \ |
| 3369 | lt_cv_prog_compiler_c_o \ |
| 3370 | need_locks \ |
| 3371 | +MANIFEST_TOOL \ |
| 3372 | DSYMUTIL \ |
| 3373 | NMEDIT \ |
| 3374 | LIPO \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3375 | @@ -15508,7 +16180,6 @@ no_undefined_flag \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3376 | hardcode_libdir_flag_spec \ |
| 3377 | hardcode_libdir_flag_spec_ld \ |
| 3378 | hardcode_libdir_separator \ |
| 3379 | -fix_srcfile_path \ |
| 3380 | exclude_expsyms \ |
| 3381 | include_expsyms \ |
| 3382 | file_list_spec \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3383 | @@ -15544,6 +16215,7 @@ module_cmds \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3384 | module_expsym_cmds \ |
| 3385 | export_symbols_cmds \ |
| 3386 | prelink_cmds \ |
| 3387 | +postlink_cmds \ |
| 3388 | postinstall_cmds \ |
| 3389 | postuninstall_cmds \ |
| 3390 | finish_cmds \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3391 | @@ -16301,7 +16973,8 @@ $as_echo X"$file" | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3392 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 3393 | # |
| 3394 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 3395 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 3396 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 3397 | +# Inc. |
| 3398 | # Written by Gordon Matzigkeit, 1996 |
| 3399 | # |
| 3400 | # This file is part of GNU Libtool. |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3401 | @@ -16404,19 +17077,42 @@ SP2NL=$lt_lt_SP2NL |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3402 | # turn newlines into spaces. |
| 3403 | NL2SP=$lt_lt_NL2SP |
| 3404 | |
| 3405 | +# convert \$build file names to \$host format. |
| 3406 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 3407 | + |
| 3408 | +# convert \$build files to toolchain format. |
| 3409 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 3410 | + |
| 3411 | # An object symbol dumper. |
| 3412 | OBJDUMP=$lt_OBJDUMP |
| 3413 | |
| 3414 | # Method to check whether dependent libraries are shared objects. |
| 3415 | deplibs_check_method=$lt_deplibs_check_method |
| 3416 | |
| 3417 | -# Command to use when deplibs_check_method == "file_magic". |
| 3418 | +# Command to use when deplibs_check_method = "file_magic". |
| 3419 | file_magic_cmd=$lt_file_magic_cmd |
| 3420 | |
| 3421 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 3422 | +file_magic_glob=$lt_file_magic_glob |
| 3423 | + |
| 3424 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 3425 | +want_nocaseglob=$lt_want_nocaseglob |
| 3426 | + |
| 3427 | +# DLL creation program. |
| 3428 | +DLLTOOL=$lt_DLLTOOL |
| 3429 | + |
| 3430 | +# Command to associate shared and link libraries. |
| 3431 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 3432 | + |
| 3433 | # The archiver. |
| 3434 | AR=$lt_AR |
| 3435 | + |
| 3436 | +# Flags to create an archive. |
| 3437 | AR_FLAGS=$lt_AR_FLAGS |
| 3438 | |
| 3439 | +# How to feed a file listing to the archiver. |
| 3440 | +archiver_list_spec=$lt_archiver_list_spec |
| 3441 | + |
| 3442 | # A symbol stripping program. |
| 3443 | STRIP=$lt_STRIP |
| 3444 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3445 | @@ -16446,6 +17142,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3446 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 3447 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 3448 | |
| 3449 | +# Specify filename containing input files for \$NM. |
| 3450 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 3451 | + |
| 3452 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 3453 | +lt_sysroot=$lt_sysroot |
| 3454 | + |
| 3455 | # The name of the directory that contains temporary libtool files. |
| 3456 | objdir=$objdir |
| 3457 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3458 | @@ -16455,6 +17157,9 @@ MAGIC_CMD=$MAGIC_CMD |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3459 | # Must we lock files when doing compilation? |
| 3460 | need_locks=$lt_need_locks |
| 3461 | |
| 3462 | +# Manifest tool. |
| 3463 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 3464 | + |
| 3465 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 3466 | DSYMUTIL=$lt_DSYMUTIL |
| 3467 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3468 | @@ -16569,12 +17274,12 @@ with_gcc=$GCC |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3469 | # Compiler flag to turn off builtin functions. |
| 3470 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 3471 | |
| 3472 | -# How to pass a linker flag through the compiler. |
| 3473 | -wl=$lt_lt_prog_compiler_wl |
| 3474 | - |
| 3475 | # Additional compiler flags for building library objects. |
| 3476 | pic_flag=$lt_lt_prog_compiler_pic |
| 3477 | |
| 3478 | +# How to pass a linker flag through the compiler. |
| 3479 | +wl=$lt_lt_prog_compiler_wl |
| 3480 | + |
| 3481 | # Compiler flag to prevent dynamic linking. |
| 3482 | link_static_flag=$lt_lt_prog_compiler_static |
| 3483 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3484 | @@ -16661,9 +17366,6 @@ inherit_rpath=$inherit_rpath |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3485 | # Whether libtool must link a program against all its dependency libraries. |
| 3486 | link_all_deplibs=$link_all_deplibs |
| 3487 | |
| 3488 | -# Fix the shell variable \$srcfile for the compiler. |
| 3489 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 3490 | - |
| 3491 | # Set to "yes" if exported symbols are required. |
| 3492 | always_export_symbols=$always_export_symbols |
| 3493 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3494 | @@ -16679,6 +17381,9 @@ include_expsyms=$lt_include_expsyms |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3495 | # Commands necessary for linking programs (against libraries) with templates. |
| 3496 | prelink_cmds=$lt_prelink_cmds |
| 3497 | |
| 3498 | +# Commands necessary for finishing linking programs. |
| 3499 | +postlink_cmds=$lt_postlink_cmds |
| 3500 | + |
| 3501 | # Specify filename containing input files. |
| 3502 | file_list_spec=$lt_file_list_spec |
| 3503 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3504 | @@ -16711,210 +17416,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3505 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 3506 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 3507 | # is reportedly fixed, but why not run on old versions too? |
| 3508 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 3509 | - || (rm -f "$cfgfile"; exit 1) |
| 3510 | - |
| 3511 | - case $xsi_shell in |
| 3512 | - yes) |
| 3513 | - cat << \_LT_EOF >> "$cfgfile" |
| 3514 | - |
| 3515 | -# func_dirname file append nondir_replacement |
| 3516 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 3517 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 3518 | -func_dirname () |
| 3519 | -{ |
| 3520 | - case ${1} in |
| 3521 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 3522 | - * ) func_dirname_result="${3}" ;; |
| 3523 | - esac |
| 3524 | -} |
| 3525 | - |
| 3526 | -# func_basename file |
| 3527 | -func_basename () |
| 3528 | -{ |
| 3529 | - func_basename_result="${1##*/}" |
| 3530 | -} |
| 3531 | - |
| 3532 | -# func_dirname_and_basename file append nondir_replacement |
| 3533 | -# perform func_basename and func_dirname in a single function |
| 3534 | -# call: |
| 3535 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 3536 | -# add APPEND to the result, otherwise set result |
| 3537 | -# to NONDIR_REPLACEMENT. |
| 3538 | -# value returned in "$func_dirname_result" |
| 3539 | -# basename: Compute filename of FILE. |
| 3540 | -# value retuned in "$func_basename_result" |
| 3541 | -# Implementation must be kept synchronized with func_dirname |
| 3542 | -# and func_basename. For efficiency, we do not delegate to |
| 3543 | -# those functions but instead duplicate the functionality here. |
| 3544 | -func_dirname_and_basename () |
| 3545 | -{ |
| 3546 | - case ${1} in |
| 3547 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 3548 | - * ) func_dirname_result="${3}" ;; |
| 3549 | - esac |
| 3550 | - func_basename_result="${1##*/}" |
| 3551 | -} |
| 3552 | - |
| 3553 | -# func_stripname prefix suffix name |
| 3554 | -# strip PREFIX and SUFFIX off of NAME. |
| 3555 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 3556 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 3557 | -# dot (in which case that matches only a dot). |
| 3558 | -func_stripname () |
| 3559 | -{ |
| 3560 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 3561 | - # positional parameters, so assign one to ordinary parameter first. |
| 3562 | - func_stripname_result=${3} |
| 3563 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 3564 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 3565 | -} |
| 3566 | - |
| 3567 | -# func_opt_split |
| 3568 | -func_opt_split () |
| 3569 | -{ |
| 3570 | - func_opt_split_opt=${1%%=*} |
| 3571 | - func_opt_split_arg=${1#*=} |
| 3572 | -} |
| 3573 | - |
| 3574 | -# func_lo2o object |
| 3575 | -func_lo2o () |
| 3576 | -{ |
| 3577 | - case ${1} in |
| 3578 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 3579 | - *) func_lo2o_result=${1} ;; |
| 3580 | - esac |
| 3581 | -} |
| 3582 | - |
| 3583 | -# func_xform libobj-or-source |
| 3584 | -func_xform () |
| 3585 | -{ |
| 3586 | - func_xform_result=${1%.*}.lo |
| 3587 | -} |
| 3588 | - |
| 3589 | -# func_arith arithmetic-term... |
| 3590 | -func_arith () |
| 3591 | -{ |
| 3592 | - func_arith_result=$(( $* )) |
| 3593 | -} |
| 3594 | - |
| 3595 | -# func_len string |
| 3596 | -# STRING may not start with a hyphen. |
| 3597 | -func_len () |
| 3598 | -{ |
| 3599 | - func_len_result=${#1} |
| 3600 | -} |
| 3601 | - |
| 3602 | -_LT_EOF |
| 3603 | - ;; |
| 3604 | - *) # Bourne compatible functions. |
| 3605 | - cat << \_LT_EOF >> "$cfgfile" |
| 3606 | - |
| 3607 | -# func_dirname file append nondir_replacement |
| 3608 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 3609 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 3610 | -func_dirname () |
| 3611 | -{ |
| 3612 | - # Extract subdirectory from the argument. |
| 3613 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 3614 | - if test "X$func_dirname_result" = "X${1}"; then |
| 3615 | - func_dirname_result="${3}" |
| 3616 | - else |
| 3617 | - func_dirname_result="$func_dirname_result${2}" |
| 3618 | - fi |
| 3619 | -} |
| 3620 | - |
| 3621 | -# func_basename file |
| 3622 | -func_basename () |
| 3623 | -{ |
| 3624 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 3625 | -} |
| 3626 | - |
| 3627 | - |
| 3628 | -# func_stripname prefix suffix name |
| 3629 | -# strip PREFIX and SUFFIX off of NAME. |
| 3630 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 3631 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 3632 | -# dot (in which case that matches only a dot). |
| 3633 | -# func_strip_suffix prefix name |
| 3634 | -func_stripname () |
| 3635 | -{ |
| 3636 | - case ${2} in |
| 3637 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 3638 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 3639 | - esac |
| 3640 | -} |
| 3641 | - |
| 3642 | -# sed scripts: |
| 3643 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 3644 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 3645 | - |
| 3646 | -# func_opt_split |
| 3647 | -func_opt_split () |
| 3648 | -{ |
| 3649 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 3650 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 3651 | -} |
| 3652 | - |
| 3653 | -# func_lo2o object |
| 3654 | -func_lo2o () |
| 3655 | -{ |
| 3656 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 3657 | -} |
| 3658 | - |
| 3659 | -# func_xform libobj-or-source |
| 3660 | -func_xform () |
| 3661 | -{ |
| 3662 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 3663 | -} |
| 3664 | - |
| 3665 | -# func_arith arithmetic-term... |
| 3666 | -func_arith () |
| 3667 | -{ |
| 3668 | - func_arith_result=`expr "$@"` |
| 3669 | -} |
| 3670 | - |
| 3671 | -# func_len string |
| 3672 | -# STRING may not start with a hyphen. |
| 3673 | -func_len () |
| 3674 | -{ |
| 3675 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 3676 | -} |
| 3677 | - |
| 3678 | -_LT_EOF |
| 3679 | -esac |
| 3680 | - |
| 3681 | -case $lt_shell_append in |
| 3682 | - yes) |
| 3683 | - cat << \_LT_EOF >> "$cfgfile" |
| 3684 | - |
| 3685 | -# func_append var value |
| 3686 | -# Append VALUE to the end of shell variable VAR. |
| 3687 | -func_append () |
| 3688 | -{ |
| 3689 | - eval "$1+=\$2" |
| 3690 | -} |
| 3691 | -_LT_EOF |
| 3692 | - ;; |
| 3693 | - *) |
| 3694 | - cat << \_LT_EOF >> "$cfgfile" |
| 3695 | - |
| 3696 | -# func_append var value |
| 3697 | -# Append VALUE to the end of shell variable VAR. |
| 3698 | -func_append () |
| 3699 | -{ |
| 3700 | - eval "$1=\$$1\$2" |
| 3701 | -} |
| 3702 | - |
| 3703 | -_LT_EOF |
| 3704 | - ;; |
| 3705 | - esac |
| 3706 | - |
| 3707 | - |
| 3708 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 3709 | - || (rm -f "$cfgfile"; exit 1) |
| 3710 | - |
| 3711 | - mv -f "$cfgfile" "$ofile" || |
| 3712 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 3713 | + || (rm -f "$cfgfile"; exit 1) |
| 3714 | + |
| 3715 | + if test x"$xsi_shell" = xyes; then |
| 3716 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 3717 | +func_dirname ()\ |
| 3718 | +{\ |
| 3719 | +\ case ${1} in\ |
| 3720 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 3721 | +\ * ) func_dirname_result="${3}" ;;\ |
| 3722 | +\ esac\ |
| 3723 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3724 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3725 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3726 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3727 | + |
| 3728 | + |
| 3729 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 3730 | +func_basename ()\ |
| 3731 | +{\ |
| 3732 | +\ func_basename_result="${1##*/}"\ |
| 3733 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3734 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3735 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3736 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3737 | + |
| 3738 | + |
| 3739 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 3740 | +func_dirname_and_basename ()\ |
| 3741 | +{\ |
| 3742 | +\ case ${1} in\ |
| 3743 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 3744 | +\ * ) func_dirname_result="${3}" ;;\ |
| 3745 | +\ esac\ |
| 3746 | +\ func_basename_result="${1##*/}"\ |
| 3747 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3748 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3749 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3750 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3751 | + |
| 3752 | + |
| 3753 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 3754 | +func_stripname ()\ |
| 3755 | +{\ |
| 3756 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 3757 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 3758 | +\ func_stripname_result=${3}\ |
| 3759 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 3760 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 3761 | +} # Extended-shell func_stripname 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_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 3768 | +func_split_long_opt ()\ |
| 3769 | +{\ |
| 3770 | +\ func_split_long_opt_name=${1%%=*}\ |
| 3771 | +\ func_split_long_opt_arg=${1#*=}\ |
| 3772 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3773 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3774 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3775 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3776 | + |
| 3777 | + |
| 3778 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 3779 | +func_split_short_opt ()\ |
| 3780 | +{\ |
| 3781 | +\ func_split_short_opt_arg=${1#??}\ |
| 3782 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 3783 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3784 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3785 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3786 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3787 | + |
| 3788 | + |
| 3789 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 3790 | +func_lo2o ()\ |
| 3791 | +{\ |
| 3792 | +\ case ${1} in\ |
| 3793 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 3794 | +\ *) func_lo2o_result=${1} ;;\ |
| 3795 | +\ esac\ |
| 3796 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3797 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3798 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3799 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3800 | + |
| 3801 | + |
| 3802 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 3803 | +func_xform ()\ |
| 3804 | +{\ |
| 3805 | + func_xform_result=${1%.*}.lo\ |
| 3806 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3807 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3808 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3809 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3810 | + |
| 3811 | + |
| 3812 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 3813 | +func_arith ()\ |
| 3814 | +{\ |
| 3815 | + func_arith_result=$(( $* ))\ |
| 3816 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3817 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3818 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3819 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3820 | + |
| 3821 | + |
| 3822 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 3823 | +func_len ()\ |
| 3824 | +{\ |
| 3825 | + func_len_result=${#1}\ |
| 3826 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3827 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3828 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3829 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3830 | + |
| 3831 | +fi |
| 3832 | + |
| 3833 | +if test x"$lt_shell_append" = xyes; then |
| 3834 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 3835 | +func_append ()\ |
| 3836 | +{\ |
| 3837 | + eval "${1}+=\\${2}"\ |
| 3838 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3839 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3840 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3841 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3842 | + |
| 3843 | + |
| 3844 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 3845 | +func_append_quoted ()\ |
| 3846 | +{\ |
| 3847 | +\ func_quote_for_eval "${2}"\ |
| 3848 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 3849 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 3850 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3851 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3852 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 3853 | + |
| 3854 | + |
| 3855 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 3856 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 3857 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3858 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3859 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 3860 | +else |
| 3861 | + # Save a `func_append' function call even when '+=' is not available |
| 3862 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 3863 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 3864 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 3865 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 3866 | +fi |
| 3867 | + |
| 3868 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 3869 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 3870 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 3871 | +fi |
| 3872 | + |
| 3873 | + |
| 3874 | + mv -f "$cfgfile" "$ofile" || |
| 3875 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 3876 | chmod +x "$ofile" |
| 3877 | |
| 3878 | diff --git a/configure b/configure |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3879 | index 85414ab..34b66f7 100755 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3880 | --- a/configure |
| 3881 | +++ b/configure |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3882 | @@ -3445,7 +3445,7 @@ case "${target}" in |
| 3883 | ;; |
| 3884 | s390-*-* | s390x-*-*) |
| 3885 | ;; |
| 3886 | - sh*-*-* | sh[34]*-*-*) |
| 3887 | + sh-*-* | sh[34]*-*-*) |
| 3888 | ;; |
| 3889 | sh64-*-* | sh5*-*-*) |
| 3890 | ;; |
| 3891 | @@ -3939,7 +3939,7 @@ case "${target}" in |
| 3892 | or1k*-*-*) |
| 3893 | noconfigdirs="$noconfigdirs gdb" |
| 3894 | ;; |
| 3895 | - sh*-*-* | sh64-*-*) |
| 3896 | + sh-*-* | sh64-*-*) |
| 3897 | case "${target}" in |
| 3898 | sh*-*-elf) |
| 3899 | ;; |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3900 | diff --git a/gas/configure b/gas/configure |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3901 | index dd9c953..89f18b3 100755 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3902 | --- a/gas/configure |
| 3903 | +++ b/gas/configure |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3904 | @@ -647,8 +647,11 @@ OTOOL |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3905 | LIPO |
| 3906 | NMEDIT |
| 3907 | DSYMUTIL |
| 3908 | +MANIFEST_TOOL |
| 3909 | RANLIB |
| 3910 | +ac_ct_AR |
| 3911 | AR |
| 3912 | +DLLTOOL |
| 3913 | OBJDUMP |
| 3914 | LN_S |
| 3915 | NM |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3916 | @@ -759,6 +762,7 @@ enable_static |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3917 | with_pic |
| 3918 | enable_fast_install |
| 3919 | with_gnu_ld |
| 3920 | +with_libtool_sysroot |
| 3921 | enable_libtool_lock |
| 3922 | enable_plugins |
| 3923 | enable_largefile |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3924 | @@ -1430,6 +1434,8 @@ Optional Packages: |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3925 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 3926 | both] |
| 3927 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 3928 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 3929 | + (or the compiler's sysroot if not specified). |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3930 | --with-system-zlib use installed libz |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3931 | |
| 3932 | Some influential environment variables: |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3933 | @@ -4909,8 +4915,8 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3934 | |
| 3935 | |
| 3936 | |
| 3937 | -macro_version='2.2.7a' |
| 3938 | -macro_revision='1.3134' |
| 3939 | +macro_version='2.4' |
| 3940 | +macro_revision='1.3293' |
| 3941 | |
| 3942 | |
| 3943 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3944 | @@ -4950,7 +4956,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3945 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 3946 | $as_echo_n "checking how to print strings... " >&6; } |
| 3947 | # Test print first, because it will be a builtin if present. |
| 3948 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 3949 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 3950 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 3951 | ECHO='print -r --' |
| 3952 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3953 | @@ -5636,8 +5642,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3954 | # Try some XSI features |
| 3955 | xsi_shell=no |
| 3956 | ( _lt_dummy="a/b/c" |
| 3957 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 3958 | - = c,a/b,, \ |
| 3959 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 3960 | + = c,a/b,b/c, \ |
| 3961 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 3962 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 3963 | && xsi_shell=yes |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 3964 | @@ -5686,6 +5692,80 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3965 | |
| 3966 | |
| 3967 | |
| 3968 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 3969 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 3970 | +if test "${lt_cv_to_host_file_cmd+set}" = set; then : |
| 3971 | + $as_echo_n "(cached) " >&6 |
| 3972 | +else |
| 3973 | + case $host in |
| 3974 | + *-*-mingw* ) |
| 3975 | + case $build in |
| 3976 | + *-*-mingw* ) # actually msys |
| 3977 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 3978 | + ;; |
| 3979 | + *-*-cygwin* ) |
| 3980 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 3981 | + ;; |
| 3982 | + * ) # otherwise, assume *nix |
| 3983 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 3984 | + ;; |
| 3985 | + esac |
| 3986 | + ;; |
| 3987 | + *-*-cygwin* ) |
| 3988 | + case $build in |
| 3989 | + *-*-mingw* ) # actually msys |
| 3990 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 3991 | + ;; |
| 3992 | + *-*-cygwin* ) |
| 3993 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 3994 | + ;; |
| 3995 | + * ) # otherwise, assume *nix |
| 3996 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 3997 | + ;; |
| 3998 | + esac |
| 3999 | + ;; |
| 4000 | + * ) # unhandled hosts (and "normal" native builds) |
| 4001 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 4002 | + ;; |
| 4003 | +esac |
| 4004 | + |
| 4005 | +fi |
| 4006 | + |
| 4007 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 4008 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 4009 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 4010 | + |
| 4011 | + |
| 4012 | + |
| 4013 | + |
| 4014 | + |
| 4015 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 4016 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 4017 | +if test "${lt_cv_to_tool_file_cmd+set}" = set; then : |
| 4018 | + $as_echo_n "(cached) " >&6 |
| 4019 | +else |
| 4020 | + #assume ordinary cross tools, or native build. |
| 4021 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 4022 | +case $host in |
| 4023 | + *-*-mingw* ) |
| 4024 | + case $build in |
| 4025 | + *-*-mingw* ) # actually msys |
| 4026 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 4027 | + ;; |
| 4028 | + esac |
| 4029 | + ;; |
| 4030 | +esac |
| 4031 | + |
| 4032 | +fi |
| 4033 | + |
| 4034 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 4035 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 4036 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 4037 | + |
| 4038 | + |
| 4039 | + |
| 4040 | + |
| 4041 | + |
| 4042 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 4043 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 4044 | if test "${lt_cv_ld_reload_flag+set}" = set; then : |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4045 | @@ -5702,6 +5782,11 @@ case $reload_flag in |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4046 | esac |
| 4047 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 4048 | case $host_os in |
| 4049 | + cygwin* | mingw* | pw32* | cegcc*) |
| 4050 | + if test "$GCC" != yes; then |
| 4051 | + reload_cmds=false |
| 4052 | + fi |
| 4053 | + ;; |
| 4054 | darwin*) |
| 4055 | if test "$GCC" = yes; then |
| 4056 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4057 | @@ -5870,7 +5955,8 @@ mingw* | pw32*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4058 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 4059 | lt_cv_file_magic_cmd='func_win32_libid' |
| 4060 | else |
| 4061 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 4062 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 4063 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 4064 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 4065 | fi |
| 4066 | ;; |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4067 | @@ -6024,6 +6110,21 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4068 | fi |
| 4069 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 4070 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 4071 | + |
| 4072 | +file_magic_glob= |
| 4073 | +want_nocaseglob=no |
| 4074 | +if test "$build" = "$host"; then |
| 4075 | + case $host_os in |
| 4076 | + mingw* | pw32*) |
| 4077 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 4078 | + want_nocaseglob=yes |
| 4079 | + else |
| 4080 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 4081 | + fi |
| 4082 | + ;; |
| 4083 | + esac |
| 4084 | +fi |
| 4085 | + |
| 4086 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 4087 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 4088 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4089 | @@ -6039,9 +6140,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4090 | |
| 4091 | |
| 4092 | |
| 4093 | + |
| 4094 | + |
| 4095 | + |
| 4096 | + |
| 4097 | + |
| 4098 | + |
| 4099 | + |
| 4100 | + |
| 4101 | + |
| 4102 | + |
| 4103 | +if test -n "$ac_tool_prefix"; then |
| 4104 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 4105 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 4106 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 4107 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 4108 | +if test "${ac_cv_prog_DLLTOOL+set}" = set; then : |
| 4109 | + $as_echo_n "(cached) " >&6 |
| 4110 | +else |
| 4111 | + if test -n "$DLLTOOL"; then |
| 4112 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 4113 | +else |
| 4114 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 4115 | +for as_dir in $PATH |
| 4116 | +do |
| 4117 | + IFS=$as_save_IFS |
| 4118 | + test -z "$as_dir" && as_dir=. |
| 4119 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 4120 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 4121 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 4122 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4123 | + break 2 |
| 4124 | + fi |
| 4125 | +done |
| 4126 | + done |
| 4127 | +IFS=$as_save_IFS |
| 4128 | + |
| 4129 | +fi |
| 4130 | +fi |
| 4131 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 4132 | +if test -n "$DLLTOOL"; then |
| 4133 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 4134 | +$as_echo "$DLLTOOL" >&6; } |
| 4135 | +else |
| 4136 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 4137 | +$as_echo "no" >&6; } |
| 4138 | +fi |
| 4139 | + |
| 4140 | + |
| 4141 | +fi |
| 4142 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 4143 | + ac_ct_DLLTOOL=$DLLTOOL |
| 4144 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 4145 | +set dummy dlltool; ac_word=$2 |
| 4146 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 4147 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 4148 | +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : |
| 4149 | + $as_echo_n "(cached) " >&6 |
| 4150 | +else |
| 4151 | + if test -n "$ac_ct_DLLTOOL"; then |
| 4152 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 4153 | +else |
| 4154 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 4155 | +for as_dir in $PATH |
| 4156 | +do |
| 4157 | + IFS=$as_save_IFS |
| 4158 | + test -z "$as_dir" && as_dir=. |
| 4159 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 4160 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 4161 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 4162 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4163 | + break 2 |
| 4164 | + fi |
| 4165 | +done |
| 4166 | + done |
| 4167 | +IFS=$as_save_IFS |
| 4168 | + |
| 4169 | +fi |
| 4170 | +fi |
| 4171 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 4172 | +if test -n "$ac_ct_DLLTOOL"; then |
| 4173 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 4174 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 4175 | +else |
| 4176 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 4177 | +$as_echo "no" >&6; } |
| 4178 | +fi |
| 4179 | + |
| 4180 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 4181 | + DLLTOOL="false" |
| 4182 | + else |
| 4183 | + case $cross_compiling:$ac_tool_warned in |
| 4184 | +yes:) |
| 4185 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 4186 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 4187 | +ac_tool_warned=yes ;; |
| 4188 | +esac |
| 4189 | + DLLTOOL=$ac_ct_DLLTOOL |
| 4190 | + fi |
| 4191 | +else |
| 4192 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 4193 | +fi |
| 4194 | + |
| 4195 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 4196 | + |
| 4197 | + |
| 4198 | + |
| 4199 | + |
| 4200 | + |
| 4201 | + |
| 4202 | + |
| 4203 | + |
| 4204 | + |
| 4205 | + |
| 4206 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 4207 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 4208 | +if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : |
| 4209 | + $as_echo_n "(cached) " >&6 |
| 4210 | +else |
| 4211 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 4212 | + |
| 4213 | +case $host_os in |
| 4214 | +cygwin* | mingw* | pw32* | cegcc*) |
| 4215 | + # two different shell functions defined in ltmain.sh |
| 4216 | + # decide which to use based on capabilities of $DLLTOOL |
| 4217 | + case `$DLLTOOL --help 2>&1` in |
| 4218 | + *--identify-strict*) |
| 4219 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 4220 | + ;; |
| 4221 | + *) |
| 4222 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 4223 | + ;; |
| 4224 | + esac |
| 4225 | + ;; |
| 4226 | +*) |
| 4227 | + # fallback: assume linklib IS sharedlib |
| 4228 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 4229 | + ;; |
| 4230 | +esac |
| 4231 | + |
| 4232 | +fi |
| 4233 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 4234 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 4235 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 4236 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 4237 | + |
| 4238 | + |
| 4239 | + |
| 4240 | + |
| 4241 | + |
| 4242 | + |
| 4243 | + |
| 4244 | if test -n "$ac_tool_prefix"; then |
| 4245 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 4246 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 4247 | + for ac_prog in ar |
| 4248 | + do |
| 4249 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 4250 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 4251 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 4252 | $as_echo_n "checking for $ac_word... " >&6; } |
| 4253 | if test "${ac_cv_prog_AR+set}" = set; then : |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4254 | @@ -6057,7 +6311,7 @@ do |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4255 | test -z "$as_dir" && as_dir=. |
| 4256 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 4257 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 4258 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 4259 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 4260 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4261 | break 2 |
| 4262 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4263 | @@ -6077,11 +6331,15 @@ $as_echo "no" >&6; } |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4264 | fi |
| 4265 | |
| 4266 | |
| 4267 | + test -n "$AR" && break |
| 4268 | + done |
| 4269 | fi |
| 4270 | -if test -z "$ac_cv_prog_AR"; then |
| 4271 | +if test -z "$AR"; then |
| 4272 | ac_ct_AR=$AR |
| 4273 | - # Extract the first word of "ar", so it can be a program name with args. |
| 4274 | -set dummy ar; ac_word=$2 |
| 4275 | + for ac_prog in ar |
| 4276 | +do |
| 4277 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 4278 | +set dummy $ac_prog; ac_word=$2 |
| 4279 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 4280 | $as_echo_n "checking for $ac_word... " >&6; } |
| 4281 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4282 | @@ -6097,7 +6355,7 @@ do |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4283 | test -z "$as_dir" && as_dir=. |
| 4284 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 4285 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 4286 | - ac_cv_prog_ac_ct_AR="ar" |
| 4287 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 4288 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4289 | break 2 |
| 4290 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4291 | @@ -6116,6 +6374,10 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4292 | $as_echo "no" >&6; } |
| 4293 | fi |
| 4294 | |
| 4295 | + |
| 4296 | + test -n "$ac_ct_AR" && break |
| 4297 | +done |
| 4298 | + |
| 4299 | if test "x$ac_ct_AR" = x; then |
| 4300 | AR="false" |
| 4301 | else |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4302 | @@ -6127,12 +6389,10 @@ ac_tool_warned=yes ;; |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4303 | esac |
| 4304 | AR=$ac_ct_AR |
| 4305 | fi |
| 4306 | -else |
| 4307 | - AR="$ac_cv_prog_AR" |
| 4308 | fi |
| 4309 | |
| 4310 | -test -z "$AR" && AR=ar |
| 4311 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 4312 | +: ${AR=ar} |
| 4313 | +: ${AR_FLAGS=cru} |
| 4314 | |
| 4315 | |
| 4316 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4317 | @@ -6144,6 +6404,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4318 | |
| 4319 | |
| 4320 | |
| 4321 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 4322 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 4323 | +if test "${lt_cv_ar_at_file+set}" = set; then : |
| 4324 | + $as_echo_n "(cached) " >&6 |
| 4325 | +else |
| 4326 | + lt_cv_ar_at_file=no |
| 4327 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 4328 | +/* end confdefs.h. */ |
| 4329 | + |
| 4330 | +int |
| 4331 | +main () |
| 4332 | +{ |
| 4333 | + |
| 4334 | + ; |
| 4335 | + return 0; |
| 4336 | +} |
| 4337 | +_ACEOF |
| 4338 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 4339 | + echo conftest.$ac_objext > conftest.lst |
| 4340 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 4341 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 4342 | + (eval $lt_ar_try) 2>&5 |
| 4343 | + ac_status=$? |
| 4344 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 4345 | + test $ac_status = 0; } |
| 4346 | + if test "$ac_status" -eq 0; then |
| 4347 | + # Ensure the archiver fails upon bogus file names. |
| 4348 | + rm -f conftest.$ac_objext libconftest.a |
| 4349 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 4350 | + (eval $lt_ar_try) 2>&5 |
| 4351 | + ac_status=$? |
| 4352 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 4353 | + test $ac_status = 0; } |
| 4354 | + if test "$ac_status" -ne 0; then |
| 4355 | + lt_cv_ar_at_file=@ |
| 4356 | + fi |
| 4357 | + fi |
| 4358 | + rm -f conftest.* libconftest.a |
| 4359 | + |
| 4360 | +fi |
| 4361 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 4362 | + |
| 4363 | +fi |
| 4364 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 4365 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 4366 | + |
| 4367 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 4368 | + archiver_list_spec= |
| 4369 | +else |
| 4370 | + archiver_list_spec=$lt_cv_ar_at_file |
| 4371 | +fi |
| 4372 | + |
| 4373 | + |
| 4374 | + |
| 4375 | + |
| 4376 | + |
| 4377 | + |
| 4378 | + |
| 4379 | if test -n "$ac_tool_prefix"; then |
| 4380 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
| 4381 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4382 | @@ -6478,8 +6796,8 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4383 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 4384 | |
| 4385 | # Transform an extracted symbol line into symbol name and symbol address |
| 4386 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 4387 | -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'" |
| 4388 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 4389 | +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'" |
| 4390 | |
| 4391 | # Handle CRLF in mingw tool chain |
| 4392 | opt_cr= |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4393 | @@ -6515,6 +6833,7 @@ for ac_symprfx in "" "_"; do |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4394 | else |
| 4395 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 4396 | fi |
| 4397 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 4398 | |
| 4399 | # Check to see that the pipe works correctly. |
| 4400 | pipe_works=no |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4401 | @@ -6556,6 +6875,18 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4402 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 4403 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 4404 | cat <<_LT_EOF > conftest.$ac_ext |
| 4405 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 4406 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 4407 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 4408 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 4409 | +# define LT_DLSYM_CONST |
| 4410 | +#elif defined(__osf__) |
| 4411 | +/* This system does not cope well with relocations in const data. */ |
| 4412 | +# define LT_DLSYM_CONST |
| 4413 | +#else |
| 4414 | +# define LT_DLSYM_CONST const |
| 4415 | +#endif |
| 4416 | + |
| 4417 | #ifdef __cplusplus |
| 4418 | extern "C" { |
| 4419 | #endif |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4420 | @@ -6567,7 +6898,7 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4421 | cat <<_LT_EOF >> conftest.$ac_ext |
| 4422 | |
| 4423 | /* The mapping between symbol names and symbols. */ |
| 4424 | -const struct { |
| 4425 | +LT_DLSYM_CONST struct { |
| 4426 | const char *name; |
| 4427 | void *address; |
| 4428 | } |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4429 | @@ -6593,8 +6924,8 @@ static const void *lt_preloaded_setup() { |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4430 | _LT_EOF |
| 4431 | # Now try linking the two files. |
| 4432 | mv conftest.$ac_objext conftstm.$ac_objext |
| 4433 | - lt_save_LIBS="$LIBS" |
| 4434 | - lt_save_CFLAGS="$CFLAGS" |
| 4435 | + lt_globsym_save_LIBS=$LIBS |
| 4436 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 4437 | LIBS="conftstm.$ac_objext" |
| 4438 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 4439 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4440 | @@ -6604,8 +6935,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4441 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 4442 | pipe_works=yes |
| 4443 | fi |
| 4444 | - LIBS="$lt_save_LIBS" |
| 4445 | - CFLAGS="$lt_save_CFLAGS" |
| 4446 | + LIBS=$lt_globsym_save_LIBS |
| 4447 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 4448 | else |
| 4449 | echo "cannot find nm_test_func in $nlist" >&5 |
| 4450 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4451 | @@ -6642,6 +6973,21 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4452 | $as_echo "ok" >&6; } |
| 4453 | fi |
| 4454 | |
| 4455 | +# Response file support. |
| 4456 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 4457 | + nm_file_list_spec='@' |
| 4458 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 4459 | + nm_file_list_spec='@' |
| 4460 | +fi |
| 4461 | + |
| 4462 | + |
| 4463 | + |
| 4464 | + |
| 4465 | + |
| 4466 | + |
| 4467 | + |
| 4468 | + |
| 4469 | + |
| 4470 | |
| 4471 | |
| 4472 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4473 | @@ -6660,6 +7006,40 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4474 | |
| 4475 | |
| 4476 | |
| 4477 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 4478 | +$as_echo_n "checking for sysroot... " >&6; } |
| 4479 | + |
| 4480 | +# Check whether --with-libtool-sysroot was given. |
| 4481 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 4482 | + withval=$with_libtool_sysroot; |
| 4483 | +else |
| 4484 | + with_libtool_sysroot=no |
| 4485 | +fi |
| 4486 | + |
| 4487 | + |
| 4488 | +lt_sysroot= |
| 4489 | +case ${with_libtool_sysroot} in #( |
| 4490 | + yes) |
| 4491 | + if test "$GCC" = yes; then |
| 4492 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 4493 | + fi |
| 4494 | + ;; #( |
| 4495 | + /*) |
| 4496 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 4497 | + ;; #( |
| 4498 | + no|'') |
| 4499 | + ;; #( |
| 4500 | + *) |
| 4501 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 4502 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 4503 | + as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 |
| 4504 | + ;; |
| 4505 | +esac |
| 4506 | + |
| 4507 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 4508 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 4509 | + |
| 4510 | + |
| 4511 | |
| 4512 | |
| 4513 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4514 | @@ -6869,6 +7249,123 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4515 | |
| 4516 | need_locks="$enable_libtool_lock" |
| 4517 | |
| 4518 | +if test -n "$ac_tool_prefix"; then |
| 4519 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 4520 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 4521 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 4522 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 4523 | +if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : |
| 4524 | + $as_echo_n "(cached) " >&6 |
| 4525 | +else |
| 4526 | + if test -n "$MANIFEST_TOOL"; then |
| 4527 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 4528 | +else |
| 4529 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 4530 | +for as_dir in $PATH |
| 4531 | +do |
| 4532 | + IFS=$as_save_IFS |
| 4533 | + test -z "$as_dir" && as_dir=. |
| 4534 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 4535 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 4536 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 4537 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4538 | + break 2 |
| 4539 | + fi |
| 4540 | +done |
| 4541 | + done |
| 4542 | +IFS=$as_save_IFS |
| 4543 | + |
| 4544 | +fi |
| 4545 | +fi |
| 4546 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 4547 | +if test -n "$MANIFEST_TOOL"; then |
| 4548 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 4549 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 4550 | +else |
| 4551 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 4552 | +$as_echo "no" >&6; } |
| 4553 | +fi |
| 4554 | + |
| 4555 | + |
| 4556 | +fi |
| 4557 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 4558 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 4559 | + # Extract the first word of "mt", so it can be a program name with args. |
| 4560 | +set dummy mt; ac_word=$2 |
| 4561 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 4562 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 4563 | +if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : |
| 4564 | + $as_echo_n "(cached) " >&6 |
| 4565 | +else |
| 4566 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 4567 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 4568 | +else |
| 4569 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 4570 | +for as_dir in $PATH |
| 4571 | +do |
| 4572 | + IFS=$as_save_IFS |
| 4573 | + test -z "$as_dir" && as_dir=. |
| 4574 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 4575 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 4576 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 4577 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4578 | + break 2 |
| 4579 | + fi |
| 4580 | +done |
| 4581 | + done |
| 4582 | +IFS=$as_save_IFS |
| 4583 | + |
| 4584 | +fi |
| 4585 | +fi |
| 4586 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 4587 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 4588 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 4589 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 4590 | +else |
| 4591 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 4592 | +$as_echo "no" >&6; } |
| 4593 | +fi |
| 4594 | + |
| 4595 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 4596 | + MANIFEST_TOOL=":" |
| 4597 | + else |
| 4598 | + case $cross_compiling:$ac_tool_warned in |
| 4599 | +yes:) |
| 4600 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 4601 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 4602 | +ac_tool_warned=yes ;; |
| 4603 | +esac |
| 4604 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 4605 | + fi |
| 4606 | +else |
| 4607 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 4608 | +fi |
| 4609 | + |
| 4610 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 4611 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 4612 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 4613 | +if test "${lt_cv_path_mainfest_tool+set}" = set; then : |
| 4614 | + $as_echo_n "(cached) " >&6 |
| 4615 | +else |
| 4616 | + lt_cv_path_mainfest_tool=no |
| 4617 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 4618 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 4619 | + cat conftest.err >&5 |
| 4620 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 4621 | + lt_cv_path_mainfest_tool=yes |
| 4622 | + fi |
| 4623 | + rm -f conftest* |
| 4624 | +fi |
| 4625 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 4626 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 4627 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 4628 | + MANIFEST_TOOL=: |
| 4629 | +fi |
| 4630 | + |
| 4631 | + |
| 4632 | + |
| 4633 | + |
| 4634 | + |
| 4635 | |
| 4636 | case $host_os in |
| 4637 | rhapsody* | darwin*) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4638 | @@ -7432,6 +7929,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4639 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 4640 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 4641 | $AR cru libconftest.a conftest.o 2>&5 |
| 4642 | + echo "$RANLIB libconftest.a" >&5 |
| 4643 | + $RANLIB libconftest.a 2>&5 |
| 4644 | cat > conftest.c << _LT_EOF |
| 4645 | int main() { return 0;} |
| 4646 | _LT_EOF |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4647 | @@ -7627,7 +8126,8 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4648 | LIBTOOL_DEPS="$ltmain" |
| 4649 | |
| 4650 | # Always use our own libtool. |
| 4651 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
| 4652 | +LIBTOOL='$(SHELL) $(top_builddir)' |
| 4653 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" |
| 4654 | |
| 4655 | |
| 4656 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4657 | @@ -7716,7 +8216,7 @@ aix3*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4658 | esac |
| 4659 | |
| 4660 | # Global variables: |
| 4661 | -ofile=libtool |
| 4662 | +ofile=${host_alias}-libtool |
| 4663 | can_build_shared=yes |
| 4664 | |
| 4665 | # All known linkers require a `.a' archive for static linking (except MSVC, |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4666 | @@ -8014,8 +8514,6 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4667 | lt_prog_compiler_pic= |
| 4668 | lt_prog_compiler_static= |
| 4669 | |
| 4670 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 4671 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 4672 | |
| 4673 | if test "$GCC" = yes; then |
| 4674 | lt_prog_compiler_wl='-Wl,' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4675 | @@ -8181,6 +8679,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4676 | lt_prog_compiler_pic='--shared' |
| 4677 | lt_prog_compiler_static='--static' |
| 4678 | ;; |
| 4679 | + nagfor*) |
| 4680 | + # NAG Fortran compiler |
| 4681 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 4682 | + lt_prog_compiler_pic='-PIC' |
| 4683 | + lt_prog_compiler_static='-Bstatic' |
| 4684 | + ;; |
| 4685 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 4686 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 4687 | # which looks to be a dead project) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4688 | @@ -8243,7 +8747,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4689 | lt_prog_compiler_pic='-KPIC' |
| 4690 | lt_prog_compiler_static='-Bstatic' |
| 4691 | case $cc_basename in |
| 4692 | - f77* | f90* | f95*) |
| 4693 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 4694 | lt_prog_compiler_wl='-Qoption ld ';; |
| 4695 | *) |
| 4696 | lt_prog_compiler_wl='-Wl,';; |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4697 | @@ -8300,13 +8804,17 @@ case $host_os in |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4698 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 4699 | ;; |
| 4700 | esac |
| 4701 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 4702 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 4703 | - |
| 4704 | - |
| 4705 | - |
| 4706 | - |
| 4707 | |
| 4708 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 4709 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 4710 | +if test "${lt_cv_prog_compiler_pic+set}" = set; then : |
| 4711 | + $as_echo_n "(cached) " >&6 |
| 4712 | +else |
| 4713 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 4714 | +fi |
| 4715 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 4716 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 4717 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 4718 | |
| 4719 | # |
| 4720 | # Check to make sure the PIC flag actually works. |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4721 | @@ -8367,6 +8875,11 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4722 | |
| 4723 | |
| 4724 | |
| 4725 | + |
| 4726 | + |
| 4727 | + |
| 4728 | + |
| 4729 | + |
| 4730 | # |
| 4731 | # Check to make sure the static flag actually works. |
| 4732 | # |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4733 | @@ -8717,7 +9230,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4734 | allow_undefined_flag=unsupported |
| 4735 | always_export_symbols=no |
| 4736 | enable_shared_with_static_runtimes=yes |
| 4737 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 4738 | + 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' |
| 4739 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 4740 | |
| 4741 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 4742 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4743 | @@ -8816,12 +9330,12 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4744 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 4745 | hardcode_libdir_flag_spec= |
| 4746 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 4747 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 4748 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 4749 | if test "x$supports_anon_versioning" = xyes; then |
| 4750 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 4751 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 4752 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 4753 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 4754 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 4755 | fi |
| 4756 | ;; |
| 4757 | esac |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4758 | @@ -8835,8 +9349,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4759 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 4760 | wlarc= |
| 4761 | else |
| 4762 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 4763 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 4764 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 4765 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 4766 | fi |
| 4767 | ;; |
| 4768 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4769 | @@ -8854,8 +9368,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4770 | |
| 4771 | _LT_EOF |
| 4772 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 4773 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 4774 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 4775 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 4776 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 4777 | else |
| 4778 | ld_shlibs=no |
| 4779 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4780 | @@ -8901,8 +9415,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4781 | |
| 4782 | *) |
| 4783 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 4784 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 4785 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 4786 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 4787 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 4788 | else |
| 4789 | ld_shlibs=no |
| 4790 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4791 | @@ -9032,7 +9546,13 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4792 | allow_undefined_flag='-berok' |
| 4793 | # Determine the default libpath from the value encoded in an |
| 4794 | # empty executable. |
| 4795 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 4796 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 4797 | + aix_libpath=$lt_cv_aix_libpath |
| 4798 | +else |
| 4799 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 4800 | + $as_echo_n "(cached) " >&6 |
| 4801 | +else |
| 4802 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 4803 | /* end confdefs.h. */ |
| 4804 | |
| 4805 | int |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4806 | @@ -9045,22 +9565,29 @@ main () |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4807 | _ACEOF |
| 4808 | if ac_fn_c_try_link "$LINENO"; then : |
| 4809 | |
| 4810 | -lt_aix_libpath_sed=' |
| 4811 | - /Import File Strings/,/^$/ { |
| 4812 | - /^0/ { |
| 4813 | - s/^0 *\(.*\)$/\1/ |
| 4814 | - p |
| 4815 | - } |
| 4816 | - }' |
| 4817 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4818 | -# Check for a 64-bit object if we didn't find anything. |
| 4819 | -if test -z "$aix_libpath"; then |
| 4820 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4821 | -fi |
| 4822 | + lt_aix_libpath_sed=' |
| 4823 | + /Import File Strings/,/^$/ { |
| 4824 | + /^0/ { |
| 4825 | + s/^0 *\([^ ]*\) *$/\1/ |
| 4826 | + p |
| 4827 | + } |
| 4828 | + }' |
| 4829 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4830 | + # Check for a 64-bit object if we didn't find anything. |
| 4831 | + if test -z "$lt_cv_aix_libpath_"; then |
| 4832 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4833 | + fi |
| 4834 | fi |
| 4835 | rm -f core conftest.err conftest.$ac_objext \ |
| 4836 | conftest$ac_exeext conftest.$ac_ext |
| 4837 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 4838 | + if test -z "$lt_cv_aix_libpath_"; then |
| 4839 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 4840 | + fi |
| 4841 | + |
| 4842 | +fi |
| 4843 | + |
| 4844 | + aix_libpath=$lt_cv_aix_libpath_ |
| 4845 | +fi |
| 4846 | |
| 4847 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 4848 | 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" |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4849 | @@ -9072,7 +9599,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4850 | else |
| 4851 | # Determine the default libpath from the value encoded in an |
| 4852 | # empty executable. |
| 4853 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 4854 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 4855 | + aix_libpath=$lt_cv_aix_libpath |
| 4856 | +else |
| 4857 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 4858 | + $as_echo_n "(cached) " >&6 |
| 4859 | +else |
| 4860 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 4861 | /* end confdefs.h. */ |
| 4862 | |
| 4863 | int |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4864 | @@ -9085,22 +9618,29 @@ main () |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4865 | _ACEOF |
| 4866 | if ac_fn_c_try_link "$LINENO"; then : |
| 4867 | |
| 4868 | -lt_aix_libpath_sed=' |
| 4869 | - /Import File Strings/,/^$/ { |
| 4870 | - /^0/ { |
| 4871 | - s/^0 *\(.*\)$/\1/ |
| 4872 | - p |
| 4873 | - } |
| 4874 | - }' |
| 4875 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4876 | -# Check for a 64-bit object if we didn't find anything. |
| 4877 | -if test -z "$aix_libpath"; then |
| 4878 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4879 | -fi |
| 4880 | + lt_aix_libpath_sed=' |
| 4881 | + /Import File Strings/,/^$/ { |
| 4882 | + /^0/ { |
| 4883 | + s/^0 *\([^ ]*\) *$/\1/ |
| 4884 | + p |
| 4885 | + } |
| 4886 | + }' |
| 4887 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4888 | + # Check for a 64-bit object if we didn't find anything. |
| 4889 | + if test -z "$lt_cv_aix_libpath_"; then |
| 4890 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 4891 | + fi |
| 4892 | fi |
| 4893 | rm -f core conftest.err conftest.$ac_objext \ |
| 4894 | conftest$ac_exeext conftest.$ac_ext |
| 4895 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 4896 | + if test -z "$lt_cv_aix_libpath_"; then |
| 4897 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 4898 | + fi |
| 4899 | + |
| 4900 | +fi |
| 4901 | + |
| 4902 | + aix_libpath=$lt_cv_aix_libpath_ |
| 4903 | +fi |
| 4904 | |
| 4905 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 4906 | # Warning - without using the other run time loading flags, |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4907 | @@ -9145,20 +9685,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4908 | # Microsoft Visual C++. |
| 4909 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 4910 | # no search path for DLLs. |
| 4911 | - hardcode_libdir_flag_spec=' ' |
| 4912 | - allow_undefined_flag=unsupported |
| 4913 | - # Tell ltmain to make .lib files, not .a files. |
| 4914 | - libext=lib |
| 4915 | - # Tell ltmain to make .dll files, not .so files. |
| 4916 | - shrext_cmds=".dll" |
| 4917 | - # FIXME: Setting linknames here is a bad hack. |
| 4918 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 4919 | - # The linker will automatically build a .lib file if we build a DLL. |
| 4920 | - old_archive_from_new_cmds='true' |
| 4921 | - # FIXME: Should let the user specify the lib program. |
| 4922 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 4923 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 4924 | - enable_shared_with_static_runtimes=yes |
| 4925 | + case $cc_basename in |
| 4926 | + cl*) |
| 4927 | + # Native MSVC |
| 4928 | + hardcode_libdir_flag_spec=' ' |
| 4929 | + allow_undefined_flag=unsupported |
| 4930 | + always_export_symbols=yes |
| 4931 | + file_list_spec='@' |
| 4932 | + # Tell ltmain to make .lib files, not .a files. |
| 4933 | + libext=lib |
| 4934 | + # Tell ltmain to make .dll files, not .so files. |
| 4935 | + shrext_cmds=".dll" |
| 4936 | + # FIXME: Setting linknames here is a bad hack. |
| 4937 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 4938 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 4939 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 4940 | + else |
| 4941 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 4942 | + fi~ |
| 4943 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 4944 | + linknames=' |
| 4945 | + # The linker will not automatically build a static lib if we build a DLL. |
| 4946 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 4947 | + enable_shared_with_static_runtimes=yes |
| 4948 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 4949 | + # Don't use ranlib |
| 4950 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 4951 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 4952 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 4953 | + case $lt_outputfile in |
| 4954 | + *.exe|*.EXE) ;; |
| 4955 | + *) |
| 4956 | + lt_outputfile="$lt_outputfile.exe" |
| 4957 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 4958 | + ;; |
| 4959 | + esac~ |
| 4960 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 4961 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 4962 | + $RM "$lt_outputfile.manifest"; |
| 4963 | + fi' |
| 4964 | + ;; |
| 4965 | + *) |
| 4966 | + # Assume MSVC wrapper |
| 4967 | + hardcode_libdir_flag_spec=' ' |
| 4968 | + allow_undefined_flag=unsupported |
| 4969 | + # Tell ltmain to make .lib files, not .a files. |
| 4970 | + libext=lib |
| 4971 | + # Tell ltmain to make .dll files, not .so files. |
| 4972 | + shrext_cmds=".dll" |
| 4973 | + # FIXME: Setting linknames here is a bad hack. |
| 4974 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 4975 | + # The linker will automatically build a .lib file if we build a DLL. |
| 4976 | + old_archive_from_new_cmds='true' |
| 4977 | + # FIXME: Should let the user specify the lib program. |
| 4978 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 4979 | + enable_shared_with_static_runtimes=yes |
| 4980 | + ;; |
| 4981 | + esac |
| 4982 | ;; |
| 4983 | |
| 4984 | darwin* | rhapsody*) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4985 | @@ -9219,7 +9802,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4986 | |
| 4987 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 4988 | freebsd* | dragonfly*) |
| 4989 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 4990 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 4991 | hardcode_libdir_flag_spec='-R$libdir' |
| 4992 | hardcode_direct=yes |
| 4993 | hardcode_shlibpath_var=no |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4994 | @@ -9227,7 +9810,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4995 | |
| 4996 | hpux9*) |
| 4997 | if test "$GCC" = yes; then |
| 4998 | - 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' |
| 4999 | + 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' |
| 5000 | else |
| 5001 | 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' |
| 5002 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5003 | @@ -9243,7 +9826,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5004 | |
| 5005 | hpux10*) |
| 5006 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 5007 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 5008 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 5009 | else |
| 5010 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 5011 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5012 | @@ -9267,10 +9850,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5013 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 5014 | ;; |
| 5015 | ia64*) |
| 5016 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 5017 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 5018 | ;; |
| 5019 | *) |
| 5020 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 5021 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 5022 | ;; |
| 5023 | esac |
| 5024 | else |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5025 | @@ -9349,23 +9932,36 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5026 | |
| 5027 | irix5* | irix6* | nonstopux*) |
| 5028 | if test "$GCC" = yes; then |
| 5029 | - 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' |
| 5030 | + 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' |
| 5031 | # Try to use the -exported_symbol ld option, if it does not |
| 5032 | # work, assume that -exports_file does not work either and |
| 5033 | # implicitly export all symbols. |
| 5034 | - save_LDFLAGS="$LDFLAGS" |
| 5035 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 5036 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 5037 | + # This should be the same for all languages, so no per-tag cache variable. |
| 5038 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 5039 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 5040 | +if test "${lt_cv_irix_exported_symbol+set}" = set; then : |
| 5041 | + $as_echo_n "(cached) " >&6 |
| 5042 | +else |
| 5043 | + save_LDFLAGS="$LDFLAGS" |
| 5044 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 5045 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 5046 | /* end confdefs.h. */ |
| 5047 | -int foo(void) {} |
| 5048 | +int foo (void) { return 0; } |
| 5049 | _ACEOF |
| 5050 | if ac_fn_c_try_link "$LINENO"; then : |
| 5051 | - 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' |
| 5052 | - |
| 5053 | + lt_cv_irix_exported_symbol=yes |
| 5054 | +else |
| 5055 | + lt_cv_irix_exported_symbol=no |
| 5056 | fi |
| 5057 | rm -f core conftest.err conftest.$ac_objext \ |
| 5058 | conftest$ac_exeext conftest.$ac_ext |
| 5059 | - LDFLAGS="$save_LDFLAGS" |
| 5060 | + LDFLAGS="$save_LDFLAGS" |
| 5061 | +fi |
| 5062 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 5063 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 5064 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 5065 | + 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' |
| 5066 | + fi |
| 5067 | else |
| 5068 | 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' |
| 5069 | 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' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5070 | @@ -9450,7 +10046,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5071 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 5072 | if test "$GCC" = yes; then |
| 5073 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 5074 | - 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' |
| 5075 | + 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' |
| 5076 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 5077 | else |
| 5078 | allow_undefined_flag=' -expect_unresolved \*' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5079 | @@ -9469,9 +10065,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5080 | no_undefined_flag=' -z defs' |
| 5081 | if test "$GCC" = yes; then |
| 5082 | wlarc='${wl}' |
| 5083 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 5084 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 5085 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 5086 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 5087 | + $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' |
| 5088 | else |
| 5089 | case `$CC -V 2>&1` in |
| 5090 | *"Compilers 5.0"*) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5091 | @@ -10047,8 +10643,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5092 | need_version=no |
| 5093 | need_lib_prefix=no |
| 5094 | |
| 5095 | - case $GCC,$host_os in |
| 5096 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 5097 | + case $GCC,$cc_basename in |
| 5098 | + yes,*) |
| 5099 | + # gcc |
| 5100 | library_names_spec='$libname.dll.a' |
| 5101 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 5102 | postinstall_cmds='base_file=`basename \${file}`~ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5103 | @@ -10081,13 +10678,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5104 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 5105 | ;; |
| 5106 | esac |
| 5107 | + dynamic_linker='Win32 ld.exe' |
| 5108 | + ;; |
| 5109 | + |
| 5110 | + *,cl*) |
| 5111 | + # Native MSVC |
| 5112 | + libname_spec='$name' |
| 5113 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 5114 | + library_names_spec='${libname}.dll.lib' |
| 5115 | + |
| 5116 | + case $build_os in |
| 5117 | + mingw*) |
| 5118 | + sys_lib_search_path_spec= |
| 5119 | + lt_save_ifs=$IFS |
| 5120 | + IFS=';' |
| 5121 | + for lt_path in $LIB |
| 5122 | + do |
| 5123 | + IFS=$lt_save_ifs |
| 5124 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 5125 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 5126 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 5127 | + done |
| 5128 | + IFS=$lt_save_ifs |
| 5129 | + # Convert to MSYS style. |
| 5130 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 5131 | + ;; |
| 5132 | + cygwin*) |
| 5133 | + # Convert to unix form, then to dos form, then back to unix form |
| 5134 | + # but this time dos style (no spaces!) so that the unix form looks |
| 5135 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 5136 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 5137 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 5138 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 5139 | + ;; |
| 5140 | + *) |
| 5141 | + sys_lib_search_path_spec="$LIB" |
| 5142 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 5143 | + # It is most probably a Windows format PATH. |
| 5144 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 5145 | + else |
| 5146 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 5147 | + fi |
| 5148 | + # FIXME: find the short name or the path components, as spaces are |
| 5149 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 5150 | + ;; |
| 5151 | + esac |
| 5152 | + |
| 5153 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 5154 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 5155 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 5156 | + dldir=$destdir/`dirname \$dlpath`~ |
| 5157 | + test -d \$dldir || mkdir -p \$dldir~ |
| 5158 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 5159 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 5160 | + dlpath=$dir/\$dldll~ |
| 5161 | + $RM \$dlpath' |
| 5162 | + shlibpath_overrides_runpath=yes |
| 5163 | + dynamic_linker='Win32 link.exe' |
| 5164 | ;; |
| 5165 | |
| 5166 | *) |
| 5167 | + # Assume MSVC wrapper |
| 5168 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 5169 | + dynamic_linker='Win32 ld.exe' |
| 5170 | ;; |
| 5171 | esac |
| 5172 | - dynamic_linker='Win32 ld.exe' |
| 5173 | # FIXME: first we should search . and the directory the executable is in |
| 5174 | shlibpath_var=PATH |
| 5175 | ;; |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5176 | @@ -10179,7 +10834,7 @@ haiku*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5177 | soname_spec='${libname}${release}${shared_ext}$major' |
| 5178 | shlibpath_var=LIBRARY_PATH |
| 5179 | shlibpath_overrides_runpath=yes |
| 5180 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' |
| 5181 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
| 5182 | hardcode_into_libs=yes |
| 5183 | ;; |
| 5184 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5185 | @@ -10975,7 +11630,7 @@ else |
| 5186 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 5187 | lt_status=$lt_dlunknown |
| 5188 | cat > conftest.$ac_ext <<_LT_EOF |
| 5189 | -#line 10978 "configure" |
| 5190 | +#line $LINENO "configure" |
| 5191 | #include "confdefs.h" |
| 5192 | |
| 5193 | #if HAVE_DLFCN_H |
| 5194 | @@ -11019,10 +11674,10 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5195 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 5196 | correspondingly for the symbols needed. */ |
| 5197 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 5198 | -void fnord () __attribute__((visibility("default"))); |
| 5199 | +int fnord () __attribute__((visibility("default"))); |
| 5200 | #endif |
| 5201 | |
| 5202 | -void fnord () { int i=42; } |
| 5203 | +int fnord () { return 42; } |
| 5204 | int main () |
| 5205 | { |
| 5206 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5207 | @@ -11081,7 +11736,7 @@ else |
| 5208 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 5209 | lt_status=$lt_dlunknown |
| 5210 | cat > conftest.$ac_ext <<_LT_EOF |
| 5211 | -#line 11084 "configure" |
| 5212 | +#line $LINENO "configure" |
| 5213 | #include "confdefs.h" |
| 5214 | |
| 5215 | #if HAVE_DLFCN_H |
| 5216 | @@ -11125,10 +11780,10 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5217 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 5218 | correspondingly for the symbols needed. */ |
| 5219 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 5220 | -void fnord () __attribute__((visibility("default"))); |
| 5221 | +int fnord () __attribute__((visibility("default"))); |
| 5222 | #endif |
| 5223 | |
| 5224 | -void fnord () { int i=42; } |
| 5225 | +int fnord () { return 42; } |
| 5226 | int main () |
| 5227 | { |
| 5228 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5229 | @@ -15276,13 +15931,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5230 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 5231 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 5232 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 5233 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 5234 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 5235 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 5236 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 5237 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 5238 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 5239 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 5240 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 5241 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 5242 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 5243 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 5244 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 5245 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 5246 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 5247 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 5248 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 5249 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5250 | @@ -15297,14 +15959,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5251 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 5252 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 5253 | 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"`' |
| 5254 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 5255 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 5256 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 5257 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 5258 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 5259 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 5260 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 5261 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 5262 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 5263 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 5264 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 5265 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 5266 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 5267 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 5268 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5269 | @@ -15337,12 +16002,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5270 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 5271 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 5272 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 5273 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 5274 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 5275 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 5276 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 5277 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 5278 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 5279 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 5280 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 5281 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 5282 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5283 | @@ -15397,8 +16062,13 @@ reload_flag \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5284 | OBJDUMP \ |
| 5285 | deplibs_check_method \ |
| 5286 | file_magic_cmd \ |
| 5287 | +file_magic_glob \ |
| 5288 | +want_nocaseglob \ |
| 5289 | +DLLTOOL \ |
| 5290 | +sharedlib_from_linklib_cmd \ |
| 5291 | AR \ |
| 5292 | AR_FLAGS \ |
| 5293 | +archiver_list_spec \ |
| 5294 | STRIP \ |
| 5295 | RANLIB \ |
| 5296 | CC \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5297 | @@ -15408,12 +16078,14 @@ lt_cv_sys_global_symbol_pipe \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5298 | lt_cv_sys_global_symbol_to_cdecl \ |
| 5299 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 5300 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 5301 | +nm_file_list_spec \ |
| 5302 | lt_prog_compiler_no_builtin_flag \ |
| 5303 | -lt_prog_compiler_wl \ |
| 5304 | lt_prog_compiler_pic \ |
| 5305 | +lt_prog_compiler_wl \ |
| 5306 | lt_prog_compiler_static \ |
| 5307 | lt_cv_prog_compiler_c_o \ |
| 5308 | need_locks \ |
| 5309 | +MANIFEST_TOOL \ |
| 5310 | DSYMUTIL \ |
| 5311 | NMEDIT \ |
| 5312 | LIPO \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5313 | @@ -15429,7 +16101,6 @@ no_undefined_flag \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5314 | hardcode_libdir_flag_spec \ |
| 5315 | hardcode_libdir_flag_spec_ld \ |
| 5316 | hardcode_libdir_separator \ |
| 5317 | -fix_srcfile_path \ |
| 5318 | exclude_expsyms \ |
| 5319 | include_expsyms \ |
| 5320 | file_list_spec \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5321 | @@ -15465,6 +16136,7 @@ module_cmds \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5322 | module_expsym_cmds \ |
| 5323 | export_symbols_cmds \ |
| 5324 | prelink_cmds \ |
| 5325 | +postlink_cmds \ |
| 5326 | postinstall_cmds \ |
| 5327 | postuninstall_cmds \ |
| 5328 | finish_cmds \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5329 | @@ -16229,7 +16901,8 @@ $as_echo X"$file" | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5330 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 5331 | # |
| 5332 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 5333 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 5334 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 5335 | +# Inc. |
| 5336 | # Written by Gordon Matzigkeit, 1996 |
| 5337 | # |
| 5338 | # This file is part of GNU Libtool. |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5339 | @@ -16332,19 +17005,42 @@ SP2NL=$lt_lt_SP2NL |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5340 | # turn newlines into spaces. |
| 5341 | NL2SP=$lt_lt_NL2SP |
| 5342 | |
| 5343 | +# convert \$build file names to \$host format. |
| 5344 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 5345 | + |
| 5346 | +# convert \$build files to toolchain format. |
| 5347 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 5348 | + |
| 5349 | # An object symbol dumper. |
| 5350 | OBJDUMP=$lt_OBJDUMP |
| 5351 | |
| 5352 | # Method to check whether dependent libraries are shared objects. |
| 5353 | deplibs_check_method=$lt_deplibs_check_method |
| 5354 | |
| 5355 | -# Command to use when deplibs_check_method == "file_magic". |
| 5356 | +# Command to use when deplibs_check_method = "file_magic". |
| 5357 | file_magic_cmd=$lt_file_magic_cmd |
| 5358 | |
| 5359 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 5360 | +file_magic_glob=$lt_file_magic_glob |
| 5361 | + |
| 5362 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 5363 | +want_nocaseglob=$lt_want_nocaseglob |
| 5364 | + |
| 5365 | +# DLL creation program. |
| 5366 | +DLLTOOL=$lt_DLLTOOL |
| 5367 | + |
| 5368 | +# Command to associate shared and link libraries. |
| 5369 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 5370 | + |
| 5371 | # The archiver. |
| 5372 | AR=$lt_AR |
| 5373 | + |
| 5374 | +# Flags to create an archive. |
| 5375 | AR_FLAGS=$lt_AR_FLAGS |
| 5376 | |
| 5377 | +# How to feed a file listing to the archiver. |
| 5378 | +archiver_list_spec=$lt_archiver_list_spec |
| 5379 | + |
| 5380 | # A symbol stripping program. |
| 5381 | STRIP=$lt_STRIP |
| 5382 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5383 | @@ -16374,6 +17070,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5384 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 5385 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 5386 | |
| 5387 | +# Specify filename containing input files for \$NM. |
| 5388 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 5389 | + |
| 5390 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 5391 | +lt_sysroot=$lt_sysroot |
| 5392 | + |
| 5393 | # The name of the directory that contains temporary libtool files. |
| 5394 | objdir=$objdir |
| 5395 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5396 | @@ -16383,6 +17085,9 @@ MAGIC_CMD=$MAGIC_CMD |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5397 | # Must we lock files when doing compilation? |
| 5398 | need_locks=$lt_need_locks |
| 5399 | |
| 5400 | +# Manifest tool. |
| 5401 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 5402 | + |
| 5403 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 5404 | DSYMUTIL=$lt_DSYMUTIL |
| 5405 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5406 | @@ -16497,12 +17202,12 @@ with_gcc=$GCC |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5407 | # Compiler flag to turn off builtin functions. |
| 5408 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 5409 | |
| 5410 | -# How to pass a linker flag through the compiler. |
| 5411 | -wl=$lt_lt_prog_compiler_wl |
| 5412 | - |
| 5413 | # Additional compiler flags for building library objects. |
| 5414 | pic_flag=$lt_lt_prog_compiler_pic |
| 5415 | |
| 5416 | +# How to pass a linker flag through the compiler. |
| 5417 | +wl=$lt_lt_prog_compiler_wl |
| 5418 | + |
| 5419 | # Compiler flag to prevent dynamic linking. |
| 5420 | link_static_flag=$lt_lt_prog_compiler_static |
| 5421 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5422 | @@ -16589,9 +17294,6 @@ inherit_rpath=$inherit_rpath |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5423 | # Whether libtool must link a program against all its dependency libraries. |
| 5424 | link_all_deplibs=$link_all_deplibs |
| 5425 | |
| 5426 | -# Fix the shell variable \$srcfile for the compiler. |
| 5427 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 5428 | - |
| 5429 | # Set to "yes" if exported symbols are required. |
| 5430 | always_export_symbols=$always_export_symbols |
| 5431 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5432 | @@ -16607,6 +17309,9 @@ include_expsyms=$lt_include_expsyms |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5433 | # Commands necessary for linking programs (against libraries) with templates. |
| 5434 | prelink_cmds=$lt_prelink_cmds |
| 5435 | |
| 5436 | +# Commands necessary for finishing linking programs. |
| 5437 | +postlink_cmds=$lt_postlink_cmds |
| 5438 | + |
| 5439 | # Specify filename containing input files. |
| 5440 | file_list_spec=$lt_file_list_spec |
| 5441 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5442 | @@ -16639,210 +17344,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5443 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 5444 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 5445 | # is reportedly fixed, but why not run on old versions too? |
| 5446 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 5447 | - || (rm -f "$cfgfile"; exit 1) |
| 5448 | - |
| 5449 | - case $xsi_shell in |
| 5450 | - yes) |
| 5451 | - cat << \_LT_EOF >> "$cfgfile" |
| 5452 | - |
| 5453 | -# func_dirname file append nondir_replacement |
| 5454 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 5455 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 5456 | -func_dirname () |
| 5457 | -{ |
| 5458 | - case ${1} in |
| 5459 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 5460 | - * ) func_dirname_result="${3}" ;; |
| 5461 | - esac |
| 5462 | -} |
| 5463 | - |
| 5464 | -# func_basename file |
| 5465 | -func_basename () |
| 5466 | -{ |
| 5467 | - func_basename_result="${1##*/}" |
| 5468 | -} |
| 5469 | - |
| 5470 | -# func_dirname_and_basename file append nondir_replacement |
| 5471 | -# perform func_basename and func_dirname in a single function |
| 5472 | -# call: |
| 5473 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 5474 | -# add APPEND to the result, otherwise set result |
| 5475 | -# to NONDIR_REPLACEMENT. |
| 5476 | -# value returned in "$func_dirname_result" |
| 5477 | -# basename: Compute filename of FILE. |
| 5478 | -# value retuned in "$func_basename_result" |
| 5479 | -# Implementation must be kept synchronized with func_dirname |
| 5480 | -# and func_basename. For efficiency, we do not delegate to |
| 5481 | -# those functions but instead duplicate the functionality here. |
| 5482 | -func_dirname_and_basename () |
| 5483 | -{ |
| 5484 | - case ${1} in |
| 5485 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 5486 | - * ) func_dirname_result="${3}" ;; |
| 5487 | - esac |
| 5488 | - func_basename_result="${1##*/}" |
| 5489 | -} |
| 5490 | - |
| 5491 | -# func_stripname prefix suffix name |
| 5492 | -# strip PREFIX and SUFFIX off of NAME. |
| 5493 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 5494 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 5495 | -# dot (in which case that matches only a dot). |
| 5496 | -func_stripname () |
| 5497 | -{ |
| 5498 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 5499 | - # positional parameters, so assign one to ordinary parameter first. |
| 5500 | - func_stripname_result=${3} |
| 5501 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 5502 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 5503 | -} |
| 5504 | - |
| 5505 | -# func_opt_split |
| 5506 | -func_opt_split () |
| 5507 | -{ |
| 5508 | - func_opt_split_opt=${1%%=*} |
| 5509 | - func_opt_split_arg=${1#*=} |
| 5510 | -} |
| 5511 | - |
| 5512 | -# func_lo2o object |
| 5513 | -func_lo2o () |
| 5514 | -{ |
| 5515 | - case ${1} in |
| 5516 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 5517 | - *) func_lo2o_result=${1} ;; |
| 5518 | - esac |
| 5519 | -} |
| 5520 | - |
| 5521 | -# func_xform libobj-or-source |
| 5522 | -func_xform () |
| 5523 | -{ |
| 5524 | - func_xform_result=${1%.*}.lo |
| 5525 | -} |
| 5526 | - |
| 5527 | -# func_arith arithmetic-term... |
| 5528 | -func_arith () |
| 5529 | -{ |
| 5530 | - func_arith_result=$(( $* )) |
| 5531 | -} |
| 5532 | - |
| 5533 | -# func_len string |
| 5534 | -# STRING may not start with a hyphen. |
| 5535 | -func_len () |
| 5536 | -{ |
| 5537 | - func_len_result=${#1} |
| 5538 | -} |
| 5539 | - |
| 5540 | -_LT_EOF |
| 5541 | - ;; |
| 5542 | - *) # Bourne compatible functions. |
| 5543 | - cat << \_LT_EOF >> "$cfgfile" |
| 5544 | - |
| 5545 | -# func_dirname file append nondir_replacement |
| 5546 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 5547 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 5548 | -func_dirname () |
| 5549 | -{ |
| 5550 | - # Extract subdirectory from the argument. |
| 5551 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 5552 | - if test "X$func_dirname_result" = "X${1}"; then |
| 5553 | - func_dirname_result="${3}" |
| 5554 | - else |
| 5555 | - func_dirname_result="$func_dirname_result${2}" |
| 5556 | - fi |
| 5557 | -} |
| 5558 | - |
| 5559 | -# func_basename file |
| 5560 | -func_basename () |
| 5561 | -{ |
| 5562 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 5563 | -} |
| 5564 | - |
| 5565 | - |
| 5566 | -# func_stripname prefix suffix name |
| 5567 | -# strip PREFIX and SUFFIX off of NAME. |
| 5568 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 5569 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 5570 | -# dot (in which case that matches only a dot). |
| 5571 | -# func_strip_suffix prefix name |
| 5572 | -func_stripname () |
| 5573 | -{ |
| 5574 | - case ${2} in |
| 5575 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 5576 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 5577 | - esac |
| 5578 | -} |
| 5579 | - |
| 5580 | -# sed scripts: |
| 5581 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 5582 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 5583 | - |
| 5584 | -# func_opt_split |
| 5585 | -func_opt_split () |
| 5586 | -{ |
| 5587 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 5588 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 5589 | -} |
| 5590 | - |
| 5591 | -# func_lo2o object |
| 5592 | -func_lo2o () |
| 5593 | -{ |
| 5594 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 5595 | -} |
| 5596 | - |
| 5597 | -# func_xform libobj-or-source |
| 5598 | -func_xform () |
| 5599 | -{ |
| 5600 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 5601 | -} |
| 5602 | - |
| 5603 | -# func_arith arithmetic-term... |
| 5604 | -func_arith () |
| 5605 | -{ |
| 5606 | - func_arith_result=`expr "$@"` |
| 5607 | -} |
| 5608 | - |
| 5609 | -# func_len string |
| 5610 | -# STRING may not start with a hyphen. |
| 5611 | -func_len () |
| 5612 | -{ |
| 5613 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 5614 | -} |
| 5615 | - |
| 5616 | -_LT_EOF |
| 5617 | -esac |
| 5618 | - |
| 5619 | -case $lt_shell_append in |
| 5620 | - yes) |
| 5621 | - cat << \_LT_EOF >> "$cfgfile" |
| 5622 | - |
| 5623 | -# func_append var value |
| 5624 | -# Append VALUE to the end of shell variable VAR. |
| 5625 | -func_append () |
| 5626 | -{ |
| 5627 | - eval "$1+=\$2" |
| 5628 | -} |
| 5629 | -_LT_EOF |
| 5630 | - ;; |
| 5631 | - *) |
| 5632 | - cat << \_LT_EOF >> "$cfgfile" |
| 5633 | - |
| 5634 | -# func_append var value |
| 5635 | -# Append VALUE to the end of shell variable VAR. |
| 5636 | -func_append () |
| 5637 | -{ |
| 5638 | - eval "$1=\$$1\$2" |
| 5639 | -} |
| 5640 | - |
| 5641 | -_LT_EOF |
| 5642 | - ;; |
| 5643 | - esac |
| 5644 | - |
| 5645 | - |
| 5646 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 5647 | - || (rm -f "$cfgfile"; exit 1) |
| 5648 | - |
| 5649 | - mv -f "$cfgfile" "$ofile" || |
| 5650 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 5651 | + || (rm -f "$cfgfile"; exit 1) |
| 5652 | + |
| 5653 | + if test x"$xsi_shell" = xyes; then |
| 5654 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 5655 | +func_dirname ()\ |
| 5656 | +{\ |
| 5657 | +\ case ${1} in\ |
| 5658 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 5659 | +\ * ) func_dirname_result="${3}" ;;\ |
| 5660 | +\ esac\ |
| 5661 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5662 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5663 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5664 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5665 | + |
| 5666 | + |
| 5667 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 5668 | +func_basename ()\ |
| 5669 | +{\ |
| 5670 | +\ func_basename_result="${1##*/}"\ |
| 5671 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5672 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5673 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5674 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5675 | + |
| 5676 | + |
| 5677 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 5678 | +func_dirname_and_basename ()\ |
| 5679 | +{\ |
| 5680 | +\ case ${1} in\ |
| 5681 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 5682 | +\ * ) func_dirname_result="${3}" ;;\ |
| 5683 | +\ esac\ |
| 5684 | +\ func_basename_result="${1##*/}"\ |
| 5685 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5686 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5687 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5688 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5689 | + |
| 5690 | + |
| 5691 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 5692 | +func_stripname ()\ |
| 5693 | +{\ |
| 5694 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 5695 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 5696 | +\ func_stripname_result=${3}\ |
| 5697 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 5698 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 5699 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5700 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5701 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5702 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5703 | + |
| 5704 | + |
| 5705 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 5706 | +func_split_long_opt ()\ |
| 5707 | +{\ |
| 5708 | +\ func_split_long_opt_name=${1%%=*}\ |
| 5709 | +\ func_split_long_opt_arg=${1#*=}\ |
| 5710 | +} # Extended-shell func_split_long_opt implementation' "$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 | + |
| 5715 | + |
| 5716 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 5717 | +func_split_short_opt ()\ |
| 5718 | +{\ |
| 5719 | +\ func_split_short_opt_arg=${1#??}\ |
| 5720 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 5721 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5722 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5723 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5724 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5725 | + |
| 5726 | + |
| 5727 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 5728 | +func_lo2o ()\ |
| 5729 | +{\ |
| 5730 | +\ case ${1} in\ |
| 5731 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 5732 | +\ *) func_lo2o_result=${1} ;;\ |
| 5733 | +\ esac\ |
| 5734 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5735 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5736 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5737 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5738 | + |
| 5739 | + |
| 5740 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 5741 | +func_xform ()\ |
| 5742 | +{\ |
| 5743 | + func_xform_result=${1%.*}.lo\ |
| 5744 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5745 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5746 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5747 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5748 | + |
| 5749 | + |
| 5750 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 5751 | +func_arith ()\ |
| 5752 | +{\ |
| 5753 | + func_arith_result=$(( $* ))\ |
| 5754 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5755 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5756 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5757 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5758 | + |
| 5759 | + |
| 5760 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 5761 | +func_len ()\ |
| 5762 | +{\ |
| 5763 | + func_len_result=${#1}\ |
| 5764 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5765 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5766 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5767 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5768 | + |
| 5769 | +fi |
| 5770 | + |
| 5771 | +if test x"$lt_shell_append" = xyes; then |
| 5772 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 5773 | +func_append ()\ |
| 5774 | +{\ |
| 5775 | + eval "${1}+=\\${2}"\ |
| 5776 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5777 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5778 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5779 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5780 | + |
| 5781 | + |
| 5782 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 5783 | +func_append_quoted ()\ |
| 5784 | +{\ |
| 5785 | +\ func_quote_for_eval "${2}"\ |
| 5786 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 5787 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 5788 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5789 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5790 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 5791 | + |
| 5792 | + |
| 5793 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 5794 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 5795 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5796 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5797 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 5798 | +else |
| 5799 | + # Save a `func_append' function call even when '+=' is not available |
| 5800 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 5801 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 5802 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 5803 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 5804 | +fi |
| 5805 | + |
| 5806 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 5807 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 5808 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 5809 | +fi |
| 5810 | + |
| 5811 | + |
| 5812 | + mv -f "$cfgfile" "$ofile" || |
| 5813 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 5814 | chmod +x "$ofile" |
| 5815 | |
| 5816 | diff --git a/gprof/configure b/gprof/configure |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5817 | index d4db554..78b292c 100755 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5818 | --- a/gprof/configure |
| 5819 | +++ b/gprof/configure |
| 5820 | @@ -629,8 +629,11 @@ OTOOL |
| 5821 | LIPO |
| 5822 | NMEDIT |
| 5823 | DSYMUTIL |
| 5824 | +MANIFEST_TOOL |
| 5825 | RANLIB |
| 5826 | +ac_ct_AR |
| 5827 | AR |
| 5828 | +DLLTOOL |
| 5829 | OBJDUMP |
| 5830 | LN_S |
| 5831 | NM |
| 5832 | @@ -741,6 +744,7 @@ enable_static |
| 5833 | with_pic |
| 5834 | enable_fast_install |
| 5835 | with_gnu_ld |
| 5836 | +with_libtool_sysroot |
| 5837 | enable_libtool_lock |
| 5838 | enable_plugins |
| 5839 | enable_largefile |
| 5840 | @@ -1399,6 +1403,8 @@ Optional Packages: |
| 5841 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 5842 | both] |
| 5843 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 5844 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 5845 | + (or the compiler's sysroot if not specified). |
| 5846 | |
| 5847 | Some influential environment variables: |
| 5848 | CC C compiler command |
| 5849 | @@ -4831,8 +4837,8 @@ esac |
| 5850 | |
| 5851 | |
| 5852 | |
| 5853 | -macro_version='2.2.7a' |
| 5854 | -macro_revision='1.3134' |
| 5855 | +macro_version='2.4' |
| 5856 | +macro_revision='1.3293' |
| 5857 | |
| 5858 | |
| 5859 | |
| 5860 | @@ -4872,7 +4878,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 5861 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 5862 | $as_echo_n "checking how to print strings... " >&6; } |
| 5863 | # Test print first, because it will be a builtin if present. |
| 5864 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 5865 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 5866 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 5867 | ECHO='print -r --' |
| 5868 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 5869 | @@ -5558,8 +5564,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 5870 | # Try some XSI features |
| 5871 | xsi_shell=no |
| 5872 | ( _lt_dummy="a/b/c" |
| 5873 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 5874 | - = c,a/b,, \ |
| 5875 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 5876 | + = c,a/b,b/c, \ |
| 5877 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 5878 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 5879 | && xsi_shell=yes |
| 5880 | @@ -5608,6 +5614,80 @@ esac |
| 5881 | |
| 5882 | |
| 5883 | |
| 5884 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 5885 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 5886 | +if test "${lt_cv_to_host_file_cmd+set}" = set; then : |
| 5887 | + $as_echo_n "(cached) " >&6 |
| 5888 | +else |
| 5889 | + case $host in |
| 5890 | + *-*-mingw* ) |
| 5891 | + case $build in |
| 5892 | + *-*-mingw* ) # actually msys |
| 5893 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 5894 | + ;; |
| 5895 | + *-*-cygwin* ) |
| 5896 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 5897 | + ;; |
| 5898 | + * ) # otherwise, assume *nix |
| 5899 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 5900 | + ;; |
| 5901 | + esac |
| 5902 | + ;; |
| 5903 | + *-*-cygwin* ) |
| 5904 | + case $build in |
| 5905 | + *-*-mingw* ) # actually msys |
| 5906 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 5907 | + ;; |
| 5908 | + *-*-cygwin* ) |
| 5909 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 5910 | + ;; |
| 5911 | + * ) # otherwise, assume *nix |
| 5912 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 5913 | + ;; |
| 5914 | + esac |
| 5915 | + ;; |
| 5916 | + * ) # unhandled hosts (and "normal" native builds) |
| 5917 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 5918 | + ;; |
| 5919 | +esac |
| 5920 | + |
| 5921 | +fi |
| 5922 | + |
| 5923 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 5924 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 5925 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 5926 | + |
| 5927 | + |
| 5928 | + |
| 5929 | + |
| 5930 | + |
| 5931 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 5932 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 5933 | +if test "${lt_cv_to_tool_file_cmd+set}" = set; then : |
| 5934 | + $as_echo_n "(cached) " >&6 |
| 5935 | +else |
| 5936 | + #assume ordinary cross tools, or native build. |
| 5937 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 5938 | +case $host in |
| 5939 | + *-*-mingw* ) |
| 5940 | + case $build in |
| 5941 | + *-*-mingw* ) # actually msys |
| 5942 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 5943 | + ;; |
| 5944 | + esac |
| 5945 | + ;; |
| 5946 | +esac |
| 5947 | + |
| 5948 | +fi |
| 5949 | + |
| 5950 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 5951 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 5952 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 5953 | + |
| 5954 | + |
| 5955 | + |
| 5956 | + |
| 5957 | + |
| 5958 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 5959 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 5960 | if test "${lt_cv_ld_reload_flag+set}" = set; then : |
| 5961 | @@ -5624,6 +5704,11 @@ case $reload_flag in |
| 5962 | esac |
| 5963 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 5964 | case $host_os in |
| 5965 | + cygwin* | mingw* | pw32* | cegcc*) |
| 5966 | + if test "$GCC" != yes; then |
| 5967 | + reload_cmds=false |
| 5968 | + fi |
| 5969 | + ;; |
| 5970 | darwin*) |
| 5971 | if test "$GCC" = yes; then |
| 5972 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 5973 | @@ -5792,7 +5877,8 @@ mingw* | pw32*) |
| 5974 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 5975 | lt_cv_file_magic_cmd='func_win32_libid' |
| 5976 | else |
| 5977 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 5978 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 5979 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 5980 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 5981 | fi |
| 5982 | ;; |
| 5983 | @@ -5869,11 +5955,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) |
| 5984 | lt_cv_deplibs_check_method=pass_all |
| 5985 | ;; |
| 5986 | |
| 5987 | -linux-uclibc*) |
| 5988 | - lt_cv_deplibs_check_method=pass_all |
| 5989 | - lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` |
| 5990 | - ;; |
| 5991 | - |
| 5992 | netbsd*) |
| 5993 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
| 5994 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' |
| 5995 | @@ -5951,6 +6032,21 @@ esac |
| 5996 | fi |
| 5997 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 5998 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 5999 | + |
| 6000 | +file_magic_glob= |
| 6001 | +want_nocaseglob=no |
| 6002 | +if test "$build" = "$host"; then |
| 6003 | + case $host_os in |
| 6004 | + mingw* | pw32*) |
| 6005 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 6006 | + want_nocaseglob=yes |
| 6007 | + else |
| 6008 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 6009 | + fi |
| 6010 | + ;; |
| 6011 | + esac |
| 6012 | +fi |
| 6013 | + |
| 6014 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 6015 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 6016 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 6017 | @@ -5966,9 +6062,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 6018 | |
| 6019 | |
| 6020 | |
| 6021 | + |
| 6022 | + |
| 6023 | + |
| 6024 | + |
| 6025 | + |
| 6026 | + |
| 6027 | + |
| 6028 | + |
| 6029 | + |
| 6030 | + |
| 6031 | +if test -n "$ac_tool_prefix"; then |
| 6032 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 6033 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 6034 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 6035 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 6036 | +if test "${ac_cv_prog_DLLTOOL+set}" = set; then : |
| 6037 | + $as_echo_n "(cached) " >&6 |
| 6038 | +else |
| 6039 | + if test -n "$DLLTOOL"; then |
| 6040 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 6041 | +else |
| 6042 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 6043 | +for as_dir in $PATH |
| 6044 | +do |
| 6045 | + IFS=$as_save_IFS |
| 6046 | + test -z "$as_dir" && as_dir=. |
| 6047 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 6048 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 6049 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 6050 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 6051 | + break 2 |
| 6052 | + fi |
| 6053 | +done |
| 6054 | + done |
| 6055 | +IFS=$as_save_IFS |
| 6056 | + |
| 6057 | +fi |
| 6058 | +fi |
| 6059 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 6060 | +if test -n "$DLLTOOL"; then |
| 6061 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 6062 | +$as_echo "$DLLTOOL" >&6; } |
| 6063 | +else |
| 6064 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 6065 | +$as_echo "no" >&6; } |
| 6066 | +fi |
| 6067 | + |
| 6068 | + |
| 6069 | +fi |
| 6070 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 6071 | + ac_ct_DLLTOOL=$DLLTOOL |
| 6072 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 6073 | +set dummy dlltool; ac_word=$2 |
| 6074 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 6075 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 6076 | +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : |
| 6077 | + $as_echo_n "(cached) " >&6 |
| 6078 | +else |
| 6079 | + if test -n "$ac_ct_DLLTOOL"; then |
| 6080 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 6081 | +else |
| 6082 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 6083 | +for as_dir in $PATH |
| 6084 | +do |
| 6085 | + IFS=$as_save_IFS |
| 6086 | + test -z "$as_dir" && as_dir=. |
| 6087 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 6088 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 6089 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 6090 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 6091 | + break 2 |
| 6092 | + fi |
| 6093 | +done |
| 6094 | + done |
| 6095 | +IFS=$as_save_IFS |
| 6096 | + |
| 6097 | +fi |
| 6098 | +fi |
| 6099 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 6100 | +if test -n "$ac_ct_DLLTOOL"; then |
| 6101 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 6102 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 6103 | +else |
| 6104 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 6105 | +$as_echo "no" >&6; } |
| 6106 | +fi |
| 6107 | + |
| 6108 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 6109 | + DLLTOOL="false" |
| 6110 | + else |
| 6111 | + case $cross_compiling:$ac_tool_warned in |
| 6112 | +yes:) |
| 6113 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 6114 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 6115 | +ac_tool_warned=yes ;; |
| 6116 | +esac |
| 6117 | + DLLTOOL=$ac_ct_DLLTOOL |
| 6118 | + fi |
| 6119 | +else |
| 6120 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 6121 | +fi |
| 6122 | + |
| 6123 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 6124 | + |
| 6125 | + |
| 6126 | + |
| 6127 | + |
| 6128 | + |
| 6129 | + |
| 6130 | + |
| 6131 | + |
| 6132 | + |
| 6133 | + |
| 6134 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 6135 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 6136 | +if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : |
| 6137 | + $as_echo_n "(cached) " >&6 |
| 6138 | +else |
| 6139 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 6140 | + |
| 6141 | +case $host_os in |
| 6142 | +cygwin* | mingw* | pw32* | cegcc*) |
| 6143 | + # two different shell functions defined in ltmain.sh |
| 6144 | + # decide which to use based on capabilities of $DLLTOOL |
| 6145 | + case `$DLLTOOL --help 2>&1` in |
| 6146 | + *--identify-strict*) |
| 6147 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 6148 | + ;; |
| 6149 | + *) |
| 6150 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 6151 | + ;; |
| 6152 | + esac |
| 6153 | + ;; |
| 6154 | +*) |
| 6155 | + # fallback: assume linklib IS sharedlib |
| 6156 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 6157 | + ;; |
| 6158 | +esac |
| 6159 | + |
| 6160 | +fi |
| 6161 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 6162 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 6163 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 6164 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 6165 | + |
| 6166 | + |
| 6167 | + |
| 6168 | + |
| 6169 | + |
| 6170 | + |
| 6171 | + |
| 6172 | if test -n "$ac_tool_prefix"; then |
| 6173 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 6174 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 6175 | + for ac_prog in ar |
| 6176 | + do |
| 6177 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 6178 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 6179 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 6180 | $as_echo_n "checking for $ac_word... " >&6; } |
| 6181 | if test "${ac_cv_prog_AR+set}" = set; then : |
| 6182 | @@ -5984,7 +6233,7 @@ do |
| 6183 | test -z "$as_dir" && as_dir=. |
| 6184 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 6185 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 6186 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 6187 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 6188 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 6189 | break 2 |
| 6190 | fi |
| 6191 | @@ -6004,11 +6253,15 @@ $as_echo "no" >&6; } |
| 6192 | fi |
| 6193 | |
| 6194 | |
| 6195 | + test -n "$AR" && break |
| 6196 | + done |
| 6197 | fi |
| 6198 | -if test -z "$ac_cv_prog_AR"; then |
| 6199 | +if test -z "$AR"; then |
| 6200 | ac_ct_AR=$AR |
| 6201 | - # Extract the first word of "ar", so it can be a program name with args. |
| 6202 | -set dummy ar; ac_word=$2 |
| 6203 | + for ac_prog in ar |
| 6204 | +do |
| 6205 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 6206 | +set dummy $ac_prog; ac_word=$2 |
| 6207 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 6208 | $as_echo_n "checking for $ac_word... " >&6; } |
| 6209 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
| 6210 | @@ -6024,7 +6277,7 @@ do |
| 6211 | test -z "$as_dir" && as_dir=. |
| 6212 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 6213 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 6214 | - ac_cv_prog_ac_ct_AR="ar" |
| 6215 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 6216 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 6217 | break 2 |
| 6218 | fi |
| 6219 | @@ -6043,6 +6296,10 @@ else |
| 6220 | $as_echo "no" >&6; } |
| 6221 | fi |
| 6222 | |
| 6223 | + |
| 6224 | + test -n "$ac_ct_AR" && break |
| 6225 | +done |
| 6226 | + |
| 6227 | if test "x$ac_ct_AR" = x; then |
| 6228 | AR="false" |
| 6229 | else |
| 6230 | @@ -6054,12 +6311,10 @@ ac_tool_warned=yes ;; |
| 6231 | esac |
| 6232 | AR=$ac_ct_AR |
| 6233 | fi |
| 6234 | -else |
| 6235 | - AR="$ac_cv_prog_AR" |
| 6236 | fi |
| 6237 | |
| 6238 | -test -z "$AR" && AR=ar |
| 6239 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 6240 | +: ${AR=ar} |
| 6241 | +: ${AR_FLAGS=cru} |
| 6242 | |
| 6243 | |
| 6244 | |
| 6245 | @@ -6071,6 +6326,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 6246 | |
| 6247 | |
| 6248 | |
| 6249 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 6250 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 6251 | +if test "${lt_cv_ar_at_file+set}" = set; then : |
| 6252 | + $as_echo_n "(cached) " >&6 |
| 6253 | +else |
| 6254 | + lt_cv_ar_at_file=no |
| 6255 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 6256 | +/* end confdefs.h. */ |
| 6257 | + |
| 6258 | +int |
| 6259 | +main () |
| 6260 | +{ |
| 6261 | + |
| 6262 | + ; |
| 6263 | + return 0; |
| 6264 | +} |
| 6265 | +_ACEOF |
| 6266 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 6267 | + echo conftest.$ac_objext > conftest.lst |
| 6268 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 6269 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 6270 | + (eval $lt_ar_try) 2>&5 |
| 6271 | + ac_status=$? |
| 6272 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 6273 | + test $ac_status = 0; } |
| 6274 | + if test "$ac_status" -eq 0; then |
| 6275 | + # Ensure the archiver fails upon bogus file names. |
| 6276 | + rm -f conftest.$ac_objext libconftest.a |
| 6277 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 6278 | + (eval $lt_ar_try) 2>&5 |
| 6279 | + ac_status=$? |
| 6280 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 6281 | + test $ac_status = 0; } |
| 6282 | + if test "$ac_status" -ne 0; then |
| 6283 | + lt_cv_ar_at_file=@ |
| 6284 | + fi |
| 6285 | + fi |
| 6286 | + rm -f conftest.* libconftest.a |
| 6287 | + |
| 6288 | +fi |
| 6289 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 6290 | + |
| 6291 | +fi |
| 6292 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 6293 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 6294 | + |
| 6295 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 6296 | + archiver_list_spec= |
| 6297 | +else |
| 6298 | + archiver_list_spec=$lt_cv_ar_at_file |
| 6299 | +fi |
| 6300 | + |
| 6301 | + |
| 6302 | + |
| 6303 | + |
| 6304 | + |
| 6305 | + |
| 6306 | + |
| 6307 | if test -n "$ac_tool_prefix"; then |
| 6308 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
| 6309 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
| 6310 | @@ -6405,8 +6718,8 @@ esac |
| 6311 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 6312 | |
| 6313 | # Transform an extracted symbol line into symbol name and symbol address |
| 6314 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 6315 | -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'" |
| 6316 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 6317 | +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'" |
| 6318 | |
| 6319 | # Handle CRLF in mingw tool chain |
| 6320 | opt_cr= |
| 6321 | @@ -6442,6 +6755,7 @@ for ac_symprfx in "" "_"; do |
| 6322 | else |
| 6323 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 6324 | fi |
| 6325 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 6326 | |
| 6327 | # Check to see that the pipe works correctly. |
| 6328 | pipe_works=no |
| 6329 | @@ -6483,6 +6797,18 @@ _LT_EOF |
| 6330 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 6331 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 6332 | cat <<_LT_EOF > conftest.$ac_ext |
| 6333 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 6334 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 6335 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 6336 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 6337 | +# define LT_DLSYM_CONST |
| 6338 | +#elif defined(__osf__) |
| 6339 | +/* This system does not cope well with relocations in const data. */ |
| 6340 | +# define LT_DLSYM_CONST |
| 6341 | +#else |
| 6342 | +# define LT_DLSYM_CONST const |
| 6343 | +#endif |
| 6344 | + |
| 6345 | #ifdef __cplusplus |
| 6346 | extern "C" { |
| 6347 | #endif |
| 6348 | @@ -6494,7 +6820,7 @@ _LT_EOF |
| 6349 | cat <<_LT_EOF >> conftest.$ac_ext |
| 6350 | |
| 6351 | /* The mapping between symbol names and symbols. */ |
| 6352 | -const struct { |
| 6353 | +LT_DLSYM_CONST struct { |
| 6354 | const char *name; |
| 6355 | void *address; |
| 6356 | } |
| 6357 | @@ -6520,8 +6846,8 @@ static const void *lt_preloaded_setup() { |
| 6358 | _LT_EOF |
| 6359 | # Now try linking the two files. |
| 6360 | mv conftest.$ac_objext conftstm.$ac_objext |
| 6361 | - lt_save_LIBS="$LIBS" |
| 6362 | - lt_save_CFLAGS="$CFLAGS" |
| 6363 | + lt_globsym_save_LIBS=$LIBS |
| 6364 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 6365 | LIBS="conftstm.$ac_objext" |
| 6366 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 6367 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 6368 | @@ -6531,8 +6857,8 @@ _LT_EOF |
| 6369 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 6370 | pipe_works=yes |
| 6371 | fi |
| 6372 | - LIBS="$lt_save_LIBS" |
| 6373 | - CFLAGS="$lt_save_CFLAGS" |
| 6374 | + LIBS=$lt_globsym_save_LIBS |
| 6375 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 6376 | else |
| 6377 | echo "cannot find nm_test_func in $nlist" >&5 |
| 6378 | fi |
| 6379 | @@ -6569,6 +6895,18 @@ else |
| 6380 | $as_echo "ok" >&6; } |
| 6381 | fi |
| 6382 | |
| 6383 | +# Response file support. |
| 6384 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 6385 | + nm_file_list_spec='@' |
| 6386 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 6387 | + nm_file_list_spec='@' |
| 6388 | +fi |
| 6389 | + |
| 6390 | + |
| 6391 | + |
| 6392 | + |
| 6393 | + |
| 6394 | + |
| 6395 | |
| 6396 | |
| 6397 | |
| 6398 | @@ -6590,6 +6928,43 @@ fi |
| 6399 | |
| 6400 | |
| 6401 | |
| 6402 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 6403 | +$as_echo_n "checking for sysroot... " >&6; } |
| 6404 | + |
| 6405 | +# Check whether --with-libtool-sysroot was given. |
| 6406 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 6407 | + withval=$with_libtool_sysroot; |
| 6408 | +else |
| 6409 | + with_libtool_sysroot=no |
| 6410 | +fi |
| 6411 | + |
| 6412 | + |
| 6413 | +lt_sysroot= |
| 6414 | +case ${with_libtool_sysroot} in #( |
| 6415 | + yes) |
| 6416 | + if test "$GCC" = yes; then |
| 6417 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 6418 | + fi |
| 6419 | + ;; #( |
| 6420 | + /*) |
| 6421 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 6422 | + ;; #( |
| 6423 | + no|'') |
| 6424 | + ;; #( |
| 6425 | + *) |
| 6426 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 6427 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 6428 | + as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 |
| 6429 | + ;; |
| 6430 | +esac |
| 6431 | + |
| 6432 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 6433 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 6434 | + |
| 6435 | + |
| 6436 | + |
| 6437 | + |
| 6438 | + |
| 6439 | # Check whether --enable-libtool-lock was given. |
| 6440 | if test "${enable_libtool_lock+set}" = set; then : |
| 6441 | enableval=$enable_libtool_lock; |
| 6442 | @@ -6796,6 +7171,123 @@ esac |
| 6443 | |
| 6444 | need_locks="$enable_libtool_lock" |
| 6445 | |
| 6446 | +if test -n "$ac_tool_prefix"; then |
| 6447 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 6448 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 6449 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 6450 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 6451 | +if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : |
| 6452 | + $as_echo_n "(cached) " >&6 |
| 6453 | +else |
| 6454 | + if test -n "$MANIFEST_TOOL"; then |
| 6455 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 6456 | +else |
| 6457 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 6458 | +for as_dir in $PATH |
| 6459 | +do |
| 6460 | + IFS=$as_save_IFS |
| 6461 | + test -z "$as_dir" && as_dir=. |
| 6462 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 6463 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 6464 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 6465 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 6466 | + break 2 |
| 6467 | + fi |
| 6468 | +done |
| 6469 | + done |
| 6470 | +IFS=$as_save_IFS |
| 6471 | + |
| 6472 | +fi |
| 6473 | +fi |
| 6474 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 6475 | +if test -n "$MANIFEST_TOOL"; then |
| 6476 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 6477 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 6478 | +else |
| 6479 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 6480 | +$as_echo "no" >&6; } |
| 6481 | +fi |
| 6482 | + |
| 6483 | + |
| 6484 | +fi |
| 6485 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 6486 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 6487 | + # Extract the first word of "mt", so it can be a program name with args. |
| 6488 | +set dummy mt; ac_word=$2 |
| 6489 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 6490 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 6491 | +if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : |
| 6492 | + $as_echo_n "(cached) " >&6 |
| 6493 | +else |
| 6494 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 6495 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 6496 | +else |
| 6497 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 6498 | +for as_dir in $PATH |
| 6499 | +do |
| 6500 | + IFS=$as_save_IFS |
| 6501 | + test -z "$as_dir" && as_dir=. |
| 6502 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 6503 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 6504 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 6505 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 6506 | + break 2 |
| 6507 | + fi |
| 6508 | +done |
| 6509 | + done |
| 6510 | +IFS=$as_save_IFS |
| 6511 | + |
| 6512 | +fi |
| 6513 | +fi |
| 6514 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 6515 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 6516 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 6517 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 6518 | +else |
| 6519 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 6520 | +$as_echo "no" >&6; } |
| 6521 | +fi |
| 6522 | + |
| 6523 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 6524 | + MANIFEST_TOOL=":" |
| 6525 | + else |
| 6526 | + case $cross_compiling:$ac_tool_warned in |
| 6527 | +yes:) |
| 6528 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 6529 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 6530 | +ac_tool_warned=yes ;; |
| 6531 | +esac |
| 6532 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 6533 | + fi |
| 6534 | +else |
| 6535 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 6536 | +fi |
| 6537 | + |
| 6538 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 6539 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 6540 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 6541 | +if test "${lt_cv_path_mainfest_tool+set}" = set; then : |
| 6542 | + $as_echo_n "(cached) " >&6 |
| 6543 | +else |
| 6544 | + lt_cv_path_mainfest_tool=no |
| 6545 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 6546 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 6547 | + cat conftest.err >&5 |
| 6548 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 6549 | + lt_cv_path_mainfest_tool=yes |
| 6550 | + fi |
| 6551 | + rm -f conftest* |
| 6552 | +fi |
| 6553 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 6554 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 6555 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 6556 | + MANIFEST_TOOL=: |
| 6557 | +fi |
| 6558 | + |
| 6559 | + |
| 6560 | + |
| 6561 | + |
| 6562 | + |
| 6563 | |
| 6564 | case $host_os in |
| 6565 | rhapsody* | darwin*) |
| 6566 | @@ -7359,6 +7851,8 @@ _LT_EOF |
| 6567 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 6568 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 6569 | $AR cru libconftest.a conftest.o 2>&5 |
| 6570 | + echo "$RANLIB libconftest.a" >&5 |
| 6571 | + $RANLIB libconftest.a 2>&5 |
| 6572 | cat > conftest.c << _LT_EOF |
| 6573 | int main() { return 0;} |
| 6574 | _LT_EOF |
| 6575 | @@ -7554,7 +8048,8 @@ fi |
| 6576 | LIBTOOL_DEPS="$ltmain" |
| 6577 | |
| 6578 | # Always use our own libtool. |
| 6579 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
| 6580 | +LIBTOOL='$(SHELL) $(top_builddir)' |
| 6581 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" |
| 6582 | |
| 6583 | |
| 6584 | |
| 6585 | @@ -7643,7 +8138,7 @@ aix3*) |
| 6586 | esac |
| 6587 | |
| 6588 | # Global variables: |
| 6589 | -ofile=libtool |
| 6590 | +ofile=${host_alias}-libtool |
| 6591 | can_build_shared=yes |
| 6592 | |
| 6593 | # All known linkers require a `.a' archive for static linking (except MSVC, |
| 6594 | @@ -7941,8 +8436,6 @@ fi |
| 6595 | lt_prog_compiler_pic= |
| 6596 | lt_prog_compiler_static= |
| 6597 | |
| 6598 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 6599 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 6600 | |
| 6601 | if test "$GCC" = yes; then |
| 6602 | lt_prog_compiler_wl='-Wl,' |
| 6603 | @@ -8108,6 +8601,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 6604 | lt_prog_compiler_pic='--shared' |
| 6605 | lt_prog_compiler_static='--static' |
| 6606 | ;; |
| 6607 | + nagfor*) |
| 6608 | + # NAG Fortran compiler |
| 6609 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 6610 | + lt_prog_compiler_pic='-PIC' |
| 6611 | + lt_prog_compiler_static='-Bstatic' |
| 6612 | + ;; |
| 6613 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 6614 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 6615 | # which looks to be a dead project) |
| 6616 | @@ -8170,7 +8669,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 6617 | lt_prog_compiler_pic='-KPIC' |
| 6618 | lt_prog_compiler_static='-Bstatic' |
| 6619 | case $cc_basename in |
| 6620 | - f77* | f90* | f95*) |
| 6621 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 6622 | lt_prog_compiler_wl='-Qoption ld ';; |
| 6623 | *) |
| 6624 | lt_prog_compiler_wl='-Wl,';; |
| 6625 | @@ -8227,13 +8726,17 @@ case $host_os in |
| 6626 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 6627 | ;; |
| 6628 | esac |
| 6629 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 6630 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 6631 | - |
| 6632 | - |
| 6633 | - |
| 6634 | - |
| 6635 | |
| 6636 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 6637 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 6638 | +if test "${lt_cv_prog_compiler_pic+set}" = set; then : |
| 6639 | + $as_echo_n "(cached) " >&6 |
| 6640 | +else |
| 6641 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 6642 | +fi |
| 6643 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 6644 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 6645 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 6646 | |
| 6647 | # |
| 6648 | # Check to make sure the PIC flag actually works. |
| 6649 | @@ -8294,6 +8797,11 @@ fi |
| 6650 | |
| 6651 | |
| 6652 | |
| 6653 | + |
| 6654 | + |
| 6655 | + |
| 6656 | + |
| 6657 | + |
| 6658 | # |
| 6659 | # Check to make sure the static flag actually works. |
| 6660 | # |
| 6661 | @@ -8644,7 +9152,8 @@ _LT_EOF |
| 6662 | allow_undefined_flag=unsupported |
| 6663 | always_export_symbols=no |
| 6664 | enable_shared_with_static_runtimes=yes |
| 6665 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 6666 | + 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' |
| 6667 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 6668 | |
| 6669 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 6670 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 6671 | @@ -8743,12 +9252,12 @@ _LT_EOF |
| 6672 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 6673 | hardcode_libdir_flag_spec= |
| 6674 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 6675 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 6676 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 6677 | if test "x$supports_anon_versioning" = xyes; then |
| 6678 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 6679 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 6680 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 6681 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 6682 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 6683 | fi |
| 6684 | ;; |
| 6685 | esac |
| 6686 | @@ -8762,8 +9271,8 @@ _LT_EOF |
| 6687 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 6688 | wlarc= |
| 6689 | else |
| 6690 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 6691 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 6692 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 6693 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 6694 | fi |
| 6695 | ;; |
| 6696 | |
| 6697 | @@ -8781,8 +9290,8 @@ _LT_EOF |
| 6698 | |
| 6699 | _LT_EOF |
| 6700 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 6701 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 6702 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 6703 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 6704 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 6705 | else |
| 6706 | ld_shlibs=no |
| 6707 | fi |
| 6708 | @@ -8828,8 +9337,8 @@ _LT_EOF |
| 6709 | |
| 6710 | *) |
| 6711 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 6712 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 6713 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 6714 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 6715 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 6716 | else |
| 6717 | ld_shlibs=no |
| 6718 | fi |
| 6719 | @@ -8959,7 +9468,13 @@ _LT_EOF |
| 6720 | allow_undefined_flag='-berok' |
| 6721 | # Determine the default libpath from the value encoded in an |
| 6722 | # empty executable. |
| 6723 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 6724 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 6725 | + aix_libpath=$lt_cv_aix_libpath |
| 6726 | +else |
| 6727 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 6728 | + $as_echo_n "(cached) " >&6 |
| 6729 | +else |
| 6730 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 6731 | /* end confdefs.h. */ |
| 6732 | |
| 6733 | int |
| 6734 | @@ -8972,22 +9487,29 @@ main () |
| 6735 | _ACEOF |
| 6736 | if ac_fn_c_try_link "$LINENO"; then : |
| 6737 | |
| 6738 | -lt_aix_libpath_sed=' |
| 6739 | - /Import File Strings/,/^$/ { |
| 6740 | - /^0/ { |
| 6741 | - s/^0 *\(.*\)$/\1/ |
| 6742 | - p |
| 6743 | - } |
| 6744 | - }' |
| 6745 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6746 | -# Check for a 64-bit object if we didn't find anything. |
| 6747 | -if test -z "$aix_libpath"; then |
| 6748 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6749 | -fi |
| 6750 | + lt_aix_libpath_sed=' |
| 6751 | + /Import File Strings/,/^$/ { |
| 6752 | + /^0/ { |
| 6753 | + s/^0 *\([^ ]*\) *$/\1/ |
| 6754 | + p |
| 6755 | + } |
| 6756 | + }' |
| 6757 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6758 | + # Check for a 64-bit object if we didn't find anything. |
| 6759 | + if test -z "$lt_cv_aix_libpath_"; then |
| 6760 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6761 | + fi |
| 6762 | fi |
| 6763 | rm -f core conftest.err conftest.$ac_objext \ |
| 6764 | conftest$ac_exeext conftest.$ac_ext |
| 6765 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6766 | + if test -z "$lt_cv_aix_libpath_"; then |
| 6767 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 6768 | + fi |
| 6769 | + |
| 6770 | +fi |
| 6771 | + |
| 6772 | + aix_libpath=$lt_cv_aix_libpath_ |
| 6773 | +fi |
| 6774 | |
| 6775 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 6776 | 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" |
| 6777 | @@ -8999,7 +9521,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6778 | else |
| 6779 | # Determine the default libpath from the value encoded in an |
| 6780 | # empty executable. |
| 6781 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 6782 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 6783 | + aix_libpath=$lt_cv_aix_libpath |
| 6784 | +else |
| 6785 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 6786 | + $as_echo_n "(cached) " >&6 |
| 6787 | +else |
| 6788 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 6789 | /* end confdefs.h. */ |
| 6790 | |
| 6791 | int |
| 6792 | @@ -9012,22 +9540,29 @@ main () |
| 6793 | _ACEOF |
| 6794 | if ac_fn_c_try_link "$LINENO"; then : |
| 6795 | |
| 6796 | -lt_aix_libpath_sed=' |
| 6797 | - /Import File Strings/,/^$/ { |
| 6798 | - /^0/ { |
| 6799 | - s/^0 *\(.*\)$/\1/ |
| 6800 | - p |
| 6801 | - } |
| 6802 | - }' |
| 6803 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6804 | -# Check for a 64-bit object if we didn't find anything. |
| 6805 | -if test -z "$aix_libpath"; then |
| 6806 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6807 | -fi |
| 6808 | + lt_aix_libpath_sed=' |
| 6809 | + /Import File Strings/,/^$/ { |
| 6810 | + /^0/ { |
| 6811 | + s/^0 *\([^ ]*\) *$/\1/ |
| 6812 | + p |
| 6813 | + } |
| 6814 | + }' |
| 6815 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6816 | + # Check for a 64-bit object if we didn't find anything. |
| 6817 | + if test -z "$lt_cv_aix_libpath_"; then |
| 6818 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6819 | + fi |
| 6820 | fi |
| 6821 | rm -f core conftest.err conftest.$ac_objext \ |
| 6822 | conftest$ac_exeext conftest.$ac_ext |
| 6823 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6824 | + if test -z "$lt_cv_aix_libpath_"; then |
| 6825 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 6826 | + fi |
| 6827 | + |
| 6828 | +fi |
| 6829 | + |
| 6830 | + aix_libpath=$lt_cv_aix_libpath_ |
| 6831 | +fi |
| 6832 | |
| 6833 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 6834 | # Warning - without using the other run time loading flags, |
| 6835 | @@ -9072,20 +9607,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6836 | # Microsoft Visual C++. |
| 6837 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 6838 | # no search path for DLLs. |
| 6839 | - hardcode_libdir_flag_spec=' ' |
| 6840 | - allow_undefined_flag=unsupported |
| 6841 | - # Tell ltmain to make .lib files, not .a files. |
| 6842 | - libext=lib |
| 6843 | - # Tell ltmain to make .dll files, not .so files. |
| 6844 | - shrext_cmds=".dll" |
| 6845 | - # FIXME: Setting linknames here is a bad hack. |
| 6846 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 6847 | - # The linker will automatically build a .lib file if we build a DLL. |
| 6848 | - old_archive_from_new_cmds='true' |
| 6849 | - # FIXME: Should let the user specify the lib program. |
| 6850 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 6851 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 6852 | - enable_shared_with_static_runtimes=yes |
| 6853 | + case $cc_basename in |
| 6854 | + cl*) |
| 6855 | + # Native MSVC |
| 6856 | + hardcode_libdir_flag_spec=' ' |
| 6857 | + allow_undefined_flag=unsupported |
| 6858 | + always_export_symbols=yes |
| 6859 | + file_list_spec='@' |
| 6860 | + # Tell ltmain to make .lib files, not .a files. |
| 6861 | + libext=lib |
| 6862 | + # Tell ltmain to make .dll files, not .so files. |
| 6863 | + shrext_cmds=".dll" |
| 6864 | + # FIXME: Setting linknames here is a bad hack. |
| 6865 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 6866 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 6867 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 6868 | + else |
| 6869 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 6870 | + fi~ |
| 6871 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 6872 | + linknames=' |
| 6873 | + # The linker will not automatically build a static lib if we build a DLL. |
| 6874 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 6875 | + enable_shared_with_static_runtimes=yes |
| 6876 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 6877 | + # Don't use ranlib |
| 6878 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 6879 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 6880 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 6881 | + case $lt_outputfile in |
| 6882 | + *.exe|*.EXE) ;; |
| 6883 | + *) |
| 6884 | + lt_outputfile="$lt_outputfile.exe" |
| 6885 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 6886 | + ;; |
| 6887 | + esac~ |
| 6888 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 6889 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 6890 | + $RM "$lt_outputfile.manifest"; |
| 6891 | + fi' |
| 6892 | + ;; |
| 6893 | + *) |
| 6894 | + # Assume MSVC wrapper |
| 6895 | + hardcode_libdir_flag_spec=' ' |
| 6896 | + allow_undefined_flag=unsupported |
| 6897 | + # Tell ltmain to make .lib files, not .a files. |
| 6898 | + libext=lib |
| 6899 | + # Tell ltmain to make .dll files, not .so files. |
| 6900 | + shrext_cmds=".dll" |
| 6901 | + # FIXME: Setting linknames here is a bad hack. |
| 6902 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 6903 | + # The linker will automatically build a .lib file if we build a DLL. |
| 6904 | + old_archive_from_new_cmds='true' |
| 6905 | + # FIXME: Should let the user specify the lib program. |
| 6906 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 6907 | + enable_shared_with_static_runtimes=yes |
| 6908 | + ;; |
| 6909 | + esac |
| 6910 | ;; |
| 6911 | |
| 6912 | darwin* | rhapsody*) |
| 6913 | @@ -9146,7 +9724,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6914 | |
| 6915 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 6916 | freebsd* | dragonfly*) |
| 6917 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 6918 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 6919 | hardcode_libdir_flag_spec='-R$libdir' |
| 6920 | hardcode_direct=yes |
| 6921 | hardcode_shlibpath_var=no |
| 6922 | @@ -9154,7 +9732,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6923 | |
| 6924 | hpux9*) |
| 6925 | if test "$GCC" = yes; then |
| 6926 | - 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' |
| 6927 | + 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' |
| 6928 | else |
| 6929 | 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' |
| 6930 | fi |
| 6931 | @@ -9170,7 +9748,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6932 | |
| 6933 | hpux10*) |
| 6934 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 6935 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 6936 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 6937 | else |
| 6938 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 6939 | fi |
| 6940 | @@ -9194,10 +9772,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6941 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 6942 | ;; |
| 6943 | ia64*) |
| 6944 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 6945 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 6946 | ;; |
| 6947 | *) |
| 6948 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 6949 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 6950 | ;; |
| 6951 | esac |
| 6952 | else |
| 6953 | @@ -9276,23 +9854,36 @@ fi |
| 6954 | |
| 6955 | irix5* | irix6* | nonstopux*) |
| 6956 | if test "$GCC" = yes; then |
| 6957 | - 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' |
| 6958 | + 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' |
| 6959 | # Try to use the -exported_symbol ld option, if it does not |
| 6960 | # work, assume that -exports_file does not work either and |
| 6961 | # implicitly export all symbols. |
| 6962 | - save_LDFLAGS="$LDFLAGS" |
| 6963 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 6964 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 6965 | + # This should be the same for all languages, so no per-tag cache variable. |
| 6966 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 6967 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 6968 | +if test "${lt_cv_irix_exported_symbol+set}" = set; then : |
| 6969 | + $as_echo_n "(cached) " >&6 |
| 6970 | +else |
| 6971 | + save_LDFLAGS="$LDFLAGS" |
| 6972 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 6973 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 6974 | /* end confdefs.h. */ |
| 6975 | -int foo(void) {} |
| 6976 | +int foo (void) { return 0; } |
| 6977 | _ACEOF |
| 6978 | if ac_fn_c_try_link "$LINENO"; then : |
| 6979 | - 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' |
| 6980 | - |
| 6981 | + lt_cv_irix_exported_symbol=yes |
| 6982 | +else |
| 6983 | + lt_cv_irix_exported_symbol=no |
| 6984 | fi |
| 6985 | rm -f core conftest.err conftest.$ac_objext \ |
| 6986 | conftest$ac_exeext conftest.$ac_ext |
| 6987 | - LDFLAGS="$save_LDFLAGS" |
| 6988 | + LDFLAGS="$save_LDFLAGS" |
| 6989 | +fi |
| 6990 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 6991 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 6992 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 6993 | + 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' |
| 6994 | + fi |
| 6995 | else |
| 6996 | 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' |
| 6997 | 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' |
| 6998 | @@ -9377,7 +9968,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 6999 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 7000 | if test "$GCC" = yes; then |
| 7001 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 7002 | - 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' |
| 7003 | + 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' |
| 7004 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 7005 | else |
| 7006 | allow_undefined_flag=' -expect_unresolved \*' |
| 7007 | @@ -9396,9 +9987,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 7008 | no_undefined_flag=' -z defs' |
| 7009 | if test "$GCC" = yes; then |
| 7010 | wlarc='${wl}' |
| 7011 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 7012 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 7013 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 7014 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 7015 | + $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' |
| 7016 | else |
| 7017 | case `$CC -V 2>&1` in |
| 7018 | *"Compilers 5.0"*) |
| 7019 | @@ -9974,8 +10565,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 7020 | need_version=no |
| 7021 | need_lib_prefix=no |
| 7022 | |
| 7023 | - case $GCC,$host_os in |
| 7024 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 7025 | + case $GCC,$cc_basename in |
| 7026 | + yes,*) |
| 7027 | + # gcc |
| 7028 | library_names_spec='$libname.dll.a' |
| 7029 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 7030 | postinstall_cmds='base_file=`basename \${file}`~ |
| 7031 | @@ -10008,13 +10600,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 7032 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 7033 | ;; |
| 7034 | esac |
| 7035 | + dynamic_linker='Win32 ld.exe' |
| 7036 | + ;; |
| 7037 | + |
| 7038 | + *,cl*) |
| 7039 | + # Native MSVC |
| 7040 | + libname_spec='$name' |
| 7041 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 7042 | + library_names_spec='${libname}.dll.lib' |
| 7043 | + |
| 7044 | + case $build_os in |
| 7045 | + mingw*) |
| 7046 | + sys_lib_search_path_spec= |
| 7047 | + lt_save_ifs=$IFS |
| 7048 | + IFS=';' |
| 7049 | + for lt_path in $LIB |
| 7050 | + do |
| 7051 | + IFS=$lt_save_ifs |
| 7052 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 7053 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 7054 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 7055 | + done |
| 7056 | + IFS=$lt_save_ifs |
| 7057 | + # Convert to MSYS style. |
| 7058 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 7059 | + ;; |
| 7060 | + cygwin*) |
| 7061 | + # Convert to unix form, then to dos form, then back to unix form |
| 7062 | + # but this time dos style (no spaces!) so that the unix form looks |
| 7063 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 7064 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 7065 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 7066 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 7067 | + ;; |
| 7068 | + *) |
| 7069 | + sys_lib_search_path_spec="$LIB" |
| 7070 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 7071 | + # It is most probably a Windows format PATH. |
| 7072 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 7073 | + else |
| 7074 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 7075 | + fi |
| 7076 | + # FIXME: find the short name or the path components, as spaces are |
| 7077 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 7078 | + ;; |
| 7079 | + esac |
| 7080 | + |
| 7081 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 7082 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 7083 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 7084 | + dldir=$destdir/`dirname \$dlpath`~ |
| 7085 | + test -d \$dldir || mkdir -p \$dldir~ |
| 7086 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 7087 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 7088 | + dlpath=$dir/\$dldll~ |
| 7089 | + $RM \$dlpath' |
| 7090 | + shlibpath_overrides_runpath=yes |
| 7091 | + dynamic_linker='Win32 link.exe' |
| 7092 | ;; |
| 7093 | |
| 7094 | *) |
| 7095 | + # Assume MSVC wrapper |
| 7096 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 7097 | + dynamic_linker='Win32 ld.exe' |
| 7098 | ;; |
| 7099 | esac |
| 7100 | - dynamic_linker='Win32 ld.exe' |
| 7101 | # FIXME: first we should search . and the directory the executable is in |
| 7102 | shlibpath_var=PATH |
| 7103 | ;; |
| 7104 | @@ -10106,7 +10756,7 @@ haiku*) |
| 7105 | soname_spec='${libname}${release}${shared_ext}$major' |
| 7106 | shlibpath_var=LIBRARY_PATH |
| 7107 | shlibpath_overrides_runpath=yes |
| 7108 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' |
| 7109 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
| 7110 | hardcode_into_libs=yes |
| 7111 | ;; |
| 7112 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 7113 | @@ -10902,7 +11552,7 @@ else |
| 7114 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 7115 | lt_status=$lt_dlunknown |
| 7116 | cat > conftest.$ac_ext <<_LT_EOF |
| 7117 | -#line 10900 "configure" |
| 7118 | +#line $LINENO "configure" |
| 7119 | #include "confdefs.h" |
| 7120 | |
| 7121 | #if HAVE_DLFCN_H |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 7122 | @@ -10946,10 +11596,10 @@ else |
| 7123 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 7124 | correspondingly for the symbols needed. */ |
| 7125 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 7126 | -void fnord () __attribute__((visibility("default"))); |
| 7127 | +int fnord () __attribute__((visibility("default"))); |
| 7128 | #endif |
| 7129 | |
| 7130 | -void fnord () { int i=42; } |
| 7131 | +int fnord () { return 42; } |
| 7132 | int main () |
| 7133 | { |
| 7134 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 7135 | @@ -11008,7 +11658,7 @@ else |
| 7136 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 7137 | lt_status=$lt_dlunknown |
| 7138 | cat > conftest.$ac_ext <<_LT_EOF |
| 7139 | -#line 11006 "configure" |
| 7140 | +#line $LINENO "configure" |
| 7141 | #include "confdefs.h" |
| 7142 | |
| 7143 | #if HAVE_DLFCN_H |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 7144 | @@ -11052,10 +11702,10 @@ else |
| 7145 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 7146 | correspondingly for the symbols needed. */ |
| 7147 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 7148 | -void fnord () __attribute__((visibility("default"))); |
| 7149 | +int fnord () __attribute__((visibility("default"))); |
| 7150 | #endif |
| 7151 | |
| 7152 | -void fnord () { int i=42; } |
| 7153 | +int fnord () { return 42; } |
| 7154 | int main () |
| 7155 | { |
| 7156 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 7157 | @@ -12924,13 +13574,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
| 7158 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 7159 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 7160 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 7161 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 7162 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 7163 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 7164 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 7165 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 7166 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 7167 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 7168 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 7169 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 7170 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 7171 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 7172 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 7173 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 7174 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 7175 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 7176 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 7177 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
| 7178 | @@ -12945,14 +13602,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
| 7179 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 7180 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 7181 | 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"`' |
| 7182 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 7183 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 7184 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 7185 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 7186 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 7187 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 7188 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 7189 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 7190 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 7191 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 7192 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 7193 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 7194 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 7195 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 7196 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
| 7197 | @@ -12985,12 +13645,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
| 7198 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 7199 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 7200 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 7201 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 7202 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 7203 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 7204 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 7205 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 7206 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 7207 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 7208 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 7209 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 7210 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 7211 | @@ -13045,8 +13705,13 @@ reload_flag \ |
| 7212 | OBJDUMP \ |
| 7213 | deplibs_check_method \ |
| 7214 | file_magic_cmd \ |
| 7215 | +file_magic_glob \ |
| 7216 | +want_nocaseglob \ |
| 7217 | +DLLTOOL \ |
| 7218 | +sharedlib_from_linklib_cmd \ |
| 7219 | AR \ |
| 7220 | AR_FLAGS \ |
| 7221 | +archiver_list_spec \ |
| 7222 | STRIP \ |
| 7223 | RANLIB \ |
| 7224 | CC \ |
| 7225 | @@ -13056,12 +13721,14 @@ lt_cv_sys_global_symbol_pipe \ |
| 7226 | lt_cv_sys_global_symbol_to_cdecl \ |
| 7227 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 7228 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 7229 | +nm_file_list_spec \ |
| 7230 | lt_prog_compiler_no_builtin_flag \ |
| 7231 | -lt_prog_compiler_wl \ |
| 7232 | lt_prog_compiler_pic \ |
| 7233 | +lt_prog_compiler_wl \ |
| 7234 | lt_prog_compiler_static \ |
| 7235 | lt_cv_prog_compiler_c_o \ |
| 7236 | need_locks \ |
| 7237 | +MANIFEST_TOOL \ |
| 7238 | DSYMUTIL \ |
| 7239 | NMEDIT \ |
| 7240 | LIPO \ |
| 7241 | @@ -13077,7 +13744,6 @@ no_undefined_flag \ |
| 7242 | hardcode_libdir_flag_spec \ |
| 7243 | hardcode_libdir_flag_spec_ld \ |
| 7244 | hardcode_libdir_separator \ |
| 7245 | -fix_srcfile_path \ |
| 7246 | exclude_expsyms \ |
| 7247 | include_expsyms \ |
| 7248 | file_list_spec \ |
| 7249 | @@ -13113,6 +13779,7 @@ module_cmds \ |
| 7250 | module_expsym_cmds \ |
| 7251 | export_symbols_cmds \ |
| 7252 | prelink_cmds \ |
| 7253 | +postlink_cmds \ |
| 7254 | postinstall_cmds \ |
| 7255 | postuninstall_cmds \ |
| 7256 | finish_cmds \ |
| 7257 | @@ -13869,7 +14536,8 @@ $as_echo X"$file" | |
| 7258 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 7259 | # |
| 7260 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 7261 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 7262 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 7263 | +# Inc. |
| 7264 | # Written by Gordon Matzigkeit, 1996 |
| 7265 | # |
| 7266 | # This file is part of GNU Libtool. |
| 7267 | @@ -13972,19 +14640,42 @@ SP2NL=$lt_lt_SP2NL |
| 7268 | # turn newlines into spaces. |
| 7269 | NL2SP=$lt_lt_NL2SP |
| 7270 | |
| 7271 | +# convert \$build file names to \$host format. |
| 7272 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 7273 | + |
| 7274 | +# convert \$build files to toolchain format. |
| 7275 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 7276 | + |
| 7277 | # An object symbol dumper. |
| 7278 | OBJDUMP=$lt_OBJDUMP |
| 7279 | |
| 7280 | # Method to check whether dependent libraries are shared objects. |
| 7281 | deplibs_check_method=$lt_deplibs_check_method |
| 7282 | |
| 7283 | -# Command to use when deplibs_check_method == "file_magic". |
| 7284 | +# Command to use when deplibs_check_method = "file_magic". |
| 7285 | file_magic_cmd=$lt_file_magic_cmd |
| 7286 | |
| 7287 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 7288 | +file_magic_glob=$lt_file_magic_glob |
| 7289 | + |
| 7290 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 7291 | +want_nocaseglob=$lt_want_nocaseglob |
| 7292 | + |
| 7293 | +# DLL creation program. |
| 7294 | +DLLTOOL=$lt_DLLTOOL |
| 7295 | + |
| 7296 | +# Command to associate shared and link libraries. |
| 7297 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 7298 | + |
| 7299 | # The archiver. |
| 7300 | AR=$lt_AR |
| 7301 | + |
| 7302 | +# Flags to create an archive. |
| 7303 | AR_FLAGS=$lt_AR_FLAGS |
| 7304 | |
| 7305 | +# How to feed a file listing to the archiver. |
| 7306 | +archiver_list_spec=$lt_archiver_list_spec |
| 7307 | + |
| 7308 | # A symbol stripping program. |
| 7309 | STRIP=$lt_STRIP |
| 7310 | |
| 7311 | @@ -14014,6 +14705,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
| 7312 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 7313 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 7314 | |
| 7315 | +# Specify filename containing input files for \$NM. |
| 7316 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 7317 | + |
| 7318 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 7319 | +lt_sysroot=$lt_sysroot |
| 7320 | + |
| 7321 | # The name of the directory that contains temporary libtool files. |
| 7322 | objdir=$objdir |
| 7323 | |
| 7324 | @@ -14023,6 +14720,9 @@ MAGIC_CMD=$MAGIC_CMD |
| 7325 | # Must we lock files when doing compilation? |
| 7326 | need_locks=$lt_need_locks |
| 7327 | |
| 7328 | +# Manifest tool. |
| 7329 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 7330 | + |
| 7331 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 7332 | DSYMUTIL=$lt_DSYMUTIL |
| 7333 | |
| 7334 | @@ -14137,12 +14837,12 @@ with_gcc=$GCC |
| 7335 | # Compiler flag to turn off builtin functions. |
| 7336 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 7337 | |
| 7338 | -# How to pass a linker flag through the compiler. |
| 7339 | -wl=$lt_lt_prog_compiler_wl |
| 7340 | - |
| 7341 | # Additional compiler flags for building library objects. |
| 7342 | pic_flag=$lt_lt_prog_compiler_pic |
| 7343 | |
| 7344 | +# How to pass a linker flag through the compiler. |
| 7345 | +wl=$lt_lt_prog_compiler_wl |
| 7346 | + |
| 7347 | # Compiler flag to prevent dynamic linking. |
| 7348 | link_static_flag=$lt_lt_prog_compiler_static |
| 7349 | |
| 7350 | @@ -14229,9 +14929,6 @@ inherit_rpath=$inherit_rpath |
| 7351 | # Whether libtool must link a program against all its dependency libraries. |
| 7352 | link_all_deplibs=$link_all_deplibs |
| 7353 | |
| 7354 | -# Fix the shell variable \$srcfile for the compiler. |
| 7355 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 7356 | - |
| 7357 | # Set to "yes" if exported symbols are required. |
| 7358 | always_export_symbols=$always_export_symbols |
| 7359 | |
| 7360 | @@ -14247,6 +14944,9 @@ include_expsyms=$lt_include_expsyms |
| 7361 | # Commands necessary for linking programs (against libraries) with templates. |
| 7362 | prelink_cmds=$lt_prelink_cmds |
| 7363 | |
| 7364 | +# Commands necessary for finishing linking programs. |
| 7365 | +postlink_cmds=$lt_postlink_cmds |
| 7366 | + |
| 7367 | # Specify filename containing input files. |
| 7368 | file_list_spec=$lt_file_list_spec |
| 7369 | |
| 7370 | @@ -14279,210 +14979,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
| 7371 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 7372 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 7373 | # is reportedly fixed, but why not run on old versions too? |
| 7374 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 7375 | - || (rm -f "$cfgfile"; exit 1) |
| 7376 | - |
| 7377 | - case $xsi_shell in |
| 7378 | - yes) |
| 7379 | - cat << \_LT_EOF >> "$cfgfile" |
| 7380 | - |
| 7381 | -# func_dirname file append nondir_replacement |
| 7382 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 7383 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 7384 | -func_dirname () |
| 7385 | -{ |
| 7386 | - case ${1} in |
| 7387 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 7388 | - * ) func_dirname_result="${3}" ;; |
| 7389 | - esac |
| 7390 | -} |
| 7391 | - |
| 7392 | -# func_basename file |
| 7393 | -func_basename () |
| 7394 | -{ |
| 7395 | - func_basename_result="${1##*/}" |
| 7396 | -} |
| 7397 | - |
| 7398 | -# func_dirname_and_basename file append nondir_replacement |
| 7399 | -# perform func_basename and func_dirname in a single function |
| 7400 | -# call: |
| 7401 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 7402 | -# add APPEND to the result, otherwise set result |
| 7403 | -# to NONDIR_REPLACEMENT. |
| 7404 | -# value returned in "$func_dirname_result" |
| 7405 | -# basename: Compute filename of FILE. |
| 7406 | -# value retuned in "$func_basename_result" |
| 7407 | -# Implementation must be kept synchronized with func_dirname |
| 7408 | -# and func_basename. For efficiency, we do not delegate to |
| 7409 | -# those functions but instead duplicate the functionality here. |
| 7410 | -func_dirname_and_basename () |
| 7411 | -{ |
| 7412 | - case ${1} in |
| 7413 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 7414 | - * ) func_dirname_result="${3}" ;; |
| 7415 | - esac |
| 7416 | - func_basename_result="${1##*/}" |
| 7417 | -} |
| 7418 | - |
| 7419 | -# func_stripname prefix suffix name |
| 7420 | -# strip PREFIX and SUFFIX off of NAME. |
| 7421 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 7422 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 7423 | -# dot (in which case that matches only a dot). |
| 7424 | -func_stripname () |
| 7425 | -{ |
| 7426 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 7427 | - # positional parameters, so assign one to ordinary parameter first. |
| 7428 | - func_stripname_result=${3} |
| 7429 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 7430 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 7431 | -} |
| 7432 | - |
| 7433 | -# func_opt_split |
| 7434 | -func_opt_split () |
| 7435 | -{ |
| 7436 | - func_opt_split_opt=${1%%=*} |
| 7437 | - func_opt_split_arg=${1#*=} |
| 7438 | -} |
| 7439 | - |
| 7440 | -# func_lo2o object |
| 7441 | -func_lo2o () |
| 7442 | -{ |
| 7443 | - case ${1} in |
| 7444 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 7445 | - *) func_lo2o_result=${1} ;; |
| 7446 | - esac |
| 7447 | -} |
| 7448 | - |
| 7449 | -# func_xform libobj-or-source |
| 7450 | -func_xform () |
| 7451 | -{ |
| 7452 | - func_xform_result=${1%.*}.lo |
| 7453 | -} |
| 7454 | - |
| 7455 | -# func_arith arithmetic-term... |
| 7456 | -func_arith () |
| 7457 | -{ |
| 7458 | - func_arith_result=$(( $* )) |
| 7459 | -} |
| 7460 | - |
| 7461 | -# func_len string |
| 7462 | -# STRING may not start with a hyphen. |
| 7463 | -func_len () |
| 7464 | -{ |
| 7465 | - func_len_result=${#1} |
| 7466 | -} |
| 7467 | - |
| 7468 | -_LT_EOF |
| 7469 | - ;; |
| 7470 | - *) # Bourne compatible functions. |
| 7471 | - cat << \_LT_EOF >> "$cfgfile" |
| 7472 | - |
| 7473 | -# func_dirname file append nondir_replacement |
| 7474 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 7475 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 7476 | -func_dirname () |
| 7477 | -{ |
| 7478 | - # Extract subdirectory from the argument. |
| 7479 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 7480 | - if test "X$func_dirname_result" = "X${1}"; then |
| 7481 | - func_dirname_result="${3}" |
| 7482 | - else |
| 7483 | - func_dirname_result="$func_dirname_result${2}" |
| 7484 | - fi |
| 7485 | -} |
| 7486 | - |
| 7487 | -# func_basename file |
| 7488 | -func_basename () |
| 7489 | -{ |
| 7490 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 7491 | -} |
| 7492 | - |
| 7493 | - |
| 7494 | -# func_stripname prefix suffix name |
| 7495 | -# strip PREFIX and SUFFIX off of NAME. |
| 7496 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 7497 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 7498 | -# dot (in which case that matches only a dot). |
| 7499 | -# func_strip_suffix prefix name |
| 7500 | -func_stripname () |
| 7501 | -{ |
| 7502 | - case ${2} in |
| 7503 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 7504 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 7505 | - esac |
| 7506 | -} |
| 7507 | - |
| 7508 | -# sed scripts: |
| 7509 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 7510 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 7511 | - |
| 7512 | -# func_opt_split |
| 7513 | -func_opt_split () |
| 7514 | -{ |
| 7515 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 7516 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 7517 | -} |
| 7518 | - |
| 7519 | -# func_lo2o object |
| 7520 | -func_lo2o () |
| 7521 | -{ |
| 7522 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 7523 | -} |
| 7524 | - |
| 7525 | -# func_xform libobj-or-source |
| 7526 | -func_xform () |
| 7527 | -{ |
| 7528 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 7529 | -} |
| 7530 | - |
| 7531 | -# func_arith arithmetic-term... |
| 7532 | -func_arith () |
| 7533 | -{ |
| 7534 | - func_arith_result=`expr "$@"` |
| 7535 | -} |
| 7536 | - |
| 7537 | -# func_len string |
| 7538 | -# STRING may not start with a hyphen. |
| 7539 | -func_len () |
| 7540 | -{ |
| 7541 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 7542 | -} |
| 7543 | - |
| 7544 | -_LT_EOF |
| 7545 | -esac |
| 7546 | - |
| 7547 | -case $lt_shell_append in |
| 7548 | - yes) |
| 7549 | - cat << \_LT_EOF >> "$cfgfile" |
| 7550 | - |
| 7551 | -# func_append var value |
| 7552 | -# Append VALUE to the end of shell variable VAR. |
| 7553 | -func_append () |
| 7554 | -{ |
| 7555 | - eval "$1+=\$2" |
| 7556 | -} |
| 7557 | -_LT_EOF |
| 7558 | - ;; |
| 7559 | - *) |
| 7560 | - cat << \_LT_EOF >> "$cfgfile" |
| 7561 | - |
| 7562 | -# func_append var value |
| 7563 | -# Append VALUE to the end of shell variable VAR. |
| 7564 | -func_append () |
| 7565 | -{ |
| 7566 | - eval "$1=\$$1\$2" |
| 7567 | -} |
| 7568 | - |
| 7569 | -_LT_EOF |
| 7570 | - ;; |
| 7571 | - esac |
| 7572 | - |
| 7573 | - |
| 7574 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 7575 | - || (rm -f "$cfgfile"; exit 1) |
| 7576 | - |
| 7577 | - mv -f "$cfgfile" "$ofile" || |
| 7578 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 7579 | + || (rm -f "$cfgfile"; exit 1) |
| 7580 | + |
| 7581 | + if test x"$xsi_shell" = xyes; then |
| 7582 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 7583 | +func_dirname ()\ |
| 7584 | +{\ |
| 7585 | +\ case ${1} in\ |
| 7586 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 7587 | +\ * ) func_dirname_result="${3}" ;;\ |
| 7588 | +\ esac\ |
| 7589 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7590 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7591 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7592 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7593 | + |
| 7594 | + |
| 7595 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 7596 | +func_basename ()\ |
| 7597 | +{\ |
| 7598 | +\ func_basename_result="${1##*/}"\ |
| 7599 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7600 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7601 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7602 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7603 | + |
| 7604 | + |
| 7605 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 7606 | +func_dirname_and_basename ()\ |
| 7607 | +{\ |
| 7608 | +\ case ${1} in\ |
| 7609 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 7610 | +\ * ) func_dirname_result="${3}" ;;\ |
| 7611 | +\ esac\ |
| 7612 | +\ func_basename_result="${1##*/}"\ |
| 7613 | +} # Extended-shell func_dirname_and_basename 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 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 7620 | +func_stripname ()\ |
| 7621 | +{\ |
| 7622 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 7623 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 7624 | +\ func_stripname_result=${3}\ |
| 7625 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 7626 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 7627 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7628 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7629 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7630 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7631 | + |
| 7632 | + |
| 7633 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 7634 | +func_split_long_opt ()\ |
| 7635 | +{\ |
| 7636 | +\ func_split_long_opt_name=${1%%=*}\ |
| 7637 | +\ func_split_long_opt_arg=${1#*=}\ |
| 7638 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7639 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7640 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7641 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7642 | + |
| 7643 | + |
| 7644 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 7645 | +func_split_short_opt ()\ |
| 7646 | +{\ |
| 7647 | +\ func_split_short_opt_arg=${1#??}\ |
| 7648 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 7649 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7650 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7651 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7652 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7653 | + |
| 7654 | + |
| 7655 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 7656 | +func_lo2o ()\ |
| 7657 | +{\ |
| 7658 | +\ case ${1} in\ |
| 7659 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 7660 | +\ *) func_lo2o_result=${1} ;;\ |
| 7661 | +\ esac\ |
| 7662 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7663 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7664 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7665 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7666 | + |
| 7667 | + |
| 7668 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 7669 | +func_xform ()\ |
| 7670 | +{\ |
| 7671 | + func_xform_result=${1%.*}.lo\ |
| 7672 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7673 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7674 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7675 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7676 | + |
| 7677 | + |
| 7678 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 7679 | +func_arith ()\ |
| 7680 | +{\ |
| 7681 | + func_arith_result=$(( $* ))\ |
| 7682 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7683 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7684 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7685 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7686 | + |
| 7687 | + |
| 7688 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 7689 | +func_len ()\ |
| 7690 | +{\ |
| 7691 | + func_len_result=${#1}\ |
| 7692 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7693 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7694 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7695 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7696 | + |
| 7697 | +fi |
| 7698 | + |
| 7699 | +if test x"$lt_shell_append" = xyes; then |
| 7700 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 7701 | +func_append ()\ |
| 7702 | +{\ |
| 7703 | + eval "${1}+=\\${2}"\ |
| 7704 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7705 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7706 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7707 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7708 | + |
| 7709 | + |
| 7710 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 7711 | +func_append_quoted ()\ |
| 7712 | +{\ |
| 7713 | +\ func_quote_for_eval "${2}"\ |
| 7714 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 7715 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 7716 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7717 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7718 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 7719 | + |
| 7720 | + |
| 7721 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 7722 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 7723 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7724 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7725 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 7726 | +else |
| 7727 | + # Save a `func_append' function call even when '+=' is not available |
| 7728 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 7729 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 7730 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 7731 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 7732 | +fi |
| 7733 | + |
| 7734 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 7735 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 7736 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 7737 | +fi |
| 7738 | + |
| 7739 | + |
| 7740 | + mv -f "$cfgfile" "$ofile" || |
| 7741 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 7742 | chmod +x "$ofile" |
| 7743 | |
| 7744 | diff --git a/ld/configure b/ld/configure |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 7745 | index 8095b71..eb4f0d7 100755 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 7746 | --- a/ld/configure |
| 7747 | +++ b/ld/configure |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 7748 | @@ -657,8 +657,11 @@ OTOOL |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 7749 | LIPO |
| 7750 | NMEDIT |
| 7751 | DSYMUTIL |
| 7752 | +MANIFEST_TOOL |
| 7753 | RANLIB |
| 7754 | +ac_ct_AR |
| 7755 | AR |
| 7756 | +DLLTOOL |
| 7757 | OBJDUMP |
| 7758 | LN_S |
| 7759 | NM |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 7760 | @@ -779,6 +782,7 @@ enable_static |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 7761 | with_pic |
| 7762 | enable_fast_install |
| 7763 | with_gnu_ld |
| 7764 | +with_libtool_sysroot |
| 7765 | enable_libtool_lock |
| 7766 | enable_plugins |
| 7767 | enable_largefile |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 7768 | @@ -1458,6 +1462,8 @@ Optional Packages: |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 7769 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 7770 | both] |
| 7771 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 7772 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 7773 | + (or the compiler's sysroot if not specified). |
| 7774 | --with-lib-path=dir1:dir2... set default LIB_PATH |
| 7775 | --with-sysroot=DIR Search for usr/lib et al within DIR. |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 7776 | |
| 7777 | @@ -5649,8 +5655,8 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 7778 | |
| 7779 | |
| 7780 | |
| 7781 | -macro_version='2.2.7a' |
| 7782 | -macro_revision='1.3134' |
| 7783 | +macro_version='2.4' |
| 7784 | +macro_revision='1.3293' |
| 7785 | |
| 7786 | |
| 7787 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 7788 | @@ -5690,7 +5696,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 7789 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 7790 | $as_echo_n "checking how to print strings... " >&6; } |
| 7791 | # Test print first, because it will be a builtin if present. |
| 7792 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 7793 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 7794 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 7795 | ECHO='print -r --' |
| 7796 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 7797 | @@ -6376,8 +6382,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 7798 | # Try some XSI features |
| 7799 | xsi_shell=no |
| 7800 | ( _lt_dummy="a/b/c" |
| 7801 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 7802 | - = c,a/b,, \ |
| 7803 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 7804 | + = c,a/b,b/c, \ |
| 7805 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 7806 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 7807 | && xsi_shell=yes |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 7808 | @@ -6426,6 +6432,80 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 7809 | |
| 7810 | |
| 7811 | |
| 7812 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 7813 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 7814 | +if test "${lt_cv_to_host_file_cmd+set}" = set; then : |
| 7815 | + $as_echo_n "(cached) " >&6 |
| 7816 | +else |
| 7817 | + case $host in |
| 7818 | + *-*-mingw* ) |
| 7819 | + case $build in |
| 7820 | + *-*-mingw* ) # actually msys |
| 7821 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 7822 | + ;; |
| 7823 | + *-*-cygwin* ) |
| 7824 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 7825 | + ;; |
| 7826 | + * ) # otherwise, assume *nix |
| 7827 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 7828 | + ;; |
| 7829 | + esac |
| 7830 | + ;; |
| 7831 | + *-*-cygwin* ) |
| 7832 | + case $build in |
| 7833 | + *-*-mingw* ) # actually msys |
| 7834 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 7835 | + ;; |
| 7836 | + *-*-cygwin* ) |
| 7837 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 7838 | + ;; |
| 7839 | + * ) # otherwise, assume *nix |
| 7840 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 7841 | + ;; |
| 7842 | + esac |
| 7843 | + ;; |
| 7844 | + * ) # unhandled hosts (and "normal" native builds) |
| 7845 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 7846 | + ;; |
| 7847 | +esac |
| 7848 | + |
| 7849 | +fi |
| 7850 | + |
| 7851 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 7852 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 7853 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 7854 | + |
| 7855 | + |
| 7856 | + |
| 7857 | + |
| 7858 | + |
| 7859 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 7860 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 7861 | +if test "${lt_cv_to_tool_file_cmd+set}" = set; then : |
| 7862 | + $as_echo_n "(cached) " >&6 |
| 7863 | +else |
| 7864 | + #assume ordinary cross tools, or native build. |
| 7865 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 7866 | +case $host in |
| 7867 | + *-*-mingw* ) |
| 7868 | + case $build in |
| 7869 | + *-*-mingw* ) # actually msys |
| 7870 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 7871 | + ;; |
| 7872 | + esac |
| 7873 | + ;; |
| 7874 | +esac |
| 7875 | + |
| 7876 | +fi |
| 7877 | + |
| 7878 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 7879 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 7880 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 7881 | + |
| 7882 | + |
| 7883 | + |
| 7884 | + |
| 7885 | + |
| 7886 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 7887 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 7888 | if test "${lt_cv_ld_reload_flag+set}" = set; then : |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 7889 | @@ -6442,6 +6522,11 @@ case $reload_flag in |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 7890 | esac |
| 7891 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 7892 | case $host_os in |
| 7893 | + cygwin* | mingw* | pw32* | cegcc*) |
| 7894 | + if test "$GCC" != yes; then |
| 7895 | + reload_cmds=false |
| 7896 | + fi |
| 7897 | + ;; |
| 7898 | darwin*) |
| 7899 | if test "$GCC" = yes; then |
| 7900 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 7901 | @@ -6610,7 +6695,8 @@ mingw* | pw32*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 7902 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 7903 | lt_cv_file_magic_cmd='func_win32_libid' |
| 7904 | else |
| 7905 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 7906 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 7907 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 7908 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 7909 | fi |
| 7910 | ;; |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 7911 | @@ -6764,6 +6850,21 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 7912 | fi |
| 7913 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 7914 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 7915 | + |
| 7916 | +file_magic_glob= |
| 7917 | +want_nocaseglob=no |
| 7918 | +if test "$build" = "$host"; then |
| 7919 | + case $host_os in |
| 7920 | + mingw* | pw32*) |
| 7921 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 7922 | + want_nocaseglob=yes |
| 7923 | + else |
| 7924 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 7925 | + fi |
| 7926 | + ;; |
| 7927 | + esac |
| 7928 | +fi |
| 7929 | + |
| 7930 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 7931 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 7932 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 7933 | @@ -6779,9 +6880,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 7934 | |
| 7935 | |
| 7936 | |
| 7937 | + |
| 7938 | + |
| 7939 | + |
| 7940 | + |
| 7941 | + |
| 7942 | + |
| 7943 | + |
| 7944 | + |
| 7945 | + |
| 7946 | + |
| 7947 | +if test -n "$ac_tool_prefix"; then |
| 7948 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 7949 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 7950 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 7951 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 7952 | +if test "${ac_cv_prog_DLLTOOL+set}" = set; then : |
| 7953 | + $as_echo_n "(cached) " >&6 |
| 7954 | +else |
| 7955 | + if test -n "$DLLTOOL"; then |
| 7956 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 7957 | +else |
| 7958 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 7959 | +for as_dir in $PATH |
| 7960 | +do |
| 7961 | + IFS=$as_save_IFS |
| 7962 | + test -z "$as_dir" && as_dir=. |
| 7963 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 7964 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 7965 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 7966 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 7967 | + break 2 |
| 7968 | + fi |
| 7969 | +done |
| 7970 | + done |
| 7971 | +IFS=$as_save_IFS |
| 7972 | + |
| 7973 | +fi |
| 7974 | +fi |
| 7975 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 7976 | +if test -n "$DLLTOOL"; then |
| 7977 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 7978 | +$as_echo "$DLLTOOL" >&6; } |
| 7979 | +else |
| 7980 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 7981 | +$as_echo "no" >&6; } |
| 7982 | +fi |
| 7983 | + |
| 7984 | + |
| 7985 | +fi |
| 7986 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 7987 | + ac_ct_DLLTOOL=$DLLTOOL |
| 7988 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 7989 | +set dummy dlltool; ac_word=$2 |
| 7990 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 7991 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 7992 | +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : |
| 7993 | + $as_echo_n "(cached) " >&6 |
| 7994 | +else |
| 7995 | + if test -n "$ac_ct_DLLTOOL"; then |
| 7996 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 7997 | +else |
| 7998 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 7999 | +for as_dir in $PATH |
| 8000 | +do |
| 8001 | + IFS=$as_save_IFS |
| 8002 | + test -z "$as_dir" && as_dir=. |
| 8003 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 8004 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 8005 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 8006 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 8007 | + break 2 |
| 8008 | + fi |
| 8009 | +done |
| 8010 | + done |
| 8011 | +IFS=$as_save_IFS |
| 8012 | + |
| 8013 | +fi |
| 8014 | +fi |
| 8015 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 8016 | +if test -n "$ac_ct_DLLTOOL"; then |
| 8017 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 8018 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 8019 | +else |
| 8020 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 8021 | +$as_echo "no" >&6; } |
| 8022 | +fi |
| 8023 | + |
| 8024 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 8025 | + DLLTOOL="false" |
| 8026 | + else |
| 8027 | + case $cross_compiling:$ac_tool_warned in |
| 8028 | +yes:) |
| 8029 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 8030 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 8031 | +ac_tool_warned=yes ;; |
| 8032 | +esac |
| 8033 | + DLLTOOL=$ac_ct_DLLTOOL |
| 8034 | + fi |
| 8035 | +else |
| 8036 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 8037 | +fi |
| 8038 | + |
| 8039 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 8040 | + |
| 8041 | + |
| 8042 | + |
| 8043 | + |
| 8044 | + |
| 8045 | + |
| 8046 | + |
| 8047 | + |
| 8048 | + |
| 8049 | + |
| 8050 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 8051 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 8052 | +if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : |
| 8053 | + $as_echo_n "(cached) " >&6 |
| 8054 | +else |
| 8055 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 8056 | + |
| 8057 | +case $host_os in |
| 8058 | +cygwin* | mingw* | pw32* | cegcc*) |
| 8059 | + # two different shell functions defined in ltmain.sh |
| 8060 | + # decide which to use based on capabilities of $DLLTOOL |
| 8061 | + case `$DLLTOOL --help 2>&1` in |
| 8062 | + *--identify-strict*) |
| 8063 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 8064 | + ;; |
| 8065 | + *) |
| 8066 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 8067 | + ;; |
| 8068 | + esac |
| 8069 | + ;; |
| 8070 | +*) |
| 8071 | + # fallback: assume linklib IS sharedlib |
| 8072 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 8073 | + ;; |
| 8074 | +esac |
| 8075 | + |
| 8076 | +fi |
| 8077 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 8078 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 8079 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 8080 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 8081 | + |
| 8082 | + |
| 8083 | + |
| 8084 | + |
| 8085 | + |
| 8086 | + |
| 8087 | + |
| 8088 | if test -n "$ac_tool_prefix"; then |
| 8089 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 8090 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 8091 | + for ac_prog in ar |
| 8092 | + do |
| 8093 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 8094 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 8095 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 8096 | $as_echo_n "checking for $ac_word... " >&6; } |
| 8097 | if test "${ac_cv_prog_AR+set}" = set; then : |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8098 | @@ -6797,7 +7051,7 @@ do |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8099 | test -z "$as_dir" && as_dir=. |
| 8100 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 8101 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 8102 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 8103 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 8104 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 8105 | break 2 |
| 8106 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8107 | @@ -6817,11 +7071,15 @@ $as_echo "no" >&6; } |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8108 | fi |
| 8109 | |
| 8110 | |
| 8111 | + test -n "$AR" && break |
| 8112 | + done |
| 8113 | fi |
| 8114 | -if test -z "$ac_cv_prog_AR"; then |
| 8115 | +if test -z "$AR"; then |
| 8116 | ac_ct_AR=$AR |
| 8117 | - # Extract the first word of "ar", so it can be a program name with args. |
| 8118 | -set dummy ar; ac_word=$2 |
| 8119 | + for ac_prog in ar |
| 8120 | +do |
| 8121 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 8122 | +set dummy $ac_prog; ac_word=$2 |
| 8123 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 8124 | $as_echo_n "checking for $ac_word... " >&6; } |
| 8125 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8126 | @@ -6837,7 +7095,7 @@ do |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8127 | test -z "$as_dir" && as_dir=. |
| 8128 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 8129 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 8130 | - ac_cv_prog_ac_ct_AR="ar" |
| 8131 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 8132 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 8133 | break 2 |
| 8134 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8135 | @@ -6856,6 +7114,10 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8136 | $as_echo "no" >&6; } |
| 8137 | fi |
| 8138 | |
| 8139 | + |
| 8140 | + test -n "$ac_ct_AR" && break |
| 8141 | +done |
| 8142 | + |
| 8143 | if test "x$ac_ct_AR" = x; then |
| 8144 | AR="false" |
| 8145 | else |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8146 | @@ -6867,12 +7129,12 @@ ac_tool_warned=yes ;; |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8147 | esac |
| 8148 | AR=$ac_ct_AR |
| 8149 | fi |
| 8150 | -else |
| 8151 | - AR="$ac_cv_prog_AR" |
| 8152 | fi |
| 8153 | |
| 8154 | -test -z "$AR" && AR=ar |
| 8155 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 8156 | +: ${AR=ar} |
| 8157 | +: ${AR_FLAGS=cru} |
| 8158 | + |
| 8159 | + |
| 8160 | |
| 8161 | |
| 8162 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8163 | @@ -6882,6 +7144,62 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8164 | |
| 8165 | |
| 8166 | |
| 8167 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 8168 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 8169 | +if test "${lt_cv_ar_at_file+set}" = set; then : |
| 8170 | + $as_echo_n "(cached) " >&6 |
| 8171 | +else |
| 8172 | + lt_cv_ar_at_file=no |
| 8173 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 8174 | +/* end confdefs.h. */ |
| 8175 | + |
| 8176 | +int |
| 8177 | +main () |
| 8178 | +{ |
| 8179 | + |
| 8180 | + ; |
| 8181 | + return 0; |
| 8182 | +} |
| 8183 | +_ACEOF |
| 8184 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 8185 | + echo conftest.$ac_objext > conftest.lst |
| 8186 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 8187 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 8188 | + (eval $lt_ar_try) 2>&5 |
| 8189 | + ac_status=$? |
| 8190 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 8191 | + test $ac_status = 0; } |
| 8192 | + if test "$ac_status" -eq 0; then |
| 8193 | + # Ensure the archiver fails upon bogus file names. |
| 8194 | + rm -f conftest.$ac_objext libconftest.a |
| 8195 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 8196 | + (eval $lt_ar_try) 2>&5 |
| 8197 | + ac_status=$? |
| 8198 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 8199 | + test $ac_status = 0; } |
| 8200 | + if test "$ac_status" -ne 0; then |
| 8201 | + lt_cv_ar_at_file=@ |
| 8202 | + fi |
| 8203 | + fi |
| 8204 | + rm -f conftest.* libconftest.a |
| 8205 | + |
| 8206 | +fi |
| 8207 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 8208 | + |
| 8209 | +fi |
| 8210 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 8211 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 8212 | + |
| 8213 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 8214 | + archiver_list_spec= |
| 8215 | +else |
| 8216 | + archiver_list_spec=$lt_cv_ar_at_file |
| 8217 | +fi |
| 8218 | + |
| 8219 | + |
| 8220 | + |
| 8221 | + |
| 8222 | + |
| 8223 | |
| 8224 | |
| 8225 | if test -n "$ac_tool_prefix"; then |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8226 | @@ -7218,8 +7536,8 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8227 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 8228 | |
| 8229 | # Transform an extracted symbol line into symbol name and symbol address |
| 8230 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 8231 | -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'" |
| 8232 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 8233 | +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'" |
| 8234 | |
| 8235 | # Handle CRLF in mingw tool chain |
| 8236 | opt_cr= |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8237 | @@ -7255,6 +7573,7 @@ for ac_symprfx in "" "_"; do |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8238 | else |
| 8239 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 8240 | fi |
| 8241 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 8242 | |
| 8243 | # Check to see that the pipe works correctly. |
| 8244 | pipe_works=no |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8245 | @@ -7296,6 +7615,18 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8246 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 8247 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 8248 | cat <<_LT_EOF > conftest.$ac_ext |
| 8249 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 8250 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 8251 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 8252 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 8253 | +# define LT_DLSYM_CONST |
| 8254 | +#elif defined(__osf__) |
| 8255 | +/* This system does not cope well with relocations in const data. */ |
| 8256 | +# define LT_DLSYM_CONST |
| 8257 | +#else |
| 8258 | +# define LT_DLSYM_CONST const |
| 8259 | +#endif |
| 8260 | + |
| 8261 | #ifdef __cplusplus |
| 8262 | extern "C" { |
| 8263 | #endif |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8264 | @@ -7307,7 +7638,7 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8265 | cat <<_LT_EOF >> conftest.$ac_ext |
| 8266 | |
| 8267 | /* The mapping between symbol names and symbols. */ |
| 8268 | -const struct { |
| 8269 | +LT_DLSYM_CONST struct { |
| 8270 | const char *name; |
| 8271 | void *address; |
| 8272 | } |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8273 | @@ -7333,8 +7664,8 @@ static const void *lt_preloaded_setup() { |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8274 | _LT_EOF |
| 8275 | # Now try linking the two files. |
| 8276 | mv conftest.$ac_objext conftstm.$ac_objext |
| 8277 | - lt_save_LIBS="$LIBS" |
| 8278 | - lt_save_CFLAGS="$CFLAGS" |
| 8279 | + lt_globsym_save_LIBS=$LIBS |
| 8280 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 8281 | LIBS="conftstm.$ac_objext" |
| 8282 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 8283 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8284 | @@ -7344,8 +7675,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8285 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 8286 | pipe_works=yes |
| 8287 | fi |
| 8288 | - LIBS="$lt_save_LIBS" |
| 8289 | - CFLAGS="$lt_save_CFLAGS" |
| 8290 | + LIBS=$lt_globsym_save_LIBS |
| 8291 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 8292 | else |
| 8293 | echo "cannot find nm_test_func in $nlist" >&5 |
| 8294 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8295 | @@ -7382,6 +7713,19 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8296 | $as_echo "ok" >&6; } |
| 8297 | fi |
| 8298 | |
| 8299 | +# Response file support. |
| 8300 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 8301 | + nm_file_list_spec='@' |
| 8302 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 8303 | + nm_file_list_spec='@' |
| 8304 | +fi |
| 8305 | + |
| 8306 | + |
| 8307 | + |
| 8308 | + |
| 8309 | + |
| 8310 | + |
| 8311 | + |
| 8312 | |
| 8313 | |
| 8314 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8315 | @@ -7402,6 +7746,42 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8316 | |
| 8317 | |
| 8318 | |
| 8319 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 8320 | +$as_echo_n "checking for sysroot... " >&6; } |
| 8321 | + |
| 8322 | +# Check whether --with-libtool-sysroot was given. |
| 8323 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 8324 | + withval=$with_libtool_sysroot; |
| 8325 | +else |
| 8326 | + with_libtool_sysroot=no |
| 8327 | +fi |
| 8328 | + |
| 8329 | + |
| 8330 | +lt_sysroot= |
| 8331 | +case ${with_libtool_sysroot} in #( |
| 8332 | + yes) |
| 8333 | + if test "$GCC" = yes; then |
| 8334 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 8335 | + fi |
| 8336 | + ;; #( |
| 8337 | + /*) |
| 8338 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 8339 | + ;; #( |
| 8340 | + no|'') |
| 8341 | + ;; #( |
| 8342 | + *) |
| 8343 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 8344 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 8345 | + as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 |
| 8346 | + ;; |
| 8347 | +esac |
| 8348 | + |
| 8349 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 8350 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 8351 | + |
| 8352 | + |
| 8353 | + |
| 8354 | + |
| 8355 | |
| 8356 | # Check whether --enable-libtool-lock was given. |
| 8357 | if test "${enable_libtool_lock+set}" = set; then : |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8358 | @@ -7609,6 +7989,123 @@ esac |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8359 | |
| 8360 | need_locks="$enable_libtool_lock" |
| 8361 | |
| 8362 | +if test -n "$ac_tool_prefix"; then |
| 8363 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 8364 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 8365 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 8366 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 8367 | +if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : |
| 8368 | + $as_echo_n "(cached) " >&6 |
| 8369 | +else |
| 8370 | + if test -n "$MANIFEST_TOOL"; then |
| 8371 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 8372 | +else |
| 8373 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 8374 | +for as_dir in $PATH |
| 8375 | +do |
| 8376 | + IFS=$as_save_IFS |
| 8377 | + test -z "$as_dir" && as_dir=. |
| 8378 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 8379 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 8380 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 8381 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 8382 | + break 2 |
| 8383 | + fi |
| 8384 | +done |
| 8385 | + done |
| 8386 | +IFS=$as_save_IFS |
| 8387 | + |
| 8388 | +fi |
| 8389 | +fi |
| 8390 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 8391 | +if test -n "$MANIFEST_TOOL"; then |
| 8392 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 8393 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 8394 | +else |
| 8395 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 8396 | +$as_echo "no" >&6; } |
| 8397 | +fi |
| 8398 | + |
| 8399 | + |
| 8400 | +fi |
| 8401 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 8402 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 8403 | + # Extract the first word of "mt", so it can be a program name with args. |
| 8404 | +set dummy mt; ac_word=$2 |
| 8405 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 8406 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 8407 | +if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : |
| 8408 | + $as_echo_n "(cached) " >&6 |
| 8409 | +else |
| 8410 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 8411 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 8412 | +else |
| 8413 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 8414 | +for as_dir in $PATH |
| 8415 | +do |
| 8416 | + IFS=$as_save_IFS |
| 8417 | + test -z "$as_dir" && as_dir=. |
| 8418 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 8419 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 8420 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 8421 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 8422 | + break 2 |
| 8423 | + fi |
| 8424 | +done |
| 8425 | + done |
| 8426 | +IFS=$as_save_IFS |
| 8427 | + |
| 8428 | +fi |
| 8429 | +fi |
| 8430 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 8431 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 8432 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 8433 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 8434 | +else |
| 8435 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 8436 | +$as_echo "no" >&6; } |
| 8437 | +fi |
| 8438 | + |
| 8439 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 8440 | + MANIFEST_TOOL=":" |
| 8441 | + else |
| 8442 | + case $cross_compiling:$ac_tool_warned in |
| 8443 | +yes:) |
| 8444 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 8445 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 8446 | +ac_tool_warned=yes ;; |
| 8447 | +esac |
| 8448 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 8449 | + fi |
| 8450 | +else |
| 8451 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 8452 | +fi |
| 8453 | + |
| 8454 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 8455 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 8456 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 8457 | +if test "${lt_cv_path_mainfest_tool+set}" = set; then : |
| 8458 | + $as_echo_n "(cached) " >&6 |
| 8459 | +else |
| 8460 | + lt_cv_path_mainfest_tool=no |
| 8461 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 8462 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 8463 | + cat conftest.err >&5 |
| 8464 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 8465 | + lt_cv_path_mainfest_tool=yes |
| 8466 | + fi |
| 8467 | + rm -f conftest* |
| 8468 | +fi |
| 8469 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 8470 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 8471 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 8472 | + MANIFEST_TOOL=: |
| 8473 | +fi |
| 8474 | + |
| 8475 | + |
| 8476 | + |
| 8477 | + |
| 8478 | + |
| 8479 | |
| 8480 | case $host_os in |
| 8481 | rhapsody* | darwin*) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8482 | @@ -8172,6 +8669,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8483 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 8484 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 8485 | $AR cru libconftest.a conftest.o 2>&5 |
| 8486 | + echo "$RANLIB libconftest.a" >&5 |
| 8487 | + $RANLIB libconftest.a 2>&5 |
| 8488 | cat > conftest.c << _LT_EOF |
| 8489 | int main() { return 0;} |
| 8490 | _LT_EOF |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8491 | @@ -8240,6 +8739,16 @@ done |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8492 | |
| 8493 | |
| 8494 | |
| 8495 | +func_stripname_cnf () |
| 8496 | +{ |
| 8497 | + case ${2} in |
| 8498 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 8499 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 8500 | + esac |
| 8501 | +} # func_stripname_cnf |
| 8502 | + |
| 8503 | + |
| 8504 | + |
| 8505 | |
| 8506 | |
| 8507 | # Set options |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8508 | @@ -8368,7 +8877,8 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8509 | LIBTOOL_DEPS="$ltmain" |
| 8510 | |
| 8511 | # Always use our own libtool. |
| 8512 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
| 8513 | +LIBTOOL='$(SHELL) $(top_builddir)' |
| 8514 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" |
| 8515 | |
| 8516 | |
| 8517 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8518 | @@ -8457,7 +8967,7 @@ aix3*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8519 | esac |
| 8520 | |
| 8521 | # Global variables: |
| 8522 | -ofile=libtool |
| 8523 | +ofile=${host_alias}-libtool |
| 8524 | can_build_shared=yes |
| 8525 | |
| 8526 | # All known linkers require a `.a' archive for static linking (except MSVC, |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8527 | @@ -8755,8 +9265,6 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8528 | lt_prog_compiler_pic= |
| 8529 | lt_prog_compiler_static= |
| 8530 | |
| 8531 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 8532 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 8533 | |
| 8534 | if test "$GCC" = yes; then |
| 8535 | lt_prog_compiler_wl='-Wl,' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8536 | @@ -8922,6 +9430,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8537 | lt_prog_compiler_pic='--shared' |
| 8538 | lt_prog_compiler_static='--static' |
| 8539 | ;; |
| 8540 | + nagfor*) |
| 8541 | + # NAG Fortran compiler |
| 8542 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 8543 | + lt_prog_compiler_pic='-PIC' |
| 8544 | + lt_prog_compiler_static='-Bstatic' |
| 8545 | + ;; |
| 8546 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 8547 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 8548 | # which looks to be a dead project) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8549 | @@ -8984,7 +9498,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8550 | lt_prog_compiler_pic='-KPIC' |
| 8551 | lt_prog_compiler_static='-Bstatic' |
| 8552 | case $cc_basename in |
| 8553 | - f77* | f90* | f95*) |
| 8554 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 8555 | lt_prog_compiler_wl='-Qoption ld ';; |
| 8556 | *) |
| 8557 | lt_prog_compiler_wl='-Wl,';; |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8558 | @@ -9041,13 +9555,17 @@ case $host_os in |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8559 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 8560 | ;; |
| 8561 | esac |
| 8562 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 8563 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 8564 | - |
| 8565 | - |
| 8566 | - |
| 8567 | - |
| 8568 | |
| 8569 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 8570 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 8571 | +if test "${lt_cv_prog_compiler_pic+set}" = set; then : |
| 8572 | + $as_echo_n "(cached) " >&6 |
| 8573 | +else |
| 8574 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 8575 | +fi |
| 8576 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 8577 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 8578 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 8579 | |
| 8580 | # |
| 8581 | # Check to make sure the PIC flag actually works. |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8582 | @@ -9108,6 +9626,11 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8583 | |
| 8584 | |
| 8585 | |
| 8586 | + |
| 8587 | + |
| 8588 | + |
| 8589 | + |
| 8590 | + |
| 8591 | # |
| 8592 | # Check to make sure the static flag actually works. |
| 8593 | # |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8594 | @@ -9458,7 +9981,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8595 | allow_undefined_flag=unsupported |
| 8596 | always_export_symbols=no |
| 8597 | enable_shared_with_static_runtimes=yes |
| 8598 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 8599 | + 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' |
| 8600 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 8601 | |
| 8602 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 8603 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8604 | @@ -9557,12 +10081,12 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8605 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 8606 | hardcode_libdir_flag_spec= |
| 8607 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 8608 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 8609 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 8610 | if test "x$supports_anon_versioning" = xyes; then |
| 8611 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 8612 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 8613 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 8614 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 8615 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 8616 | fi |
| 8617 | ;; |
| 8618 | esac |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8619 | @@ -9576,8 +10100,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8620 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 8621 | wlarc= |
| 8622 | else |
| 8623 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 8624 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 8625 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 8626 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 8627 | fi |
| 8628 | ;; |
| 8629 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8630 | @@ -9595,8 +10119,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8631 | |
| 8632 | _LT_EOF |
| 8633 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 8634 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 8635 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 8636 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 8637 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 8638 | else |
| 8639 | ld_shlibs=no |
| 8640 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8641 | @@ -9642,8 +10166,8 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8642 | |
| 8643 | *) |
| 8644 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 8645 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 8646 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 8647 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 8648 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 8649 | else |
| 8650 | ld_shlibs=no |
| 8651 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8652 | @@ -9773,7 +10297,13 @@ _LT_EOF |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8653 | allow_undefined_flag='-berok' |
| 8654 | # Determine the default libpath from the value encoded in an |
| 8655 | # empty executable. |
| 8656 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 8657 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 8658 | + aix_libpath=$lt_cv_aix_libpath |
| 8659 | +else |
| 8660 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 8661 | + $as_echo_n "(cached) " >&6 |
| 8662 | +else |
| 8663 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 8664 | /* end confdefs.h. */ |
| 8665 | |
| 8666 | int |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8667 | @@ -9786,22 +10316,29 @@ main () |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8668 | _ACEOF |
| 8669 | if ac_fn_c_try_link "$LINENO"; then : |
| 8670 | |
| 8671 | -lt_aix_libpath_sed=' |
| 8672 | - /Import File Strings/,/^$/ { |
| 8673 | - /^0/ { |
| 8674 | - s/^0 *\(.*\)$/\1/ |
| 8675 | - p |
| 8676 | - } |
| 8677 | - }' |
| 8678 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8679 | -# Check for a 64-bit object if we didn't find anything. |
| 8680 | -if test -z "$aix_libpath"; then |
| 8681 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8682 | -fi |
| 8683 | + lt_aix_libpath_sed=' |
| 8684 | + /Import File Strings/,/^$/ { |
| 8685 | + /^0/ { |
| 8686 | + s/^0 *\([^ ]*\) *$/\1/ |
| 8687 | + p |
| 8688 | + } |
| 8689 | + }' |
| 8690 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8691 | + # Check for a 64-bit object if we didn't find anything. |
| 8692 | + if test -z "$lt_cv_aix_libpath_"; then |
| 8693 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8694 | + fi |
| 8695 | fi |
| 8696 | rm -f core conftest.err conftest.$ac_objext \ |
| 8697 | conftest$ac_exeext conftest.$ac_ext |
| 8698 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 8699 | + if test -z "$lt_cv_aix_libpath_"; then |
| 8700 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 8701 | + fi |
| 8702 | + |
| 8703 | +fi |
| 8704 | + |
| 8705 | + aix_libpath=$lt_cv_aix_libpath_ |
| 8706 | +fi |
| 8707 | |
| 8708 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 8709 | 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" |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8710 | @@ -9813,7 +10350,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8711 | else |
| 8712 | # Determine the default libpath from the value encoded in an |
| 8713 | # empty executable. |
| 8714 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 8715 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 8716 | + aix_libpath=$lt_cv_aix_libpath |
| 8717 | +else |
| 8718 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 8719 | + $as_echo_n "(cached) " >&6 |
| 8720 | +else |
| 8721 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 8722 | /* end confdefs.h. */ |
| 8723 | |
| 8724 | int |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8725 | @@ -9826,22 +10369,29 @@ main () |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8726 | _ACEOF |
| 8727 | if ac_fn_c_try_link "$LINENO"; then : |
| 8728 | |
| 8729 | -lt_aix_libpath_sed=' |
| 8730 | - /Import File Strings/,/^$/ { |
| 8731 | - /^0/ { |
| 8732 | - s/^0 *\(.*\)$/\1/ |
| 8733 | - p |
| 8734 | - } |
| 8735 | - }' |
| 8736 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8737 | -# Check for a 64-bit object if we didn't find anything. |
| 8738 | -if test -z "$aix_libpath"; then |
| 8739 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8740 | -fi |
| 8741 | + lt_aix_libpath_sed=' |
| 8742 | + /Import File Strings/,/^$/ { |
| 8743 | + /^0/ { |
| 8744 | + s/^0 *\([^ ]*\) *$/\1/ |
| 8745 | + p |
| 8746 | + } |
| 8747 | + }' |
| 8748 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8749 | + # Check for a 64-bit object if we didn't find anything. |
| 8750 | + if test -z "$lt_cv_aix_libpath_"; then |
| 8751 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 8752 | + fi |
| 8753 | fi |
| 8754 | rm -f core conftest.err conftest.$ac_objext \ |
| 8755 | conftest$ac_exeext conftest.$ac_ext |
| 8756 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 8757 | + if test -z "$lt_cv_aix_libpath_"; then |
| 8758 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 8759 | + fi |
| 8760 | + |
| 8761 | +fi |
| 8762 | + |
| 8763 | + aix_libpath=$lt_cv_aix_libpath_ |
| 8764 | +fi |
| 8765 | |
| 8766 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 8767 | # Warning - without using the other run time loading flags, |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8768 | @@ -9885,21 +10435,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8769 | # When not using gcc, we currently assume that we are using |
| 8770 | # Microsoft Visual C++. |
| 8771 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 8772 | - # no search path for DLLs. |
| 8773 | - hardcode_libdir_flag_spec=' ' |
| 8774 | - allow_undefined_flag=unsupported |
| 8775 | - # Tell ltmain to make .lib files, not .a files. |
| 8776 | - libext=lib |
| 8777 | - # Tell ltmain to make .dll files, not .so files. |
| 8778 | - shrext_cmds=".dll" |
| 8779 | - # FIXME: Setting linknames here is a bad hack. |
| 8780 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 8781 | - # The linker will automatically build a .lib file if we build a DLL. |
| 8782 | - old_archive_from_new_cmds='true' |
| 8783 | - # FIXME: Should let the user specify the lib program. |
| 8784 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 8785 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 8786 | - enable_shared_with_static_runtimes=yes |
| 8787 | + # no search path for DLLs. |
| 8788 | + case $cc_basename in |
| 8789 | + cl*) |
| 8790 | + # Native MSVC |
| 8791 | + hardcode_libdir_flag_spec=' ' |
| 8792 | + allow_undefined_flag=unsupported |
| 8793 | + always_export_symbols=yes |
| 8794 | + file_list_spec='@' |
| 8795 | + # Tell ltmain to make .lib files, not .a files. |
| 8796 | + libext=lib |
| 8797 | + # Tell ltmain to make .dll files, not .so files. |
| 8798 | + shrext_cmds=".dll" |
| 8799 | + # FIXME: Setting linknames here is a bad hack. |
| 8800 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 8801 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 8802 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 8803 | + else |
| 8804 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 8805 | + fi~ |
| 8806 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 8807 | + linknames=' |
| 8808 | + # The linker will not automatically build a static lib if we build a DLL. |
| 8809 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 8810 | + enable_shared_with_static_runtimes=yes |
| 8811 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 8812 | + # Don't use ranlib |
| 8813 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 8814 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 8815 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 8816 | + case $lt_outputfile in |
| 8817 | + *.exe|*.EXE) ;; |
| 8818 | + *) |
| 8819 | + lt_outputfile="$lt_outputfile.exe" |
| 8820 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 8821 | + ;; |
| 8822 | + esac~ |
| 8823 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 8824 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 8825 | + $RM "$lt_outputfile.manifest"; |
| 8826 | + fi' |
| 8827 | + ;; |
| 8828 | + *) |
| 8829 | + # Assume MSVC wrapper |
| 8830 | + hardcode_libdir_flag_spec=' ' |
| 8831 | + allow_undefined_flag=unsupported |
| 8832 | + # Tell ltmain to make .lib files, not .a files. |
| 8833 | + libext=lib |
| 8834 | + # Tell ltmain to make .dll files, not .so files. |
| 8835 | + shrext_cmds=".dll" |
| 8836 | + # FIXME: Setting linknames here is a bad hack. |
| 8837 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 8838 | + # The linker will automatically build a .lib file if we build a DLL. |
| 8839 | + old_archive_from_new_cmds='true' |
| 8840 | + # FIXME: Should let the user specify the lib program. |
| 8841 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 8842 | + enable_shared_with_static_runtimes=yes |
| 8843 | + ;; |
| 8844 | + esac |
| 8845 | ;; |
| 8846 | |
| 8847 | darwin* | rhapsody*) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8848 | @@ -9960,7 +10553,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8849 | |
| 8850 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 8851 | freebsd* | dragonfly*) |
| 8852 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 8853 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 8854 | hardcode_libdir_flag_spec='-R$libdir' |
| 8855 | hardcode_direct=yes |
| 8856 | hardcode_shlibpath_var=no |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8857 | @@ -9968,7 +10561,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8858 | |
| 8859 | hpux9*) |
| 8860 | if test "$GCC" = yes; then |
| 8861 | - 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' |
| 8862 | + 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' |
| 8863 | else |
| 8864 | 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' |
| 8865 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8866 | @@ -9984,7 +10577,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8867 | |
| 8868 | hpux10*) |
| 8869 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 8870 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 8871 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 8872 | else |
| 8873 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 8874 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8875 | @@ -10008,10 +10601,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8876 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 8877 | ;; |
| 8878 | ia64*) |
| 8879 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 8880 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 8881 | ;; |
| 8882 | *) |
| 8883 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 8884 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 8885 | ;; |
| 8886 | esac |
| 8887 | else |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8888 | @@ -10090,23 +10683,36 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8889 | |
| 8890 | irix5* | irix6* | nonstopux*) |
| 8891 | if test "$GCC" = yes; then |
| 8892 | - 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' |
| 8893 | + 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' |
| 8894 | # Try to use the -exported_symbol ld option, if it does not |
| 8895 | # work, assume that -exports_file does not work either and |
| 8896 | # implicitly export all symbols. |
| 8897 | - save_LDFLAGS="$LDFLAGS" |
| 8898 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 8899 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 8900 | + # This should be the same for all languages, so no per-tag cache variable. |
| 8901 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 8902 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 8903 | +if test "${lt_cv_irix_exported_symbol+set}" = set; then : |
| 8904 | + $as_echo_n "(cached) " >&6 |
| 8905 | +else |
| 8906 | + save_LDFLAGS="$LDFLAGS" |
| 8907 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 8908 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 8909 | /* end confdefs.h. */ |
| 8910 | -int foo(void) {} |
| 8911 | +int foo (void) { return 0; } |
| 8912 | _ACEOF |
| 8913 | if ac_fn_c_try_link "$LINENO"; then : |
| 8914 | - 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' |
| 8915 | - |
| 8916 | + lt_cv_irix_exported_symbol=yes |
| 8917 | +else |
| 8918 | + lt_cv_irix_exported_symbol=no |
| 8919 | fi |
| 8920 | rm -f core conftest.err conftest.$ac_objext \ |
| 8921 | conftest$ac_exeext conftest.$ac_ext |
| 8922 | - LDFLAGS="$save_LDFLAGS" |
| 8923 | + LDFLAGS="$save_LDFLAGS" |
| 8924 | +fi |
| 8925 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 8926 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 8927 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 8928 | + 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' |
| 8929 | + fi |
| 8930 | else |
| 8931 | 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' |
| 8932 | 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' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8933 | @@ -10191,7 +10797,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8934 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 8935 | if test "$GCC" = yes; then |
| 8936 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 8937 | - 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' |
| 8938 | + 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' |
| 8939 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 8940 | else |
| 8941 | allow_undefined_flag=' -expect_unresolved \*' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8942 | @@ -10210,9 +10816,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8943 | no_undefined_flag=' -z defs' |
| 8944 | if test "$GCC" = yes; then |
| 8945 | wlarc='${wl}' |
| 8946 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 8947 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 8948 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 8949 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 8950 | + $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' |
| 8951 | else |
| 8952 | case `$CC -V 2>&1` in |
| 8953 | *"Compilers 5.0"*) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8954 | @@ -10788,8 +11394,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8955 | need_version=no |
| 8956 | need_lib_prefix=no |
| 8957 | |
| 8958 | - case $GCC,$host_os in |
| 8959 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 8960 | + case $GCC,$cc_basename in |
| 8961 | + yes,*) |
| 8962 | + # gcc |
| 8963 | library_names_spec='$libname.dll.a' |
| 8964 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 8965 | postinstall_cmds='base_file=`basename \${file}`~ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8966 | @@ -10822,13 +11429,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8967 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 8968 | ;; |
| 8969 | esac |
| 8970 | + dynamic_linker='Win32 ld.exe' |
| 8971 | + ;; |
| 8972 | + |
| 8973 | + *,cl*) |
| 8974 | + # Native MSVC |
| 8975 | + libname_spec='$name' |
| 8976 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 8977 | + library_names_spec='${libname}.dll.lib' |
| 8978 | + |
| 8979 | + case $build_os in |
| 8980 | + mingw*) |
| 8981 | + sys_lib_search_path_spec= |
| 8982 | + lt_save_ifs=$IFS |
| 8983 | + IFS=';' |
| 8984 | + for lt_path in $LIB |
| 8985 | + do |
| 8986 | + IFS=$lt_save_ifs |
| 8987 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 8988 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 8989 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 8990 | + done |
| 8991 | + IFS=$lt_save_ifs |
| 8992 | + # Convert to MSYS style. |
| 8993 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 8994 | + ;; |
| 8995 | + cygwin*) |
| 8996 | + # Convert to unix form, then to dos form, then back to unix form |
| 8997 | + # but this time dos style (no spaces!) so that the unix form looks |
| 8998 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 8999 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 9000 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 9001 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 9002 | + ;; |
| 9003 | + *) |
| 9004 | + sys_lib_search_path_spec="$LIB" |
| 9005 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 9006 | + # It is most probably a Windows format PATH. |
| 9007 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 9008 | + else |
| 9009 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 9010 | + fi |
| 9011 | + # FIXME: find the short name or the path components, as spaces are |
| 9012 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 9013 | + ;; |
| 9014 | + esac |
| 9015 | + |
| 9016 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 9017 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 9018 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 9019 | + dldir=$destdir/`dirname \$dlpath`~ |
| 9020 | + test -d \$dldir || mkdir -p \$dldir~ |
| 9021 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 9022 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 9023 | + dlpath=$dir/\$dldll~ |
| 9024 | + $RM \$dlpath' |
| 9025 | + shlibpath_overrides_runpath=yes |
| 9026 | + dynamic_linker='Win32 link.exe' |
| 9027 | ;; |
| 9028 | |
| 9029 | *) |
| 9030 | + # Assume MSVC wrapper |
| 9031 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 9032 | + dynamic_linker='Win32 ld.exe' |
| 9033 | ;; |
| 9034 | esac |
| 9035 | - dynamic_linker='Win32 ld.exe' |
| 9036 | # FIXME: first we should search . and the directory the executable is in |
| 9037 | shlibpath_var=PATH |
| 9038 | ;; |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9039 | @@ -10920,7 +11585,7 @@ haiku*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9040 | soname_spec='${libname}${release}${shared_ext}$major' |
| 9041 | shlibpath_var=LIBRARY_PATH |
| 9042 | shlibpath_overrides_runpath=yes |
| 9043 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' |
| 9044 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
| 9045 | hardcode_into_libs=yes |
| 9046 | ;; |
| 9047 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9048 | @@ -11716,7 +12381,7 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9049 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 9050 | lt_status=$lt_dlunknown |
| 9051 | cat > conftest.$ac_ext <<_LT_EOF |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9052 | -#line 11719 "configure" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9053 | +#line $LINENO "configure" |
| 9054 | #include "confdefs.h" |
| 9055 | |
| 9056 | #if HAVE_DLFCN_H |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9057 | @@ -11760,10 +12425,10 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9058 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 9059 | correspondingly for the symbols needed. */ |
| 9060 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 9061 | -void fnord () __attribute__((visibility("default"))); |
| 9062 | +int fnord () __attribute__((visibility("default"))); |
| 9063 | #endif |
| 9064 | |
| 9065 | -void fnord () { int i=42; } |
| 9066 | +int fnord () { return 42; } |
| 9067 | int main () |
| 9068 | { |
| 9069 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9070 | @@ -11822,7 +12487,7 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9071 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 9072 | lt_status=$lt_dlunknown |
| 9073 | cat > conftest.$ac_ext <<_LT_EOF |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9074 | -#line 11825 "configure" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9075 | +#line $LINENO "configure" |
| 9076 | #include "confdefs.h" |
| 9077 | |
| 9078 | #if HAVE_DLFCN_H |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9079 | @@ -11866,10 +12531,10 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9080 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 9081 | correspondingly for the symbols needed. */ |
| 9082 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 9083 | -void fnord () __attribute__((visibility("default"))); |
| 9084 | +int fnord () __attribute__((visibility("default"))); |
| 9085 | #endif |
| 9086 | |
| 9087 | -void fnord () { int i=42; } |
| 9088 | +int fnord () { return 42; } |
| 9089 | int main () |
| 9090 | { |
| 9091 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9092 | @@ -12261,6 +12926,7 @@ $RM -r conftest* |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9093 | |
| 9094 | # Allow CC to be a program name with arguments. |
| 9095 | lt_save_CC=$CC |
| 9096 | + lt_save_CFLAGS=$CFLAGS |
| 9097 | lt_save_LD=$LD |
| 9098 | lt_save_GCC=$GCC |
| 9099 | GCC=$GXX |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9100 | @@ -12278,6 +12944,7 @@ $RM -r conftest* |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9101 | fi |
| 9102 | test -z "${LDCXX+set}" || LD=$LDCXX |
| 9103 | CC=${CXX-"c++"} |
| 9104 | + CFLAGS=$CXXFLAGS |
| 9105 | compiler=$CC |
| 9106 | compiler_CXX=$CC |
| 9107 | for cc_temp in $compiler""; do |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9108 | @@ -12560,7 +13227,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9109 | allow_undefined_flag_CXX='-berok' |
| 9110 | # Determine the default libpath from the value encoded in an empty |
| 9111 | # executable. |
| 9112 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 9113 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 9114 | + aix_libpath=$lt_cv_aix_libpath |
| 9115 | +else |
| 9116 | + if test "${lt_cv_aix_libpath__CXX+set}" = set; then : |
| 9117 | + $as_echo_n "(cached) " >&6 |
| 9118 | +else |
| 9119 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 9120 | /* end confdefs.h. */ |
| 9121 | |
| 9122 | int |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9123 | @@ -12573,22 +13246,29 @@ main () |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9124 | _ACEOF |
| 9125 | if ac_fn_cxx_try_link "$LINENO"; then : |
| 9126 | |
| 9127 | -lt_aix_libpath_sed=' |
| 9128 | - /Import File Strings/,/^$/ { |
| 9129 | - /^0/ { |
| 9130 | - s/^0 *\(.*\)$/\1/ |
| 9131 | - p |
| 9132 | - } |
| 9133 | - }' |
| 9134 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9135 | -# Check for a 64-bit object if we didn't find anything. |
| 9136 | -if test -z "$aix_libpath"; then |
| 9137 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9138 | -fi |
| 9139 | + lt_aix_libpath_sed=' |
| 9140 | + /Import File Strings/,/^$/ { |
| 9141 | + /^0/ { |
| 9142 | + s/^0 *\([^ ]*\) *$/\1/ |
| 9143 | + p |
| 9144 | + } |
| 9145 | + }' |
| 9146 | + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9147 | + # Check for a 64-bit object if we didn't find anything. |
| 9148 | + if test -z "$lt_cv_aix_libpath__CXX"; then |
| 9149 | + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9150 | + fi |
| 9151 | fi |
| 9152 | rm -f core conftest.err conftest.$ac_objext \ |
| 9153 | conftest$ac_exeext conftest.$ac_ext |
| 9154 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9155 | + if test -z "$lt_cv_aix_libpath__CXX"; then |
| 9156 | + lt_cv_aix_libpath__CXX="/usr/lib:/lib" |
| 9157 | + fi |
| 9158 | + |
| 9159 | +fi |
| 9160 | + |
| 9161 | + aix_libpath=$lt_cv_aix_libpath__CXX |
| 9162 | +fi |
| 9163 | |
| 9164 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 9165 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9166 | @@ -12601,7 +13281,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9167 | else |
| 9168 | # Determine the default libpath from the value encoded in an |
| 9169 | # empty executable. |
| 9170 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 9171 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 9172 | + aix_libpath=$lt_cv_aix_libpath |
| 9173 | +else |
| 9174 | + if test "${lt_cv_aix_libpath__CXX+set}" = set; then : |
| 9175 | + $as_echo_n "(cached) " >&6 |
| 9176 | +else |
| 9177 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 9178 | /* end confdefs.h. */ |
| 9179 | |
| 9180 | int |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9181 | @@ -12614,22 +13300,29 @@ main () |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9182 | _ACEOF |
| 9183 | if ac_fn_cxx_try_link "$LINENO"; then : |
| 9184 | |
| 9185 | -lt_aix_libpath_sed=' |
| 9186 | - /Import File Strings/,/^$/ { |
| 9187 | - /^0/ { |
| 9188 | - s/^0 *\(.*\)$/\1/ |
| 9189 | - p |
| 9190 | - } |
| 9191 | - }' |
| 9192 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9193 | -# Check for a 64-bit object if we didn't find anything. |
| 9194 | -if test -z "$aix_libpath"; then |
| 9195 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9196 | -fi |
| 9197 | + lt_aix_libpath_sed=' |
| 9198 | + /Import File Strings/,/^$/ { |
| 9199 | + /^0/ { |
| 9200 | + s/^0 *\([^ ]*\) *$/\1/ |
| 9201 | + p |
| 9202 | + } |
| 9203 | + }' |
| 9204 | + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9205 | + # Check for a 64-bit object if we didn't find anything. |
| 9206 | + if test -z "$lt_cv_aix_libpath__CXX"; then |
| 9207 | + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 9208 | + fi |
| 9209 | fi |
| 9210 | rm -f core conftest.err conftest.$ac_objext \ |
| 9211 | conftest$ac_exeext conftest.$ac_ext |
| 9212 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 9213 | + if test -z "$lt_cv_aix_libpath__CXX"; then |
| 9214 | + lt_cv_aix_libpath__CXX="/usr/lib:/lib" |
| 9215 | + fi |
| 9216 | + |
| 9217 | +fi |
| 9218 | + |
| 9219 | + aix_libpath=$lt_cv_aix_libpath__CXX |
| 9220 | +fi |
| 9221 | |
| 9222 | hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 9223 | # Warning - without using the other run time loading flags, |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9224 | @@ -12672,29 +13365,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9225 | ;; |
| 9226 | |
| 9227 | cygwin* | mingw* | pw32* | cegcc*) |
| 9228 | - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, |
| 9229 | - # as there is no search path for DLLs. |
| 9230 | - hardcode_libdir_flag_spec_CXX='-L$libdir' |
| 9231 | - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' |
| 9232 | - allow_undefined_flag_CXX=unsupported |
| 9233 | - always_export_symbols_CXX=no |
| 9234 | - enable_shared_with_static_runtimes_CXX=yes |
| 9235 | - |
| 9236 | - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 9237 | - 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' |
| 9238 | - # If the export-symbols file already is a .def file (1st line |
| 9239 | - # is EXPORTS), use it as is; otherwise, prepend... |
| 9240 | - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 9241 | - cp $export_symbols $output_objdir/$soname.def; |
| 9242 | - else |
| 9243 | - echo EXPORTS > $output_objdir/$soname.def; |
| 9244 | - cat $export_symbols >> $output_objdir/$soname.def; |
| 9245 | - fi~ |
| 9246 | - $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' |
| 9247 | - else |
| 9248 | - ld_shlibs_CXX=no |
| 9249 | - fi |
| 9250 | - ;; |
| 9251 | + case $GXX,$cc_basename in |
| 9252 | + ,cl* | no,cl*) |
| 9253 | + # Native MSVC |
| 9254 | + # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 9255 | + # no search path for DLLs. |
| 9256 | + hardcode_libdir_flag_spec_CXX=' ' |
| 9257 | + allow_undefined_flag_CXX=unsupported |
| 9258 | + always_export_symbols_CXX=yes |
| 9259 | + file_list_spec_CXX='@' |
| 9260 | + # Tell ltmain to make .lib files, not .a files. |
| 9261 | + libext=lib |
| 9262 | + # Tell ltmain to make .dll files, not .so files. |
| 9263 | + shrext_cmds=".dll" |
| 9264 | + # FIXME: Setting linknames here is a bad hack. |
| 9265 | + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 9266 | + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 9267 | + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 9268 | + else |
| 9269 | + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 9270 | + fi~ |
| 9271 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 9272 | + linknames=' |
| 9273 | + # The linker will not automatically build a static lib if we build a DLL. |
| 9274 | + # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' |
| 9275 | + enable_shared_with_static_runtimes_CXX=yes |
| 9276 | + # Don't use ranlib |
| 9277 | + old_postinstall_cmds_CXX='chmod 644 $oldlib' |
| 9278 | + postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ |
| 9279 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 9280 | + case $lt_outputfile in |
| 9281 | + *.exe|*.EXE) ;; |
| 9282 | + *) |
| 9283 | + lt_outputfile="$lt_outputfile.exe" |
| 9284 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 9285 | + ;; |
| 9286 | + esac~ |
| 9287 | + func_to_tool_file "$lt_outputfile"~ |
| 9288 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 9289 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 9290 | + $RM "$lt_outputfile.manifest"; |
| 9291 | + fi' |
| 9292 | + ;; |
| 9293 | + *) |
| 9294 | + # g++ |
| 9295 | + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, |
| 9296 | + # as there is no search path for DLLs. |
| 9297 | + hardcode_libdir_flag_spec_CXX='-L$libdir' |
| 9298 | + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' |
| 9299 | + allow_undefined_flag_CXX=unsupported |
| 9300 | + always_export_symbols_CXX=no |
| 9301 | + enable_shared_with_static_runtimes_CXX=yes |
| 9302 | + |
| 9303 | + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 9304 | + 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' |
| 9305 | + # If the export-symbols file already is a .def file (1st line |
| 9306 | + # is EXPORTS), use it as is; otherwise, prepend... |
| 9307 | + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 9308 | + cp $export_symbols $output_objdir/$soname.def; |
| 9309 | + else |
| 9310 | + echo EXPORTS > $output_objdir/$soname.def; |
| 9311 | + cat $export_symbols >> $output_objdir/$soname.def; |
| 9312 | + fi~ |
| 9313 | + $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' |
| 9314 | + else |
| 9315 | + ld_shlibs_CXX=no |
| 9316 | + fi |
| 9317 | + ;; |
| 9318 | + esac |
| 9319 | + ;; |
| 9320 | darwin* | rhapsody*) |
| 9321 | |
| 9322 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9323 | @@ -12800,7 +13539,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9324 | ;; |
| 9325 | *) |
| 9326 | if test "$GXX" = yes; then |
| 9327 | - 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' |
| 9328 | + 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' |
| 9329 | else |
| 9330 | # FIXME: insert proper C++ library support |
| 9331 | ld_shlibs_CXX=no |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9332 | @@ -12871,10 +13610,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9333 | archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 9334 | ;; |
| 9335 | ia64*) |
| 9336 | - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 9337 | + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 9338 | ;; |
| 9339 | *) |
| 9340 | - 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' |
| 9341 | + 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' |
| 9342 | ;; |
| 9343 | esac |
| 9344 | fi |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9345 | @@ -12915,9 +13654,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9346 | *) |
| 9347 | if test "$GXX" = yes; then |
| 9348 | if test "$with_gnu_ld" = no; then |
| 9349 | - 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' |
| 9350 | + 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' |
| 9351 | else |
| 9352 | - 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' |
| 9353 | + 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' |
| 9354 | fi |
| 9355 | fi |
| 9356 | link_all_deplibs_CXX=yes |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9357 | @@ -12987,20 +13726,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9358 | prelink_cmds_CXX='tpldir=Template.dir~ |
| 9359 | rm -rf $tpldir~ |
| 9360 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
| 9361 | - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' |
| 9362 | + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' |
| 9363 | old_archive_cmds_CXX='tpldir=Template.dir~ |
| 9364 | rm -rf $tpldir~ |
| 9365 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ |
| 9366 | - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ |
| 9367 | + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ |
| 9368 | $RANLIB $oldlib' |
| 9369 | archive_cmds_CXX='tpldir=Template.dir~ |
| 9370 | rm -rf $tpldir~ |
| 9371 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
| 9372 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 9373 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 9374 | archive_expsym_cmds_CXX='tpldir=Template.dir~ |
| 9375 | rm -rf $tpldir~ |
| 9376 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
| 9377 | - $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' |
| 9378 | + $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' |
| 9379 | ;; |
| 9380 | *) # Version 6 and above use weak symbols |
| 9381 | archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9382 | @@ -13195,7 +13934,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9383 | 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' |
| 9384 | ;; |
| 9385 | *) |
| 9386 | - 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' |
| 9387 | + 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' |
| 9388 | ;; |
| 9389 | esac |
| 9390 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9391 | @@ -13241,7 +13980,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9392 | |
| 9393 | solaris*) |
| 9394 | case $cc_basename in |
| 9395 | - CC*) |
| 9396 | + CC* | sunCC*) |
| 9397 | # Sun C++ 4.2, 5.x and Centerline C++ |
| 9398 | archive_cmds_need_lc_CXX=yes |
| 9399 | no_undefined_flag_CXX=' -zdefs' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9400 | @@ -13282,9 +14021,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9401 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
| 9402 | no_undefined_flag_CXX=' ${wl}-z ${wl}defs' |
| 9403 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
| 9404 | - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
| 9405 | + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
| 9406 | archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 9407 | - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
| 9408 | + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
| 9409 | |
| 9410 | # Commands to make compiler produce verbose output that lists |
| 9411 | # what "hidden" libraries, object files and flags are used when |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9412 | @@ -13419,6 +14158,13 @@ private: |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9413 | }; |
| 9414 | _LT_EOF |
| 9415 | |
| 9416 | + |
| 9417 | +_lt_libdeps_save_CFLAGS=$CFLAGS |
| 9418 | +case "$CC $CFLAGS " in #( |
| 9419 | +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; |
| 9420 | +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; |
| 9421 | +esac |
| 9422 | + |
| 9423 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
| 9424 | (eval $ac_compile) 2>&5 |
| 9425 | ac_status=$? |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9426 | @@ -13432,7 +14178,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9427 | pre_test_object_deps_done=no |
| 9428 | |
| 9429 | for p in `eval "$output_verbose_link_cmd"`; do |
| 9430 | - case $p in |
| 9431 | + case ${prev}${p} in |
| 9432 | |
| 9433 | -L* | -R* | -l*) |
| 9434 | # Some compilers place space between "-{L,R}" and the path. |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9435 | @@ -13441,13 +14187,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9436 | test $p = "-R"; then |
| 9437 | prev=$p |
| 9438 | continue |
| 9439 | - else |
| 9440 | - prev= |
| 9441 | fi |
| 9442 | |
| 9443 | + # Expand the sysroot to ease extracting the directories later. |
| 9444 | + if test -z "$prev"; then |
| 9445 | + case $p in |
| 9446 | + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; |
| 9447 | + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; |
| 9448 | + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; |
| 9449 | + esac |
| 9450 | + fi |
| 9451 | + case $p in |
| 9452 | + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; |
| 9453 | + esac |
| 9454 | if test "$pre_test_object_deps_done" = no; then |
| 9455 | - case $p in |
| 9456 | - -L* | -R*) |
| 9457 | + case ${prev} in |
| 9458 | + -L | -R) |
| 9459 | # Internal compiler library paths should come after those |
| 9460 | # provided the user. The postdeps already come after the |
| 9461 | # user supplied libs so there is no need to process them. |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9462 | @@ -13467,8 +14222,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9463 | postdeps_CXX="${postdeps_CXX} ${prev}${p}" |
| 9464 | fi |
| 9465 | fi |
| 9466 | + prev= |
| 9467 | ;; |
| 9468 | |
| 9469 | + *.lto.$objext) ;; # Ignore GCC LTO objects |
| 9470 | *.$objext) |
| 9471 | # This assumes that the test object file only shows up |
| 9472 | # once in the compiler output. |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9473 | @@ -13504,6 +14261,7 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9474 | fi |
| 9475 | |
| 9476 | $RM -f confest.$objext |
| 9477 | +CFLAGS=$_lt_libdeps_save_CFLAGS |
| 9478 | |
| 9479 | # PORTME: override above test on systems where it is broken |
| 9480 | case $host_os in |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9481 | @@ -13539,7 +14297,7 @@ linux*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9482 | |
| 9483 | solaris*) |
| 9484 | case $cc_basename in |
| 9485 | - CC*) |
| 9486 | + CC* | sunCC*) |
| 9487 | # The more standards-conforming stlport4 library is |
| 9488 | # incompatible with the Cstd library. Avoid specifying |
| 9489 | # it if it's in CXXFLAGS. Ignore libCrun as |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9490 | @@ -13604,8 +14362,6 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9491 | lt_prog_compiler_pic_CXX= |
| 9492 | lt_prog_compiler_static_CXX= |
| 9493 | |
| 9494 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 9495 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 9496 | |
| 9497 | # C++ specific cases for pic, static, wl, etc. |
| 9498 | if test "$GXX" = yes; then |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9499 | @@ -13710,6 +14466,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9500 | ;; |
| 9501 | esac |
| 9502 | ;; |
| 9503 | + mingw* | cygwin* | os2* | pw32* | cegcc*) |
| 9504 | + # This hack is so that the source file can tell whether it is being |
| 9505 | + # built for inclusion in a dll (and should export symbols for example). |
| 9506 | + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' |
| 9507 | + ;; |
| 9508 | dgux*) |
| 9509 | case $cc_basename in |
| 9510 | ec++*) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9511 | @@ -13862,7 +14623,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9512 | ;; |
| 9513 | solaris*) |
| 9514 | case $cc_basename in |
| 9515 | - CC*) |
| 9516 | + CC* | sunCC*) |
| 9517 | # Sun C++ 4.2, 5.x and Centerline C++ |
| 9518 | lt_prog_compiler_pic_CXX='-KPIC' |
| 9519 | lt_prog_compiler_static_CXX='-Bstatic' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9520 | @@ -13927,10 +14688,17 @@ case $host_os in |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9521 | lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" |
| 9522 | ;; |
| 9523 | esac |
| 9524 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 |
| 9525 | -$as_echo "$lt_prog_compiler_pic_CXX" >&6; } |
| 9526 | - |
| 9527 | |
| 9528 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 9529 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 9530 | +if test "${lt_cv_prog_compiler_pic_CXX+set}" = set; then : |
| 9531 | + $as_echo_n "(cached) " >&6 |
| 9532 | +else |
| 9533 | + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX |
| 9534 | +fi |
| 9535 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 |
| 9536 | +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } |
| 9537 | +lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX |
| 9538 | |
| 9539 | # |
| 9540 | # Check to make sure the PIC flag actually works. |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9541 | @@ -13988,6 +14756,8 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9542 | |
| 9543 | |
| 9544 | |
| 9545 | + |
| 9546 | + |
| 9547 | # |
| 9548 | # Check to make sure the static flag actually works. |
| 9549 | # |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9550 | @@ -14165,6 +14935,7 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9551 | $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } |
| 9552 | |
| 9553 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
| 9554 | + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' |
| 9555 | case $host_os in |
| 9556 | aix[4-9]*) |
| 9557 | # If we're using GNU nm, then we don't want the "-C" option. |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9558 | @@ -14179,15 +14950,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9559 | ;; |
| 9560 | pw32*) |
| 9561 | export_symbols_cmds_CXX="$ltdll_cmds" |
| 9562 | - ;; |
| 9563 | + ;; |
| 9564 | cygwin* | mingw* | cegcc*) |
| 9565 | - 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' |
| 9566 | - ;; |
| 9567 | + case $cc_basename in |
| 9568 | + cl*) ;; |
| 9569 | + *) |
| 9570 | + 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' |
| 9571 | + exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 9572 | + ;; |
| 9573 | + esac |
| 9574 | + ;; |
| 9575 | *) |
| 9576 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
| 9577 | - ;; |
| 9578 | + ;; |
| 9579 | esac |
| 9580 | - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' |
| 9581 | |
| 9582 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 |
| 9583 | $as_echo "$ld_shlibs_CXX" >&6; } |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9584 | @@ -14450,8 +15226,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9585 | need_version=no |
| 9586 | need_lib_prefix=no |
| 9587 | |
| 9588 | - case $GCC,$host_os in |
| 9589 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 9590 | + case $GCC,$cc_basename in |
| 9591 | + yes,*) |
| 9592 | + # gcc |
| 9593 | library_names_spec='$libname.dll.a' |
| 9594 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 9595 | postinstall_cmds='base_file=`basename \${file}`~ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9596 | @@ -14483,13 +15260,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9597 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 9598 | ;; |
| 9599 | esac |
| 9600 | + dynamic_linker='Win32 ld.exe' |
| 9601 | + ;; |
| 9602 | + |
| 9603 | + *,cl*) |
| 9604 | + # Native MSVC |
| 9605 | + libname_spec='$name' |
| 9606 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 9607 | + library_names_spec='${libname}.dll.lib' |
| 9608 | + |
| 9609 | + case $build_os in |
| 9610 | + mingw*) |
| 9611 | + sys_lib_search_path_spec= |
| 9612 | + lt_save_ifs=$IFS |
| 9613 | + IFS=';' |
| 9614 | + for lt_path in $LIB |
| 9615 | + do |
| 9616 | + IFS=$lt_save_ifs |
| 9617 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 9618 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 9619 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 9620 | + done |
| 9621 | + IFS=$lt_save_ifs |
| 9622 | + # Convert to MSYS style. |
| 9623 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 9624 | + ;; |
| 9625 | + cygwin*) |
| 9626 | + # Convert to unix form, then to dos form, then back to unix form |
| 9627 | + # but this time dos style (no spaces!) so that the unix form looks |
| 9628 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 9629 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 9630 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 9631 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 9632 | + ;; |
| 9633 | + *) |
| 9634 | + sys_lib_search_path_spec="$LIB" |
| 9635 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 9636 | + # It is most probably a Windows format PATH. |
| 9637 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 9638 | + else |
| 9639 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 9640 | + fi |
| 9641 | + # FIXME: find the short name or the path components, as spaces are |
| 9642 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 9643 | + ;; |
| 9644 | + esac |
| 9645 | + |
| 9646 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 9647 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 9648 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 9649 | + dldir=$destdir/`dirname \$dlpath`~ |
| 9650 | + test -d \$dldir || mkdir -p \$dldir~ |
| 9651 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 9652 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 9653 | + dlpath=$dir/\$dldll~ |
| 9654 | + $RM \$dlpath' |
| 9655 | + shlibpath_overrides_runpath=yes |
| 9656 | + dynamic_linker='Win32 link.exe' |
| 9657 | ;; |
| 9658 | |
| 9659 | *) |
| 9660 | + # Assume MSVC wrapper |
| 9661 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 9662 | + dynamic_linker='Win32 ld.exe' |
| 9663 | ;; |
| 9664 | esac |
| 9665 | - dynamic_linker='Win32 ld.exe' |
| 9666 | # FIXME: first we should search . and the directory the executable is in |
| 9667 | shlibpath_var=PATH |
| 9668 | ;; |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9669 | @@ -14580,7 +15415,7 @@ haiku*) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9670 | soname_spec='${libname}${release}${shared_ext}$major' |
| 9671 | shlibpath_var=LIBRARY_PATH |
| 9672 | shlibpath_overrides_runpath=yes |
| 9673 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' |
| 9674 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
| 9675 | hardcode_into_libs=yes |
| 9676 | ;; |
| 9677 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9678 | @@ -15039,6 +15874,7 @@ fi |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9679 | fi # test -n "$compiler" |
| 9680 | |
| 9681 | CC=$lt_save_CC |
| 9682 | + CFLAGS=$lt_save_CFLAGS |
| 9683 | LDCXX=$LD |
| 9684 | LD=$lt_save_LD |
| 9685 | GCC=$lt_save_GCC |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9686 | @@ -17953,13 +18789,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9687 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 9688 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 9689 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 9690 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 9691 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 9692 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 9693 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 9694 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 9695 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 9696 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 9697 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 9698 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 9699 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 9700 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 9701 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 9702 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 9703 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 9704 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 9705 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 9706 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9707 | @@ -17974,14 +18817,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9708 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 9709 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 9710 | 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"`' |
| 9711 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 9712 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 9713 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 9714 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 9715 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 9716 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 9717 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 9718 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 9719 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 9720 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 9721 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 9722 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 9723 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 9724 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 9725 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9726 | @@ -18014,12 +18860,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9727 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 9728 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 9729 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 9730 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 9731 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 9732 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 9733 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 9734 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 9735 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 9736 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 9737 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 9738 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 9739 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9740 | @@ -18058,8 +18904,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9741 | compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' |
| 9742 | GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' |
| 9743 | lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' |
| 9744 | -lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' |
| 9745 | lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' |
| 9746 | +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' |
| 9747 | lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' |
| 9748 | lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' |
| 9749 | archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9750 | @@ -18086,12 +18932,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9751 | hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' |
| 9752 | inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' |
| 9753 | link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' |
| 9754 | -fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`' |
| 9755 | always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' |
| 9756 | export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' |
| 9757 | exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' |
| 9758 | include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' |
| 9759 | prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' |
| 9760 | +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' |
| 9761 | file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' |
| 9762 | hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' |
| 9763 | compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9764 | @@ -18129,8 +18975,13 @@ reload_flag \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9765 | OBJDUMP \ |
| 9766 | deplibs_check_method \ |
| 9767 | file_magic_cmd \ |
| 9768 | +file_magic_glob \ |
| 9769 | +want_nocaseglob \ |
| 9770 | +DLLTOOL \ |
| 9771 | +sharedlib_from_linklib_cmd \ |
| 9772 | AR \ |
| 9773 | AR_FLAGS \ |
| 9774 | +archiver_list_spec \ |
| 9775 | STRIP \ |
| 9776 | RANLIB \ |
| 9777 | CC \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9778 | @@ -18140,12 +18991,14 @@ lt_cv_sys_global_symbol_pipe \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9779 | lt_cv_sys_global_symbol_to_cdecl \ |
| 9780 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 9781 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 9782 | +nm_file_list_spec \ |
| 9783 | lt_prog_compiler_no_builtin_flag \ |
| 9784 | -lt_prog_compiler_wl \ |
| 9785 | lt_prog_compiler_pic \ |
| 9786 | +lt_prog_compiler_wl \ |
| 9787 | lt_prog_compiler_static \ |
| 9788 | lt_cv_prog_compiler_c_o \ |
| 9789 | need_locks \ |
| 9790 | +MANIFEST_TOOL \ |
| 9791 | DSYMUTIL \ |
| 9792 | NMEDIT \ |
| 9793 | LIPO \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9794 | @@ -18161,7 +19014,6 @@ no_undefined_flag \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9795 | hardcode_libdir_flag_spec \ |
| 9796 | hardcode_libdir_flag_spec_ld \ |
| 9797 | hardcode_libdir_separator \ |
| 9798 | -fix_srcfile_path \ |
| 9799 | exclude_expsyms \ |
| 9800 | include_expsyms \ |
| 9801 | file_list_spec \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9802 | @@ -18183,8 +19035,8 @@ LD_CXX \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9803 | reload_flag_CXX \ |
| 9804 | compiler_CXX \ |
| 9805 | lt_prog_compiler_no_builtin_flag_CXX \ |
| 9806 | -lt_prog_compiler_wl_CXX \ |
| 9807 | lt_prog_compiler_pic_CXX \ |
| 9808 | +lt_prog_compiler_wl_CXX \ |
| 9809 | lt_prog_compiler_static_CXX \ |
| 9810 | lt_cv_prog_compiler_c_o_CXX \ |
| 9811 | export_dynamic_flag_spec_CXX \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9812 | @@ -18196,7 +19048,6 @@ no_undefined_flag_CXX \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9813 | hardcode_libdir_flag_spec_CXX \ |
| 9814 | hardcode_libdir_flag_spec_ld_CXX \ |
| 9815 | hardcode_libdir_separator_CXX \ |
| 9816 | -fix_srcfile_path_CXX \ |
| 9817 | exclude_expsyms_CXX \ |
| 9818 | include_expsyms_CXX \ |
| 9819 | file_list_spec_CXX \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9820 | @@ -18230,6 +19081,7 @@ module_cmds \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9821 | module_expsym_cmds \ |
| 9822 | export_symbols_cmds \ |
| 9823 | prelink_cmds \ |
| 9824 | +postlink_cmds \ |
| 9825 | postinstall_cmds \ |
| 9826 | postuninstall_cmds \ |
| 9827 | finish_cmds \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9828 | @@ -18244,7 +19096,8 @@ archive_expsym_cmds_CXX \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9829 | module_cmds_CXX \ |
| 9830 | module_expsym_cmds_CXX \ |
| 9831 | export_symbols_cmds_CXX \ |
| 9832 | -prelink_cmds_CXX; do |
| 9833 | +prelink_cmds_CXX \ |
| 9834 | +postlink_cmds_CXX; do |
| 9835 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
| 9836 | *[\\\\\\\`\\"\\\$]*) |
| 9837 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9838 | @@ -19037,7 +19890,8 @@ $as_echo X"$file" | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9839 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 9840 | # |
| 9841 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 9842 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 9843 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 9844 | +# Inc. |
| 9845 | # Written by Gordon Matzigkeit, 1996 |
| 9846 | # |
| 9847 | # This file is part of GNU Libtool. |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9848 | @@ -19140,19 +19994,42 @@ SP2NL=$lt_lt_SP2NL |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9849 | # turn newlines into spaces. |
| 9850 | NL2SP=$lt_lt_NL2SP |
| 9851 | |
| 9852 | +# convert \$build file names to \$host format. |
| 9853 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 9854 | + |
| 9855 | +# convert \$build files to toolchain format. |
| 9856 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 9857 | + |
| 9858 | # An object symbol dumper. |
| 9859 | OBJDUMP=$lt_OBJDUMP |
| 9860 | |
| 9861 | # Method to check whether dependent libraries are shared objects. |
| 9862 | deplibs_check_method=$lt_deplibs_check_method |
| 9863 | |
| 9864 | -# Command to use when deplibs_check_method == "file_magic". |
| 9865 | +# Command to use when deplibs_check_method = "file_magic". |
| 9866 | file_magic_cmd=$lt_file_magic_cmd |
| 9867 | |
| 9868 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 9869 | +file_magic_glob=$lt_file_magic_glob |
| 9870 | + |
| 9871 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 9872 | +want_nocaseglob=$lt_want_nocaseglob |
| 9873 | + |
| 9874 | +# DLL creation program. |
| 9875 | +DLLTOOL=$lt_DLLTOOL |
| 9876 | + |
| 9877 | +# Command to associate shared and link libraries. |
| 9878 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 9879 | + |
| 9880 | # The archiver. |
| 9881 | AR=$lt_AR |
| 9882 | + |
| 9883 | +# Flags to create an archive. |
| 9884 | AR_FLAGS=$lt_AR_FLAGS |
| 9885 | |
| 9886 | +# How to feed a file listing to the archiver. |
| 9887 | +archiver_list_spec=$lt_archiver_list_spec |
| 9888 | + |
| 9889 | # A symbol stripping program. |
| 9890 | STRIP=$lt_STRIP |
| 9891 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9892 | @@ -19182,6 +20059,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9893 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 9894 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 9895 | |
| 9896 | +# Specify filename containing input files for \$NM. |
| 9897 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 9898 | + |
| 9899 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 9900 | +lt_sysroot=$lt_sysroot |
| 9901 | + |
| 9902 | # The name of the directory that contains temporary libtool files. |
| 9903 | objdir=$objdir |
| 9904 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9905 | @@ -19191,6 +20074,9 @@ MAGIC_CMD=$MAGIC_CMD |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9906 | # Must we lock files when doing compilation? |
| 9907 | need_locks=$lt_need_locks |
| 9908 | |
| 9909 | +# Manifest tool. |
| 9910 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 9911 | + |
| 9912 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 9913 | DSYMUTIL=$lt_DSYMUTIL |
| 9914 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9915 | @@ -19305,12 +20191,12 @@ with_gcc=$GCC |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9916 | # Compiler flag to turn off builtin functions. |
| 9917 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 9918 | |
| 9919 | -# How to pass a linker flag through the compiler. |
| 9920 | -wl=$lt_lt_prog_compiler_wl |
| 9921 | - |
| 9922 | # Additional compiler flags for building library objects. |
| 9923 | pic_flag=$lt_lt_prog_compiler_pic |
| 9924 | |
| 9925 | +# How to pass a linker flag through the compiler. |
| 9926 | +wl=$lt_lt_prog_compiler_wl |
| 9927 | + |
| 9928 | # Compiler flag to prevent dynamic linking. |
| 9929 | link_static_flag=$lt_lt_prog_compiler_static |
| 9930 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9931 | @@ -19397,9 +20283,6 @@ inherit_rpath=$inherit_rpath |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9932 | # Whether libtool must link a program against all its dependency libraries. |
| 9933 | link_all_deplibs=$link_all_deplibs |
| 9934 | |
| 9935 | -# Fix the shell variable \$srcfile for the compiler. |
| 9936 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 9937 | - |
| 9938 | # Set to "yes" if exported symbols are required. |
| 9939 | always_export_symbols=$always_export_symbols |
| 9940 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9941 | @@ -19415,6 +20298,9 @@ include_expsyms=$lt_include_expsyms |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9942 | # Commands necessary for linking programs (against libraries) with templates. |
| 9943 | prelink_cmds=$lt_prelink_cmds |
| 9944 | |
| 9945 | +# Commands necessary for finishing linking programs. |
| 9946 | +postlink_cmds=$lt_postlink_cmds |
| 9947 | + |
| 9948 | # Specify filename containing input files. |
| 9949 | file_list_spec=$lt_file_list_spec |
| 9950 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9951 | @@ -19461,210 +20347,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 9952 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 9953 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 9954 | # is reportedly fixed, but why not run on old versions too? |
| 9955 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 9956 | - || (rm -f "$cfgfile"; exit 1) |
| 9957 | - |
| 9958 | - case $xsi_shell in |
| 9959 | - yes) |
| 9960 | - cat << \_LT_EOF >> "$cfgfile" |
| 9961 | - |
| 9962 | -# func_dirname file append nondir_replacement |
| 9963 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 9964 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 9965 | -func_dirname () |
| 9966 | -{ |
| 9967 | - case ${1} in |
| 9968 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 9969 | - * ) func_dirname_result="${3}" ;; |
| 9970 | - esac |
| 9971 | -} |
| 9972 | - |
| 9973 | -# func_basename file |
| 9974 | -func_basename () |
| 9975 | -{ |
| 9976 | - func_basename_result="${1##*/}" |
| 9977 | -} |
| 9978 | - |
| 9979 | -# func_dirname_and_basename file append nondir_replacement |
| 9980 | -# perform func_basename and func_dirname in a single function |
| 9981 | -# call: |
| 9982 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 9983 | -# add APPEND to the result, otherwise set result |
| 9984 | -# to NONDIR_REPLACEMENT. |
| 9985 | -# value returned in "$func_dirname_result" |
| 9986 | -# basename: Compute filename of FILE. |
| 9987 | -# value retuned in "$func_basename_result" |
| 9988 | -# Implementation must be kept synchronized with func_dirname |
| 9989 | -# and func_basename. For efficiency, we do not delegate to |
| 9990 | -# those functions but instead duplicate the functionality here. |
| 9991 | -func_dirname_and_basename () |
| 9992 | -{ |
| 9993 | - case ${1} in |
| 9994 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 9995 | - * ) func_dirname_result="${3}" ;; |
| 9996 | - esac |
| 9997 | - func_basename_result="${1##*/}" |
| 9998 | -} |
| 9999 | - |
| 10000 | -# func_stripname prefix suffix name |
| 10001 | -# strip PREFIX and SUFFIX off of NAME. |
| 10002 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 10003 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 10004 | -# dot (in which case that matches only a dot). |
| 10005 | -func_stripname () |
| 10006 | -{ |
| 10007 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 10008 | - # positional parameters, so assign one to ordinary parameter first. |
| 10009 | - func_stripname_result=${3} |
| 10010 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 10011 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 10012 | -} |
| 10013 | - |
| 10014 | -# func_opt_split |
| 10015 | -func_opt_split () |
| 10016 | -{ |
| 10017 | - func_opt_split_opt=${1%%=*} |
| 10018 | - func_opt_split_arg=${1#*=} |
| 10019 | -} |
| 10020 | - |
| 10021 | -# func_lo2o object |
| 10022 | -func_lo2o () |
| 10023 | -{ |
| 10024 | - case ${1} in |
| 10025 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 10026 | - *) func_lo2o_result=${1} ;; |
| 10027 | - esac |
| 10028 | -} |
| 10029 | - |
| 10030 | -# func_xform libobj-or-source |
| 10031 | -func_xform () |
| 10032 | -{ |
| 10033 | - func_xform_result=${1%.*}.lo |
| 10034 | -} |
| 10035 | - |
| 10036 | -# func_arith arithmetic-term... |
| 10037 | -func_arith () |
| 10038 | -{ |
| 10039 | - func_arith_result=$(( $* )) |
| 10040 | -} |
| 10041 | - |
| 10042 | -# func_len string |
| 10043 | -# STRING may not start with a hyphen. |
| 10044 | -func_len () |
| 10045 | -{ |
| 10046 | - func_len_result=${#1} |
| 10047 | -} |
| 10048 | - |
| 10049 | -_LT_EOF |
| 10050 | - ;; |
| 10051 | - *) # Bourne compatible functions. |
| 10052 | - cat << \_LT_EOF >> "$cfgfile" |
| 10053 | - |
| 10054 | -# func_dirname file append nondir_replacement |
| 10055 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 10056 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 10057 | -func_dirname () |
| 10058 | -{ |
| 10059 | - # Extract subdirectory from the argument. |
| 10060 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 10061 | - if test "X$func_dirname_result" = "X${1}"; then |
| 10062 | - func_dirname_result="${3}" |
| 10063 | - else |
| 10064 | - func_dirname_result="$func_dirname_result${2}" |
| 10065 | - fi |
| 10066 | -} |
| 10067 | - |
| 10068 | -# func_basename file |
| 10069 | -func_basename () |
| 10070 | -{ |
| 10071 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 10072 | -} |
| 10073 | - |
| 10074 | - |
| 10075 | -# func_stripname prefix suffix name |
| 10076 | -# strip PREFIX and SUFFIX off of NAME. |
| 10077 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 10078 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 10079 | -# dot (in which case that matches only a dot). |
| 10080 | -# func_strip_suffix prefix name |
| 10081 | -func_stripname () |
| 10082 | -{ |
| 10083 | - case ${2} in |
| 10084 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 10085 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 10086 | - esac |
| 10087 | -} |
| 10088 | - |
| 10089 | -# sed scripts: |
| 10090 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 10091 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 10092 | - |
| 10093 | -# func_opt_split |
| 10094 | -func_opt_split () |
| 10095 | -{ |
| 10096 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 10097 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 10098 | -} |
| 10099 | - |
| 10100 | -# func_lo2o object |
| 10101 | -func_lo2o () |
| 10102 | -{ |
| 10103 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 10104 | -} |
| 10105 | - |
| 10106 | -# func_xform libobj-or-source |
| 10107 | -func_xform () |
| 10108 | -{ |
| 10109 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 10110 | -} |
| 10111 | - |
| 10112 | -# func_arith arithmetic-term... |
| 10113 | -func_arith () |
| 10114 | -{ |
| 10115 | - func_arith_result=`expr "$@"` |
| 10116 | -} |
| 10117 | - |
| 10118 | -# func_len string |
| 10119 | -# STRING may not start with a hyphen. |
| 10120 | -func_len () |
| 10121 | -{ |
| 10122 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 10123 | -} |
| 10124 | - |
| 10125 | -_LT_EOF |
| 10126 | -esac |
| 10127 | - |
| 10128 | -case $lt_shell_append in |
| 10129 | - yes) |
| 10130 | - cat << \_LT_EOF >> "$cfgfile" |
| 10131 | - |
| 10132 | -# func_append var value |
| 10133 | -# Append VALUE to the end of shell variable VAR. |
| 10134 | -func_append () |
| 10135 | -{ |
| 10136 | - eval "$1+=\$2" |
| 10137 | -} |
| 10138 | -_LT_EOF |
| 10139 | - ;; |
| 10140 | - *) |
| 10141 | - cat << \_LT_EOF >> "$cfgfile" |
| 10142 | - |
| 10143 | -# func_append var value |
| 10144 | -# Append VALUE to the end of shell variable VAR. |
| 10145 | -func_append () |
| 10146 | -{ |
| 10147 | - eval "$1=\$$1\$2" |
| 10148 | -} |
| 10149 | - |
| 10150 | -_LT_EOF |
| 10151 | - ;; |
| 10152 | - esac |
| 10153 | - |
| 10154 | - |
| 10155 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 10156 | - || (rm -f "$cfgfile"; exit 1) |
| 10157 | - |
| 10158 | - mv -f "$cfgfile" "$ofile" || |
| 10159 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 10160 | + || (rm -f "$cfgfile"; exit 1) |
| 10161 | + |
| 10162 | + if test x"$xsi_shell" = xyes; then |
| 10163 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 10164 | +func_dirname ()\ |
| 10165 | +{\ |
| 10166 | +\ case ${1} in\ |
| 10167 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 10168 | +\ * ) func_dirname_result="${3}" ;;\ |
| 10169 | +\ esac\ |
| 10170 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10171 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10172 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10173 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10174 | + |
| 10175 | + |
| 10176 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 10177 | +func_basename ()\ |
| 10178 | +{\ |
| 10179 | +\ func_basename_result="${1##*/}"\ |
| 10180 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10181 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10182 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10183 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10184 | + |
| 10185 | + |
| 10186 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 10187 | +func_dirname_and_basename ()\ |
| 10188 | +{\ |
| 10189 | +\ case ${1} in\ |
| 10190 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 10191 | +\ * ) func_dirname_result="${3}" ;;\ |
| 10192 | +\ esac\ |
| 10193 | +\ func_basename_result="${1##*/}"\ |
| 10194 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10195 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10196 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10197 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10198 | + |
| 10199 | + |
| 10200 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 10201 | +func_stripname ()\ |
| 10202 | +{\ |
| 10203 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 10204 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 10205 | +\ func_stripname_result=${3}\ |
| 10206 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 10207 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 10208 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10209 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10210 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10211 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10212 | + |
| 10213 | + |
| 10214 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 10215 | +func_split_long_opt ()\ |
| 10216 | +{\ |
| 10217 | +\ func_split_long_opt_name=${1%%=*}\ |
| 10218 | +\ func_split_long_opt_arg=${1#*=}\ |
| 10219 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10220 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10221 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10222 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10223 | + |
| 10224 | + |
| 10225 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 10226 | +func_split_short_opt ()\ |
| 10227 | +{\ |
| 10228 | +\ func_split_short_opt_arg=${1#??}\ |
| 10229 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 10230 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10231 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10232 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10233 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10234 | + |
| 10235 | + |
| 10236 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 10237 | +func_lo2o ()\ |
| 10238 | +{\ |
| 10239 | +\ case ${1} in\ |
| 10240 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 10241 | +\ *) func_lo2o_result=${1} ;;\ |
| 10242 | +\ esac\ |
| 10243 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10244 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10245 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10246 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10247 | + |
| 10248 | + |
| 10249 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 10250 | +func_xform ()\ |
| 10251 | +{\ |
| 10252 | + func_xform_result=${1%.*}.lo\ |
| 10253 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10254 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10255 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10256 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10257 | + |
| 10258 | + |
| 10259 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 10260 | +func_arith ()\ |
| 10261 | +{\ |
| 10262 | + func_arith_result=$(( $* ))\ |
| 10263 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10264 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10265 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10266 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10267 | + |
| 10268 | + |
| 10269 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 10270 | +func_len ()\ |
| 10271 | +{\ |
| 10272 | + func_len_result=${#1}\ |
| 10273 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10274 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10275 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10276 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10277 | + |
| 10278 | +fi |
| 10279 | + |
| 10280 | +if test x"$lt_shell_append" = xyes; then |
| 10281 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 10282 | +func_append ()\ |
| 10283 | +{\ |
| 10284 | + eval "${1}+=\\${2}"\ |
| 10285 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10286 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10287 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10288 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10289 | + |
| 10290 | + |
| 10291 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 10292 | +func_append_quoted ()\ |
| 10293 | +{\ |
| 10294 | +\ func_quote_for_eval "${2}"\ |
| 10295 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 10296 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 10297 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10298 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10299 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 10300 | + |
| 10301 | + |
| 10302 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 10303 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 10304 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10305 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10306 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 10307 | +else |
| 10308 | + # Save a `func_append' function call even when '+=' is not available |
| 10309 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 10310 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 10311 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 10312 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 10313 | +fi |
| 10314 | + |
| 10315 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 10316 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 10317 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 10318 | +fi |
| 10319 | + |
| 10320 | + |
| 10321 | + mv -f "$cfgfile" "$ofile" || |
| 10322 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 10323 | chmod +x "$ofile" |
| 10324 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 10325 | @@ -19692,12 +20537,12 @@ with_gcc=$GCC_CXX |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 10326 | # Compiler flag to turn off builtin functions. |
| 10327 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX |
| 10328 | |
| 10329 | -# How to pass a linker flag through the compiler. |
| 10330 | -wl=$lt_lt_prog_compiler_wl_CXX |
| 10331 | - |
| 10332 | # Additional compiler flags for building library objects. |
| 10333 | pic_flag=$lt_lt_prog_compiler_pic_CXX |
| 10334 | |
| 10335 | +# How to pass a linker flag through the compiler. |
| 10336 | +wl=$lt_lt_prog_compiler_wl_CXX |
| 10337 | + |
| 10338 | # Compiler flag to prevent dynamic linking. |
| 10339 | link_static_flag=$lt_lt_prog_compiler_static_CXX |
| 10340 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 10341 | @@ -19784,9 +20629,6 @@ inherit_rpath=$inherit_rpath_CXX |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 10342 | # Whether libtool must link a program against all its dependency libraries. |
| 10343 | link_all_deplibs=$link_all_deplibs_CXX |
| 10344 | |
| 10345 | -# Fix the shell variable \$srcfile for the compiler. |
| 10346 | -fix_srcfile_path=$lt_fix_srcfile_path_CXX |
| 10347 | - |
| 10348 | # Set to "yes" if exported symbols are required. |
| 10349 | always_export_symbols=$always_export_symbols_CXX |
| 10350 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 10351 | @@ -19802,6 +20644,9 @@ include_expsyms=$lt_include_expsyms_CXX |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 10352 | # Commands necessary for linking programs (against libraries) with templates. |
| 10353 | prelink_cmds=$lt_prelink_cmds_CXX |
| 10354 | |
| 10355 | +# Commands necessary for finishing linking programs. |
| 10356 | +postlink_cmds=$lt_postlink_cmds_CXX |
| 10357 | + |
| 10358 | # Specify filename containing input files. |
| 10359 | file_list_spec=$lt_file_list_spec_CXX |
| 10360 | |
| 10361 | diff --git a/libtool.m4 b/libtool.m4 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 10362 | index 4b2d30a..008d331 100644 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 10363 | --- a/libtool.m4 |
| 10364 | +++ b/libtool.m4 |
| 10365 | @@ -1,7 +1,8 @@ |
| 10366 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
| 10367 | # |
| 10368 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 10369 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 10370 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 10371 | +# Inc. |
| 10372 | # Written by Gordon Matzigkeit, 1996 |
| 10373 | # |
| 10374 | # This file is free software; the Free Software Foundation gives |
| 10375 | @@ -10,7 +11,8 @@ |
| 10376 | |
| 10377 | m4_define([_LT_COPYING], [dnl |
| 10378 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 10379 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 10380 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 10381 | +# Inc. |
| 10382 | # Written by Gordon Matzigkeit, 1996 |
| 10383 | # |
| 10384 | # This file is part of GNU Libtool. |
| 10385 | @@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl |
| 10386 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
| 10387 | ]) |
| 10388 | |
| 10389 | -# serial 56 LT_INIT |
| 10390 | +# serial 57 LT_INIT |
| 10391 | |
| 10392 | |
| 10393 | # LT_PREREQ(VERSION) |
| 10394 | @@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) |
| 10395 | LIBTOOL_DEPS="$ltmain" |
| 10396 | |
| 10397 | # Always use our own libtool. |
| 10398 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
| 10399 | +LIBTOOL='$(SHELL) $(top_builddir)' |
| 10400 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" |
| 10401 | AC_SUBST(LIBTOOL)dnl |
| 10402 | |
| 10403 | _LT_SETUP |
| 10404 | @@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl |
| 10405 | dnl |
| 10406 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
| 10407 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
| 10408 | +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl |
| 10409 | m4_require([_LT_CMD_RELOAD])dnl |
| 10410 | m4_require([_LT_CHECK_MAGIC_METHOD])dnl |
| 10411 | +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl |
| 10412 | m4_require([_LT_CMD_OLD_ARCHIVE])dnl |
| 10413 | m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl |
| 10414 | +m4_require([_LT_WITH_SYSROOT])dnl |
| 10415 | |
| 10416 | _LT_CONFIG_LIBTOOL_INIT([ |
| 10417 | # See if we are running on zsh, and set the options which allow our |
| 10418 | @@ -199,7 +205,7 @@ aix3*) |
| 10419 | esac |
| 10420 | |
| 10421 | # Global variables: |
| 10422 | -ofile=libtool |
| 10423 | +ofile=${host_alias}-libtool |
| 10424 | can_build_shared=yes |
| 10425 | |
| 10426 | # All known linkers require a `.a' archive for static linking (except MSVC, |
| 10427 | @@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl |
| 10428 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
| 10429 | configured by $[0], generated by m4_PACKAGE_STRING. |
| 10430 | |
| 10431 | -Copyright (C) 2009 Free Software Foundation, Inc. |
| 10432 | +Copyright (C) 2010 Free Software Foundation, Inc. |
| 10433 | This config.lt script is free software; the Free Software Foundation |
| 10434 | gives unlimited permision to copy, distribute and modify it." |
| 10435 | |
| 10436 | @@ -746,15 +752,12 @@ _LT_EOF |
| 10437 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 10438 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 10439 | # is reportedly fixed, but why not run on old versions too? |
| 10440 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 10441 | - || (rm -f "$cfgfile"; exit 1) |
| 10442 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 10443 | + || (rm -f "$cfgfile"; exit 1) |
| 10444 | |
| 10445 | - _LT_PROG_XSI_SHELLFNS |
| 10446 | + _LT_PROG_REPLACE_SHELLFNS |
| 10447 | |
| 10448 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 10449 | - || (rm -f "$cfgfile"; exit 1) |
| 10450 | - |
| 10451 | - mv -f "$cfgfile" "$ofile" || |
| 10452 | + mv -f "$cfgfile" "$ofile" || |
| 10453 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 10454 | chmod +x "$ofile" |
| 10455 | ], |
| 10456 | @@ -980,6 +983,8 @@ _LT_EOF |
| 10457 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD |
| 10458 | echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD |
| 10459 | $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD |
| 10460 | + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD |
| 10461 | + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD |
| 10462 | cat > conftest.c << _LT_EOF |
| 10463 | int main() { return 0;} |
| 10464 | _LT_EOF |
| 10465 | @@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], |
| 10466 | fi |
| 10467 | ]) |
| 10468 | |
| 10469 | -# _LT_SYS_MODULE_PATH_AIX |
| 10470 | -# ----------------------- |
| 10471 | +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) |
| 10472 | +# ---------------------------------- |
| 10473 | # Links a minimal program and checks the executable |
| 10474 | # for the system default hardcoded library path. In most cases, |
| 10475 | # this is /usr/lib:/lib, but when the MPI compilers are used |
| 10476 | # the location of the communication and MPI libs are included too. |
| 10477 | # If we don't find anything, use the default library path according |
| 10478 | # to the aix ld manual. |
| 10479 | +# Store the results from the different compilers for each TAGNAME. |
| 10480 | +# Allow to override them for all tags through lt_cv_aix_libpath. |
| 10481 | m4_defun([_LT_SYS_MODULE_PATH_AIX], |
| 10482 | [m4_require([_LT_DECL_SED])dnl |
| 10483 | -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ |
| 10484 | -lt_aix_libpath_sed=' |
| 10485 | - /Import File Strings/,/^$/ { |
| 10486 | - /^0/ { |
| 10487 | - s/^0 *\(.*\)$/\1/ |
| 10488 | - p |
| 10489 | - } |
| 10490 | - }' |
| 10491 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 10492 | -# Check for a 64-bit object if we didn't find anything. |
| 10493 | -if test -z "$aix_libpath"; then |
| 10494 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 10495 | -fi],[]) |
| 10496 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 10497 | +if test "${lt_cv_aix_libpath+set}" = set; then |
| 10498 | + aix_libpath=$lt_cv_aix_libpath |
| 10499 | +else |
| 10500 | + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], |
| 10501 | + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ |
| 10502 | + lt_aix_libpath_sed='[ |
| 10503 | + /Import File Strings/,/^$/ { |
| 10504 | + /^0/ { |
| 10505 | + s/^0 *\([^ ]*\) *$/\1/ |
| 10506 | + p |
| 10507 | + } |
| 10508 | + }]' |
| 10509 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 10510 | + # Check for a 64-bit object if we didn't find anything. |
| 10511 | + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then |
| 10512 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 10513 | + fi],[]) |
| 10514 | + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then |
| 10515 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" |
| 10516 | + fi |
| 10517 | + ]) |
| 10518 | + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) |
| 10519 | +fi |
| 10520 | ])# _LT_SYS_MODULE_PATH_AIX |
| 10521 | |
| 10522 | |
| 10523 | @@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 10524 | |
| 10525 | AC_MSG_CHECKING([how to print strings]) |
| 10526 | # Test print first, because it will be a builtin if present. |
| 10527 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 10528 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 10529 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 10530 | ECHO='print -r --' |
| 10531 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 10532 | @@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) |
| 10533 | ])# _LT_PROG_ECHO_BACKSLASH |
| 10534 | |
| 10535 | |
| 10536 | +# _LT_WITH_SYSROOT |
| 10537 | +# ---------------- |
| 10538 | +AC_DEFUN([_LT_WITH_SYSROOT], |
| 10539 | +[AC_MSG_CHECKING([for sysroot]) |
| 10540 | +AC_ARG_WITH([libtool-sysroot], |
| 10541 | +[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR |
| 10542 | + (or the compiler's sysroot if not specified).], |
| 10543 | +[], [with_libtool_sysroot=no]) |
| 10544 | + |
| 10545 | +dnl lt_sysroot will always be passed unquoted. We quote it here |
| 10546 | +dnl in case the user passed a directory name. |
| 10547 | +lt_sysroot= |
| 10548 | +case ${with_libtool_sysroot} in #( |
| 10549 | + yes) |
| 10550 | + if test "$GCC" = yes; then |
| 10551 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 10552 | + fi |
| 10553 | + ;; #( |
| 10554 | + /*) |
| 10555 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 10556 | + ;; #( |
| 10557 | + no|'') |
| 10558 | + ;; #( |
| 10559 | + *) |
| 10560 | + AC_MSG_RESULT([${with_libtool_sysroot}]) |
| 10561 | + AC_MSG_ERROR([The sysroot must be an absolute path.]) |
| 10562 | + ;; |
| 10563 | +esac |
| 10564 | + |
| 10565 | + AC_MSG_RESULT([${lt_sysroot:-no}]) |
| 10566 | +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl |
| 10567 | +[dependent libraries, and in which our libraries should be installed.])]) |
| 10568 | + |
| 10569 | # _LT_ENABLE_LOCK |
| 10570 | # --------------- |
| 10571 | m4_defun([_LT_ENABLE_LOCK], |
| 10572 | @@ -1320,14 +1369,47 @@ need_locks="$enable_libtool_lock" |
| 10573 | ])# _LT_ENABLE_LOCK |
| 10574 | |
| 10575 | |
| 10576 | +# _LT_PROG_AR |
| 10577 | +# ----------- |
| 10578 | +m4_defun([_LT_PROG_AR], |
| 10579 | +[AC_CHECK_TOOLS(AR, [ar], false) |
| 10580 | +: ${AR=ar} |
| 10581 | +: ${AR_FLAGS=cru} |
| 10582 | +_LT_DECL([], [AR], [1], [The archiver]) |
| 10583 | +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) |
| 10584 | + |
| 10585 | +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], |
| 10586 | + [lt_cv_ar_at_file=no |
| 10587 | + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], |
| 10588 | + [echo conftest.$ac_objext > conftest.lst |
| 10589 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' |
| 10590 | + AC_TRY_EVAL([lt_ar_try]) |
| 10591 | + if test "$ac_status" -eq 0; then |
| 10592 | + # Ensure the archiver fails upon bogus file names. |
| 10593 | + rm -f conftest.$ac_objext libconftest.a |
| 10594 | + AC_TRY_EVAL([lt_ar_try]) |
| 10595 | + if test "$ac_status" -ne 0; then |
| 10596 | + lt_cv_ar_at_file=@ |
| 10597 | + fi |
| 10598 | + fi |
| 10599 | + rm -f conftest.* libconftest.a |
| 10600 | + ]) |
| 10601 | + ]) |
| 10602 | + |
| 10603 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 10604 | + archiver_list_spec= |
| 10605 | +else |
| 10606 | + archiver_list_spec=$lt_cv_ar_at_file |
| 10607 | +fi |
| 10608 | +_LT_DECL([], [archiver_list_spec], [1], |
| 10609 | + [How to feed a file listing to the archiver]) |
| 10610 | +])# _LT_PROG_AR |
| 10611 | + |
| 10612 | + |
| 10613 | # _LT_CMD_OLD_ARCHIVE |
| 10614 | # ------------------- |
| 10615 | m4_defun([_LT_CMD_OLD_ARCHIVE], |
| 10616 | -[AC_CHECK_TOOL(AR, ar, false) |
| 10617 | -test -z "$AR" && AR=ar |
| 10618 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 10619 | -_LT_DECL([], [AR], [1], [The archiver]) |
| 10620 | -_LT_DECL([], [AR_FLAGS], [1]) |
| 10621 | +[_LT_PROG_AR |
| 10622 | |
| 10623 | AC_CHECK_TOOL(STRIP, strip, :) |
| 10624 | test -z "$STRIP" && STRIP=: |
| 10625 | @@ -1623,7 +1705,7 @@ else |
| 10626 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 10627 | lt_status=$lt_dlunknown |
| 10628 | cat > conftest.$ac_ext <<_LT_EOF |
| 10629 | -[#line __oline__ "configure" |
| 10630 | +[#line $LINENO "configure" |
| 10631 | #include "confdefs.h" |
| 10632 | |
| 10633 | #if HAVE_DLFCN_H |
| 10634 | @@ -1667,10 +1749,10 @@ else |
| 10635 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 10636 | correspondingly for the symbols needed. */ |
| 10637 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 10638 | -void fnord () __attribute__((visibility("default"))); |
| 10639 | +int fnord () __attribute__((visibility("default"))); |
| 10640 | #endif |
| 10641 | |
| 10642 | -void fnord () { int i=42; } |
| 10643 | +int fnord () { return 42; } |
| 10644 | int main () |
| 10645 | { |
| 10646 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 10647 | @@ -2210,8 +2292,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 10648 | need_version=no |
| 10649 | need_lib_prefix=no |
| 10650 | |
| 10651 | - case $GCC,$host_os in |
| 10652 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 10653 | + case $GCC,$cc_basename in |
| 10654 | + yes,*) |
| 10655 | + # gcc |
| 10656 | library_names_spec='$libname.dll.a' |
| 10657 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 10658 | postinstall_cmds='base_file=`basename \${file}`~ |
| 10659 | @@ -2244,13 +2327,71 @@ m4_if([$1], [],[ |
| 10660 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
| 10661 | ;; |
| 10662 | esac |
| 10663 | + dynamic_linker='Win32 ld.exe' |
| 10664 | + ;; |
| 10665 | + |
| 10666 | + *,cl*) |
| 10667 | + # Native MSVC |
| 10668 | + libname_spec='$name' |
| 10669 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
| 10670 | + library_names_spec='${libname}.dll.lib' |
| 10671 | + |
| 10672 | + case $build_os in |
| 10673 | + mingw*) |
| 10674 | + sys_lib_search_path_spec= |
| 10675 | + lt_save_ifs=$IFS |
| 10676 | + IFS=';' |
| 10677 | + for lt_path in $LIB |
| 10678 | + do |
| 10679 | + IFS=$lt_save_ifs |
| 10680 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 10681 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 10682 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 10683 | + done |
| 10684 | + IFS=$lt_save_ifs |
| 10685 | + # Convert to MSYS style. |
| 10686 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` |
| 10687 | + ;; |
| 10688 | + cygwin*) |
| 10689 | + # Convert to unix form, then to dos form, then back to unix form |
| 10690 | + # but this time dos style (no spaces!) so that the unix form looks |
| 10691 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 10692 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 10693 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 10694 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 10695 | + ;; |
| 10696 | + *) |
| 10697 | + sys_lib_search_path_spec="$LIB" |
| 10698 | + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then |
| 10699 | + # It is most probably a Windows format PATH. |
| 10700 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 10701 | + else |
| 10702 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 10703 | + fi |
| 10704 | + # FIXME: find the short name or the path components, as spaces are |
| 10705 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 10706 | + ;; |
| 10707 | + esac |
| 10708 | + |
| 10709 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 10710 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 10711 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 10712 | + dldir=$destdir/`dirname \$dlpath`~ |
| 10713 | + test -d \$dldir || mkdir -p \$dldir~ |
| 10714 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 10715 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 10716 | + dlpath=$dir/\$dldll~ |
| 10717 | + $RM \$dlpath' |
| 10718 | + shlibpath_overrides_runpath=yes |
| 10719 | + dynamic_linker='Win32 link.exe' |
| 10720 | ;; |
| 10721 | |
| 10722 | *) |
| 10723 | + # Assume MSVC wrapper |
| 10724 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 10725 | + dynamic_linker='Win32 ld.exe' |
| 10726 | ;; |
| 10727 | esac |
| 10728 | - dynamic_linker='Win32 ld.exe' |
| 10729 | # FIXME: first we should search . and the directory the executable is in |
| 10730 | shlibpath_var=PATH |
| 10731 | ;; |
| 10732 | @@ -2342,7 +2483,7 @@ haiku*) |
| 10733 | soname_spec='${libname}${release}${shared_ext}$major' |
| 10734 | shlibpath_var=LIBRARY_PATH |
| 10735 | shlibpath_overrides_runpath=yes |
| 10736 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' |
| 10737 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
| 10738 | hardcode_into_libs=yes |
| 10739 | ;; |
| 10740 | |
| 10741 | @@ -2950,6 +3091,11 @@ case $reload_flag in |
| 10742 | esac |
| 10743 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 10744 | case $host_os in |
| 10745 | + cygwin* | mingw* | pw32* | cegcc*) |
| 10746 | + if test "$GCC" != yes; then |
| 10747 | + reload_cmds=false |
| 10748 | + fi |
| 10749 | + ;; |
| 10750 | darwin*) |
| 10751 | if test "$GCC" = yes; then |
| 10752 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 10753 | @@ -3016,7 +3162,8 @@ mingw* | pw32*) |
| 10754 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 10755 | lt_cv_file_magic_cmd='func_win32_libid' |
| 10756 | else |
| 10757 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 10758 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 10759 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 10760 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 10761 | fi |
| 10762 | ;; |
| 10763 | @@ -3167,6 +3314,21 @@ tpf*) |
| 10764 | ;; |
| 10765 | esac |
| 10766 | ]) |
| 10767 | + |
| 10768 | +file_magic_glob= |
| 10769 | +want_nocaseglob=no |
| 10770 | +if test "$build" = "$host"; then |
| 10771 | + case $host_os in |
| 10772 | + mingw* | pw32*) |
| 10773 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 10774 | + want_nocaseglob=yes |
| 10775 | + else |
| 10776 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` |
| 10777 | + fi |
| 10778 | + ;; |
| 10779 | + esac |
| 10780 | +fi |
| 10781 | + |
| 10782 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 10783 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 10784 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 10785 | @@ -3174,7 +3336,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 10786 | _LT_DECL([], [deplibs_check_method], [1], |
| 10787 | [Method to check whether dependent libraries are shared objects]) |
| 10788 | _LT_DECL([], [file_magic_cmd], [1], |
| 10789 | - [Command to use when deplibs_check_method == "file_magic"]) |
| 10790 | + [Command to use when deplibs_check_method = "file_magic"]) |
| 10791 | +_LT_DECL([], [file_magic_glob], [1], |
| 10792 | + [How to find potential files when deplibs_check_method = "file_magic"]) |
| 10793 | +_LT_DECL([], [want_nocaseglob], [1], |
| 10794 | + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) |
| 10795 | ])# _LT_CHECK_MAGIC_METHOD |
| 10796 | |
| 10797 | |
| 10798 | @@ -3277,6 +3443,67 @@ dnl aclocal-1.4 backwards compatibility: |
| 10799 | dnl AC_DEFUN([AM_PROG_NM], []) |
| 10800 | dnl AC_DEFUN([AC_PROG_NM], []) |
| 10801 | |
| 10802 | +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB |
| 10803 | +# -------------------------------- |
| 10804 | +# how to determine the name of the shared library |
| 10805 | +# associated with a specific link library. |
| 10806 | +# -- PORTME fill in with the dynamic library characteristics |
| 10807 | +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], |
| 10808 | +[m4_require([_LT_DECL_EGREP]) |
| 10809 | +m4_require([_LT_DECL_OBJDUMP]) |
| 10810 | +m4_require([_LT_DECL_DLLTOOL]) |
| 10811 | +AC_CACHE_CHECK([how to associate runtime and link libraries], |
| 10812 | +lt_cv_sharedlib_from_linklib_cmd, |
| 10813 | +[lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 10814 | + |
| 10815 | +case $host_os in |
| 10816 | +cygwin* | mingw* | pw32* | cegcc*) |
| 10817 | + # two different shell functions defined in ltmain.sh |
| 10818 | + # decide which to use based on capabilities of $DLLTOOL |
| 10819 | + case `$DLLTOOL --help 2>&1` in |
| 10820 | + *--identify-strict*) |
| 10821 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 10822 | + ;; |
| 10823 | + *) |
| 10824 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 10825 | + ;; |
| 10826 | + esac |
| 10827 | + ;; |
| 10828 | +*) |
| 10829 | + # fallback: assume linklib IS sharedlib |
| 10830 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 10831 | + ;; |
| 10832 | +esac |
| 10833 | +]) |
| 10834 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 10835 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 10836 | + |
| 10837 | +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], |
| 10838 | + [Command to associate shared and link libraries]) |
| 10839 | +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB |
| 10840 | + |
| 10841 | + |
| 10842 | +# _LT_PATH_MANIFEST_TOOL |
| 10843 | +# ---------------------- |
| 10844 | +# locate the manifest tool |
| 10845 | +m4_defun([_LT_PATH_MANIFEST_TOOL], |
| 10846 | +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) |
| 10847 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 10848 | +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], |
| 10849 | + [lt_cv_path_mainfest_tool=no |
| 10850 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD |
| 10851 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 10852 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
| 10853 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 10854 | + lt_cv_path_mainfest_tool=yes |
| 10855 | + fi |
| 10856 | + rm -f conftest*]) |
| 10857 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 10858 | + MANIFEST_TOOL=: |
| 10859 | +fi |
| 10860 | +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl |
| 10861 | +])# _LT_PATH_MANIFEST_TOOL |
| 10862 | + |
| 10863 | |
| 10864 | # LT_LIB_M |
| 10865 | # -------- |
| 10866 | @@ -3403,8 +3630,8 @@ esac |
| 10867 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 10868 | |
| 10869 | # Transform an extracted symbol line into symbol name and symbol address |
| 10870 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 10871 | -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'" |
| 10872 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 10873 | +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'" |
| 10874 | |
| 10875 | # Handle CRLF in mingw tool chain |
| 10876 | opt_cr= |
| 10877 | @@ -3440,6 +3667,7 @@ for ac_symprfx in "" "_"; do |
| 10878 | else |
| 10879 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 10880 | fi |
| 10881 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 10882 | |
| 10883 | # Check to see that the pipe works correctly. |
| 10884 | pipe_works=no |
| 10885 | @@ -3473,6 +3701,18 @@ _LT_EOF |
| 10886 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 10887 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 10888 | cat <<_LT_EOF > conftest.$ac_ext |
| 10889 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 10890 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 10891 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 10892 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 10893 | +# define LT@&t@_DLSYM_CONST |
| 10894 | +#elif defined(__osf__) |
| 10895 | +/* This system does not cope well with relocations in const data. */ |
| 10896 | +# define LT@&t@_DLSYM_CONST |
| 10897 | +#else |
| 10898 | +# define LT@&t@_DLSYM_CONST const |
| 10899 | +#endif |
| 10900 | + |
| 10901 | #ifdef __cplusplus |
| 10902 | extern "C" { |
| 10903 | #endif |
| 10904 | @@ -3484,7 +3724,7 @@ _LT_EOF |
| 10905 | cat <<_LT_EOF >> conftest.$ac_ext |
| 10906 | |
| 10907 | /* The mapping between symbol names and symbols. */ |
| 10908 | -const struct { |
| 10909 | +LT@&t@_DLSYM_CONST struct { |
| 10910 | const char *name; |
| 10911 | void *address; |
| 10912 | } |
| 10913 | @@ -3510,15 +3750,15 @@ static const void *lt_preloaded_setup() { |
| 10914 | _LT_EOF |
| 10915 | # Now try linking the two files. |
| 10916 | mv conftest.$ac_objext conftstm.$ac_objext |
| 10917 | - lt_save_LIBS="$LIBS" |
| 10918 | - lt_save_CFLAGS="$CFLAGS" |
| 10919 | + lt_globsym_save_LIBS=$LIBS |
| 10920 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 10921 | LIBS="conftstm.$ac_objext" |
| 10922 | CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" |
| 10923 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then |
| 10924 | pipe_works=yes |
| 10925 | fi |
| 10926 | - LIBS="$lt_save_LIBS" |
| 10927 | - CFLAGS="$lt_save_CFLAGS" |
| 10928 | + LIBS=$lt_globsym_save_LIBS |
| 10929 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 10930 | else |
| 10931 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD |
| 10932 | fi |
| 10933 | @@ -3551,6 +3791,13 @@ else |
| 10934 | AC_MSG_RESULT(ok) |
| 10935 | fi |
| 10936 | |
| 10937 | +# Response file support. |
| 10938 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 10939 | + nm_file_list_spec='@' |
| 10940 | +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then |
| 10941 | + nm_file_list_spec='@' |
| 10942 | +fi |
| 10943 | + |
| 10944 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], |
| 10945 | [Take the output of nm and produce a listing of raw symbols and C names]) |
| 10946 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], |
| 10947 | @@ -3561,6 +3808,8 @@ _LT_DECL([global_symbol_to_c_name_address], |
| 10948 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], |
| 10949 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], |
| 10950 | [Transform the output of nm in a C name address pair when lib prefix is needed]) |
| 10951 | +_LT_DECL([], [nm_file_list_spec], [1], |
| 10952 | + [Specify filename containing input files for $NM]) |
| 10953 | ]) # _LT_CMD_GLOBAL_SYMBOLS |
| 10954 | |
| 10955 | |
| 10956 | @@ -3572,7 +3821,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= |
| 10957 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
| 10958 | _LT_TAGVAR(lt_prog_compiler_static, $1)= |
| 10959 | |
| 10960 | -AC_MSG_CHECKING([for $compiler option to produce PIC]) |
| 10961 | m4_if([$1], [CXX], [ |
| 10962 | # C++ specific cases for pic, static, wl, etc. |
| 10963 | if test "$GXX" = yes; then |
| 10964 | @@ -3678,6 +3926,12 @@ m4_if([$1], [CXX], [ |
| 10965 | ;; |
| 10966 | esac |
| 10967 | ;; |
| 10968 | + mingw* | cygwin* | os2* | pw32* | cegcc*) |
| 10969 | + # This hack is so that the source file can tell whether it is being |
| 10970 | + # built for inclusion in a dll (and should export symbols for example). |
| 10971 | + m4_if([$1], [GCJ], [], |
| 10972 | + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) |
| 10973 | + ;; |
| 10974 | dgux*) |
| 10975 | case $cc_basename in |
| 10976 | ec++*) |
| 10977 | @@ -3830,7 +4084,7 @@ m4_if([$1], [CXX], [ |
| 10978 | ;; |
| 10979 | solaris*) |
| 10980 | case $cc_basename in |
| 10981 | - CC*) |
| 10982 | + CC* | sunCC*) |
| 10983 | # Sun C++ 4.2, 5.x and Centerline C++ |
| 10984 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
| 10985 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
| 10986 | @@ -4053,6 +4307,12 @@ m4_if([$1], [CXX], [ |
| 10987 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' |
| 10988 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' |
| 10989 | ;; |
| 10990 | + nagfor*) |
| 10991 | + # NAG Fortran compiler |
| 10992 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' |
| 10993 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' |
| 10994 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
| 10995 | + ;; |
| 10996 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 10997 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 10998 | # which looks to be a dead project) |
| 10999 | @@ -4115,7 +4375,7 @@ m4_if([$1], [CXX], [ |
| 11000 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
| 11001 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
| 11002 | case $cc_basename in |
| 11003 | - f77* | f90* | f95*) |
| 11004 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 11005 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; |
| 11006 | *) |
| 11007 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; |
| 11008 | @@ -4172,9 +4432,11 @@ case $host_os in |
| 11009 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" |
| 11010 | ;; |
| 11011 | esac |
| 11012 | -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) |
| 11013 | -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], |
| 11014 | - [How to pass a linker flag through the compiler]) |
| 11015 | + |
| 11016 | +AC_CACHE_CHECK([for $compiler option to produce PIC], |
| 11017 | + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], |
| 11018 | + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) |
| 11019 | +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) |
| 11020 | |
| 11021 | # |
| 11022 | # Check to make sure the PIC flag actually works. |
| 11023 | @@ -4193,6 +4455,8 @@ fi |
| 11024 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], |
| 11025 | [Additional compiler flags for building library objects]) |
| 11026 | |
| 11027 | +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], |
| 11028 | + [How to pass a linker flag through the compiler]) |
| 11029 | # |
| 11030 | # Check to make sure the static flag actually works. |
| 11031 | # |
| 11032 | @@ -4213,6 +4477,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], |
| 11033 | m4_defun([_LT_LINKER_SHLIBS], |
| 11034 | [AC_REQUIRE([LT_PATH_LD])dnl |
| 11035 | AC_REQUIRE([LT_PATH_NM])dnl |
| 11036 | +m4_require([_LT_PATH_MANIFEST_TOOL])dnl |
| 11037 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
| 11038 | m4_require([_LT_DECL_EGREP])dnl |
| 11039 | m4_require([_LT_DECL_SED])dnl |
| 11040 | @@ -4221,6 +4486,7 @@ m4_require([_LT_TAG_COMPILER])dnl |
| 11041 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) |
| 11042 | m4_if([$1], [CXX], [ |
| 11043 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
| 11044 | + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] |
| 11045 | case $host_os in |
| 11046 | aix[[4-9]]*) |
| 11047 | # If we're using GNU nm, then we don't want the "-C" option. |
| 11048 | @@ -4235,15 +4501,20 @@ m4_if([$1], [CXX], [ |
| 11049 | ;; |
| 11050 | pw32*) |
| 11051 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" |
| 11052 | - ;; |
| 11053 | + ;; |
| 11054 | cygwin* | mingw* | cegcc*) |
| 11055 | - _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' |
| 11056 | - ;; |
| 11057 | + case $cc_basename in |
| 11058 | + cl*) ;; |
| 11059 | + *) |
| 11060 | + _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' |
| 11061 | + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
| 11062 | + ;; |
| 11063 | + esac |
| 11064 | + ;; |
| 11065 | *) |
| 11066 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
| 11067 | - ;; |
| 11068 | + ;; |
| 11069 | esac |
| 11070 | - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] |
| 11071 | ], [ |
| 11072 | runpath_var= |
| 11073 | _LT_TAGVAR(allow_undefined_flag, $1)= |
| 11074 | @@ -4411,7 +4682,8 @@ _LT_EOF |
| 11075 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 11076 | _LT_TAGVAR(always_export_symbols, $1)=no |
| 11077 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 11078 | - _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' |
| 11079 | + _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' |
| 11080 | + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
| 11081 | |
| 11082 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 11083 | _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' |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 11084 | @@ -4510,12 +4782,12 @@ _LT_EOF |
| 11085 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
| 11086 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
| 11087 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' |
| 11088 | - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 11089 | + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 11090 | if test "x$supports_anon_versioning" = xyes; then |
| 11091 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ |
| 11092 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 11093 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 11094 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 11095 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 11096 | fi |
| 11097 | ;; |
| 11098 | esac |
| 11099 | @@ -4529,8 +4801,8 @@ _LT_EOF |
| 11100 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 11101 | wlarc= |
| 11102 | else |
| 11103 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 11104 | - _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' |
| 11105 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 11106 | + _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' |
| 11107 | fi |
| 11108 | ;; |
| 11109 | |
| 11110 | @@ -4548,8 +4820,8 @@ _LT_EOF |
| 11111 | |
| 11112 | _LT_EOF |
| 11113 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 11114 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 11115 | - _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' |
| 11116 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 11117 | + _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' |
| 11118 | else |
| 11119 | _LT_TAGVAR(ld_shlibs, $1)=no |
| 11120 | fi |
| 11121 | @@ -4595,8 +4867,8 @@ _LT_EOF |
| 11122 | |
| 11123 | *) |
| 11124 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 11125 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 11126 | - _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' |
| 11127 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 11128 | + _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' |
| 11129 | else |
| 11130 | _LT_TAGVAR(ld_shlibs, $1)=no |
| 11131 | fi |
| 11132 | @@ -4726,7 +4998,7 @@ _LT_EOF |
| 11133 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
| 11134 | # Determine the default libpath from the value encoded in an |
| 11135 | # empty executable. |
| 11136 | - _LT_SYS_MODULE_PATH_AIX |
| 11137 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
| 11138 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 11139 | _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" |
| 11140 | else |
| 11141 | @@ -4737,7 +5009,7 @@ _LT_EOF |
| 11142 | else |
| 11143 | # Determine the default libpath from the value encoded in an |
| 11144 | # empty executable. |
| 11145 | - _LT_SYS_MODULE_PATH_AIX |
| 11146 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
| 11147 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 11148 | # Warning - without using the other run time loading flags, |
| 11149 | # -berok will link without error, but may produce a broken library. |
| 11150 | @@ -4781,20 +5053,63 @@ _LT_EOF |
| 11151 | # Microsoft Visual C++. |
| 11152 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 11153 | # no search path for DLLs. |
| 11154 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
| 11155 | - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 11156 | - # Tell ltmain to make .lib files, not .a files. |
| 11157 | - libext=lib |
| 11158 | - # Tell ltmain to make .dll files, not .so files. |
| 11159 | - shrext_cmds=".dll" |
| 11160 | - # FIXME: Setting linknames here is a bad hack. |
| 11161 | - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 11162 | - # The linker will automatically build a .lib file if we build a DLL. |
| 11163 | - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
| 11164 | - # FIXME: Should let the user specify the lib program. |
| 11165 | - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 11166 | - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' |
| 11167 | - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 11168 | + case $cc_basename in |
| 11169 | + cl*) |
| 11170 | + # Native MSVC |
| 11171 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
| 11172 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 11173 | + _LT_TAGVAR(always_export_symbols, $1)=yes |
| 11174 | + _LT_TAGVAR(file_list_spec, $1)='@' |
| 11175 | + # Tell ltmain to make .lib files, not .a files. |
| 11176 | + libext=lib |
| 11177 | + # Tell ltmain to make .dll files, not .so files. |
| 11178 | + shrext_cmds=".dll" |
| 11179 | + # FIXME: Setting linknames here is a bad hack. |
| 11180 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 11181 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 11182 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 11183 | + else |
| 11184 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 11185 | + fi~ |
| 11186 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 11187 | + linknames=' |
| 11188 | + # The linker will not automatically build a static lib if we build a DLL. |
| 11189 | + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
| 11190 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 11191 | + _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' |
| 11192 | + # Don't use ranlib |
| 11193 | + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
| 11194 | + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ |
| 11195 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 11196 | + case $lt_outputfile in |
| 11197 | + *.exe|*.EXE) ;; |
| 11198 | + *) |
| 11199 | + lt_outputfile="$lt_outputfile.exe" |
| 11200 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 11201 | + ;; |
| 11202 | + esac~ |
| 11203 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 11204 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 11205 | + $RM "$lt_outputfile.manifest"; |
| 11206 | + fi' |
| 11207 | + ;; |
| 11208 | + *) |
| 11209 | + # Assume MSVC wrapper |
| 11210 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
| 11211 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 11212 | + # Tell ltmain to make .lib files, not .a files. |
| 11213 | + libext=lib |
| 11214 | + # Tell ltmain to make .dll files, not .so files. |
| 11215 | + shrext_cmds=".dll" |
| 11216 | + # FIXME: Setting linknames here is a bad hack. |
| 11217 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 11218 | + # The linker will automatically build a .lib file if we build a DLL. |
| 11219 | + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
| 11220 | + # FIXME: Should let the user specify the lib program. |
| 11221 | + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 11222 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 11223 | + ;; |
| 11224 | + esac |
| 11225 | ;; |
| 11226 | |
| 11227 | darwin* | rhapsody*) |
| 11228 | @@ -4828,7 +5143,7 @@ _LT_EOF |
| 11229 | |
| 11230 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 11231 | freebsd* | dragonfly*) |
| 11232 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 11233 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 11234 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
| 11235 | _LT_TAGVAR(hardcode_direct, $1)=yes |
| 11236 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
| 11237 | @@ -4836,7 +5151,7 @@ _LT_EOF |
| 11238 | |
| 11239 | hpux9*) |
| 11240 | if test "$GCC" = yes; then |
| 11241 | - _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' |
| 11242 | + _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' |
| 11243 | else |
| 11244 | _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' |
| 11245 | fi |
| 11246 | @@ -4852,7 +5167,7 @@ _LT_EOF |
| 11247 | |
| 11248 | hpux10*) |
| 11249 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 11250 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 11251 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 11252 | else |
| 11253 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 11254 | fi |
| 11255 | @@ -4876,10 +5191,10 @@ _LT_EOF |
| 11256 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 11257 | ;; |
| 11258 | ia64*) |
| 11259 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 11260 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 11261 | ;; |
| 11262 | *) |
| 11263 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 11264 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 11265 | ;; |
| 11266 | esac |
| 11267 | else |
| 11268 | @@ -4926,16 +5241,31 @@ _LT_EOF |
| 11269 | |
| 11270 | irix5* | irix6* | nonstopux*) |
| 11271 | if test "$GCC" = yes; then |
| 11272 | - _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' |
| 11273 | + _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' |
| 11274 | # Try to use the -exported_symbol ld option, if it does not |
| 11275 | # work, assume that -exports_file does not work either and |
| 11276 | # implicitly export all symbols. |
| 11277 | - save_LDFLAGS="$LDFLAGS" |
| 11278 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 11279 | - AC_LINK_IFELSE(int foo(void) {}, |
| 11280 | - _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' |
| 11281 | - ) |
| 11282 | - LDFLAGS="$save_LDFLAGS" |
| 11283 | + # This should be the same for all languages, so no per-tag cache variable. |
| 11284 | + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], |
| 11285 | + [lt_cv_irix_exported_symbol], |
| 11286 | + [save_LDFLAGS="$LDFLAGS" |
| 11287 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 11288 | + AC_LINK_IFELSE( |
| 11289 | + [AC_LANG_SOURCE( |
| 11290 | + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], |
| 11291 | + [C++], [[int foo (void) { return 0; }]], |
| 11292 | + [Fortran 77], [[ |
| 11293 | + subroutine foo |
| 11294 | + end]], |
| 11295 | + [Fortran], [[ |
| 11296 | + subroutine foo |
| 11297 | + end]])])], |
| 11298 | + [lt_cv_irix_exported_symbol=yes], |
| 11299 | + [lt_cv_irix_exported_symbol=no]) |
| 11300 | + LDFLAGS="$save_LDFLAGS"]) |
| 11301 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 11302 | + _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' |
| 11303 | + fi |
| 11304 | else |
| 11305 | _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' |
| 11306 | _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' |
| 11307 | @@ -5020,7 +5350,7 @@ _LT_EOF |
| 11308 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 11309 | if test "$GCC" = yes; then |
| 11310 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
| 11311 | - _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' |
| 11312 | + _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' |
| 11313 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
| 11314 | else |
| 11315 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
| 11316 | @@ -5039,9 +5369,9 @@ _LT_EOF |
| 11317 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' |
| 11318 | if test "$GCC" = yes; then |
| 11319 | wlarc='${wl}' |
| 11320 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 11321 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 11322 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 11323 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 11324 | + $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' |
| 11325 | else |
| 11326 | case `$CC -V 2>&1` in |
| 11327 | *"Compilers 5.0"*) |
| 11328 | @@ -5313,8 +5643,6 @@ _LT_TAGDECL([], [inherit_rpath], [0], |
| 11329 | to runtime path list]) |
| 11330 | _LT_TAGDECL([], [link_all_deplibs], [0], |
| 11331 | [Whether libtool must link a program against all its dependency libraries]) |
| 11332 | -_LT_TAGDECL([], [fix_srcfile_path], [1], |
| 11333 | - [Fix the shell variable $srcfile for the compiler]) |
| 11334 | _LT_TAGDECL([], [always_export_symbols], [0], |
| 11335 | [Set to "yes" if exported symbols are required]) |
| 11336 | _LT_TAGDECL([], [export_symbols_cmds], [2], |
| 11337 | @@ -5325,6 +5653,8 @@ _LT_TAGDECL([], [include_expsyms], [1], |
| 11338 | [Symbols that must always be exported]) |
| 11339 | _LT_TAGDECL([], [prelink_cmds], [2], |
| 11340 | [Commands necessary for linking programs (against libraries) with templates]) |
| 11341 | +_LT_TAGDECL([], [postlink_cmds], [2], |
| 11342 | + [Commands necessary for finishing linking programs]) |
| 11343 | _LT_TAGDECL([], [file_list_spec], [1], |
| 11344 | [Specify filename containing input files]) |
| 11345 | dnl FIXME: Not yet implemented |
| 11346 | @@ -5426,6 +5756,7 @@ CC="$lt_save_CC" |
| 11347 | m4_defun([_LT_LANG_CXX_CONFIG], |
| 11348 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
| 11349 | m4_require([_LT_DECL_EGREP])dnl |
| 11350 | +m4_require([_LT_PATH_MANIFEST_TOOL])dnl |
| 11351 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
| 11352 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
| 11353 | (test "X$CXX" != "Xg++"))) ; then |
| 11354 | @@ -5487,6 +5818,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11355 | |
| 11356 | # Allow CC to be a program name with arguments. |
| 11357 | lt_save_CC=$CC |
| 11358 | + lt_save_CFLAGS=$CFLAGS |
| 11359 | lt_save_LD=$LD |
| 11360 | lt_save_GCC=$GCC |
| 11361 | GCC=$GXX |
| 11362 | @@ -5504,6 +5836,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11363 | fi |
| 11364 | test -z "${LDCXX+set}" || LD=$LDCXX |
| 11365 | CC=${CXX-"c++"} |
| 11366 | + CFLAGS=$CXXFLAGS |
| 11367 | compiler=$CC |
| 11368 | _LT_TAGVAR(compiler, $1)=$CC |
| 11369 | _LT_CC_BASENAME([$compiler]) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 11370 | @@ -5667,7 +6000,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11371 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
| 11372 | # Determine the default libpath from the value encoded in an empty |
| 11373 | # executable. |
| 11374 | - _LT_SYS_MODULE_PATH_AIX |
| 11375 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
| 11376 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 11377 | |
| 11378 | _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" |
| 11379 | @@ -5679,7 +6012,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11380 | else |
| 11381 | # Determine the default libpath from the value encoded in an |
| 11382 | # empty executable. |
| 11383 | - _LT_SYS_MODULE_PATH_AIX |
| 11384 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
| 11385 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 11386 | # Warning - without using the other run time loading flags, |
| 11387 | # -berok will link without error, but may produce a broken library. |
| 11388 | @@ -5721,29 +6054,75 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11389 | ;; |
| 11390 | |
| 11391 | cygwin* | mingw* | pw32* | cegcc*) |
| 11392 | - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
| 11393 | - # as there is no search path for DLLs. |
| 11394 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
| 11395 | - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' |
| 11396 | - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 11397 | - _LT_TAGVAR(always_export_symbols, $1)=no |
| 11398 | - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 11399 | - |
| 11400 | - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 11401 | - _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' |
| 11402 | - # If the export-symbols file already is a .def file (1st line |
| 11403 | - # is EXPORTS), use it as is; otherwise, prepend... |
| 11404 | - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 11405 | - cp $export_symbols $output_objdir/$soname.def; |
| 11406 | - else |
| 11407 | - echo EXPORTS > $output_objdir/$soname.def; |
| 11408 | - cat $export_symbols >> $output_objdir/$soname.def; |
| 11409 | - fi~ |
| 11410 | - $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' |
| 11411 | - else |
| 11412 | - _LT_TAGVAR(ld_shlibs, $1)=no |
| 11413 | - fi |
| 11414 | - ;; |
| 11415 | + case $GXX,$cc_basename in |
| 11416 | + ,cl* | no,cl*) |
| 11417 | + # Native MSVC |
| 11418 | + # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 11419 | + # no search path for DLLs. |
| 11420 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
| 11421 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 11422 | + _LT_TAGVAR(always_export_symbols, $1)=yes |
| 11423 | + _LT_TAGVAR(file_list_spec, $1)='@' |
| 11424 | + # Tell ltmain to make .lib files, not .a files. |
| 11425 | + libext=lib |
| 11426 | + # Tell ltmain to make .dll files, not .so files. |
| 11427 | + shrext_cmds=".dll" |
| 11428 | + # FIXME: Setting linknames here is a bad hack. |
| 11429 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 11430 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 11431 | + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 11432 | + else |
| 11433 | + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 11434 | + fi~ |
| 11435 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 11436 | + linknames=' |
| 11437 | + # The linker will not automatically build a static lib if we build a DLL. |
| 11438 | + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
| 11439 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 11440 | + # Don't use ranlib |
| 11441 | + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
| 11442 | + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ |
| 11443 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 11444 | + case $lt_outputfile in |
| 11445 | + *.exe|*.EXE) ;; |
| 11446 | + *) |
| 11447 | + lt_outputfile="$lt_outputfile.exe" |
| 11448 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 11449 | + ;; |
| 11450 | + esac~ |
| 11451 | + func_to_tool_file "$lt_outputfile"~ |
| 11452 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 11453 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 11454 | + $RM "$lt_outputfile.manifest"; |
| 11455 | + fi' |
| 11456 | + ;; |
| 11457 | + *) |
| 11458 | + # g++ |
| 11459 | + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
| 11460 | + # as there is no search path for DLLs. |
| 11461 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
| 11462 | + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' |
| 11463 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
| 11464 | + _LT_TAGVAR(always_export_symbols, $1)=no |
| 11465 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
| 11466 | + |
| 11467 | + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 11468 | + _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' |
| 11469 | + # If the export-symbols file already is a .def file (1st line |
| 11470 | + # is EXPORTS), use it as is; otherwise, prepend... |
| 11471 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 11472 | + cp $export_symbols $output_objdir/$soname.def; |
| 11473 | + else |
| 11474 | + echo EXPORTS > $output_objdir/$soname.def; |
| 11475 | + cat $export_symbols >> $output_objdir/$soname.def; |
| 11476 | + fi~ |
| 11477 | + $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' |
| 11478 | + else |
| 11479 | + _LT_TAGVAR(ld_shlibs, $1)=no |
| 11480 | + fi |
| 11481 | + ;; |
| 11482 | + esac |
| 11483 | + ;; |
| 11484 | darwin* | rhapsody*) |
| 11485 | _LT_DARWIN_LINKER_FEATURES($1) |
| 11486 | ;; |
| 11487 | @@ -5818,7 +6197,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11488 | ;; |
| 11489 | *) |
| 11490 | if test "$GXX" = yes; then |
| 11491 | - _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' |
| 11492 | + _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' |
| 11493 | else |
| 11494 | # FIXME: insert proper C++ library support |
| 11495 | _LT_TAGVAR(ld_shlibs, $1)=no |
| 11496 | @@ -5889,10 +6268,10 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11497 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
| 11498 | ;; |
| 11499 | ia64*) |
| 11500 | - _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' |
| 11501 | + _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' |
| 11502 | ;; |
| 11503 | *) |
| 11504 | - _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' |
| 11505 | + _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' |
| 11506 | ;; |
| 11507 | esac |
| 11508 | fi |
| 11509 | @@ -5933,9 +6312,9 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11510 | *) |
| 11511 | if test "$GXX" = yes; then |
| 11512 | if test "$with_gnu_ld" = no; then |
| 11513 | - _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' |
| 11514 | + _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' |
| 11515 | else |
| 11516 | - _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' |
| 11517 | + _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' |
| 11518 | fi |
| 11519 | fi |
| 11520 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
| 11521 | @@ -6005,20 +6384,20 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11522 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ |
| 11523 | rm -rf $tpldir~ |
| 11524 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
| 11525 | - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' |
| 11526 | + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' |
| 11527 | _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ |
| 11528 | rm -rf $tpldir~ |
| 11529 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ |
| 11530 | - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ |
| 11531 | + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ |
| 11532 | $RANLIB $oldlib' |
| 11533 | _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ |
| 11534 | rm -rf $tpldir~ |
| 11535 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
| 11536 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 11537 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 11538 | _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ |
| 11539 | rm -rf $tpldir~ |
| 11540 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
| 11541 | - $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' |
| 11542 | + $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' |
| 11543 | ;; |
| 11544 | *) # Version 6 and above use weak symbols |
| 11545 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
| 11546 | @@ -6213,7 +6592,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11547 | _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' |
| 11548 | ;; |
| 11549 | *) |
| 11550 | - _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' |
| 11551 | + _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' |
| 11552 | ;; |
| 11553 | esac |
| 11554 | |
| 11555 | @@ -6259,7 +6638,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11556 | |
| 11557 | solaris*) |
| 11558 | case $cc_basename in |
| 11559 | - CC*) |
| 11560 | + CC* | sunCC*) |
| 11561 | # Sun C++ 4.2, 5.x and Centerline C++ |
| 11562 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes |
| 11563 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' |
| 11564 | @@ -6300,9 +6679,9 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11565 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
| 11566 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' |
| 11567 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
| 11568 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
| 11569 | + _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' |
| 11570 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 11571 | - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
| 11572 | + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
| 11573 | |
| 11574 | # Commands to make compiler produce verbose output that lists |
| 11575 | # what "hidden" libraries, object files and flags are used when |
| 11576 | @@ -6431,6 +6810,7 @@ if test "$_lt_caught_CXX_error" != yes; then |
| 11577 | fi # test -n "$compiler" |
| 11578 | |
| 11579 | CC=$lt_save_CC |
| 11580 | + CFLAGS=$lt_save_CFLAGS |
| 11581 | LDCXX=$LD |
| 11582 | LD=$lt_save_LD |
| 11583 | GCC=$lt_save_GCC |
| 11584 | @@ -6445,6 +6825,29 @@ AC_LANG_POP |
| 11585 | ])# _LT_LANG_CXX_CONFIG |
| 11586 | |
| 11587 | |
| 11588 | +# _LT_FUNC_STRIPNAME_CNF |
| 11589 | +# ---------------------- |
| 11590 | +# func_stripname_cnf prefix suffix name |
| 11591 | +# strip PREFIX and SUFFIX off of NAME. |
| 11592 | +# PREFIX and SUFFIX must not contain globbing or regex special |
| 11593 | +# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 11594 | +# dot (in which case that matches only a dot). |
| 11595 | +# |
| 11596 | +# This function is identical to the (non-XSI) version of func_stripname, |
| 11597 | +# except this one can be used by m4 code that may be executed by configure, |
| 11598 | +# rather than the libtool script. |
| 11599 | +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl |
| 11600 | +AC_REQUIRE([_LT_DECL_SED]) |
| 11601 | +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) |
| 11602 | +func_stripname_cnf () |
| 11603 | +{ |
| 11604 | + case ${2} in |
| 11605 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 11606 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 11607 | + esac |
| 11608 | +} # func_stripname_cnf |
| 11609 | +])# _LT_FUNC_STRIPNAME_CNF |
| 11610 | + |
| 11611 | # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) |
| 11612 | # --------------------------------- |
| 11613 | # Figure out "hidden" library dependencies from verbose |
| 11614 | @@ -6453,6 +6856,7 @@ AC_LANG_POP |
| 11615 | # objects, libraries and library flags. |
| 11616 | m4_defun([_LT_SYS_HIDDEN_LIBDEPS], |
| 11617 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
| 11618 | +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl |
| 11619 | # Dependencies to place before and after the object being linked: |
| 11620 | _LT_TAGVAR(predep_objects, $1)= |
| 11621 | _LT_TAGVAR(postdep_objects, $1)= |
| 11622 | @@ -6503,6 +6907,13 @@ public class foo { |
| 11623 | }; |
| 11624 | _LT_EOF |
| 11625 | ]) |
| 11626 | + |
| 11627 | +_lt_libdeps_save_CFLAGS=$CFLAGS |
| 11628 | +case "$CC $CFLAGS " in #( |
| 11629 | +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; |
| 11630 | +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; |
| 11631 | +esac |
| 11632 | + |
| 11633 | dnl Parse the compiler output and extract the necessary |
| 11634 | dnl objects, libraries and library flags. |
| 11635 | if AC_TRY_EVAL(ac_compile); then |
| 11636 | @@ -6514,7 +6925,7 @@ if AC_TRY_EVAL(ac_compile); then |
| 11637 | pre_test_object_deps_done=no |
| 11638 | |
| 11639 | for p in `eval "$output_verbose_link_cmd"`; do |
| 11640 | - case $p in |
| 11641 | + case ${prev}${p} in |
| 11642 | |
| 11643 | -L* | -R* | -l*) |
| 11644 | # Some compilers place space between "-{L,R}" and the path. |
| 11645 | @@ -6523,13 +6934,22 @@ if AC_TRY_EVAL(ac_compile); then |
| 11646 | test $p = "-R"; then |
| 11647 | prev=$p |
| 11648 | continue |
| 11649 | - else |
| 11650 | - prev= |
| 11651 | fi |
| 11652 | |
| 11653 | + # Expand the sysroot to ease extracting the directories later. |
| 11654 | + if test -z "$prev"; then |
| 11655 | + case $p in |
| 11656 | + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; |
| 11657 | + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; |
| 11658 | + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; |
| 11659 | + esac |
| 11660 | + fi |
| 11661 | + case $p in |
| 11662 | + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; |
| 11663 | + esac |
| 11664 | if test "$pre_test_object_deps_done" = no; then |
| 11665 | - case $p in |
| 11666 | - -L* | -R*) |
| 11667 | + case ${prev} in |
| 11668 | + -L | -R) |
| 11669 | # Internal compiler library paths should come after those |
| 11670 | # provided the user. The postdeps already come after the |
| 11671 | # user supplied libs so there is no need to process them. |
| 11672 | @@ -6549,8 +6969,10 @@ if AC_TRY_EVAL(ac_compile); then |
| 11673 | _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" |
| 11674 | fi |
| 11675 | fi |
| 11676 | + prev= |
| 11677 | ;; |
| 11678 | |
| 11679 | + *.lto.$objext) ;; # Ignore GCC LTO objects |
| 11680 | *.$objext) |
| 11681 | # This assumes that the test object file only shows up |
| 11682 | # once in the compiler output. |
| 11683 | @@ -6586,6 +7008,7 @@ else |
| 11684 | fi |
| 11685 | |
| 11686 | $RM -f confest.$objext |
| 11687 | +CFLAGS=$_lt_libdeps_save_CFLAGS |
| 11688 | |
| 11689 | # PORTME: override above test on systems where it is broken |
| 11690 | m4_if([$1], [CXX], |
| 11691 | @@ -6622,7 +7045,7 @@ linux*) |
| 11692 | |
| 11693 | solaris*) |
| 11694 | case $cc_basename in |
| 11695 | - CC*) |
| 11696 | + CC* | sunCC*) |
| 11697 | # The more standards-conforming stlport4 library is |
| 11698 | # incompatible with the Cstd library. Avoid specifying |
| 11699 | # it if it's in CXXFLAGS. Ignore libCrun as |
| 11700 | @@ -6735,7 +7158,9 @@ if test "$_lt_disable_F77" != yes; then |
| 11701 | # Allow CC to be a program name with arguments. |
| 11702 | lt_save_CC="$CC" |
| 11703 | lt_save_GCC=$GCC |
| 11704 | + lt_save_CFLAGS=$CFLAGS |
| 11705 | CC=${F77-"f77"} |
| 11706 | + CFLAGS=$FFLAGS |
| 11707 | compiler=$CC |
| 11708 | _LT_TAGVAR(compiler, $1)=$CC |
| 11709 | _LT_CC_BASENAME([$compiler]) |
| 11710 | @@ -6789,6 +7214,7 @@ if test "$_lt_disable_F77" != yes; then |
| 11711 | |
| 11712 | GCC=$lt_save_GCC |
| 11713 | CC="$lt_save_CC" |
| 11714 | + CFLAGS="$lt_save_CFLAGS" |
| 11715 | fi # test "$_lt_disable_F77" != yes |
| 11716 | |
| 11717 | AC_LANG_POP |
| 11718 | @@ -6865,7 +7291,9 @@ if test "$_lt_disable_FC" != yes; then |
| 11719 | # Allow CC to be a program name with arguments. |
| 11720 | lt_save_CC="$CC" |
| 11721 | lt_save_GCC=$GCC |
| 11722 | + lt_save_CFLAGS=$CFLAGS |
| 11723 | CC=${FC-"f95"} |
| 11724 | + CFLAGS=$FCFLAGS |
| 11725 | compiler=$CC |
| 11726 | GCC=$ac_cv_fc_compiler_gnu |
| 11727 | |
| 11728 | @@ -6921,7 +7349,8 @@ if test "$_lt_disable_FC" != yes; then |
| 11729 | fi # test -n "$compiler" |
| 11730 | |
| 11731 | GCC=$lt_save_GCC |
| 11732 | - CC="$lt_save_CC" |
| 11733 | + CC=$lt_save_CC |
| 11734 | + CFLAGS=$lt_save_CFLAGS |
| 11735 | fi # test "$_lt_disable_FC" != yes |
| 11736 | |
| 11737 | AC_LANG_POP |
| 11738 | @@ -6958,10 +7387,12 @@ _LT_COMPILER_BOILERPLATE |
| 11739 | _LT_LINKER_BOILERPLATE |
| 11740 | |
| 11741 | # Allow CC to be a program name with arguments. |
| 11742 | -lt_save_CC="$CC" |
| 11743 | +lt_save_CC=$CC |
| 11744 | +lt_save_CFLAGS=$CFLAGS |
| 11745 | lt_save_GCC=$GCC |
| 11746 | GCC=yes |
| 11747 | CC=${GCJ-"gcj"} |
| 11748 | +CFLAGS=$GCJFLAGS |
| 11749 | compiler=$CC |
| 11750 | _LT_TAGVAR(compiler, $1)=$CC |
| 11751 | _LT_TAGVAR(LD, $1)="$LD" |
| 11752 | @@ -6992,7 +7423,8 @@ fi |
| 11753 | AC_LANG_RESTORE |
| 11754 | |
| 11755 | GCC=$lt_save_GCC |
| 11756 | -CC="$lt_save_CC" |
| 11757 | +CC=$lt_save_CC |
| 11758 | +CFLAGS=$lt_save_CFLAGS |
| 11759 | ])# _LT_LANG_GCJ_CONFIG |
| 11760 | |
| 11761 | |
| 11762 | @@ -7027,9 +7459,11 @@ _LT_LINKER_BOILERPLATE |
| 11763 | |
| 11764 | # Allow CC to be a program name with arguments. |
| 11765 | lt_save_CC="$CC" |
| 11766 | +lt_save_CFLAGS=$CFLAGS |
| 11767 | lt_save_GCC=$GCC |
| 11768 | GCC= |
| 11769 | CC=${RC-"windres"} |
| 11770 | +CFLAGS= |
| 11771 | compiler=$CC |
| 11772 | _LT_TAGVAR(compiler, $1)=$CC |
| 11773 | _LT_CC_BASENAME([$compiler]) |
| 11774 | @@ -7042,7 +7476,8 @@ fi |
| 11775 | |
| 11776 | GCC=$lt_save_GCC |
| 11777 | AC_LANG_RESTORE |
| 11778 | -CC="$lt_save_CC" |
| 11779 | +CC=$lt_save_CC |
| 11780 | +CFLAGS=$lt_save_CFLAGS |
| 11781 | ])# _LT_LANG_RC_CONFIG |
| 11782 | |
| 11783 | |
| 11784 | @@ -7101,6 +7536,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) |
| 11785 | AC_SUBST([OBJDUMP]) |
| 11786 | ]) |
| 11787 | |
| 11788 | +# _LT_DECL_DLLTOOL |
| 11789 | +# ---------------- |
| 11790 | +# Ensure DLLTOOL variable is set. |
| 11791 | +m4_defun([_LT_DECL_DLLTOOL], |
| 11792 | +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) |
| 11793 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 11794 | +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) |
| 11795 | +AC_SUBST([DLLTOOL]) |
| 11796 | +]) |
| 11797 | |
| 11798 | # _LT_DECL_SED |
| 11799 | # ------------ |
| 11800 | @@ -7194,8 +7638,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], |
| 11801 | # Try some XSI features |
| 11802 | xsi_shell=no |
| 11803 | ( _lt_dummy="a/b/c" |
| 11804 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 11805 | - = c,a/b,, \ |
| 11806 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 11807 | + = c,a/b,b/c, \ |
| 11808 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 11809 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 11810 | && xsi_shell=yes |
| 11811 | @@ -7234,206 +7678,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl |
| 11812 | ])# _LT_CHECK_SHELL_FEATURES |
| 11813 | |
| 11814 | |
| 11815 | -# _LT_PROG_XSI_SHELLFNS |
| 11816 | -# --------------------- |
| 11817 | -# Bourne and XSI compatible variants of some useful shell functions. |
| 11818 | -m4_defun([_LT_PROG_XSI_SHELLFNS], |
| 11819 | -[case $xsi_shell in |
| 11820 | - yes) |
| 11821 | - cat << \_LT_EOF >> "$cfgfile" |
| 11822 | - |
| 11823 | -# func_dirname file append nondir_replacement |
| 11824 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 11825 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 11826 | -func_dirname () |
| 11827 | -{ |
| 11828 | - case ${1} in |
| 11829 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 11830 | - * ) func_dirname_result="${3}" ;; |
| 11831 | - esac |
| 11832 | -} |
| 11833 | - |
| 11834 | -# func_basename file |
| 11835 | -func_basename () |
| 11836 | -{ |
| 11837 | - func_basename_result="${1##*/}" |
| 11838 | -} |
| 11839 | - |
| 11840 | -# func_dirname_and_basename file append nondir_replacement |
| 11841 | -# perform func_basename and func_dirname in a single function |
| 11842 | -# call: |
| 11843 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 11844 | -# add APPEND to the result, otherwise set result |
| 11845 | -# to NONDIR_REPLACEMENT. |
| 11846 | -# value returned in "$func_dirname_result" |
| 11847 | -# basename: Compute filename of FILE. |
| 11848 | -# value retuned in "$func_basename_result" |
| 11849 | -# Implementation must be kept synchronized with func_dirname |
| 11850 | -# and func_basename. For efficiency, we do not delegate to |
| 11851 | -# those functions but instead duplicate the functionality here. |
| 11852 | -func_dirname_and_basename () |
| 11853 | -{ |
| 11854 | - case ${1} in |
| 11855 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 11856 | - * ) func_dirname_result="${3}" ;; |
| 11857 | - esac |
| 11858 | - func_basename_result="${1##*/}" |
| 11859 | -} |
| 11860 | - |
| 11861 | -# func_stripname prefix suffix name |
| 11862 | -# strip PREFIX and SUFFIX off of NAME. |
| 11863 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 11864 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 11865 | -# dot (in which case that matches only a dot). |
| 11866 | -func_stripname () |
| 11867 | -{ |
| 11868 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 11869 | - # positional parameters, so assign one to ordinary parameter first. |
| 11870 | - func_stripname_result=${3} |
| 11871 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 11872 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 11873 | -} |
| 11874 | - |
| 11875 | -# func_opt_split |
| 11876 | -func_opt_split () |
| 11877 | -{ |
| 11878 | - func_opt_split_opt=${1%%=*} |
| 11879 | - func_opt_split_arg=${1#*=} |
| 11880 | -} |
| 11881 | - |
| 11882 | -# func_lo2o object |
| 11883 | -func_lo2o () |
| 11884 | -{ |
| 11885 | - case ${1} in |
| 11886 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 11887 | - *) func_lo2o_result=${1} ;; |
| 11888 | - esac |
| 11889 | -} |
| 11890 | - |
| 11891 | -# func_xform libobj-or-source |
| 11892 | -func_xform () |
| 11893 | -{ |
| 11894 | - func_xform_result=${1%.*}.lo |
| 11895 | -} |
| 11896 | - |
| 11897 | -# func_arith arithmetic-term... |
| 11898 | -func_arith () |
| 11899 | -{ |
| 11900 | - func_arith_result=$(( $[*] )) |
| 11901 | -} |
| 11902 | - |
| 11903 | -# func_len string |
| 11904 | -# STRING may not start with a hyphen. |
| 11905 | -func_len () |
| 11906 | -{ |
| 11907 | - func_len_result=${#1} |
| 11908 | -} |
| 11909 | +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) |
| 11910 | +# ------------------------------------------------------ |
| 11911 | +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and |
| 11912 | +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. |
| 11913 | +m4_defun([_LT_PROG_FUNCTION_REPLACE], |
| 11914 | +[dnl { |
| 11915 | +sed -e '/^$1 ()$/,/^} # $1 /c\ |
| 11916 | +$1 ()\ |
| 11917 | +{\ |
| 11918 | +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) |
| 11919 | +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ |
| 11920 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 11921 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 11922 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 11923 | +]) |
| 11924 | |
| 11925 | -_LT_EOF |
| 11926 | - ;; |
| 11927 | - *) # Bourne compatible functions. |
| 11928 | - cat << \_LT_EOF >> "$cfgfile" |
| 11929 | |
| 11930 | -# func_dirname file append nondir_replacement |
| 11931 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 11932 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 11933 | -func_dirname () |
| 11934 | -{ |
| 11935 | - # Extract subdirectory from the argument. |
| 11936 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 11937 | - if test "X$func_dirname_result" = "X${1}"; then |
| 11938 | - func_dirname_result="${3}" |
| 11939 | - else |
| 11940 | - func_dirname_result="$func_dirname_result${2}" |
| 11941 | - fi |
| 11942 | -} |
| 11943 | +# _LT_PROG_REPLACE_SHELLFNS |
| 11944 | +# ------------------------- |
| 11945 | +# Replace existing portable implementations of several shell functions with |
| 11946 | +# equivalent extended shell implementations where those features are available.. |
| 11947 | +m4_defun([_LT_PROG_REPLACE_SHELLFNS], |
| 11948 | +[if test x"$xsi_shell" = xyes; then |
| 11949 | + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl |
| 11950 | + case ${1} in |
| 11951 | + */*) func_dirname_result="${1%/*}${2}" ;; |
| 11952 | + * ) func_dirname_result="${3}" ;; |
| 11953 | + esac]) |
| 11954 | + |
| 11955 | + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl |
| 11956 | + func_basename_result="${1##*/}"]) |
| 11957 | + |
| 11958 | + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl |
| 11959 | + case ${1} in |
| 11960 | + */*) func_dirname_result="${1%/*}${2}" ;; |
| 11961 | + * ) func_dirname_result="${3}" ;; |
| 11962 | + esac |
| 11963 | + func_basename_result="${1##*/}"]) |
| 11964 | |
| 11965 | -# func_basename file |
| 11966 | -func_basename () |
| 11967 | -{ |
| 11968 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 11969 | -} |
| 11970 | + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl |
| 11971 | + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 11972 | + # positional parameters, so assign one to ordinary parameter first. |
| 11973 | + func_stripname_result=${3} |
| 11974 | + func_stripname_result=${func_stripname_result#"${1}"} |
| 11975 | + func_stripname_result=${func_stripname_result%"${2}"}]) |
| 11976 | |
| 11977 | -dnl func_dirname_and_basename |
| 11978 | -dnl A portable version of this function is already defined in general.m4sh |
| 11979 | -dnl so there is no need for it here. |
| 11980 | + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl |
| 11981 | + func_split_long_opt_name=${1%%=*} |
| 11982 | + func_split_long_opt_arg=${1#*=}]) |
| 11983 | |
| 11984 | -# func_stripname prefix suffix name |
| 11985 | -# strip PREFIX and SUFFIX off of NAME. |
| 11986 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 11987 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 11988 | -# dot (in which case that matches only a dot). |
| 11989 | -# func_strip_suffix prefix name |
| 11990 | -func_stripname () |
| 11991 | -{ |
| 11992 | - case ${2} in |
| 11993 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 11994 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 11995 | - esac |
| 11996 | -} |
| 11997 | + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl |
| 11998 | + func_split_short_opt_arg=${1#??} |
| 11999 | + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) |
| 12000 | |
| 12001 | -# sed scripts: |
| 12002 | -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' |
| 12003 | -my_sed_long_arg='1s/^-[[^=]]*=//' |
| 12004 | + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl |
| 12005 | + case ${1} in |
| 12006 | + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 12007 | + *) func_lo2o_result=${1} ;; |
| 12008 | + esac]) |
| 12009 | |
| 12010 | -# func_opt_split |
| 12011 | -func_opt_split () |
| 12012 | -{ |
| 12013 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 12014 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 12015 | -} |
| 12016 | + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) |
| 12017 | |
| 12018 | -# func_lo2o object |
| 12019 | -func_lo2o () |
| 12020 | -{ |
| 12021 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 12022 | -} |
| 12023 | + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) |
| 12024 | |
| 12025 | -# func_xform libobj-or-source |
| 12026 | -func_xform () |
| 12027 | -{ |
| 12028 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` |
| 12029 | -} |
| 12030 | + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) |
| 12031 | +fi |
| 12032 | |
| 12033 | -# func_arith arithmetic-term... |
| 12034 | -func_arith () |
| 12035 | -{ |
| 12036 | - func_arith_result=`expr "$[@]"` |
| 12037 | -} |
| 12038 | +if test x"$lt_shell_append" = xyes; then |
| 12039 | + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) |
| 12040 | |
| 12041 | -# func_len string |
| 12042 | -# STRING may not start with a hyphen. |
| 12043 | -func_len () |
| 12044 | -{ |
| 12045 | - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 12046 | -} |
| 12047 | + _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl |
| 12048 | + func_quote_for_eval "${2}" |
| 12049 | +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ |
| 12050 | + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) |
| 12051 | |
| 12052 | -_LT_EOF |
| 12053 | -esac |
| 12054 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 12055 | + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 12056 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 12057 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 12058 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 12059 | +else |
| 12060 | + # Save a `func_append' function call even when '+=' is not available |
| 12061 | + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 12062 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 12063 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 12064 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 12065 | +fi |
| 12066 | |
| 12067 | -case $lt_shell_append in |
| 12068 | - yes) |
| 12069 | - cat << \_LT_EOF >> "$cfgfile" |
| 12070 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 12071 | + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) |
| 12072 | +fi |
| 12073 | +]) |
| 12074 | |
| 12075 | -# func_append var value |
| 12076 | -# Append VALUE to the end of shell variable VAR. |
| 12077 | -func_append () |
| 12078 | -{ |
| 12079 | - eval "$[1]+=\$[2]" |
| 12080 | -} |
| 12081 | -_LT_EOF |
| 12082 | +# _LT_PATH_CONVERSION_FUNCTIONS |
| 12083 | +# ----------------------------- |
| 12084 | +# Determine which file name conversion functions should be used by |
| 12085 | +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed |
| 12086 | +# for certain cross-compile configurations and native mingw. |
| 12087 | +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], |
| 12088 | +[AC_REQUIRE([AC_CANONICAL_HOST])dnl |
| 12089 | +AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
| 12090 | +AC_MSG_CHECKING([how to convert $build file names to $host format]) |
| 12091 | +AC_CACHE_VAL(lt_cv_to_host_file_cmd, |
| 12092 | +[case $host in |
| 12093 | + *-*-mingw* ) |
| 12094 | + case $build in |
| 12095 | + *-*-mingw* ) # actually msys |
| 12096 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 12097 | + ;; |
| 12098 | + *-*-cygwin* ) |
| 12099 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 12100 | + ;; |
| 12101 | + * ) # otherwise, assume *nix |
| 12102 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 12103 | + ;; |
| 12104 | + esac |
| 12105 | ;; |
| 12106 | - *) |
| 12107 | - cat << \_LT_EOF >> "$cfgfile" |
| 12108 | - |
| 12109 | -# func_append var value |
| 12110 | -# Append VALUE to the end of shell variable VAR. |
| 12111 | -func_append () |
| 12112 | -{ |
| 12113 | - eval "$[1]=\$$[1]\$[2]" |
| 12114 | -} |
| 12115 | - |
| 12116 | -_LT_EOF |
| 12117 | + *-*-cygwin* ) |
| 12118 | + case $build in |
| 12119 | + *-*-mingw* ) # actually msys |
| 12120 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 12121 | + ;; |
| 12122 | + *-*-cygwin* ) |
| 12123 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 12124 | + ;; |
| 12125 | + * ) # otherwise, assume *nix |
| 12126 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 12127 | + ;; |
| 12128 | + esac |
| 12129 | ;; |
| 12130 | - esac |
| 12131 | + * ) # unhandled hosts (and "normal" native builds) |
| 12132 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 12133 | + ;; |
| 12134 | +esac |
| 12135 | +]) |
| 12136 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 12137 | +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) |
| 12138 | +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], |
| 12139 | + [0], [convert $build file names to $host format])dnl |
| 12140 | + |
| 12141 | +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) |
| 12142 | +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, |
| 12143 | +[#assume ordinary cross tools, or native build. |
| 12144 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 12145 | +case $host in |
| 12146 | + *-*-mingw* ) |
| 12147 | + case $build in |
| 12148 | + *-*-mingw* ) # actually msys |
| 12149 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 12150 | + ;; |
| 12151 | + esac |
| 12152 | + ;; |
| 12153 | +esac |
| 12154 | ]) |
| 12155 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 12156 | +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) |
| 12157 | +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], |
| 12158 | + [0], [convert $build files to toolchain format])dnl |
| 12159 | +])# _LT_PATH_CONVERSION_FUNCTIONS |
| 12160 | diff --git a/ltmain.sh b/ltmain.sh |
| 12161 | index 9503ec8..70e856e 100644 |
| 12162 | --- a/ltmain.sh |
| 12163 | +++ b/ltmain.sh |
| 12164 | @@ -1,10 +1,9 @@ |
| 12165 | -# Generated from ltmain.m4sh. |
| 12166 | |
| 12167 | -# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a |
| 12168 | +# libtool (GNU libtool) 2.4 |
| 12169 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 |
| 12170 | |
| 12171 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, |
| 12172 | -# 2007, 2008, 2009 Free Software Foundation, Inc. |
| 12173 | +# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
| 12174 | # This is free software; see the source for copying conditions. There is NO |
| 12175 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 12176 | |
| 12177 | @@ -38,7 +37,6 @@ |
| 12178 | # -n, --dry-run display commands without modifying any files |
| 12179 | # --features display basic configuration information and exit |
| 12180 | # --mode=MODE use operation mode MODE |
| 12181 | -# --no-finish let install mode avoid finish commands |
| 12182 | # --preserve-dup-deps don't remove duplicate dependency libraries |
| 12183 | # --quiet, --silent don't print informational messages |
| 12184 | # --no-quiet, --no-silent |
| 12185 | @@ -71,17 +69,19 @@ |
| 12186 | # compiler: $LTCC |
| 12187 | # compiler flags: $LTCFLAGS |
| 12188 | # linker: $LD (gnu? $with_gnu_ld) |
| 12189 | -# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a |
| 12190 | +# $progname: (GNU libtool) 2.4 |
| 12191 | # automake: $automake_version |
| 12192 | # autoconf: $autoconf_version |
| 12193 | # |
| 12194 | # Report bugs to <bug-libtool@gnu.org>. |
| 12195 | +# GNU libtool home page: <http://www.gnu.org/software/libtool/>. |
| 12196 | +# General help using GNU software: <http://www.gnu.org/gethelp/>. |
| 12197 | |
| 12198 | PROGRAM=libtool |
| 12199 | PACKAGE=libtool |
| 12200 | -VERSION=2.2.7a |
| 12201 | -TIMESTAMP=" 1.3134 2009-11-29" |
| 12202 | -package_revision=1.3134 |
| 12203 | +VERSION=2.4 |
| 12204 | +TIMESTAMP="" |
| 12205 | +package_revision=1.3293 |
| 12206 | |
| 12207 | # Be Bourne compatible |
| 12208 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
| 12209 | @@ -106,9 +106,6 @@ _LTECHO_EOF' |
| 12210 | } |
| 12211 | |
| 12212 | # NLS nuisances: We save the old values to restore during execute mode. |
| 12213 | -# Only set LANG and LC_ALL to C if already set. |
| 12214 | -# These must not be set unconditionally because not all systems understand |
| 12215 | -# e.g. LANG=C (notably SCO). |
| 12216 | lt_user_locale= |
| 12217 | lt_safe_locale= |
| 12218 | for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES |
| 12219 | @@ -121,15 +118,13 @@ do |
| 12220 | lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" |
| 12221 | fi" |
| 12222 | done |
| 12223 | +LC_ALL=C |
| 12224 | +LANGUAGE=C |
| 12225 | +export LANGUAGE LC_ALL |
| 12226 | |
| 12227 | $lt_unset CDPATH |
| 12228 | |
| 12229 | |
| 12230 | - |
| 12231 | - |
| 12232 | - |
| 12233 | - |
| 12234 | - |
| 12235 | # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh |
| 12236 | # is ksh but when the shell is invoked as "sh" and the current value of |
| 12237 | # the _XPG environment variable is not equal to 1 (one), the special |
| 12238 | @@ -140,7 +135,7 @@ progpath="$0" |
| 12239 | |
| 12240 | |
| 12241 | : ${CP="cp -f"} |
| 12242 | -: ${ECHO=$as_echo} |
| 12243 | +test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} |
| 12244 | : ${EGREP="/bin/grep -E"} |
| 12245 | : ${FGREP="/bin/grep -F"} |
| 12246 | : ${GREP="/bin/grep"} |
| 12247 | @@ -149,7 +144,7 @@ progpath="$0" |
| 12248 | : ${MKDIR="mkdir"} |
| 12249 | : ${MV="mv -f"} |
| 12250 | : ${RM="rm -f"} |
| 12251 | -: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"} |
| 12252 | +: ${SED="/bin/sed"} |
| 12253 | : ${SHELL="${CONFIG_SHELL-/bin/sh}"} |
| 12254 | : ${Xsed="$SED -e 1s/^X//"} |
| 12255 | |
| 12256 | @@ -169,6 +164,27 @@ IFS=" $lt_nl" |
| 12257 | dirname="s,/[^/]*$,," |
| 12258 | basename="s,^.*/,," |
| 12259 | |
| 12260 | +# func_dirname file append nondir_replacement |
| 12261 | +# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 12262 | +# otherwise set result to NONDIR_REPLACEMENT. |
| 12263 | +func_dirname () |
| 12264 | +{ |
| 12265 | + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 12266 | + if test "X$func_dirname_result" = "X${1}"; then |
| 12267 | + func_dirname_result="${3}" |
| 12268 | + else |
| 12269 | + func_dirname_result="$func_dirname_result${2}" |
| 12270 | + fi |
| 12271 | +} # func_dirname may be replaced by extended shell implementation |
| 12272 | + |
| 12273 | + |
| 12274 | +# func_basename file |
| 12275 | +func_basename () |
| 12276 | +{ |
| 12277 | + func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 12278 | +} # func_basename may be replaced by extended shell implementation |
| 12279 | + |
| 12280 | + |
| 12281 | # func_dirname_and_basename file append nondir_replacement |
| 12282 | # perform func_basename and func_dirname in a single function |
| 12283 | # call: |
| 12284 | @@ -183,17 +199,31 @@ basename="s,^.*/,," |
| 12285 | # those functions but instead duplicate the functionality here. |
| 12286 | func_dirname_and_basename () |
| 12287 | { |
| 12288 | - # Extract subdirectory from the argument. |
| 12289 | - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` |
| 12290 | - if test "X$func_dirname_result" = "X${1}"; then |
| 12291 | - func_dirname_result="${3}" |
| 12292 | - else |
| 12293 | - func_dirname_result="$func_dirname_result${2}" |
| 12294 | - fi |
| 12295 | - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` |
| 12296 | -} |
| 12297 | + # Extract subdirectory from the argument. |
| 12298 | + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` |
| 12299 | + if test "X$func_dirname_result" = "X${1}"; then |
| 12300 | + func_dirname_result="${3}" |
| 12301 | + else |
| 12302 | + func_dirname_result="$func_dirname_result${2}" |
| 12303 | + fi |
| 12304 | + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` |
| 12305 | +} # func_dirname_and_basename may be replaced by extended shell implementation |
| 12306 | + |
| 12307 | + |
| 12308 | +# func_stripname prefix suffix name |
| 12309 | +# strip PREFIX and SUFFIX off of NAME. |
| 12310 | +# PREFIX and SUFFIX must not contain globbing or regex special |
| 12311 | +# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 12312 | +# dot (in which case that matches only a dot). |
| 12313 | +# func_strip_suffix prefix name |
| 12314 | +func_stripname () |
| 12315 | +{ |
| 12316 | + case ${2} in |
| 12317 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 12318 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 12319 | + esac |
| 12320 | +} # func_stripname may be replaced by extended shell implementation |
| 12321 | |
| 12322 | -# Generated shell functions inserted here. |
| 12323 | |
| 12324 | # These SED scripts presuppose an absolute path with a trailing slash. |
| 12325 | pathcar='s,^/\([^/]*\).*$,\1,' |
| 12326 | @@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' |
| 12327 | # Same as above, but do not quote variable references. |
| 12328 | double_quote_subst='s/\(["`\\]\)/\\\1/g' |
| 12329 | |
| 12330 | +# Sed substitution that turns a string into a regex matching for the |
| 12331 | +# string literally. |
| 12332 | +sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' |
| 12333 | + |
| 12334 | +# Sed substitution that converts a w32 file name or path |
| 12335 | +# which contains forward slashes, into one that contains |
| 12336 | +# (escaped) backslashes. A very naive implementation. |
| 12337 | +lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' |
| 12338 | + |
| 12339 | # Re-`\' parameter expansions in output of double_quote_subst that were |
| 12340 | # `\'-ed in input to the same. If an odd number of `\' preceded a '$' |
| 12341 | # in input to double_quote_subst, that '$' was protected from expansion. |
| 12342 | @@ -404,7 +443,7 @@ opt_warning=: |
| 12343 | # name if it has been set yet. |
| 12344 | func_echo () |
| 12345 | { |
| 12346 | - $ECHO "$progname${mode+: }$mode: $*" |
| 12347 | + $ECHO "$progname: ${opt_mode+$opt_mode: }$*" |
| 12348 | } |
| 12349 | |
| 12350 | # func_verbose arg... |
| 12351 | @@ -430,14 +469,14 @@ func_echo_all () |
| 12352 | # Echo program name prefixed message to standard error. |
| 12353 | func_error () |
| 12354 | { |
| 12355 | - $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 |
| 12356 | + $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 |
| 12357 | } |
| 12358 | |
| 12359 | # func_warning arg... |
| 12360 | # Echo program name prefixed warning message to standard error. |
| 12361 | func_warning () |
| 12362 | { |
| 12363 | - $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 |
| 12364 | + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 |
| 12365 | |
| 12366 | # bash bug again: |
| 12367 | : |
| 12368 | @@ -656,19 +695,35 @@ func_show_eval_locale () |
| 12369 | fi |
| 12370 | } |
| 12371 | |
| 12372 | - |
| 12373 | - |
| 12374 | +# func_tr_sh |
| 12375 | +# Turn $1 into a string suitable for a shell variable name. |
| 12376 | +# Result is stored in $func_tr_sh_result. All characters |
| 12377 | +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, |
| 12378 | +# if $1 begins with a digit, a '_' is prepended as well. |
| 12379 | +func_tr_sh () |
| 12380 | +{ |
| 12381 | + case $1 in |
| 12382 | + [0-9]* | *[!a-zA-Z0-9_]*) |
| 12383 | + func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` |
| 12384 | + ;; |
| 12385 | + * ) |
| 12386 | + func_tr_sh_result=$1 |
| 12387 | + ;; |
| 12388 | + esac |
| 12389 | +} |
| 12390 | |
| 12391 | |
| 12392 | # func_version |
| 12393 | # Echo version message to standard output and exit. |
| 12394 | func_version () |
| 12395 | { |
| 12396 | + $opt_debug |
| 12397 | + |
| 12398 | $SED -n '/(C)/!b go |
| 12399 | :more |
| 12400 | /\./!{ |
| 12401 | N |
| 12402 | - s/\n# // |
| 12403 | + s/\n# / / |
| 12404 | b more |
| 12405 | } |
| 12406 | :go |
| 12407 | @@ -685,7 +740,9 @@ func_version () |
| 12408 | # Echo short help message to standard output and exit. |
| 12409 | func_usage () |
| 12410 | { |
| 12411 | - $SED -n '/^# Usage:/,/^# *-h/ { |
| 12412 | + $opt_debug |
| 12413 | + |
| 12414 | + $SED -n '/^# Usage:/,/^# *.*--help/ { |
| 12415 | s/^# // |
| 12416 | s/^# *$// |
| 12417 | s/\$progname/'$progname'/ |
| 12418 | @@ -701,7 +758,10 @@ func_usage () |
| 12419 | # unless 'noexit' is passed as argument. |
| 12420 | func_help () |
| 12421 | { |
| 12422 | + $opt_debug |
| 12423 | + |
| 12424 | $SED -n '/^# Usage:/,/# Report bugs to/ { |
| 12425 | + :print |
| 12426 | s/^# // |
| 12427 | s/^# *$// |
| 12428 | s*\$progname*'$progname'* |
| 12429 | @@ -714,7 +774,11 @@ func_help () |
| 12430 | s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ |
| 12431 | s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ |
| 12432 | p |
| 12433 | - }' < "$progpath" |
| 12434 | + d |
| 12435 | + } |
| 12436 | + /^# .* home page:/b print |
| 12437 | + /^# General help using/b print |
| 12438 | + ' < "$progpath" |
| 12439 | ret=$? |
| 12440 | if test -z "$1"; then |
| 12441 | exit $ret |
| 12442 | @@ -726,12 +790,39 @@ func_help () |
| 12443 | # exit_cmd. |
| 12444 | func_missing_arg () |
| 12445 | { |
| 12446 | - func_error "missing argument for $1" |
| 12447 | + $opt_debug |
| 12448 | + |
| 12449 | + func_error "missing argument for $1." |
| 12450 | exit_cmd=exit |
| 12451 | } |
| 12452 | |
| 12453 | -exit_cmd=: |
| 12454 | |
| 12455 | +# func_split_short_opt shortopt |
| 12456 | +# Set func_split_short_opt_name and func_split_short_opt_arg shell |
| 12457 | +# variables after splitting SHORTOPT after the 2nd character. |
| 12458 | +func_split_short_opt () |
| 12459 | +{ |
| 12460 | + my_sed_short_opt='1s/^\(..\).*$/\1/;q' |
| 12461 | + my_sed_short_rest='1s/^..\(.*\)$/\1/;q' |
| 12462 | + |
| 12463 | + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` |
| 12464 | + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` |
| 12465 | +} # func_split_short_opt may be replaced by extended shell implementation |
| 12466 | + |
| 12467 | + |
| 12468 | +# func_split_long_opt longopt |
| 12469 | +# Set func_split_long_opt_name and func_split_long_opt_arg shell |
| 12470 | +# variables after splitting LONGOPT at the `=' sign. |
| 12471 | +func_split_long_opt () |
| 12472 | +{ |
| 12473 | + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' |
| 12474 | + my_sed_long_arg='1s/^--[^=]*=//' |
| 12475 | + |
| 12476 | + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` |
| 12477 | + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` |
| 12478 | +} # func_split_long_opt may be replaced by extended shell implementation |
| 12479 | + |
| 12480 | +exit_cmd=: |
| 12481 | |
| 12482 | |
| 12483 | |
| 12484 | @@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%" |
| 12485 | magic_exe="%%%MAGIC EXE variable%%%" |
| 12486 | |
| 12487 | # Global variables. |
| 12488 | -# $mode is unset |
| 12489 | nonopt= |
| 12490 | -execute_dlfiles= |
| 12491 | preserve_args= |
| 12492 | lo2o="s/\\.lo\$/.${objext}/" |
| 12493 | o2lo="s/\\.${objext}\$/.lo/" |
| 12494 | extracted_archives= |
| 12495 | extracted_serial=0 |
| 12496 | |
| 12497 | -opt_dry_run=false |
| 12498 | -opt_finish=: |
| 12499 | -opt_duplicate_deps=false |
| 12500 | -opt_silent=false |
| 12501 | -opt_debug=: |
| 12502 | - |
| 12503 | # If this variable is set in any of the actions, the command in it |
| 12504 | # will be execed at the end. This prevents here-documents from being |
| 12505 | # left over by shells. |
| 12506 | exec_cmd= |
| 12507 | |
| 12508 | +# func_append var value |
| 12509 | +# Append VALUE to the end of shell variable VAR. |
| 12510 | +func_append () |
| 12511 | +{ |
| 12512 | + eval "${1}=\$${1}\${2}" |
| 12513 | +} # func_append may be replaced by extended shell implementation |
| 12514 | + |
| 12515 | +# func_append_quoted var value |
| 12516 | +# Quote VALUE and append to the end of shell variable VAR, separated |
| 12517 | +# by a space. |
| 12518 | +func_append_quoted () |
| 12519 | +{ |
| 12520 | + func_quote_for_eval "${2}" |
| 12521 | + eval "${1}=\$${1}\\ \$func_quote_for_eval_result" |
| 12522 | +} # func_append_quoted may be replaced by extended shell implementation |
| 12523 | + |
| 12524 | + |
| 12525 | +# func_arith arithmetic-term... |
| 12526 | +func_arith () |
| 12527 | +{ |
| 12528 | + func_arith_result=`expr "${@}"` |
| 12529 | +} # func_arith may be replaced by extended shell implementation |
| 12530 | + |
| 12531 | + |
| 12532 | +# func_len string |
| 12533 | +# STRING may not start with a hyphen. |
| 12534 | +func_len () |
| 12535 | +{ |
| 12536 | + func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 12537 | +} # func_len may be replaced by extended shell implementation |
| 12538 | + |
| 12539 | + |
| 12540 | +# func_lo2o object |
| 12541 | +func_lo2o () |
| 12542 | +{ |
| 12543 | + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 12544 | +} # func_lo2o may be replaced by extended shell implementation |
| 12545 | + |
| 12546 | + |
| 12547 | +# func_xform libobj-or-source |
| 12548 | +func_xform () |
| 12549 | +{ |
| 12550 | + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 12551 | +} # func_xform may be replaced by extended shell implementation |
| 12552 | + |
| 12553 | + |
| 12554 | # func_fatal_configuration arg... |
| 12555 | # Echo program name prefixed message to standard error, followed by |
| 12556 | # a configuration failure hint, and exit. |
| 12557 | @@ -850,130 +979,204 @@ func_enable_tag () |
| 12558 | esac |
| 12559 | } |
| 12560 | |
| 12561 | -# Parse options once, thoroughly. This comes as soon as possible in |
| 12562 | -# the script to make things like `libtool --version' happen quickly. |
| 12563 | +# func_check_version_match |
| 12564 | +# Ensure that we are using m4 macros, and libtool script from the same |
| 12565 | +# release of libtool. |
| 12566 | +func_check_version_match () |
| 12567 | { |
| 12568 | + if test "$package_revision" != "$macro_revision"; then |
| 12569 | + if test "$VERSION" != "$macro_version"; then |
| 12570 | + if test -z "$macro_version"; then |
| 12571 | + cat >&2 <<_LT_EOF |
| 12572 | +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the |
| 12573 | +$progname: definition of this LT_INIT comes from an older release. |
| 12574 | +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION |
| 12575 | +$progname: and run autoconf again. |
| 12576 | +_LT_EOF |
| 12577 | + else |
| 12578 | + cat >&2 <<_LT_EOF |
| 12579 | +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the |
| 12580 | +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. |
| 12581 | +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION |
| 12582 | +$progname: and run autoconf again. |
| 12583 | +_LT_EOF |
| 12584 | + fi |
| 12585 | + else |
| 12586 | + cat >&2 <<_LT_EOF |
| 12587 | +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, |
| 12588 | +$progname: but the definition of this LT_INIT comes from revision $macro_revision. |
| 12589 | +$progname: You should recreate aclocal.m4 with macros from revision $package_revision |
| 12590 | +$progname: of $PACKAGE $VERSION and run autoconf again. |
| 12591 | +_LT_EOF |
| 12592 | + fi |
| 12593 | |
| 12594 | - # Shorthand for --mode=foo, only valid as the first argument |
| 12595 | - case $1 in |
| 12596 | - clean|clea|cle|cl) |
| 12597 | - shift; set dummy --mode clean ${1+"$@"}; shift |
| 12598 | - ;; |
| 12599 | - compile|compil|compi|comp|com|co|c) |
| 12600 | - shift; set dummy --mode compile ${1+"$@"}; shift |
| 12601 | - ;; |
| 12602 | - execute|execut|execu|exec|exe|ex|e) |
| 12603 | - shift; set dummy --mode execute ${1+"$@"}; shift |
| 12604 | - ;; |
| 12605 | - finish|finis|fini|fin|fi|f) |
| 12606 | - shift; set dummy --mode finish ${1+"$@"}; shift |
| 12607 | - ;; |
| 12608 | - install|instal|insta|inst|ins|in|i) |
| 12609 | - shift; set dummy --mode install ${1+"$@"}; shift |
| 12610 | - ;; |
| 12611 | - link|lin|li|l) |
| 12612 | - shift; set dummy --mode link ${1+"$@"}; shift |
| 12613 | - ;; |
| 12614 | - uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) |
| 12615 | - shift; set dummy --mode uninstall ${1+"$@"}; shift |
| 12616 | - ;; |
| 12617 | - esac |
| 12618 | + exit $EXIT_MISMATCH |
| 12619 | + fi |
| 12620 | +} |
| 12621 | + |
| 12622 | + |
| 12623 | +# Shorthand for --mode=foo, only valid as the first argument |
| 12624 | +case $1 in |
| 12625 | +clean|clea|cle|cl) |
| 12626 | + shift; set dummy --mode clean ${1+"$@"}; shift |
| 12627 | + ;; |
| 12628 | +compile|compil|compi|comp|com|co|c) |
| 12629 | + shift; set dummy --mode compile ${1+"$@"}; shift |
| 12630 | + ;; |
| 12631 | +execute|execut|execu|exec|exe|ex|e) |
| 12632 | + shift; set dummy --mode execute ${1+"$@"}; shift |
| 12633 | + ;; |
| 12634 | +finish|finis|fini|fin|fi|f) |
| 12635 | + shift; set dummy --mode finish ${1+"$@"}; shift |
| 12636 | + ;; |
| 12637 | +install|instal|insta|inst|ins|in|i) |
| 12638 | + shift; set dummy --mode install ${1+"$@"}; shift |
| 12639 | + ;; |
| 12640 | +link|lin|li|l) |
| 12641 | + shift; set dummy --mode link ${1+"$@"}; shift |
| 12642 | + ;; |
| 12643 | +uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) |
| 12644 | + shift; set dummy --mode uninstall ${1+"$@"}; shift |
| 12645 | + ;; |
| 12646 | +esac |
| 12647 | |
| 12648 | - # Parse non-mode specific arguments: |
| 12649 | - while test "$#" -gt 0; do |
| 12650 | + |
| 12651 | + |
| 12652 | +# Option defaults: |
| 12653 | +opt_debug=: |
| 12654 | +opt_dry_run=false |
| 12655 | +opt_config=false |
| 12656 | +opt_preserve_dup_deps=false |
| 12657 | +opt_features=false |
| 12658 | +opt_finish=false |
| 12659 | +opt_help=false |
| 12660 | +opt_help_all=false |
| 12661 | +opt_silent=: |
| 12662 | +opt_verbose=: |
| 12663 | +opt_silent=false |
| 12664 | +opt_verbose=false |
| 12665 | + |
| 12666 | + |
| 12667 | +# Parse options once, thoroughly. This comes as soon as possible in the |
| 12668 | +# script to make things like `--version' happen as quickly as we can. |
| 12669 | +{ |
| 12670 | + # this just eases exit handling |
| 12671 | + while test $# -gt 0; do |
| 12672 | opt="$1" |
| 12673 | shift |
| 12674 | - |
| 12675 | case $opt in |
| 12676 | - --config) func_config ;; |
| 12677 | - |
| 12678 | - --debug) preserve_args="$preserve_args $opt" |
| 12679 | + --debug|-x) opt_debug='set -x' |
| 12680 | func_echo "enabling shell trace mode" |
| 12681 | - opt_debug='set -x' |
| 12682 | $opt_debug |
| 12683 | ;; |
| 12684 | - |
| 12685 | - -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break |
| 12686 | - execute_dlfiles="$execute_dlfiles $1" |
| 12687 | - shift |
| 12688 | + --dry-run|--dryrun|-n) |
| 12689 | + opt_dry_run=: |
| 12690 | ;; |
| 12691 | - |
| 12692 | - --dry-run | -n) opt_dry_run=: ;; |
| 12693 | - --features) func_features ;; |
| 12694 | - --finish) mode="finish" ;; |
| 12695 | - --no-finish) opt_finish=false ;; |
| 12696 | - |
| 12697 | - --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break |
| 12698 | - case $1 in |
| 12699 | - # Valid mode arguments: |
| 12700 | - clean) ;; |
| 12701 | - compile) ;; |
| 12702 | - execute) ;; |
| 12703 | - finish) ;; |
| 12704 | - install) ;; |
| 12705 | - link) ;; |
| 12706 | - relink) ;; |
| 12707 | - uninstall) ;; |
| 12708 | - |
| 12709 | - # Catch anything else as an error |
| 12710 | - *) func_error "invalid argument for $opt" |
| 12711 | - exit_cmd=exit |
| 12712 | - break |
| 12713 | - ;; |
| 12714 | - esac |
| 12715 | - |
| 12716 | - mode="$1" |
| 12717 | + --config) |
| 12718 | + opt_config=: |
| 12719 | +func_config |
| 12720 | + ;; |
| 12721 | + --dlopen|-dlopen) |
| 12722 | + optarg="$1" |
| 12723 | + opt_dlopen="${opt_dlopen+$opt_dlopen |
| 12724 | +}$optarg" |
| 12725 | shift |
| 12726 | ;; |
| 12727 | - |
| 12728 | --preserve-dup-deps) |
| 12729 | - opt_duplicate_deps=: ;; |
| 12730 | - |
| 12731 | - --quiet|--silent) preserve_args="$preserve_args $opt" |
| 12732 | - opt_silent=: |
| 12733 | - opt_verbose=false |
| 12734 | + opt_preserve_dup_deps=: |
| 12735 | ;; |
| 12736 | - |
| 12737 | - --no-quiet|--no-silent) |
| 12738 | - preserve_args="$preserve_args $opt" |
| 12739 | - opt_silent=false |
| 12740 | + --features) |
| 12741 | + opt_features=: |
| 12742 | +func_features |
| 12743 | ;; |
| 12744 | - |
| 12745 | - --verbose| -v) preserve_args="$preserve_args $opt" |
| 12746 | + --finish) |
| 12747 | + opt_finish=: |
| 12748 | +set dummy --mode finish ${1+"$@"}; shift |
| 12749 | + ;; |
| 12750 | + --help) |
| 12751 | + opt_help=: |
| 12752 | + ;; |
| 12753 | + --help-all) |
| 12754 | + opt_help_all=: |
| 12755 | +opt_help=': help-all' |
| 12756 | + ;; |
| 12757 | + --mode) |
| 12758 | + test $# = 0 && func_missing_arg $opt && break |
| 12759 | + optarg="$1" |
| 12760 | + opt_mode="$optarg" |
| 12761 | +case $optarg in |
| 12762 | + # Valid mode arguments: |
| 12763 | + clean|compile|execute|finish|install|link|relink|uninstall) ;; |
| 12764 | + |
| 12765 | + # Catch anything else as an error |
| 12766 | + *) func_error "invalid argument for $opt" |
| 12767 | + exit_cmd=exit |
| 12768 | + break |
| 12769 | + ;; |
| 12770 | +esac |
| 12771 | + shift |
| 12772 | + ;; |
| 12773 | + --no-silent|--no-quiet) |
| 12774 | opt_silent=false |
| 12775 | - opt_verbose=: |
| 12776 | +func_append preserve_args " $opt" |
| 12777 | ;; |
| 12778 | - |
| 12779 | - --no-verbose) preserve_args="$preserve_args $opt" |
| 12780 | + --no-verbose) |
| 12781 | opt_verbose=false |
| 12782 | +func_append preserve_args " $opt" |
| 12783 | ;; |
| 12784 | - |
| 12785 | - --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break |
| 12786 | - preserve_args="$preserve_args $opt $1" |
| 12787 | - func_enable_tag "$1" # tagname is set here |
| 12788 | + --silent|--quiet) |
| 12789 | + opt_silent=: |
| 12790 | +func_append preserve_args " $opt" |
| 12791 | + opt_verbose=false |
| 12792 | + ;; |
| 12793 | + --verbose|-v) |
| 12794 | + opt_verbose=: |
| 12795 | +func_append preserve_args " $opt" |
| 12796 | +opt_silent=false |
| 12797 | + ;; |
| 12798 | + --tag) |
| 12799 | + test $# = 0 && func_missing_arg $opt && break |
| 12800 | + optarg="$1" |
| 12801 | + opt_tag="$optarg" |
| 12802 | +func_append preserve_args " $opt $optarg" |
| 12803 | +func_enable_tag "$optarg" |
| 12804 | shift |
| 12805 | ;; |
| 12806 | |
| 12807 | + -\?|-h) func_usage ;; |
| 12808 | + --help) func_help ;; |
| 12809 | + --version) func_version ;; |
| 12810 | + |
| 12811 | # Separate optargs to long options: |
| 12812 | - -dlopen=*|--mode=*|--tag=*) |
| 12813 | - func_opt_split "$opt" |
| 12814 | - set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} |
| 12815 | + --*=*) |
| 12816 | + func_split_long_opt "$opt" |
| 12817 | + set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} |
| 12818 | shift |
| 12819 | ;; |
| 12820 | |
| 12821 | - -\?|-h) func_usage ;; |
| 12822 | - --help) opt_help=: ;; |
| 12823 | - --help-all) opt_help=': help-all' ;; |
| 12824 | - --version) func_version ;; |
| 12825 | - |
| 12826 | - -*) func_fatal_help "unrecognized option \`$opt'" ;; |
| 12827 | - |
| 12828 | - *) nonopt="$opt" |
| 12829 | - break |
| 12830 | + # Separate non-argument short options: |
| 12831 | + -\?*|-h*|-n*|-v*) |
| 12832 | + func_split_short_opt "$opt" |
| 12833 | + set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} |
| 12834 | + shift |
| 12835 | ;; |
| 12836 | + |
| 12837 | + --) break ;; |
| 12838 | + -*) func_fatal_help "unrecognized option \`$opt'" ;; |
| 12839 | + *) set dummy "$opt" ${1+"$@"}; shift; break ;; |
| 12840 | esac |
| 12841 | done |
| 12842 | |
| 12843 | + # Validate options: |
| 12844 | + |
| 12845 | + # save first non-option argument |
| 12846 | + if test "$#" -gt 0; then |
| 12847 | + nonopt="$opt" |
| 12848 | + shift |
| 12849 | + fi |
| 12850 | + |
| 12851 | + # preserve --debug |
| 12852 | + test "$opt_debug" = : || func_append preserve_args " --debug" |
| 12853 | |
| 12854 | case $host in |
| 12855 | *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* ) |
| 12856 | @@ -981,82 +1184,44 @@ func_enable_tag () |
| 12857 | opt_duplicate_compiler_generated_deps=: |
| 12858 | ;; |
| 12859 | *) |
| 12860 | - opt_duplicate_compiler_generated_deps=$opt_duplicate_deps |
| 12861 | + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps |
| 12862 | ;; |
| 12863 | esac |
| 12864 | |
| 12865 | - # Having warned about all mis-specified options, bail out if |
| 12866 | - # anything was wrong. |
| 12867 | - $exit_cmd $EXIT_FAILURE |
| 12868 | -} |
| 12869 | + $opt_help || { |
| 12870 | + # Sanity checks first: |
| 12871 | + func_check_version_match |
| 12872 | |
| 12873 | -# func_check_version_match |
| 12874 | -# Ensure that we are using m4 macros, and libtool script from the same |
| 12875 | -# release of libtool. |
| 12876 | -func_check_version_match () |
| 12877 | -{ |
| 12878 | - if test "$package_revision" != "$macro_revision"; then |
| 12879 | - if test "$VERSION" != "$macro_version"; then |
| 12880 | - if test -z "$macro_version"; then |
| 12881 | - cat >&2 <<_LT_EOF |
| 12882 | -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the |
| 12883 | -$progname: definition of this LT_INIT comes from an older release. |
| 12884 | -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION |
| 12885 | -$progname: and run autoconf again. |
| 12886 | -_LT_EOF |
| 12887 | - else |
| 12888 | - cat >&2 <<_LT_EOF |
| 12889 | -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the |
| 12890 | -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. |
| 12891 | -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION |
| 12892 | -$progname: and run autoconf again. |
| 12893 | -_LT_EOF |
| 12894 | - fi |
| 12895 | - else |
| 12896 | - cat >&2 <<_LT_EOF |
| 12897 | -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, |
| 12898 | -$progname: but the definition of this LT_INIT comes from revision $macro_revision. |
| 12899 | -$progname: You should recreate aclocal.m4 with macros from revision $package_revision |
| 12900 | -$progname: of $PACKAGE $VERSION and run autoconf again. |
| 12901 | -_LT_EOF |
| 12902 | + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then |
| 12903 | + func_fatal_configuration "not configured to build any kind of library" |
| 12904 | fi |
| 12905 | |
| 12906 | - exit $EXIT_MISMATCH |
| 12907 | - fi |
| 12908 | -} |
| 12909 | - |
| 12910 | + # Darwin sucks |
| 12911 | + eval std_shrext=\"$shrext_cmds\" |
| 12912 | |
| 12913 | -## ----------- ## |
| 12914 | -## Main. ## |
| 12915 | -## ----------- ## |
| 12916 | - |
| 12917 | -$opt_help || { |
| 12918 | - # Sanity checks first: |
| 12919 | - func_check_version_match |
| 12920 | - |
| 12921 | - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then |
| 12922 | - func_fatal_configuration "not configured to build any kind of library" |
| 12923 | - fi |
| 12924 | + # Only execute mode is allowed to have -dlopen flags. |
| 12925 | + if test -n "$opt_dlopen" && test "$opt_mode" != execute; then |
| 12926 | + func_error "unrecognized option \`-dlopen'" |
| 12927 | + $ECHO "$help" 1>&2 |
| 12928 | + exit $EXIT_FAILURE |
| 12929 | + fi |
| 12930 | |
| 12931 | - test -z "$mode" && func_fatal_error "error: you must specify a MODE." |
| 12932 | + # Change the help message to a mode-specific one. |
| 12933 | + generic_help="$help" |
| 12934 | + help="Try \`$progname --help --mode=$opt_mode' for more information." |
| 12935 | + } |
| 12936 | |
| 12937 | |
| 12938 | - # Darwin sucks |
| 12939 | - eval "std_shrext=\"$shrext_cmds\"" |
| 12940 | + # Bail if the options were screwed |
| 12941 | + $exit_cmd $EXIT_FAILURE |
| 12942 | +} |
| 12943 | |
| 12944 | |
| 12945 | - # Only execute mode is allowed to have -dlopen flags. |
| 12946 | - if test -n "$execute_dlfiles" && test "$mode" != execute; then |
| 12947 | - func_error "unrecognized option \`-dlopen'" |
| 12948 | - $ECHO "$help" 1>&2 |
| 12949 | - exit $EXIT_FAILURE |
| 12950 | - fi |
| 12951 | |
| 12952 | - # Change the help message to a mode-specific one. |
| 12953 | - generic_help="$help" |
| 12954 | - help="Try \`$progname --help --mode=$mode' for more information." |
| 12955 | -} |
| 12956 | |
| 12957 | +## ----------- ## |
| 12958 | +## Main. ## |
| 12959 | +## ----------- ## |
| 12960 | |
| 12961 | # func_lalib_p file |
| 12962 | # True iff FILE is a libtool `.la' library or `.lo' object file. |
| 12963 | @@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p () |
| 12964 | # temporary ltwrapper_script. |
| 12965 | func_ltwrapper_scriptname () |
| 12966 | { |
| 12967 | - func_ltwrapper_scriptname_result="" |
| 12968 | - if func_ltwrapper_executable_p "$1"; then |
| 12969 | - func_dirname_and_basename "$1" "" "." |
| 12970 | - func_stripname '' '.exe' "$func_basename_result" |
| 12971 | - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" |
| 12972 | - fi |
| 12973 | + func_dirname_and_basename "$1" "" "." |
| 12974 | + func_stripname '' '.exe' "$func_basename_result" |
| 12975 | + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" |
| 12976 | } |
| 12977 | |
| 12978 | # func_ltwrapper_p file |
| 12979 | @@ -1149,7 +1311,7 @@ func_execute_cmds () |
| 12980 | save_ifs=$IFS; IFS='~' |
| 12981 | for cmd in $1; do |
| 12982 | IFS=$save_ifs |
| 12983 | - eval "cmd=\"$cmd\"" |
| 12984 | + eval cmd=\"$cmd\" |
| 12985 | func_show_eval "$cmd" "${2-:}" |
| 12986 | done |
| 12987 | IFS=$save_ifs |
| 12988 | @@ -1172,6 +1334,37 @@ func_source () |
| 12989 | } |
| 12990 | |
| 12991 | |
| 12992 | +# func_resolve_sysroot PATH |
| 12993 | +# Replace a leading = in PATH with a sysroot. Store the result into |
| 12994 | +# func_resolve_sysroot_result |
| 12995 | +func_resolve_sysroot () |
| 12996 | +{ |
| 12997 | + func_resolve_sysroot_result=$1 |
| 12998 | + case $func_resolve_sysroot_result in |
| 12999 | + =*) |
| 13000 | + func_stripname '=' '' "$func_resolve_sysroot_result" |
| 13001 | + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result |
| 13002 | + ;; |
| 13003 | + esac |
| 13004 | +} |
| 13005 | + |
| 13006 | +# func_replace_sysroot PATH |
| 13007 | +# If PATH begins with the sysroot, replace it with = and |
| 13008 | +# store the result into func_replace_sysroot_result. |
| 13009 | +func_replace_sysroot () |
| 13010 | +{ |
| 13011 | + case "$lt_sysroot:$1" in |
| 13012 | + ?*:"$lt_sysroot"*) |
| 13013 | + func_stripname "$lt_sysroot" '' "$1" |
| 13014 | + func_replace_sysroot_result="=$func_stripname_result" |
| 13015 | + ;; |
| 13016 | + *) |
| 13017 | + # Including no sysroot. |
| 13018 | + func_replace_sysroot_result=$1 |
| 13019 | + ;; |
| 13020 | + esac |
| 13021 | +} |
| 13022 | + |
| 13023 | # func_infer_tag arg |
| 13024 | # Infer tagged configuration to use if any are available and |
| 13025 | # if one wasn't chosen via the "--tag" command line option. |
| 13026 | @@ -1184,8 +1377,7 @@ func_infer_tag () |
| 13027 | if test -n "$available_tags" && test -z "$tagname"; then |
| 13028 | CC_quoted= |
| 13029 | for arg in $CC; do |
| 13030 | - func_quote_for_eval "$arg" |
| 13031 | - CC_quoted="$CC_quoted $func_quote_for_eval_result" |
| 13032 | + func_append_quoted CC_quoted "$arg" |
| 13033 | done |
| 13034 | CC_expanded=`func_echo_all $CC` |
| 13035 | CC_quoted_expanded=`func_echo_all $CC_quoted` |
| 13036 | @@ -1204,8 +1396,7 @@ func_infer_tag () |
| 13037 | CC_quoted= |
| 13038 | for arg in $CC; do |
| 13039 | # Double-quote args containing other shell metacharacters. |
| 13040 | - func_quote_for_eval "$arg" |
| 13041 | - CC_quoted="$CC_quoted $func_quote_for_eval_result" |
| 13042 | + func_append_quoted CC_quoted "$arg" |
| 13043 | done |
| 13044 | CC_expanded=`func_echo_all $CC` |
| 13045 | CC_quoted_expanded=`func_echo_all $CC_quoted` |
| 13046 | @@ -1274,6 +1465,486 @@ EOF |
| 13047 | } |
| 13048 | } |
| 13049 | |
| 13050 | + |
| 13051 | +################################################## |
| 13052 | +# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # |
| 13053 | +################################################## |
| 13054 | + |
| 13055 | +# func_convert_core_file_wine_to_w32 ARG |
| 13056 | +# Helper function used by file name conversion functions when $build is *nix, |
| 13057 | +# and $host is mingw, cygwin, or some other w32 environment. Relies on a |
| 13058 | +# correctly configured wine environment available, with the winepath program |
| 13059 | +# in $build's $PATH. |
| 13060 | +# |
| 13061 | +# ARG is the $build file name to be converted to w32 format. |
| 13062 | +# Result is available in $func_convert_core_file_wine_to_w32_result, and will |
| 13063 | +# be empty on error (or when ARG is empty) |
| 13064 | +func_convert_core_file_wine_to_w32 () |
| 13065 | +{ |
| 13066 | + $opt_debug |
| 13067 | + func_convert_core_file_wine_to_w32_result="$1" |
| 13068 | + if test -n "$1"; then |
| 13069 | + # Unfortunately, winepath does not exit with a non-zero error code, so we |
| 13070 | + # are forced to check the contents of stdout. On the other hand, if the |
| 13071 | + # command is not found, the shell will set an exit code of 127 and print |
| 13072 | + # *an error message* to stdout. So we must check for both error code of |
| 13073 | + # zero AND non-empty stdout, which explains the odd construction: |
| 13074 | + func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` |
| 13075 | + if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then |
| 13076 | + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | |
| 13077 | + $SED -e "$lt_sed_naive_backslashify"` |
| 13078 | + else |
| 13079 | + func_convert_core_file_wine_to_w32_result= |
| 13080 | + fi |
| 13081 | + fi |
| 13082 | +} |
| 13083 | +# end: func_convert_core_file_wine_to_w32 |
| 13084 | + |
| 13085 | + |
| 13086 | +# func_convert_core_path_wine_to_w32 ARG |
| 13087 | +# Helper function used by path conversion functions when $build is *nix, and |
| 13088 | +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly |
| 13089 | +# configured wine environment available, with the winepath program in $build's |
| 13090 | +# $PATH. Assumes ARG has no leading or trailing path separator characters. |
| 13091 | +# |
| 13092 | +# ARG is path to be converted from $build format to win32. |
| 13093 | +# Result is available in $func_convert_core_path_wine_to_w32_result. |
| 13094 | +# Unconvertible file (directory) names in ARG are skipped; if no directory names |
| 13095 | +# are convertible, then the result may be empty. |
| 13096 | +func_convert_core_path_wine_to_w32 () |
| 13097 | +{ |
| 13098 | + $opt_debug |
| 13099 | + # unfortunately, winepath doesn't convert paths, only file names |
| 13100 | + func_convert_core_path_wine_to_w32_result="" |
| 13101 | + if test -n "$1"; then |
| 13102 | + oldIFS=$IFS |
| 13103 | + IFS=: |
| 13104 | + for func_convert_core_path_wine_to_w32_f in $1; do |
| 13105 | + IFS=$oldIFS |
| 13106 | + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" |
| 13107 | + if test -n "$func_convert_core_file_wine_to_w32_result" ; then |
| 13108 | + if test -z "$func_convert_core_path_wine_to_w32_result"; then |
| 13109 | + func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" |
| 13110 | + else |
| 13111 | + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" |
| 13112 | + fi |
| 13113 | + fi |
| 13114 | + done |
| 13115 | + IFS=$oldIFS |
| 13116 | + fi |
| 13117 | +} |
| 13118 | +# end: func_convert_core_path_wine_to_w32 |
| 13119 | + |
| 13120 | + |
| 13121 | +# func_cygpath ARGS... |
| 13122 | +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when |
| 13123 | +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) |
| 13124 | +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or |
| 13125 | +# (2), returns the Cygwin file name or path in func_cygpath_result (input |
| 13126 | +# file name or path is assumed to be in w32 format, as previously converted |
| 13127 | +# from $build's *nix or MSYS format). In case (3), returns the w32 file name |
| 13128 | +# or path in func_cygpath_result (input file name or path is assumed to be in |
| 13129 | +# Cygwin format). Returns an empty string on error. |
| 13130 | +# |
| 13131 | +# ARGS are passed to cygpath, with the last one being the file name or path to |
| 13132 | +# be converted. |
| 13133 | +# |
| 13134 | +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH |
| 13135 | +# environment variable; do not put it in $PATH. |
| 13136 | +func_cygpath () |
| 13137 | +{ |
| 13138 | + $opt_debug |
| 13139 | + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then |
| 13140 | + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` |
| 13141 | + if test "$?" -ne 0; then |
| 13142 | + # on failure, ensure result is empty |
| 13143 | + func_cygpath_result= |
| 13144 | + fi |
| 13145 | + else |
| 13146 | + func_cygpath_result= |
| 13147 | + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" |
| 13148 | + fi |
| 13149 | +} |
| 13150 | +#end: func_cygpath |
| 13151 | + |
| 13152 | + |
| 13153 | +# func_convert_core_msys_to_w32 ARG |
| 13154 | +# Convert file name or path ARG from MSYS format to w32 format. Return |
| 13155 | +# result in func_convert_core_msys_to_w32_result. |
| 13156 | +func_convert_core_msys_to_w32 () |
| 13157 | +{ |
| 13158 | + $opt_debug |
| 13159 | + # awkward: cmd appends spaces to result |
| 13160 | + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | |
| 13161 | + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` |
| 13162 | +} |
| 13163 | +#end: func_convert_core_msys_to_w32 |
| 13164 | + |
| 13165 | + |
| 13166 | +# func_convert_file_check ARG1 ARG2 |
| 13167 | +# Verify that ARG1 (a file name in $build format) was converted to $host |
| 13168 | +# format in ARG2. Otherwise, emit an error message, but continue (resetting |
| 13169 | +# func_to_host_file_result to ARG1). |
| 13170 | +func_convert_file_check () |
| 13171 | +{ |
| 13172 | + $opt_debug |
| 13173 | + if test -z "$2" && test -n "$1" ; then |
| 13174 | + func_error "Could not determine host file name corresponding to" |
| 13175 | + func_error " \`$1'" |
| 13176 | + func_error "Continuing, but uninstalled executables may not work." |
| 13177 | + # Fallback: |
| 13178 | + func_to_host_file_result="$1" |
| 13179 | + fi |
| 13180 | +} |
| 13181 | +# end func_convert_file_check |
| 13182 | + |
| 13183 | + |
| 13184 | +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH |
| 13185 | +# Verify that FROM_PATH (a path in $build format) was converted to $host |
| 13186 | +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting |
| 13187 | +# func_to_host_file_result to a simplistic fallback value (see below). |
| 13188 | +func_convert_path_check () |
| 13189 | +{ |
| 13190 | + $opt_debug |
| 13191 | + if test -z "$4" && test -n "$3"; then |
| 13192 | + func_error "Could not determine the host path corresponding to" |
| 13193 | + func_error " \`$3'" |
| 13194 | + func_error "Continuing, but uninstalled executables may not work." |
| 13195 | + # Fallback. This is a deliberately simplistic "conversion" and |
| 13196 | + # should not be "improved". See libtool.info. |
| 13197 | + if test "x$1" != "x$2"; then |
| 13198 | + lt_replace_pathsep_chars="s|$1|$2|g" |
| 13199 | + func_to_host_path_result=`echo "$3" | |
| 13200 | + $SED -e "$lt_replace_pathsep_chars"` |
| 13201 | + else |
| 13202 | + func_to_host_path_result="$3" |
| 13203 | + fi |
| 13204 | + fi |
| 13205 | +} |
| 13206 | +# end func_convert_path_check |
| 13207 | + |
| 13208 | + |
| 13209 | +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG |
| 13210 | +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT |
| 13211 | +# and appending REPL if ORIG matches BACKPAT. |
| 13212 | +func_convert_path_front_back_pathsep () |
| 13213 | +{ |
| 13214 | + $opt_debug |
| 13215 | + case $4 in |
| 13216 | + $1 ) func_to_host_path_result="$3$func_to_host_path_result" |
| 13217 | + ;; |
| 13218 | + esac |
| 13219 | + case $4 in |
| 13220 | + $2 ) func_append func_to_host_path_result "$3" |
| 13221 | + ;; |
| 13222 | + esac |
| 13223 | +} |
| 13224 | +# end func_convert_path_front_back_pathsep |
| 13225 | + |
| 13226 | + |
| 13227 | +################################################## |
| 13228 | +# $build to $host FILE NAME CONVERSION FUNCTIONS # |
| 13229 | +################################################## |
| 13230 | +# invoked via `$to_host_file_cmd ARG' |
| 13231 | +# |
| 13232 | +# In each case, ARG is the path to be converted from $build to $host format. |
| 13233 | +# Result will be available in $func_to_host_file_result. |
| 13234 | + |
| 13235 | + |
| 13236 | +# func_to_host_file ARG |
| 13237 | +# Converts the file name ARG from $build format to $host format. Return result |
| 13238 | +# in func_to_host_file_result. |
| 13239 | +func_to_host_file () |
| 13240 | +{ |
| 13241 | + $opt_debug |
| 13242 | + $to_host_file_cmd "$1" |
| 13243 | +} |
| 13244 | +# end func_to_host_file |
| 13245 | + |
| 13246 | + |
| 13247 | +# func_to_tool_file ARG LAZY |
| 13248 | +# converts the file name ARG from $build format to toolchain format. Return |
| 13249 | +# result in func_to_tool_file_result. If the conversion in use is listed |
| 13250 | +# in (the comma separated) LAZY, no conversion takes place. |
| 13251 | +func_to_tool_file () |
| 13252 | +{ |
| 13253 | + $opt_debug |
| 13254 | + case ,$2, in |
| 13255 | + *,"$to_tool_file_cmd",*) |
| 13256 | + func_to_tool_file_result=$1 |
| 13257 | + ;; |
| 13258 | + *) |
| 13259 | + $to_tool_file_cmd "$1" |
| 13260 | + func_to_tool_file_result=$func_to_host_file_result |
| 13261 | + ;; |
| 13262 | + esac |
| 13263 | +} |
| 13264 | +# end func_to_tool_file |
| 13265 | + |
| 13266 | + |
| 13267 | +# func_convert_file_noop ARG |
| 13268 | +# Copy ARG to func_to_host_file_result. |
| 13269 | +func_convert_file_noop () |
| 13270 | +{ |
| 13271 | + func_to_host_file_result="$1" |
| 13272 | +} |
| 13273 | +# end func_convert_file_noop |
| 13274 | + |
| 13275 | + |
| 13276 | +# func_convert_file_msys_to_w32 ARG |
| 13277 | +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic |
| 13278 | +# conversion to w32 is not available inside the cwrapper. Returns result in |
| 13279 | +# func_to_host_file_result. |
| 13280 | +func_convert_file_msys_to_w32 () |
| 13281 | +{ |
| 13282 | + $opt_debug |
| 13283 | + func_to_host_file_result="$1" |
| 13284 | + if test -n "$1"; then |
| 13285 | + func_convert_core_msys_to_w32 "$1" |
| 13286 | + func_to_host_file_result="$func_convert_core_msys_to_w32_result" |
| 13287 | + fi |
| 13288 | + func_convert_file_check "$1" "$func_to_host_file_result" |
| 13289 | +} |
| 13290 | +# end func_convert_file_msys_to_w32 |
| 13291 | + |
| 13292 | + |
| 13293 | +# func_convert_file_cygwin_to_w32 ARG |
| 13294 | +# Convert file name ARG from Cygwin to w32 format. Returns result in |
| 13295 | +# func_to_host_file_result. |
| 13296 | +func_convert_file_cygwin_to_w32 () |
| 13297 | +{ |
| 13298 | + $opt_debug |
| 13299 | + func_to_host_file_result="$1" |
| 13300 | + if test -n "$1"; then |
| 13301 | + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use |
| 13302 | + # LT_CYGPATH in this case. |
| 13303 | + func_to_host_file_result=`cygpath -m "$1"` |
| 13304 | + fi |
| 13305 | + func_convert_file_check "$1" "$func_to_host_file_result" |
| 13306 | +} |
| 13307 | +# end func_convert_file_cygwin_to_w32 |
| 13308 | + |
| 13309 | + |
| 13310 | +# func_convert_file_nix_to_w32 ARG |
| 13311 | +# Convert file name ARG from *nix to w32 format. Requires a wine environment |
| 13312 | +# and a working winepath. Returns result in func_to_host_file_result. |
| 13313 | +func_convert_file_nix_to_w32 () |
| 13314 | +{ |
| 13315 | + $opt_debug |
| 13316 | + func_to_host_file_result="$1" |
| 13317 | + if test -n "$1"; then |
| 13318 | + func_convert_core_file_wine_to_w32 "$1" |
| 13319 | + func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" |
| 13320 | + fi |
| 13321 | + func_convert_file_check "$1" "$func_to_host_file_result" |
| 13322 | +} |
| 13323 | +# end func_convert_file_nix_to_w32 |
| 13324 | + |
| 13325 | + |
| 13326 | +# func_convert_file_msys_to_cygwin ARG |
| 13327 | +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. |
| 13328 | +# Returns result in func_to_host_file_result. |
| 13329 | +func_convert_file_msys_to_cygwin () |
| 13330 | +{ |
| 13331 | + $opt_debug |
| 13332 | + func_to_host_file_result="$1" |
| 13333 | + if test -n "$1"; then |
| 13334 | + func_convert_core_msys_to_w32 "$1" |
| 13335 | + func_cygpath -u "$func_convert_core_msys_to_w32_result" |
| 13336 | + func_to_host_file_result="$func_cygpath_result" |
| 13337 | + fi |
| 13338 | + func_convert_file_check "$1" "$func_to_host_file_result" |
| 13339 | +} |
| 13340 | +# end func_convert_file_msys_to_cygwin |
| 13341 | + |
| 13342 | + |
| 13343 | +# func_convert_file_nix_to_cygwin ARG |
| 13344 | +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed |
| 13345 | +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result |
| 13346 | +# in func_to_host_file_result. |
| 13347 | +func_convert_file_nix_to_cygwin () |
| 13348 | +{ |
| 13349 | + $opt_debug |
| 13350 | + func_to_host_file_result="$1" |
| 13351 | + if test -n "$1"; then |
| 13352 | + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. |
| 13353 | + func_convert_core_file_wine_to_w32 "$1" |
| 13354 | + func_cygpath -u "$func_convert_core_file_wine_to_w32_result" |
| 13355 | + func_to_host_file_result="$func_cygpath_result" |
| 13356 | + fi |
| 13357 | + func_convert_file_check "$1" "$func_to_host_file_result" |
| 13358 | +} |
| 13359 | +# end func_convert_file_nix_to_cygwin |
| 13360 | + |
| 13361 | + |
| 13362 | +############################################# |
| 13363 | +# $build to $host PATH CONVERSION FUNCTIONS # |
| 13364 | +############################################# |
| 13365 | +# invoked via `$to_host_path_cmd ARG' |
| 13366 | +# |
| 13367 | +# In each case, ARG is the path to be converted from $build to $host format. |
| 13368 | +# The result will be available in $func_to_host_path_result. |
| 13369 | +# |
| 13370 | +# Path separators are also converted from $build format to $host format. If |
| 13371 | +# ARG begins or ends with a path separator character, it is preserved (but |
| 13372 | +# converted to $host format) on output. |
| 13373 | +# |
| 13374 | +# All path conversion functions are named using the following convention: |
| 13375 | +# file name conversion function : func_convert_file_X_to_Y () |
| 13376 | +# path conversion function : func_convert_path_X_to_Y () |
| 13377 | +# where, for any given $build/$host combination the 'X_to_Y' value is the |
| 13378 | +# same. If conversion functions are added for new $build/$host combinations, |
| 13379 | +# the two new functions must follow this pattern, or func_init_to_host_path_cmd |
| 13380 | +# will break. |
| 13381 | + |
| 13382 | + |
| 13383 | +# func_init_to_host_path_cmd |
| 13384 | +# Ensures that function "pointer" variable $to_host_path_cmd is set to the |
| 13385 | +# appropriate value, based on the value of $to_host_file_cmd. |
| 13386 | +to_host_path_cmd= |
| 13387 | +func_init_to_host_path_cmd () |
| 13388 | +{ |
| 13389 | + $opt_debug |
| 13390 | + if test -z "$to_host_path_cmd"; then |
| 13391 | + func_stripname 'func_convert_file_' '' "$to_host_file_cmd" |
| 13392 | + to_host_path_cmd="func_convert_path_${func_stripname_result}" |
| 13393 | + fi |
| 13394 | +} |
| 13395 | + |
| 13396 | + |
| 13397 | +# func_to_host_path ARG |
| 13398 | +# Converts the path ARG from $build format to $host format. Return result |
| 13399 | +# in func_to_host_path_result. |
| 13400 | +func_to_host_path () |
| 13401 | +{ |
| 13402 | + $opt_debug |
| 13403 | + func_init_to_host_path_cmd |
| 13404 | + $to_host_path_cmd "$1" |
| 13405 | +} |
| 13406 | +# end func_to_host_path |
| 13407 | + |
| 13408 | + |
| 13409 | +# func_convert_path_noop ARG |
| 13410 | +# Copy ARG to func_to_host_path_result. |
| 13411 | +func_convert_path_noop () |
| 13412 | +{ |
| 13413 | + func_to_host_path_result="$1" |
| 13414 | +} |
| 13415 | +# end func_convert_path_noop |
| 13416 | + |
| 13417 | + |
| 13418 | +# func_convert_path_msys_to_w32 ARG |
| 13419 | +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic |
| 13420 | +# conversion to w32 is not available inside the cwrapper. Returns result in |
| 13421 | +# func_to_host_path_result. |
| 13422 | +func_convert_path_msys_to_w32 () |
| 13423 | +{ |
| 13424 | + $opt_debug |
| 13425 | + func_to_host_path_result="$1" |
| 13426 | + if test -n "$1"; then |
| 13427 | + # Remove leading and trailing path separator characters from ARG. MSYS |
| 13428 | + # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; |
| 13429 | + # and winepath ignores them completely. |
| 13430 | + func_stripname : : "$1" |
| 13431 | + func_to_host_path_tmp1=$func_stripname_result |
| 13432 | + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" |
| 13433 | + func_to_host_path_result="$func_convert_core_msys_to_w32_result" |
| 13434 | + func_convert_path_check : ";" \ |
| 13435 | + "$func_to_host_path_tmp1" "$func_to_host_path_result" |
| 13436 | + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" |
| 13437 | + fi |
| 13438 | +} |
| 13439 | +# end func_convert_path_msys_to_w32 |
| 13440 | + |
| 13441 | + |
| 13442 | +# func_convert_path_cygwin_to_w32 ARG |
| 13443 | +# Convert path ARG from Cygwin to w32 format. Returns result in |
| 13444 | +# func_to_host_file_result. |
| 13445 | +func_convert_path_cygwin_to_w32 () |
| 13446 | +{ |
| 13447 | + $opt_debug |
| 13448 | + func_to_host_path_result="$1" |
| 13449 | + if test -n "$1"; then |
| 13450 | + # See func_convert_path_msys_to_w32: |
| 13451 | + func_stripname : : "$1" |
| 13452 | + func_to_host_path_tmp1=$func_stripname_result |
| 13453 | + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` |
| 13454 | + func_convert_path_check : ";" \ |
| 13455 | + "$func_to_host_path_tmp1" "$func_to_host_path_result" |
| 13456 | + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" |
| 13457 | + fi |
| 13458 | +} |
| 13459 | +# end func_convert_path_cygwin_to_w32 |
| 13460 | + |
| 13461 | + |
| 13462 | +# func_convert_path_nix_to_w32 ARG |
| 13463 | +# Convert path ARG from *nix to w32 format. Requires a wine environment and |
| 13464 | +# a working winepath. Returns result in func_to_host_file_result. |
| 13465 | +func_convert_path_nix_to_w32 () |
| 13466 | +{ |
| 13467 | + $opt_debug |
| 13468 | + func_to_host_path_result="$1" |
| 13469 | + if test -n "$1"; then |
| 13470 | + # See func_convert_path_msys_to_w32: |
| 13471 | + func_stripname : : "$1" |
| 13472 | + func_to_host_path_tmp1=$func_stripname_result |
| 13473 | + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" |
| 13474 | + func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" |
| 13475 | + func_convert_path_check : ";" \ |
| 13476 | + "$func_to_host_path_tmp1" "$func_to_host_path_result" |
| 13477 | + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" |
| 13478 | + fi |
| 13479 | +} |
| 13480 | +# end func_convert_path_nix_to_w32 |
| 13481 | + |
| 13482 | + |
| 13483 | +# func_convert_path_msys_to_cygwin ARG |
| 13484 | +# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. |
| 13485 | +# Returns result in func_to_host_file_result. |
| 13486 | +func_convert_path_msys_to_cygwin () |
| 13487 | +{ |
| 13488 | + $opt_debug |
| 13489 | + func_to_host_path_result="$1" |
| 13490 | + if test -n "$1"; then |
| 13491 | + # See func_convert_path_msys_to_w32: |
| 13492 | + func_stripname : : "$1" |
| 13493 | + func_to_host_path_tmp1=$func_stripname_result |
| 13494 | + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" |
| 13495 | + func_cygpath -u -p "$func_convert_core_msys_to_w32_result" |
| 13496 | + func_to_host_path_result="$func_cygpath_result" |
| 13497 | + func_convert_path_check : : \ |
| 13498 | + "$func_to_host_path_tmp1" "$func_to_host_path_result" |
| 13499 | + func_convert_path_front_back_pathsep ":*" "*:" : "$1" |
| 13500 | + fi |
| 13501 | +} |
| 13502 | +# end func_convert_path_msys_to_cygwin |
| 13503 | + |
| 13504 | + |
| 13505 | +# func_convert_path_nix_to_cygwin ARG |
| 13506 | +# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a |
| 13507 | +# a wine environment, working winepath, and LT_CYGPATH set. Returns result in |
| 13508 | +# func_to_host_file_result. |
| 13509 | +func_convert_path_nix_to_cygwin () |
| 13510 | +{ |
| 13511 | + $opt_debug |
| 13512 | + func_to_host_path_result="$1" |
| 13513 | + if test -n "$1"; then |
| 13514 | + # Remove leading and trailing path separator characters from |
| 13515 | + # ARG. msys behavior is inconsistent here, cygpath turns them |
| 13516 | + # into '.;' and ';.', and winepath ignores them completely. |
| 13517 | + func_stripname : : "$1" |
| 13518 | + func_to_host_path_tmp1=$func_stripname_result |
| 13519 | + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" |
| 13520 | + func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" |
| 13521 | + func_to_host_path_result="$func_cygpath_result" |
| 13522 | + func_convert_path_check : : \ |
| 13523 | + "$func_to_host_path_tmp1" "$func_to_host_path_result" |
| 13524 | + func_convert_path_front_back_pathsep ":*" "*:" : "$1" |
| 13525 | + fi |
| 13526 | +} |
| 13527 | +# end func_convert_path_nix_to_cygwin |
| 13528 | + |
| 13529 | + |
| 13530 | # func_mode_compile arg... |
| 13531 | func_mode_compile () |
| 13532 | { |
| 13533 | @@ -1314,12 +1985,12 @@ func_mode_compile () |
| 13534 | ;; |
| 13535 | |
| 13536 | -pie | -fpie | -fPIE) |
| 13537 | - pie_flag="$pie_flag $arg" |
| 13538 | + func_append pie_flag " $arg" |
| 13539 | continue |
| 13540 | ;; |
| 13541 | |
| 13542 | -shared | -static | -prefer-pic | -prefer-non-pic) |
| 13543 | - later="$later $arg" |
| 13544 | + func_append later " $arg" |
| 13545 | continue |
| 13546 | ;; |
| 13547 | |
| 13548 | @@ -1340,15 +2011,14 @@ func_mode_compile () |
| 13549 | save_ifs="$IFS"; IFS=',' |
| 13550 | for arg in $args; do |
| 13551 | IFS="$save_ifs" |
| 13552 | - func_quote_for_eval "$arg" |
| 13553 | - lastarg="$lastarg $func_quote_for_eval_result" |
| 13554 | + func_append_quoted lastarg "$arg" |
| 13555 | done |
| 13556 | IFS="$save_ifs" |
| 13557 | func_stripname ' ' '' "$lastarg" |
| 13558 | lastarg=$func_stripname_result |
| 13559 | |
| 13560 | # Add the arguments to base_compile. |
| 13561 | - base_compile="$base_compile $lastarg" |
| 13562 | + func_append base_compile " $lastarg" |
| 13563 | continue |
| 13564 | ;; |
| 13565 | |
| 13566 | @@ -1364,8 +2034,7 @@ func_mode_compile () |
| 13567 | esac # case $arg_mode |
| 13568 | |
| 13569 | # Aesthetically quote the previous argument. |
| 13570 | - func_quote_for_eval "$lastarg" |
| 13571 | - base_compile="$base_compile $func_quote_for_eval_result" |
| 13572 | + func_append_quoted base_compile "$lastarg" |
| 13573 | done # for arg |
| 13574 | |
| 13575 | case $arg_mode in |
| 13576 | @@ -1496,17 +2165,16 @@ compiler." |
| 13577 | $opt_dry_run || $RM $removelist |
| 13578 | exit $EXIT_FAILURE |
| 13579 | fi |
| 13580 | - removelist="$removelist $output_obj" |
| 13581 | + func_append removelist " $output_obj" |
| 13582 | $ECHO "$srcfile" > "$lockfile" |
| 13583 | fi |
| 13584 | |
| 13585 | $opt_dry_run || $RM $removelist |
| 13586 | - removelist="$removelist $lockfile" |
| 13587 | + func_append removelist " $lockfile" |
| 13588 | trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 |
| 13589 | |
| 13590 | - if test -n "$fix_srcfile_path"; then |
| 13591 | - eval "srcfile=\"$fix_srcfile_path\"" |
| 13592 | - fi |
| 13593 | + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 |
| 13594 | + srcfile=$func_to_tool_file_result |
| 13595 | func_quote_for_eval "$srcfile" |
| 13596 | qsrcfile=$func_quote_for_eval_result |
| 13597 | |
| 13598 | @@ -1526,7 +2194,7 @@ compiler." |
| 13599 | |
| 13600 | if test -z "$output_obj"; then |
| 13601 | # Place PIC objects in $objdir |
| 13602 | - command="$command -o $lobj" |
| 13603 | + func_append command " -o $lobj" |
| 13604 | fi |
| 13605 | |
| 13606 | func_show_eval_locale "$command" \ |
| 13607 | @@ -1573,11 +2241,11 @@ compiler." |
| 13608 | command="$base_compile $qsrcfile $pic_flag" |
| 13609 | fi |
| 13610 | if test "$compiler_c_o" = yes; then |
| 13611 | - command="$command -o $obj" |
| 13612 | + func_append command " -o $obj" |
| 13613 | fi |
| 13614 | |
| 13615 | # Suppress compiler output if we already did a PIC compilation. |
| 13616 | - command="$command$suppress_output" |
| 13617 | + func_append command "$suppress_output" |
| 13618 | func_show_eval_locale "$command" \ |
| 13619 | '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' |
| 13620 | |
| 13621 | @@ -1622,13 +2290,13 @@ compiler." |
| 13622 | } |
| 13623 | |
| 13624 | $opt_help || { |
| 13625 | - test "$mode" = compile && func_mode_compile ${1+"$@"} |
| 13626 | + test "$opt_mode" = compile && func_mode_compile ${1+"$@"} |
| 13627 | } |
| 13628 | |
| 13629 | func_mode_help () |
| 13630 | { |
| 13631 | # We need to display help for each of the modes. |
| 13632 | - case $mode in |
| 13633 | + case $opt_mode in |
| 13634 | "") |
| 13635 | # Generic help is extracted from the usage comments |
| 13636 | # at the start of this file. |
| 13637 | @@ -1659,8 +2327,8 @@ This mode accepts the following additional options: |
| 13638 | |
| 13639 | -o OUTPUT-FILE set the output file name to OUTPUT-FILE |
| 13640 | -no-suppress do not suppress compiler output for multiple passes |
| 13641 | - -prefer-pic try to building PIC objects only |
| 13642 | - -prefer-non-pic try to building non-PIC objects only |
| 13643 | + -prefer-pic try to build PIC objects only |
| 13644 | + -prefer-non-pic try to build non-PIC objects only |
| 13645 | -shared do not build a \`.o' file suitable for static linking |
| 13646 | -static only build a \`.o' file suitable for static linking |
| 13647 | -Wc,FLAG pass FLAG directly to the compiler |
| 13648 | @@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM." |
| 13649 | ;; |
| 13650 | |
| 13651 | *) |
| 13652 | - func_fatal_help "invalid operation mode \`$mode'" |
| 13653 | + func_fatal_help "invalid operation mode \`$opt_mode'" |
| 13654 | ;; |
| 13655 | esac |
| 13656 | |
| 13657 | @@ -1819,13 +2487,13 @@ if $opt_help; then |
| 13658 | else |
| 13659 | { |
| 13660 | func_help noexit |
| 13661 | - for mode in compile link execute install finish uninstall clean; do |
| 13662 | + for opt_mode in compile link execute install finish uninstall clean; do |
| 13663 | func_mode_help |
| 13664 | done |
| 13665 | } | sed -n '1p; 2,$s/^Usage:/ or: /p' |
| 13666 | { |
| 13667 | func_help noexit |
| 13668 | - for mode in compile link execute install finish uninstall clean; do |
| 13669 | + for opt_mode in compile link execute install finish uninstall clean; do |
| 13670 | echo |
| 13671 | func_mode_help |
| 13672 | done |
| 13673 | @@ -1854,13 +2522,16 @@ func_mode_execute () |
| 13674 | func_fatal_help "you must specify a COMMAND" |
| 13675 | |
| 13676 | # Handle -dlopen flags immediately. |
| 13677 | - for file in $execute_dlfiles; do |
| 13678 | + for file in $opt_dlopen; do |
| 13679 | test -f "$file" \ |
| 13680 | || func_fatal_help "\`$file' is not a file" |
| 13681 | |
| 13682 | dir= |
| 13683 | case $file in |
| 13684 | *.la) |
| 13685 | + func_resolve_sysroot "$file" |
| 13686 | + file=$func_resolve_sysroot_result |
| 13687 | + |
| 13688 | # Check to see that this really is a libtool archive. |
| 13689 | func_lalib_unsafe_p "$file" \ |
| 13690 | || func_fatal_help "\`$lib' is not a valid libtool archive" |
| 13691 | @@ -1882,7 +2553,7 @@ func_mode_execute () |
| 13692 | dir="$func_dirname_result" |
| 13693 | |
| 13694 | if test -f "$dir/$objdir/$dlname"; then |
| 13695 | - dir="$dir/$objdir" |
| 13696 | + func_append dir "/$objdir" |
| 13697 | else |
| 13698 | if test ! -f "$dir/$dlname"; then |
| 13699 | func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" |
| 13700 | @@ -1907,10 +2578,10 @@ func_mode_execute () |
| 13701 | test -n "$absdir" && dir="$absdir" |
| 13702 | |
| 13703 | # Now add the directory to shlibpath_var. |
| 13704 | - if eval test -z \"\$$shlibpath_var\"; then |
| 13705 | - eval $shlibpath_var=\$dir |
| 13706 | + if eval "test -z \"\$$shlibpath_var\""; then |
| 13707 | + eval "$shlibpath_var=\"\$dir\"" |
| 13708 | else |
| 13709 | - eval $shlibpath_var=\$dir:\$$shlibpath_var |
| 13710 | + eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" |
| 13711 | fi |
| 13712 | done |
| 13713 | |
| 13714 | @@ -1939,8 +2610,7 @@ func_mode_execute () |
| 13715 | ;; |
| 13716 | esac |
| 13717 | # Quote arguments (to preserve shell metacharacters). |
| 13718 | - func_quote_for_eval "$file" |
| 13719 | - args="$args $func_quote_for_eval_result" |
| 13720 | + func_append_quoted args "$file" |
| 13721 | done |
| 13722 | |
| 13723 | if test "X$opt_dry_run" = Xfalse; then |
| 13724 | @@ -1972,22 +2642,59 @@ func_mode_execute () |
| 13725 | fi |
| 13726 | } |
| 13727 | |
| 13728 | -test "$mode" = execute && func_mode_execute ${1+"$@"} |
| 13729 | +test "$opt_mode" = execute && func_mode_execute ${1+"$@"} |
| 13730 | |
| 13731 | |
| 13732 | # func_mode_finish arg... |
| 13733 | func_mode_finish () |
| 13734 | { |
| 13735 | $opt_debug |
| 13736 | - libdirs="$nonopt" |
| 13737 | + libs= |
| 13738 | + libdirs= |
| 13739 | admincmds= |
| 13740 | |
| 13741 | - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then |
| 13742 | - for dir |
| 13743 | - do |
| 13744 | - libdirs="$libdirs $dir" |
| 13745 | - done |
| 13746 | + for opt in "$nonopt" ${1+"$@"} |
| 13747 | + do |
| 13748 | + if test -d "$opt"; then |
| 13749 | + func_append libdirs " $opt" |
| 13750 | |
| 13751 | + elif test -f "$opt"; then |
| 13752 | + if func_lalib_unsafe_p "$opt"; then |
| 13753 | + func_append libs " $opt" |
| 13754 | + else |
| 13755 | + func_warning "\`$opt' is not a valid libtool archive" |
| 13756 | + fi |
| 13757 | + |
| 13758 | + else |
| 13759 | + func_fatal_error "invalid argument \`$opt'" |
| 13760 | + fi |
| 13761 | + done |
| 13762 | + |
| 13763 | + if test -n "$libs"; then |
| 13764 | + if test -n "$lt_sysroot"; then |
| 13765 | + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` |
| 13766 | + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" |
| 13767 | + else |
| 13768 | + sysroot_cmd= |
| 13769 | + fi |
| 13770 | + |
| 13771 | + # Remove sysroot references |
| 13772 | + if $opt_dry_run; then |
| 13773 | + for lib in $libs; do |
| 13774 | + echo "removing references to $lt_sysroot and \`=' prefixes from $lib" |
| 13775 | + done |
| 13776 | + else |
| 13777 | + tmpdir=`func_mktempdir` |
| 13778 | + for lib in $libs; do |
| 13779 | + sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ |
| 13780 | + > $tmpdir/tmp-la |
| 13781 | + mv -f $tmpdir/tmp-la $lib |
| 13782 | + done |
| 13783 | + ${RM}r "$tmpdir" |
| 13784 | + fi |
| 13785 | + fi |
| 13786 | + |
| 13787 | + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then |
| 13788 | for libdir in $libdirs; do |
| 13789 | if test -n "$finish_cmds"; then |
| 13790 | # Do each command in the finish commands. |
| 13791 | @@ -1997,7 +2704,7 @@ func_mode_finish () |
| 13792 | if test -n "$finish_eval"; then |
| 13793 | # Do the single finish_eval. |
| 13794 | eval cmds=\"$finish_eval\" |
| 13795 | - $opt_dry_run || eval "$cmds" || admincmds="$admincmds |
| 13796 | + $opt_dry_run || eval "$cmds" || func_append admincmds " |
| 13797 | $cmds" |
| 13798 | fi |
| 13799 | done |
| 13800 | @@ -2006,53 +2713,55 @@ func_mode_finish () |
| 13801 | # Exit here if they wanted silent mode. |
| 13802 | $opt_silent && exit $EXIT_SUCCESS |
| 13803 | |
| 13804 | - echo "----------------------------------------------------------------------" |
| 13805 | - echo "Libraries have been installed in:" |
| 13806 | - for libdir in $libdirs; do |
| 13807 | - $ECHO " $libdir" |
| 13808 | - done |
| 13809 | - echo |
| 13810 | - echo "If you ever happen to want to link against installed libraries" |
| 13811 | - echo "in a given directory, LIBDIR, you must either use libtool, and" |
| 13812 | - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" |
| 13813 | - echo "flag during linking and do at least one of the following:" |
| 13814 | - if test -n "$shlibpath_var"; then |
| 13815 | - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" |
| 13816 | - echo " during execution" |
| 13817 | - fi |
| 13818 | - if test -n "$runpath_var"; then |
| 13819 | - echo " - add LIBDIR to the \`$runpath_var' environment variable" |
| 13820 | - echo " during linking" |
| 13821 | - fi |
| 13822 | - if test -n "$hardcode_libdir_flag_spec"; then |
| 13823 | - libdir=LIBDIR |
| 13824 | - eval "flag=\"$hardcode_libdir_flag_spec\"" |
| 13825 | + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then |
| 13826 | + echo "----------------------------------------------------------------------" |
| 13827 | + echo "Libraries have been installed in:" |
| 13828 | + for libdir in $libdirs; do |
| 13829 | + $ECHO " $libdir" |
| 13830 | + done |
| 13831 | + echo |
| 13832 | + echo "If you ever happen to want to link against installed libraries" |
| 13833 | + echo "in a given directory, LIBDIR, you must either use libtool, and" |
| 13834 | + echo "specify the full pathname of the library, or use the \`-LLIBDIR'" |
| 13835 | + echo "flag during linking and do at least one of the following:" |
| 13836 | + if test -n "$shlibpath_var"; then |
| 13837 | + echo " - add LIBDIR to the \`$shlibpath_var' environment variable" |
| 13838 | + echo " during execution" |
| 13839 | + fi |
| 13840 | + if test -n "$runpath_var"; then |
| 13841 | + echo " - add LIBDIR to the \`$runpath_var' environment variable" |
| 13842 | + echo " during linking" |
| 13843 | + fi |
| 13844 | + if test -n "$hardcode_libdir_flag_spec"; then |
| 13845 | + libdir=LIBDIR |
| 13846 | + eval flag=\"$hardcode_libdir_flag_spec\" |
| 13847 | |
| 13848 | - $ECHO " - use the \`$flag' linker flag" |
| 13849 | - fi |
| 13850 | - if test -n "$admincmds"; then |
| 13851 | - $ECHO " - have your system administrator run these commands:$admincmds" |
| 13852 | - fi |
| 13853 | - if test -f /etc/ld.so.conf; then |
| 13854 | - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" |
| 13855 | - fi |
| 13856 | - echo |
| 13857 | + $ECHO " - use the \`$flag' linker flag" |
| 13858 | + fi |
| 13859 | + if test -n "$admincmds"; then |
| 13860 | + $ECHO " - have your system administrator run these commands:$admincmds" |
| 13861 | + fi |
| 13862 | + if test -f /etc/ld.so.conf; then |
| 13863 | + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" |
| 13864 | + fi |
| 13865 | + echo |
| 13866 | |
| 13867 | - echo "See any operating system documentation about shared libraries for" |
| 13868 | - case $host in |
| 13869 | - solaris2.[6789]|solaris2.1[0-9]) |
| 13870 | - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" |
| 13871 | - echo "pages." |
| 13872 | - ;; |
| 13873 | - *) |
| 13874 | - echo "more information, such as the ld(1) and ld.so(8) manual pages." |
| 13875 | - ;; |
| 13876 | - esac |
| 13877 | - echo "----------------------------------------------------------------------" |
| 13878 | + echo "See any operating system documentation about shared libraries for" |
| 13879 | + case $host in |
| 13880 | + solaris2.[6789]|solaris2.1[0-9]) |
| 13881 | + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" |
| 13882 | + echo "pages." |
| 13883 | + ;; |
| 13884 | + *) |
| 13885 | + echo "more information, such as the ld(1) and ld.so(8) manual pages." |
| 13886 | + ;; |
| 13887 | + esac |
| 13888 | + echo "----------------------------------------------------------------------" |
| 13889 | + fi |
| 13890 | exit $EXIT_SUCCESS |
| 13891 | } |
| 13892 | |
| 13893 | -test "$mode" = finish && func_mode_finish ${1+"$@"} |
| 13894 | +test "$opt_mode" = finish && func_mode_finish ${1+"$@"} |
| 13895 | |
| 13896 | |
| 13897 | # func_mode_install arg... |
| 13898 | @@ -2077,7 +2786,7 @@ func_mode_install () |
| 13899 | # The real first argument should be the name of the installation program. |
| 13900 | # Aesthetically quote it. |
| 13901 | func_quote_for_eval "$arg" |
| 13902 | - install_prog="$install_prog$func_quote_for_eval_result" |
| 13903 | + func_append install_prog "$func_quote_for_eval_result" |
| 13904 | install_shared_prog=$install_prog |
| 13905 | case " $install_prog " in |
| 13906 | *[\\\ /]cp\ *) install_cp=: ;; |
| 13907 | @@ -2097,7 +2806,7 @@ func_mode_install () |
| 13908 | do |
| 13909 | arg2= |
| 13910 | if test -n "$dest"; then |
| 13911 | - files="$files $dest" |
| 13912 | + func_append files " $dest" |
| 13913 | dest=$arg |
| 13914 | continue |
| 13915 | fi |
| 13916 | @@ -2135,11 +2844,11 @@ func_mode_install () |
| 13917 | |
| 13918 | # Aesthetically quote the argument. |
| 13919 | func_quote_for_eval "$arg" |
| 13920 | - install_prog="$install_prog $func_quote_for_eval_result" |
| 13921 | + func_append install_prog " $func_quote_for_eval_result" |
| 13922 | if test -n "$arg2"; then |
| 13923 | func_quote_for_eval "$arg2" |
| 13924 | fi |
| 13925 | - install_shared_prog="$install_shared_prog $func_quote_for_eval_result" |
| 13926 | + func_append install_shared_prog " $func_quote_for_eval_result" |
| 13927 | done |
| 13928 | |
| 13929 | test -z "$install_prog" && \ |
| 13930 | @@ -2151,7 +2860,7 @@ func_mode_install () |
| 13931 | if test -n "$install_override_mode" && $no_mode; then |
| 13932 | if $install_cp; then :; else |
| 13933 | func_quote_for_eval "$install_override_mode" |
| 13934 | - install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result" |
| 13935 | + func_append install_shared_prog " -m $func_quote_for_eval_result" |
| 13936 | fi |
| 13937 | fi |
| 13938 | |
| 13939 | @@ -2209,10 +2918,13 @@ func_mode_install () |
| 13940 | case $file in |
| 13941 | *.$libext) |
| 13942 | # Do the static libraries later. |
| 13943 | - staticlibs="$staticlibs $file" |
| 13944 | + func_append staticlibs " $file" |
| 13945 | ;; |
| 13946 | |
| 13947 | *.la) |
| 13948 | + func_resolve_sysroot "$file" |
| 13949 | + file=$func_resolve_sysroot_result |
| 13950 | + |
| 13951 | # Check to see that this really is a libtool archive. |
| 13952 | func_lalib_unsafe_p "$file" \ |
| 13953 | || func_fatal_help "\`$file' is not a valid libtool archive" |
| 13954 | @@ -2226,23 +2938,30 @@ func_mode_install () |
| 13955 | if test "X$destdir" = "X$libdir"; then |
| 13956 | case "$current_libdirs " in |
| 13957 | *" $libdir "*) ;; |
| 13958 | - *) current_libdirs="$current_libdirs $libdir" ;; |
| 13959 | + *) func_append current_libdirs " $libdir" ;; |
| 13960 | esac |
| 13961 | else |
| 13962 | # Note the libdir as a future libdir. |
| 13963 | case "$future_libdirs " in |
| 13964 | *" $libdir "*) ;; |
| 13965 | - *) future_libdirs="$future_libdirs $libdir" ;; |
| 13966 | + *) func_append future_libdirs " $libdir" ;; |
| 13967 | esac |
| 13968 | fi |
| 13969 | |
| 13970 | func_dirname "$file" "/" "" |
| 13971 | dir="$func_dirname_result" |
| 13972 | - dir="$dir$objdir" |
| 13973 | + func_append dir "$objdir" |
| 13974 | |
| 13975 | if test -n "$relink_command"; then |
| 13976 | + # Strip any trailing slash from the destination. |
| 13977 | + func_stripname '' '/' "$libdir" |
| 13978 | + destlibdir=$func_stripname_result |
| 13979 | + |
| 13980 | + func_stripname '' '/' "$destdir" |
| 13981 | + s_destdir=$func_stripname_result |
| 13982 | + |
| 13983 | # Determine the prefix the user has applied to our future dir. |
| 13984 | - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` |
| 13985 | + inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` |
| 13986 | |
| 13987 | # Don't allow the user to place us outside of our expected |
| 13988 | # location b/c this prevents finding dependent libraries that |
| 13989 | @@ -2315,7 +3034,7 @@ func_mode_install () |
| 13990 | func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' |
| 13991 | |
| 13992 | # Maybe install the static library, too. |
| 13993 | - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" |
| 13994 | + test -n "$old_library" && func_append staticlibs " $dir/$old_library" |
| 13995 | ;; |
| 13996 | |
| 13997 | *.lo) |
| 13998 | @@ -2503,7 +3222,7 @@ func_mode_install () |
| 13999 | test -n "$future_libdirs" && \ |
| 14000 | func_warning "remember to run \`$progname --finish$future_libdirs'" |
| 14001 | |
| 14002 | - if test -n "$current_libdirs" && $opt_finish; then |
| 14003 | + if test -n "$current_libdirs"; then |
| 14004 | # Maybe just do a dry run. |
| 14005 | $opt_dry_run && current_libdirs=" -n$current_libdirs" |
| 14006 | exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' |
| 14007 | @@ -2512,7 +3231,7 @@ func_mode_install () |
| 14008 | fi |
| 14009 | } |
| 14010 | |
| 14011 | -test "$mode" = install && func_mode_install ${1+"$@"} |
| 14012 | +test "$opt_mode" = install && func_mode_install ${1+"$@"} |
| 14013 | |
| 14014 | |
| 14015 | # func_generate_dlsyms outputname originator pic_p |
| 14016 | @@ -2559,6 +3278,18 @@ extern \"C\" { |
| 14017 | #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" |
| 14018 | #endif |
| 14019 | |
| 14020 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 14021 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 14022 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 14023 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 14024 | +# define LT_DLSYM_CONST |
| 14025 | +#elif defined(__osf__) |
| 14026 | +/* This system does not cope well with relocations in const data. */ |
| 14027 | +# define LT_DLSYM_CONST |
| 14028 | +#else |
| 14029 | +# define LT_DLSYM_CONST const |
| 14030 | +#endif |
| 14031 | + |
| 14032 | /* External symbol declarations for the compiler. */\ |
| 14033 | " |
| 14034 | |
| 14035 | @@ -2570,21 +3301,22 @@ extern \"C\" { |
| 14036 | # Add our own program objects to the symbol list. |
| 14037 | progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` |
| 14038 | for progfile in $progfiles; do |
| 14039 | - func_verbose "extracting global C symbols from \`$progfile'" |
| 14040 | - $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" |
| 14041 | + func_to_tool_file "$progfile" func_convert_file_msys_to_w32 |
| 14042 | + func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" |
| 14043 | + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" |
| 14044 | done |
| 14045 | |
| 14046 | if test -n "$exclude_expsyms"; then |
| 14047 | $opt_dry_run || { |
| 14048 | - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T |
| 14049 | - $MV "$nlist"T "$nlist" |
| 14050 | + eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' |
| 14051 | + eval '$MV "$nlist"T "$nlist"' |
| 14052 | } |
| 14053 | fi |
| 14054 | |
| 14055 | if test -n "$export_symbols_regex"; then |
| 14056 | $opt_dry_run || { |
| 14057 | - $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T |
| 14058 | - $MV "$nlist"T "$nlist" |
| 14059 | + eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' |
| 14060 | + eval '$MV "$nlist"T "$nlist"' |
| 14061 | } |
| 14062 | fi |
| 14063 | |
| 14064 | @@ -2593,23 +3325,23 @@ extern \"C\" { |
| 14065 | export_symbols="$output_objdir/$outputname.exp" |
| 14066 | $opt_dry_run || { |
| 14067 | $RM $export_symbols |
| 14068 | - ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols" |
| 14069 | + eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' |
| 14070 | case $host in |
| 14071 | *cygwin* | *mingw* | *cegcc* ) |
| 14072 | - echo EXPORTS > "$output_objdir/$outputname.def" |
| 14073 | - cat "$export_symbols" >> "$output_objdir/$outputname.def" |
| 14074 | + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' |
| 14075 | + eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' |
| 14076 | ;; |
| 14077 | esac |
| 14078 | } |
| 14079 | else |
| 14080 | $opt_dry_run || { |
| 14081 | - ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp" |
| 14082 | - $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T |
| 14083 | - $MV "$nlist"T "$nlist" |
| 14084 | + eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' |
| 14085 | + eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' |
| 14086 | + eval '$MV "$nlist"T "$nlist"' |
| 14087 | case $host in |
| 14088 | *cygwin* | *mingw* | *cegcc* ) |
| 14089 | - echo EXPORTS > "$output_objdir/$outputname.def" |
| 14090 | - cat "$nlist" >> "$output_objdir/$outputname.def" |
| 14091 | + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' |
| 14092 | + eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' |
| 14093 | ;; |
| 14094 | esac |
| 14095 | } |
| 14096 | @@ -2620,10 +3352,52 @@ extern \"C\" { |
| 14097 | func_verbose "extracting global C symbols from \`$dlprefile'" |
| 14098 | func_basename "$dlprefile" |
| 14099 | name="$func_basename_result" |
| 14100 | - $opt_dry_run || { |
| 14101 | - $ECHO ": $name " >> "$nlist" |
| 14102 | - eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" |
| 14103 | - } |
| 14104 | + case $host in |
| 14105 | + *cygwin* | *mingw* | *cegcc* ) |
| 14106 | + # if an import library, we need to obtain dlname |
| 14107 | + if func_win32_import_lib_p "$dlprefile"; then |
| 14108 | + func_tr_sh "$dlprefile" |
| 14109 | + eval "curr_lafile=\$libfile_$func_tr_sh_result" |
| 14110 | + dlprefile_dlbasename="" |
| 14111 | + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then |
| 14112 | + # Use subshell, to avoid clobbering current variable values |
| 14113 | + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` |
| 14114 | + if test -n "$dlprefile_dlname" ; then |
| 14115 | + func_basename "$dlprefile_dlname" |
| 14116 | + dlprefile_dlbasename="$func_basename_result" |
| 14117 | + else |
| 14118 | + # no lafile. user explicitly requested -dlpreopen <import library>. |
| 14119 | + $sharedlib_from_linklib_cmd "$dlprefile" |
| 14120 | + dlprefile_dlbasename=$sharedlib_from_linklib_result |
| 14121 | + fi |
| 14122 | + fi |
| 14123 | + $opt_dry_run || { |
| 14124 | + if test -n "$dlprefile_dlbasename" ; then |
| 14125 | + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' |
| 14126 | + else |
| 14127 | + func_warning "Could not compute DLL name from $name" |
| 14128 | + eval '$ECHO ": $name " >> "$nlist"' |
| 14129 | + fi |
| 14130 | + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 |
| 14131 | + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | |
| 14132 | + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" |
| 14133 | + } |
| 14134 | + else # not an import lib |
| 14135 | + $opt_dry_run || { |
| 14136 | + eval '$ECHO ": $name " >> "$nlist"' |
| 14137 | + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 |
| 14138 | + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" |
| 14139 | + } |
| 14140 | + fi |
| 14141 | + ;; |
| 14142 | + *) |
| 14143 | + $opt_dry_run || { |
| 14144 | + eval '$ECHO ": $name " >> "$nlist"' |
| 14145 | + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 |
| 14146 | + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" |
| 14147 | + } |
| 14148 | + ;; |
| 14149 | + esac |
| 14150 | done |
| 14151 | |
| 14152 | $opt_dry_run || { |
| 14153 | @@ -2661,26 +3435,9 @@ typedef struct { |
| 14154 | const char *name; |
| 14155 | void *address; |
| 14156 | } lt_dlsymlist; |
| 14157 | -" |
| 14158 | - case $host in |
| 14159 | - *cygwin* | *mingw* | *cegcc* ) |
| 14160 | - echo >> "$output_objdir/$my_dlsyms" "\ |
| 14161 | -/* DATA imports from DLLs on WIN32 con't be const, because |
| 14162 | - runtime relocations are performed -- see ld's documentation |
| 14163 | - on pseudo-relocs. */" |
| 14164 | - lt_dlsym_const= ;; |
| 14165 | - *osf5*) |
| 14166 | - echo >> "$output_objdir/$my_dlsyms" "\ |
| 14167 | -/* This system does not cope well with relocations in const data */" |
| 14168 | - lt_dlsym_const= ;; |
| 14169 | - *) |
| 14170 | - lt_dlsym_const=const ;; |
| 14171 | - esac |
| 14172 | - |
| 14173 | - echo >> "$output_objdir/$my_dlsyms" "\ |
| 14174 | -extern $lt_dlsym_const lt_dlsymlist |
| 14175 | +extern LT_DLSYM_CONST lt_dlsymlist |
| 14176 | lt_${my_prefix}_LTX_preloaded_symbols[]; |
| 14177 | -$lt_dlsym_const lt_dlsymlist |
| 14178 | +LT_DLSYM_CONST lt_dlsymlist |
| 14179 | lt_${my_prefix}_LTX_preloaded_symbols[] = |
| 14180 | {\ |
| 14181 | { \"$my_originator\", (void *) 0 }," |
| 14182 | @@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() { |
| 14183 | for arg in $LTCFLAGS; do |
| 14184 | case $arg in |
| 14185 | -pie | -fpie | -fPIE) ;; |
| 14186 | - *) symtab_cflags="$symtab_cflags $arg" ;; |
| 14187 | + *) func_append symtab_cflags " $arg" ;; |
| 14188 | esac |
| 14189 | done |
| 14190 | |
| 14191 | @@ -2796,9 +3553,11 @@ func_win32_libid () |
| 14192 | win32_libid_type="x86 archive import" |
| 14193 | ;; |
| 14194 | *ar\ archive*) # could be an import, or static |
| 14195 | - if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null | |
| 14196 | - $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then |
| 14197 | - win32_nmres=`$NM -f posix -A "$1" | |
| 14198 | + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. |
| 14199 | + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | |
| 14200 | + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then |
| 14201 | + func_to_tool_file "$1" func_convert_file_msys_to_w32 |
| 14202 | + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | |
| 14203 | $SED -n -e ' |
| 14204 | 1,100{ |
| 14205 | / I /{ |
| 14206 | @@ -2827,6 +3586,131 @@ func_win32_libid () |
| 14207 | $ECHO "$win32_libid_type" |
| 14208 | } |
| 14209 | |
| 14210 | +# func_cygming_dll_for_implib ARG |
| 14211 | +# |
| 14212 | +# Platform-specific function to extract the |
| 14213 | +# name of the DLL associated with the specified |
| 14214 | +# import library ARG. |
| 14215 | +# Invoked by eval'ing the libtool variable |
| 14216 | +# $sharedlib_from_linklib_cmd |
| 14217 | +# Result is available in the variable |
| 14218 | +# $sharedlib_from_linklib_result |
| 14219 | +func_cygming_dll_for_implib () |
| 14220 | +{ |
| 14221 | + $opt_debug |
| 14222 | + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` |
| 14223 | +} |
| 14224 | + |
| 14225 | +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs |
| 14226 | +# |
| 14227 | +# The is the core of a fallback implementation of a |
| 14228 | +# platform-specific function to extract the name of the |
| 14229 | +# DLL associated with the specified import library LIBNAME. |
| 14230 | +# |
| 14231 | +# SECTION_NAME is either .idata$6 or .idata$7, depending |
| 14232 | +# on the platform and compiler that created the implib. |
| 14233 | +# |
| 14234 | +# Echos the name of the DLL associated with the |
| 14235 | +# specified import library. |
| 14236 | +func_cygming_dll_for_implib_fallback_core () |
| 14237 | +{ |
| 14238 | + $opt_debug |
| 14239 | + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` |
| 14240 | + $OBJDUMP -s --section "$1" "$2" 2>/dev/null | |
| 14241 | + $SED '/^Contents of section '"$match_literal"':/{ |
| 14242 | + # Place marker at beginning of archive member dllname section |
| 14243 | + s/.*/====MARK====/ |
| 14244 | + p |
| 14245 | + d |
| 14246 | + } |
| 14247 | + # These lines can sometimes be longer than 43 characters, but |
| 14248 | + # are always uninteresting |
| 14249 | + /:[ ]*file format pe[i]\{,1\}-/d |
| 14250 | + /^In archive [^:]*:/d |
| 14251 | + # Ensure marker is printed |
| 14252 | + /^====MARK====/p |
| 14253 | + # Remove all lines with less than 43 characters |
| 14254 | + /^.\{43\}/!d |
| 14255 | + # From remaining lines, remove first 43 characters |
| 14256 | + s/^.\{43\}//' | |
| 14257 | + $SED -n ' |
| 14258 | + # Join marker and all lines until next marker into a single line |
| 14259 | + /^====MARK====/ b para |
| 14260 | + H |
| 14261 | + $ b para |
| 14262 | + b |
| 14263 | + :para |
| 14264 | + x |
| 14265 | + s/\n//g |
| 14266 | + # Remove the marker |
| 14267 | + s/^====MARK====// |
| 14268 | + # Remove trailing dots and whitespace |
| 14269 | + s/[\. \t]*$// |
| 14270 | + # Print |
| 14271 | + /./p' | |
| 14272 | + # we now have a list, one entry per line, of the stringified |
| 14273 | + # contents of the appropriate section of all members of the |
| 14274 | + # archive which possess that section. Heuristic: eliminate |
| 14275 | + # all those which have a first or second character that is |
| 14276 | + # a '.' (that is, objdump's representation of an unprintable |
| 14277 | + # character.) This should work for all archives with less than |
| 14278 | + # 0x302f exports -- but will fail for DLLs whose name actually |
| 14279 | + # begins with a literal '.' or a single character followed by |
| 14280 | + # a '.'. |
| 14281 | + # |
| 14282 | + # Of those that remain, print the first one. |
| 14283 | + $SED -e '/^\./d;/^.\./d;q' |
| 14284 | +} |
| 14285 | + |
| 14286 | +# func_cygming_gnu_implib_p ARG |
| 14287 | +# This predicate returns with zero status (TRUE) if |
| 14288 | +# ARG is a GNU/binutils-style import library. Returns |
| 14289 | +# with nonzero status (FALSE) otherwise. |
| 14290 | +func_cygming_gnu_implib_p () |
| 14291 | +{ |
| 14292 | + $opt_debug |
| 14293 | + func_to_tool_file "$1" func_convert_file_msys_to_w32 |
| 14294 | + 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)$'` |
| 14295 | + test -n "$func_cygming_gnu_implib_tmp" |
| 14296 | +} |
| 14297 | + |
| 14298 | +# func_cygming_ms_implib_p ARG |
| 14299 | +# This predicate returns with zero status (TRUE) if |
| 14300 | +# ARG is an MS-style import library. Returns |
| 14301 | +# with nonzero status (FALSE) otherwise. |
| 14302 | +func_cygming_ms_implib_p () |
| 14303 | +{ |
| 14304 | + $opt_debug |
| 14305 | + func_to_tool_file "$1" func_convert_file_msys_to_w32 |
| 14306 | + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` |
| 14307 | + test -n "$func_cygming_ms_implib_tmp" |
| 14308 | +} |
| 14309 | + |
| 14310 | +# func_cygming_dll_for_implib_fallback ARG |
| 14311 | +# Platform-specific function to extract the |
| 14312 | +# name of the DLL associated with the specified |
| 14313 | +# import library ARG. |
| 14314 | +# |
| 14315 | +# This fallback implementation is for use when $DLLTOOL |
| 14316 | +# does not support the --identify-strict option. |
| 14317 | +# Invoked by eval'ing the libtool variable |
| 14318 | +# $sharedlib_from_linklib_cmd |
| 14319 | +# Result is available in the variable |
| 14320 | +# $sharedlib_from_linklib_result |
| 14321 | +func_cygming_dll_for_implib_fallback () |
| 14322 | +{ |
| 14323 | + $opt_debug |
| 14324 | + if func_cygming_gnu_implib_p "$1" ; then |
| 14325 | + # binutils import library |
| 14326 | + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` |
| 14327 | + elif func_cygming_ms_implib_p "$1" ; then |
| 14328 | + # ms-generated import library |
| 14329 | + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` |
| 14330 | + else |
| 14331 | + # unknown |
| 14332 | + sharedlib_from_linklib_result="" |
| 14333 | + fi |
| 14334 | +} |
| 14335 | |
| 14336 | |
| 14337 | # func_extract_an_archive dir oldlib |
| 14338 | @@ -2917,7 +3801,7 @@ func_extract_archives () |
| 14339 | darwin_file= |
| 14340 | darwin_files= |
| 14341 | for darwin_file in $darwin_filelist; do |
| 14342 | - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` |
| 14343 | + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` |
| 14344 | $LIPO -create -output "$darwin_file" $darwin_files |
| 14345 | done # $darwin_filelist |
| 14346 | $RM -rf unfat-$$ |
| 14347 | @@ -2932,7 +3816,7 @@ func_extract_archives () |
| 14348 | func_extract_an_archive "$my_xdir" "$my_xabs" |
| 14349 | ;; |
| 14350 | esac |
| 14351 | - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` |
| 14352 | + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` |
| 14353 | done |
| 14354 | |
| 14355 | func_extract_archives_result="$my_oldobjs" |
| 14356 | @@ -3014,7 +3898,110 @@ func_fallback_echo () |
| 14357 | _LTECHO_EOF' |
| 14358 | } |
| 14359 | ECHO=\"$qECHO\" |
| 14360 | - fi\ |
| 14361 | + fi |
| 14362 | + |
| 14363 | +# Very basic option parsing. These options are (a) specific to |
| 14364 | +# the libtool wrapper, (b) are identical between the wrapper |
| 14365 | +# /script/ and the wrapper /executable/ which is used only on |
| 14366 | +# windows platforms, and (c) all begin with the string "--lt-" |
| 14367 | +# (application programs are unlikely to have options which match |
| 14368 | +# this pattern). |
| 14369 | +# |
| 14370 | +# There are only two supported options: --lt-debug and |
| 14371 | +# --lt-dump-script. There is, deliberately, no --lt-help. |
| 14372 | +# |
| 14373 | +# The first argument to this parsing function should be the |
| 14374 | +# script's $0 value, followed by "$@". |
| 14375 | +lt_option_debug= |
| 14376 | +func_parse_lt_options () |
| 14377 | +{ |
| 14378 | + lt_script_arg0=\$0 |
| 14379 | + shift |
| 14380 | + for lt_opt |
| 14381 | + do |
| 14382 | + case \"\$lt_opt\" in |
| 14383 | + --lt-debug) lt_option_debug=1 ;; |
| 14384 | + --lt-dump-script) |
| 14385 | + lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` |
| 14386 | + test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. |
| 14387 | + lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` |
| 14388 | + cat \"\$lt_dump_D/\$lt_dump_F\" |
| 14389 | + exit 0 |
| 14390 | + ;; |
| 14391 | + --lt-*) |
| 14392 | + \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 |
| 14393 | + exit 1 |
| 14394 | + ;; |
| 14395 | + esac |
| 14396 | + done |
| 14397 | + |
| 14398 | + # Print the debug banner immediately: |
| 14399 | + if test -n \"\$lt_option_debug\"; then |
| 14400 | + echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 |
| 14401 | + fi |
| 14402 | +} |
| 14403 | + |
| 14404 | +# Used when --lt-debug. Prints its arguments to stdout |
| 14405 | +# (redirection is the responsibility of the caller) |
| 14406 | +func_lt_dump_args () |
| 14407 | +{ |
| 14408 | + lt_dump_args_N=1; |
| 14409 | + for lt_arg |
| 14410 | + do |
| 14411 | + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" |
| 14412 | + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` |
| 14413 | + done |
| 14414 | +} |
| 14415 | + |
| 14416 | +# Core function for launching the target application |
| 14417 | +func_exec_program_core () |
| 14418 | +{ |
| 14419 | +" |
| 14420 | + case $host in |
| 14421 | + # Backslashes separate directories on plain windows |
| 14422 | + *-*-mingw | *-*-os2* | *-cegcc*) |
| 14423 | + $ECHO "\ |
| 14424 | + if test -n \"\$lt_option_debug\"; then |
| 14425 | + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 |
| 14426 | + func_lt_dump_args \${1+\"\$@\"} 1>&2 |
| 14427 | + fi |
| 14428 | + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} |
| 14429 | +" |
| 14430 | + ;; |
| 14431 | + |
| 14432 | + *) |
| 14433 | + $ECHO "\ |
| 14434 | + if test -n \"\$lt_option_debug\"; then |
| 14435 | + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 |
| 14436 | + func_lt_dump_args \${1+\"\$@\"} 1>&2 |
| 14437 | + fi |
| 14438 | + exec \"\$progdir/\$program\" \${1+\"\$@\"} |
| 14439 | +" |
| 14440 | + ;; |
| 14441 | + esac |
| 14442 | + $ECHO "\ |
| 14443 | + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 |
| 14444 | + exit 1 |
| 14445 | +} |
| 14446 | + |
| 14447 | +# A function to encapsulate launching the target application |
| 14448 | +# Strips options in the --lt-* namespace from \$@ and |
| 14449 | +# launches target application with the remaining arguments. |
| 14450 | +func_exec_program () |
| 14451 | +{ |
| 14452 | + for lt_wr_arg |
| 14453 | + do |
| 14454 | + case \$lt_wr_arg in |
| 14455 | + --lt-*) ;; |
| 14456 | + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; |
| 14457 | + esac |
| 14458 | + shift |
| 14459 | + done |
| 14460 | + func_exec_program_core \${1+\"\$@\"} |
| 14461 | +} |
| 14462 | + |
| 14463 | + # Parse options |
| 14464 | + func_parse_lt_options \"\$0\" \${1+\"\$@\"} |
| 14465 | |
| 14466 | # Find the directory that this script lives in. |
| 14467 | thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` |
| 14468 | @@ -3078,7 +4065,7 @@ _LTECHO_EOF' |
| 14469 | |
| 14470 | # relink executable if necessary |
| 14471 | if test -n \"\$relink_command\"; then |
| 14472 | - if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then : |
| 14473 | + if relink_command_output=\`eval \$relink_command 2>&1\`; then : |
| 14474 | else |
| 14475 | $ECHO \"\$relink_command_output\" >&2 |
| 14476 | $RM \"\$progdir/\$file\" |
| 14477 | @@ -3102,6 +4089,18 @@ _LTECHO_EOF' |
| 14478 | |
| 14479 | if test -f \"\$progdir/\$program\"; then" |
| 14480 | |
| 14481 | + # fixup the dll searchpath if we need to. |
| 14482 | + # |
| 14483 | + # Fix the DLL searchpath if we need to. Do this before prepending |
| 14484 | + # to shlibpath, because on Windows, both are PATH and uninstalled |
| 14485 | + # libraries must come first. |
| 14486 | + if test -n "$dllsearchpath"; then |
| 14487 | + $ECHO "\ |
| 14488 | + # Add the dll search path components to the executable PATH |
| 14489 | + PATH=$dllsearchpath:\$PATH |
| 14490 | +" |
| 14491 | + fi |
| 14492 | + |
| 14493 | # Export our shlibpath_var if we have one. |
| 14494 | if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then |
| 14495 | $ECHO "\ |
| 14496 | @@ -3116,35 +4115,10 @@ _LTECHO_EOF' |
| 14497 | " |
| 14498 | fi |
| 14499 | |
| 14500 | - # fixup the dll searchpath if we need to. |
| 14501 | - if test -n "$dllsearchpath"; then |
| 14502 | - $ECHO "\ |
| 14503 | - # Add the dll search path components to the executable PATH |
| 14504 | - PATH=$dllsearchpath:\$PATH |
| 14505 | -" |
| 14506 | - fi |
| 14507 | - |
| 14508 | $ECHO "\ |
| 14509 | if test \"\$libtool_execute_magic\" != \"$magic\"; then |
| 14510 | # Run the actual program with our arguments. |
| 14511 | -" |
| 14512 | - case $host in |
| 14513 | - # Backslashes separate directories on plain windows |
| 14514 | - *-*-mingw | *-*-os2* | *-cegcc*) |
| 14515 | - $ECHO "\ |
| 14516 | - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} |
| 14517 | -" |
| 14518 | - ;; |
| 14519 | - |
| 14520 | - *) |
| 14521 | - $ECHO "\ |
| 14522 | - exec \"\$progdir/\$program\" \${1+\"\$@\"} |
| 14523 | -" |
| 14524 | - ;; |
| 14525 | - esac |
| 14526 | - $ECHO "\ |
| 14527 | - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 |
| 14528 | - exit 1 |
| 14529 | + func_exec_program \${1+\"\$@\"} |
| 14530 | fi |
| 14531 | else |
| 14532 | # The program doesn't exist. |
| 14533 | @@ -3158,166 +4132,6 @@ fi\ |
| 14534 | } |
| 14535 | |
| 14536 | |
| 14537 | -# func_to_host_path arg |
| 14538 | -# |
| 14539 | -# Convert paths to host format when used with build tools. |
| 14540 | -# Intended for use with "native" mingw (where libtool itself |
| 14541 | -# is running under the msys shell), or in the following cross- |
| 14542 | -# build environments: |
| 14543 | -# $build $host |
| 14544 | -# mingw (msys) mingw [e.g. native] |
| 14545 | -# cygwin mingw |
| 14546 | -# *nix + wine mingw |
| 14547 | -# where wine is equipped with the `winepath' executable. |
| 14548 | -# In the native mingw case, the (msys) shell automatically |
| 14549 | -# converts paths for any non-msys applications it launches, |
| 14550 | -# but that facility isn't available from inside the cwrapper. |
| 14551 | -# Similar accommodations are necessary for $host mingw and |
| 14552 | -# $build cygwin. Calling this function does no harm for other |
| 14553 | -# $host/$build combinations not listed above. |
| 14554 | -# |
| 14555 | -# ARG is the path (on $build) that should be converted to |
| 14556 | -# the proper representation for $host. The result is stored |
| 14557 | -# in $func_to_host_path_result. |
| 14558 | -func_to_host_path () |
| 14559 | -{ |
| 14560 | - func_to_host_path_result="$1" |
| 14561 | - if test -n "$1"; then |
| 14562 | - case $host in |
| 14563 | - *mingw* ) |
| 14564 | - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' |
| 14565 | - case $build in |
| 14566 | - *mingw* ) # actually, msys |
| 14567 | - # awkward: cmd appends spaces to result |
| 14568 | - func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | |
| 14569 | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` |
| 14570 | - ;; |
| 14571 | - *cygwin* ) |
| 14572 | - func_to_host_path_result=`cygpath -w "$1" | |
| 14573 | - $SED -e "$lt_sed_naive_backslashify"` |
| 14574 | - ;; |
| 14575 | - * ) |
| 14576 | - # Unfortunately, winepath does not exit with a non-zero |
| 14577 | - # error code, so we are forced to check the contents of |
| 14578 | - # stdout. On the other hand, if the command is not |
| 14579 | - # found, the shell will set an exit code of 127 and print |
| 14580 | - # *an error message* to stdout. So we must check for both |
| 14581 | - # error code of zero AND non-empty stdout, which explains |
| 14582 | - # the odd construction: |
| 14583 | - func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` |
| 14584 | - if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then |
| 14585 | - func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | |
| 14586 | - $SED -e "$lt_sed_naive_backslashify"` |
| 14587 | - else |
| 14588 | - # Allow warning below. |
| 14589 | - func_to_host_path_result= |
| 14590 | - fi |
| 14591 | - ;; |
| 14592 | - esac |
| 14593 | - if test -z "$func_to_host_path_result" ; then |
| 14594 | - func_error "Could not determine host path corresponding to" |
| 14595 | - func_error " \`$1'" |
| 14596 | - func_error "Continuing, but uninstalled executables may not work." |
| 14597 | - # Fallback: |
| 14598 | - func_to_host_path_result="$1" |
| 14599 | - fi |
| 14600 | - ;; |
| 14601 | - esac |
| 14602 | - fi |
| 14603 | -} |
| 14604 | -# end: func_to_host_path |
| 14605 | - |
| 14606 | -# func_to_host_pathlist arg |
| 14607 | -# |
| 14608 | -# Convert pathlists to host format when used with build tools. |
| 14609 | -# See func_to_host_path(), above. This function supports the |
| 14610 | -# following $build/$host combinations (but does no harm for |
| 14611 | -# combinations not listed here): |
| 14612 | -# $build $host |
| 14613 | -# mingw (msys) mingw [e.g. native] |
| 14614 | -# cygwin mingw |
| 14615 | -# *nix + wine mingw |
| 14616 | -# |
| 14617 | -# Path separators are also converted from $build format to |
| 14618 | -# $host format. If ARG begins or ends with a path separator |
| 14619 | -# character, it is preserved (but converted to $host format) |
| 14620 | -# on output. |
| 14621 | -# |
| 14622 | -# ARG is a pathlist (on $build) that should be converted to |
| 14623 | -# the proper representation on $host. The result is stored |
| 14624 | -# in $func_to_host_pathlist_result. |
| 14625 | -func_to_host_pathlist () |
| 14626 | -{ |
| 14627 | - func_to_host_pathlist_result="$1" |
| 14628 | - if test -n "$1"; then |
| 14629 | - case $host in |
| 14630 | - *mingw* ) |
| 14631 | - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' |
| 14632 | - # Remove leading and trailing path separator characters from |
| 14633 | - # ARG. msys behavior is inconsistent here, cygpath turns them |
| 14634 | - # into '.;' and ';.', and winepath ignores them completely. |
| 14635 | - func_stripname : : "$1" |
| 14636 | - func_to_host_pathlist_tmp1=$func_stripname_result |
| 14637 | - case $build in |
| 14638 | - *mingw* ) # Actually, msys. |
| 14639 | - # Awkward: cmd appends spaces to result. |
| 14640 | - func_to_host_pathlist_result=` |
| 14641 | - ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | |
| 14642 | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` |
| 14643 | - ;; |
| 14644 | - *cygwin* ) |
| 14645 | - func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | |
| 14646 | - $SED -e "$lt_sed_naive_backslashify"` |
| 14647 | - ;; |
| 14648 | - * ) |
| 14649 | - # unfortunately, winepath doesn't convert pathlists |
| 14650 | - func_to_host_pathlist_result="" |
| 14651 | - func_to_host_pathlist_oldIFS=$IFS |
| 14652 | - IFS=: |
| 14653 | - for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do |
| 14654 | - IFS=$func_to_host_pathlist_oldIFS |
| 14655 | - if test -n "$func_to_host_pathlist_f" ; then |
| 14656 | - func_to_host_path "$func_to_host_pathlist_f" |
| 14657 | - if test -n "$func_to_host_path_result" ; then |
| 14658 | - if test -z "$func_to_host_pathlist_result" ; then |
| 14659 | - func_to_host_pathlist_result="$func_to_host_path_result" |
| 14660 | - else |
| 14661 | - func_append func_to_host_pathlist_result ";$func_to_host_path_result" |
| 14662 | - fi |
| 14663 | - fi |
| 14664 | - fi |
| 14665 | - done |
| 14666 | - IFS=$func_to_host_pathlist_oldIFS |
| 14667 | - ;; |
| 14668 | - esac |
| 14669 | - if test -z "$func_to_host_pathlist_result"; then |
| 14670 | - func_error "Could not determine the host path(s) corresponding to" |
| 14671 | - func_error " \`$1'" |
| 14672 | - func_error "Continuing, but uninstalled executables may not work." |
| 14673 | - # Fallback. This may break if $1 contains DOS-style drive |
| 14674 | - # specifications. The fix is not to complicate the expression |
| 14675 | - # below, but for the user to provide a working wine installation |
| 14676 | - # with winepath so that path translation in the cross-to-mingw |
| 14677 | - # case works properly. |
| 14678 | - lt_replace_pathsep_nix_to_dos="s|:|;|g" |
| 14679 | - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ |
| 14680 | - $SED -e "$lt_replace_pathsep_nix_to_dos"` |
| 14681 | - fi |
| 14682 | - # Now, add the leading and trailing path separators back |
| 14683 | - case "$1" in |
| 14684 | - :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" |
| 14685 | - ;; |
| 14686 | - esac |
| 14687 | - case "$1" in |
| 14688 | - *: ) func_append func_to_host_pathlist_result ";" |
| 14689 | - ;; |
| 14690 | - esac |
| 14691 | - ;; |
| 14692 | - esac |
| 14693 | - fi |
| 14694 | -} |
| 14695 | -# end: func_to_host_pathlist |
| 14696 | - |
| 14697 | # func_emit_cwrapperexe_src |
| 14698 | # emit the source code for a wrapper executable on stdout |
| 14699 | # Must ONLY be called from within func_mode_link because |
| 14700 | @@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src () |
| 14701 | |
| 14702 | This wrapper executable should never be moved out of the build directory. |
| 14703 | If it is, it will not operate correctly. |
| 14704 | - |
| 14705 | - Currently, it simply execs the wrapper *script* "$SHELL $output", |
| 14706 | - but could eventually absorb all of the scripts functionality and |
| 14707 | - exec $objdir/$outputname directly. |
| 14708 | */ |
| 14709 | EOF |
| 14710 | cat <<"EOF" |
| 14711 | @@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int); |
| 14712 | if (stale) { free ((void *) stale); stale = 0; } \ |
| 14713 | } while (0) |
| 14714 | |
| 14715 | -#undef LTWRAPPER_DEBUGPRINTF |
| 14716 | -#if defined LT_DEBUGWRAPPER |
| 14717 | -# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args |
| 14718 | -static void |
| 14719 | -ltwrapper_debugprintf (const char *fmt, ...) |
| 14720 | -{ |
| 14721 | - va_list args; |
| 14722 | - va_start (args, fmt); |
| 14723 | - (void) vfprintf (stderr, fmt, args); |
| 14724 | - va_end (args); |
| 14725 | -} |
| 14726 | +#if defined(LT_DEBUGWRAPPER) |
| 14727 | +static int lt_debug = 1; |
| 14728 | #else |
| 14729 | -# define LTWRAPPER_DEBUGPRINTF(args) |
| 14730 | +static int lt_debug = 0; |
| 14731 | #endif |
| 14732 | |
| 14733 | -const char *program_name = NULL; |
| 14734 | +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ |
| 14735 | |
| 14736 | void *xmalloc (size_t num); |
| 14737 | char *xstrdup (const char *string); |
| 14738 | @@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec); |
| 14739 | int make_executable (const char *path); |
| 14740 | int check_executable (const char *path); |
| 14741 | char *strendzap (char *str, const char *pat); |
| 14742 | -void lt_fatal (const char *message, ...); |
| 14743 | +void lt_debugprintf (const char *file, int line, const char *fmt, ...); |
| 14744 | +void lt_fatal (const char *file, int line, const char *message, ...); |
| 14745 | +static const char *nonnull (const char *s); |
| 14746 | +static const char *nonempty (const char *s); |
| 14747 | void lt_setenv (const char *name, const char *value); |
| 14748 | char *lt_extend_str (const char *orig_value, const char *add, int to_end); |
| 14749 | void lt_update_exe_path (const char *name, const char *value); |
| 14750 | @@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f); |
| 14751 | EOF |
| 14752 | |
| 14753 | cat <<EOF |
| 14754 | -const char * MAGIC_EXE = "$magic_exe"; |
| 14755 | +volatile const char * MAGIC_EXE = "$magic_exe"; |
| 14756 | const char * LIB_PATH_VARNAME = "$shlibpath_var"; |
| 14757 | EOF |
| 14758 | |
| 14759 | if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then |
| 14760 | - func_to_host_pathlist "$temp_rpath" |
| 14761 | + func_to_host_path "$temp_rpath" |
| 14762 | cat <<EOF |
| 14763 | -const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result"; |
| 14764 | +const char * LIB_PATH_VALUE = "$func_to_host_path_result"; |
| 14765 | EOF |
| 14766 | else |
| 14767 | cat <<"EOF" |
| 14768 | @@ -3513,10 +4317,10 @@ EOF |
| 14769 | fi |
| 14770 | |
| 14771 | if test -n "$dllsearchpath"; then |
| 14772 | - func_to_host_pathlist "$dllsearchpath:" |
| 14773 | + func_to_host_path "$dllsearchpath:" |
| 14774 | cat <<EOF |
| 14775 | const char * EXE_PATH_VARNAME = "PATH"; |
| 14776 | -const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result"; |
| 14777 | +const char * EXE_PATH_VALUE = "$func_to_host_path_result"; |
| 14778 | EOF |
| 14779 | else |
| 14780 | cat <<"EOF" |
| 14781 | @@ -3539,12 +4343,10 @@ EOF |
| 14782 | cat <<"EOF" |
| 14783 | |
| 14784 | #define LTWRAPPER_OPTION_PREFIX "--lt-" |
| 14785 | -#define LTWRAPPER_OPTION_PREFIX_LENGTH 5 |
| 14786 | |
| 14787 | -static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH; |
| 14788 | static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX; |
| 14789 | - |
| 14790 | static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script"; |
| 14791 | +static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug"; |
| 14792 | |
| 14793 | int |
| 14794 | main (int argc, char *argv[]) |
| 14795 | @@ -3561,10 +4363,13 @@ main (int argc, char *argv[]) |
| 14796 | int i; |
| 14797 | |
| 14798 | program_name = (char *) xstrdup (base_name (argv[0])); |
| 14799 | - LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0])); |
| 14800 | - LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name)); |
| 14801 | + newargz = XMALLOC (char *, argc + 1); |
| 14802 | |
| 14803 | - /* very simple arg parsing; don't want to rely on getopt */ |
| 14804 | + /* very simple arg parsing; don't want to rely on getopt |
| 14805 | + * also, copy all non cwrapper options to newargz, except |
| 14806 | + * argz[0], which is handled differently |
| 14807 | + */ |
| 14808 | + newargc=0; |
| 14809 | for (i = 1; i < argc; i++) |
| 14810 | { |
| 14811 | if (strcmp (argv[i], dumpscript_opt) == 0) |
| 14812 | @@ -3581,21 +4386,54 @@ EOF |
| 14813 | lt_dump_script (stdout); |
| 14814 | return 0; |
| 14815 | } |
| 14816 | + if (strcmp (argv[i], debug_opt) == 0) |
| 14817 | + { |
| 14818 | + lt_debug = 1; |
| 14819 | + continue; |
| 14820 | + } |
| 14821 | + if (strcmp (argv[i], ltwrapper_option_prefix) == 0) |
| 14822 | + { |
| 14823 | + /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX |
| 14824 | + namespace, but it is not one of the ones we know about and |
| 14825 | + have already dealt with, above (inluding dump-script), then |
| 14826 | + report an error. Otherwise, targets might begin to believe |
| 14827 | + they are allowed to use options in the LTWRAPPER_OPTION_PREFIX |
| 14828 | + namespace. The first time any user complains about this, we'll |
| 14829 | + need to make LTWRAPPER_OPTION_PREFIX a configure-time option |
| 14830 | + or a configure.ac-settable value. |
| 14831 | + */ |
| 14832 | + lt_fatal (__FILE__, __LINE__, |
| 14833 | + "unrecognized %s option: '%s'", |
| 14834 | + ltwrapper_option_prefix, argv[i]); |
| 14835 | + } |
| 14836 | + /* otherwise ... */ |
| 14837 | + newargz[++newargc] = xstrdup (argv[i]); |
| 14838 | } |
| 14839 | + newargz[++newargc] = NULL; |
| 14840 | + |
| 14841 | +EOF |
| 14842 | + cat <<EOF |
| 14843 | + /* The GNU banner must be the first non-error debug message */ |
| 14844 | + lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n"); |
| 14845 | +EOF |
| 14846 | + cat <<"EOF" |
| 14847 | + lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]); |
| 14848 | + lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name); |
| 14849 | |
| 14850 | - newargz = XMALLOC (char *, argc + 1); |
| 14851 | tmp_pathspec = find_executable (argv[0]); |
| 14852 | if (tmp_pathspec == NULL) |
| 14853 | - lt_fatal ("Couldn't find %s", argv[0]); |
| 14854 | - LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", |
| 14855 | - tmp_pathspec)); |
| 14856 | + lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]); |
| 14857 | + lt_debugprintf (__FILE__, __LINE__, |
| 14858 | + "(main) found exe (before symlink chase) at: %s\n", |
| 14859 | + tmp_pathspec); |
| 14860 | |
| 14861 | actual_cwrapper_path = chase_symlinks (tmp_pathspec); |
| 14862 | - LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n", |
| 14863 | - actual_cwrapper_path)); |
| 14864 | + lt_debugprintf (__FILE__, __LINE__, |
| 14865 | + "(main) found exe (after symlink chase) at: %s\n", |
| 14866 | + actual_cwrapper_path); |
| 14867 | XFREE (tmp_pathspec); |
| 14868 | |
| 14869 | - actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path)); |
| 14870 | + actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path)); |
| 14871 | strendzap (actual_cwrapper_path, actual_cwrapper_name); |
| 14872 | |
| 14873 | /* wrapper name transforms */ |
| 14874 | @@ -3613,8 +4451,9 @@ EOF |
| 14875 | target_name = tmp_pathspec; |
| 14876 | tmp_pathspec = 0; |
| 14877 | |
| 14878 | - LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n", |
| 14879 | - target_name)); |
| 14880 | + lt_debugprintf (__FILE__, __LINE__, |
| 14881 | + "(main) libtool target name: %s\n", |
| 14882 | + target_name); |
| 14883 | EOF |
| 14884 | |
| 14885 | cat <<EOF |
| 14886 | @@ -3664,35 +4503,19 @@ EOF |
| 14887 | |
| 14888 | lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */ |
| 14889 | lt_setenv ("DUALCASE", "1"); /* for MSK sh */ |
| 14890 | - lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); |
| 14891 | + /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must |
| 14892 | + be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath) |
| 14893 | + because on Windows, both *_VARNAMEs are PATH but uninstalled |
| 14894 | + libraries must come first. */ |
| 14895 | lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE); |
| 14896 | + lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); |
| 14897 | |
| 14898 | - newargc=0; |
| 14899 | - for (i = 1; i < argc; i++) |
| 14900 | - { |
| 14901 | - if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0) |
| 14902 | - { |
| 14903 | - /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX |
| 14904 | - namespace, but it is not one of the ones we know about and |
| 14905 | - have already dealt with, above (inluding dump-script), then |
| 14906 | - report an error. Otherwise, targets might begin to believe |
| 14907 | - they are allowed to use options in the LTWRAPPER_OPTION_PREFIX |
| 14908 | - namespace. The first time any user complains about this, we'll |
| 14909 | - need to make LTWRAPPER_OPTION_PREFIX a configure-time option |
| 14910 | - or a configure.ac-settable value. |
| 14911 | - */ |
| 14912 | - lt_fatal ("Unrecognized option in %s namespace: '%s'", |
| 14913 | - ltwrapper_option_prefix, argv[i]); |
| 14914 | - } |
| 14915 | - /* otherwise ... */ |
| 14916 | - newargz[++newargc] = xstrdup (argv[i]); |
| 14917 | - } |
| 14918 | - newargz[++newargc] = NULL; |
| 14919 | - |
| 14920 | - LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>"))); |
| 14921 | + lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", |
| 14922 | + nonnull (lt_argv_zero)); |
| 14923 | for (i = 0; i < newargc; i++) |
| 14924 | { |
| 14925 | - LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>"))); |
| 14926 | + lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", |
| 14927 | + i, nonnull (newargz[i])); |
| 14928 | } |
| 14929 | |
| 14930 | EOF |
| 14931 | @@ -3706,7 +4529,9 @@ EOF |
| 14932 | if (rval == -1) |
| 14933 | { |
| 14934 | /* failed to start process */ |
| 14935 | - LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); |
| 14936 | + lt_debugprintf (__FILE__, __LINE__, |
| 14937 | + "(main) failed to launch target \"%s\": %s\n", |
| 14938 | + lt_argv_zero, nonnull (strerror (errno))); |
| 14939 | return 127; |
| 14940 | } |
| 14941 | return rval; |
| 14942 | @@ -3728,7 +4553,7 @@ xmalloc (size_t num) |
| 14943 | { |
| 14944 | void *p = (void *) malloc (num); |
| 14945 | if (!p) |
| 14946 | - lt_fatal ("Memory exhausted"); |
| 14947 | + lt_fatal (__FILE__, __LINE__, "memory exhausted"); |
| 14948 | |
| 14949 | return p; |
| 14950 | } |
| 14951 | @@ -3762,8 +4587,8 @@ check_executable (const char *path) |
| 14952 | { |
| 14953 | struct stat st; |
| 14954 | |
| 14955 | - LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", |
| 14956 | - path ? (*path ? path : "EMPTY!") : "NULL!")); |
| 14957 | + lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", |
| 14958 | + nonempty (path)); |
| 14959 | if ((!path) || (!*path)) |
| 14960 | return 0; |
| 14961 | |
| 14962 | @@ -3780,8 +4605,8 @@ make_executable (const char *path) |
| 14963 | int rval = 0; |
| 14964 | struct stat st; |
| 14965 | |
| 14966 | - LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", |
| 14967 | - path ? (*path ? path : "EMPTY!") : "NULL!")); |
| 14968 | + lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", |
| 14969 | + nonempty (path)); |
| 14970 | if ((!path) || (!*path)) |
| 14971 | return 0; |
| 14972 | |
| 14973 | @@ -3807,8 +4632,8 @@ find_executable (const char *wrapper) |
| 14974 | int tmp_len; |
| 14975 | char *concat_name; |
| 14976 | |
| 14977 | - LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", |
| 14978 | - wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); |
| 14979 | + lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", |
| 14980 | + nonempty (wrapper)); |
| 14981 | |
| 14982 | if ((wrapper == NULL) || (*wrapper == '\0')) |
| 14983 | return NULL; |
| 14984 | @@ -3861,7 +4686,8 @@ find_executable (const char *wrapper) |
| 14985 | { |
| 14986 | /* empty path: current directory */ |
| 14987 | if (getcwd (tmp, LT_PATHMAX) == NULL) |
| 14988 | - lt_fatal ("getcwd failed"); |
| 14989 | + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", |
| 14990 | + nonnull (strerror (errno))); |
| 14991 | tmp_len = strlen (tmp); |
| 14992 | concat_name = |
| 14993 | XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); |
| 14994 | @@ -3886,7 +4712,8 @@ find_executable (const char *wrapper) |
| 14995 | } |
| 14996 | /* Relative path | not found in path: prepend cwd */ |
| 14997 | if (getcwd (tmp, LT_PATHMAX) == NULL) |
| 14998 | - lt_fatal ("getcwd failed"); |
| 14999 | + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", |
| 15000 | + nonnull (strerror (errno))); |
| 15001 | tmp_len = strlen (tmp); |
| 15002 | concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); |
| 15003 | memcpy (concat_name, tmp, tmp_len); |
| 15004 | @@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec) |
| 15005 | int has_symlinks = 0; |
| 15006 | while (strlen (tmp_pathspec) && !has_symlinks) |
| 15007 | { |
| 15008 | - LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", |
| 15009 | - tmp_pathspec)); |
| 15010 | + lt_debugprintf (__FILE__, __LINE__, |
| 15011 | + "checking path component for symlinks: %s\n", |
| 15012 | + tmp_pathspec); |
| 15013 | if (lstat (tmp_pathspec, &s) == 0) |
| 15014 | { |
| 15015 | if (S_ISLNK (s.st_mode) != 0) |
| 15016 | @@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec) |
| 15017 | } |
| 15018 | else |
| 15019 | { |
| 15020 | - char *errstr = strerror (errno); |
| 15021 | - lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); |
| 15022 | + lt_fatal (__FILE__, __LINE__, |
| 15023 | + "error accessing file \"%s\": %s", |
| 15024 | + tmp_pathspec, nonnull (strerror (errno))); |
| 15025 | } |
| 15026 | } |
| 15027 | XFREE (tmp_pathspec); |
| 15028 | @@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec) |
| 15029 | tmp_pathspec = realpath (pathspec, buf); |
| 15030 | if (tmp_pathspec == 0) |
| 15031 | { |
| 15032 | - lt_fatal ("Could not follow symlinks for %s", pathspec); |
| 15033 | + lt_fatal (__FILE__, __LINE__, |
| 15034 | + "could not follow symlinks for %s", pathspec); |
| 15035 | } |
| 15036 | return xstrdup (tmp_pathspec); |
| 15037 | #endif |
| 15038 | @@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat) |
| 15039 | return str; |
| 15040 | } |
| 15041 | |
| 15042 | +void |
| 15043 | +lt_debugprintf (const char *file, int line, const char *fmt, ...) |
| 15044 | +{ |
| 15045 | + va_list args; |
| 15046 | + if (lt_debug) |
| 15047 | + { |
| 15048 | + (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); |
| 15049 | + va_start (args, fmt); |
| 15050 | + (void) vfprintf (stderr, fmt, args); |
| 15051 | + va_end (args); |
| 15052 | + } |
| 15053 | +} |
| 15054 | + |
| 15055 | static void |
| 15056 | -lt_error_core (int exit_status, const char *mode, |
| 15057 | +lt_error_core (int exit_status, const char *file, |
| 15058 | + int line, const char *mode, |
| 15059 | const char *message, va_list ap) |
| 15060 | { |
| 15061 | - fprintf (stderr, "%s: %s: ", program_name, mode); |
| 15062 | + fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); |
| 15063 | vfprintf (stderr, message, ap); |
| 15064 | fprintf (stderr, ".\n"); |
| 15065 | |
| 15066 | @@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode, |
| 15067 | } |
| 15068 | |
| 15069 | void |
| 15070 | -lt_fatal (const char *message, ...) |
| 15071 | +lt_fatal (const char *file, int line, const char *message, ...) |
| 15072 | { |
| 15073 | va_list ap; |
| 15074 | va_start (ap, message); |
| 15075 | - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); |
| 15076 | + lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); |
| 15077 | va_end (ap); |
| 15078 | } |
| 15079 | |
| 15080 | +static const char * |
| 15081 | +nonnull (const char *s) |
| 15082 | +{ |
| 15083 | + return s ? s : "(null)"; |
| 15084 | +} |
| 15085 | + |
| 15086 | +static const char * |
| 15087 | +nonempty (const char *s) |
| 15088 | +{ |
| 15089 | + return (s && !*s) ? "(empty)" : nonnull (s); |
| 15090 | +} |
| 15091 | + |
| 15092 | void |
| 15093 | lt_setenv (const char *name, const char *value) |
| 15094 | { |
| 15095 | - LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", |
| 15096 | - (name ? name : "<NULL>"), |
| 15097 | - (value ? value : "<NULL>"))); |
| 15098 | + lt_debugprintf (__FILE__, __LINE__, |
| 15099 | + "(lt_setenv) setting '%s' to '%s'\n", |
| 15100 | + nonnull (name), nonnull (value)); |
| 15101 | { |
| 15102 | #ifdef HAVE_SETENV |
| 15103 | /* always make a copy, for consistency with !HAVE_SETENV */ |
| 15104 | @@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) |
| 15105 | void |
| 15106 | lt_update_exe_path (const char *name, const char *value) |
| 15107 | { |
| 15108 | - LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", |
| 15109 | - (name ? name : "<NULL>"), |
| 15110 | - (value ? value : "<NULL>"))); |
| 15111 | + lt_debugprintf (__FILE__, __LINE__, |
| 15112 | + "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", |
| 15113 | + nonnull (name), nonnull (value)); |
| 15114 | |
| 15115 | if (name && *name && value && *value) |
| 15116 | { |
| 15117 | @@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value) |
| 15118 | void |
| 15119 | lt_update_lib_path (const char *name, const char *value) |
| 15120 | { |
| 15121 | - LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", |
| 15122 | - (name ? name : "<NULL>"), |
| 15123 | - (value ? value : "<NULL>"))); |
| 15124 | + lt_debugprintf (__FILE__, __LINE__, |
| 15125 | + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", |
| 15126 | + nonnull (name), nonnull (value)); |
| 15127 | |
| 15128 | if (name && *name && value && *value) |
| 15129 | { |
| 15130 | @@ -4222,7 +5078,7 @@ EOF |
| 15131 | func_win32_import_lib_p () |
| 15132 | { |
| 15133 | $opt_debug |
| 15134 | - case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in |
| 15135 | + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in |
| 15136 | *import*) : ;; |
| 15137 | *) false ;; |
| 15138 | esac |
| 15139 | @@ -4401,9 +5257,9 @@ func_mode_link () |
| 15140 | ;; |
| 15141 | *) |
| 15142 | if test "$prev" = dlfiles; then |
| 15143 | - dlfiles="$dlfiles $arg" |
| 15144 | + func_append dlfiles " $arg" |
| 15145 | else |
| 15146 | - dlprefiles="$dlprefiles $arg" |
| 15147 | + func_append dlprefiles " $arg" |
| 15148 | fi |
| 15149 | prev= |
| 15150 | continue |
| 15151 | @@ -4427,7 +5283,7 @@ func_mode_link () |
| 15152 | *-*-darwin*) |
| 15153 | case "$deplibs " in |
| 15154 | *" $qarg.ltframework "*) ;; |
| 15155 | - *) deplibs="$deplibs $qarg.ltframework" # this is fixed later |
| 15156 | + *) func_append deplibs " $qarg.ltframework" # this is fixed later |
| 15157 | ;; |
| 15158 | esac |
| 15159 | ;; |
| 15160 | @@ -4446,7 +5302,7 @@ func_mode_link () |
| 15161 | moreargs= |
| 15162 | for fil in `cat "$save_arg"` |
| 15163 | do |
| 15164 | -# moreargs="$moreargs $fil" |
| 15165 | +# func_append moreargs " $fil" |
| 15166 | arg=$fil |
| 15167 | # A libtool-controlled object. |
| 15168 | |
| 15169 | @@ -4475,7 +5331,7 @@ func_mode_link () |
| 15170 | |
| 15171 | if test "$prev" = dlfiles; then |
| 15172 | if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then |
| 15173 | - dlfiles="$dlfiles $pic_object" |
| 15174 | + func_append dlfiles " $pic_object" |
| 15175 | prev= |
| 15176 | continue |
| 15177 | else |
| 15178 | @@ -4487,7 +5343,7 @@ func_mode_link () |
| 15179 | # CHECK ME: I think I busted this. -Ossama |
| 15180 | if test "$prev" = dlprefiles; then |
| 15181 | # Preload the old-style object. |
| 15182 | - dlprefiles="$dlprefiles $pic_object" |
| 15183 | + func_append dlprefiles " $pic_object" |
| 15184 | prev= |
| 15185 | fi |
| 15186 | |
| 15187 | @@ -4557,12 +5413,12 @@ func_mode_link () |
| 15188 | if test "$prev" = rpath; then |
| 15189 | case "$rpath " in |
| 15190 | *" $arg "*) ;; |
| 15191 | - *) rpath="$rpath $arg" ;; |
| 15192 | + *) func_append rpath " $arg" ;; |
| 15193 | esac |
| 15194 | else |
| 15195 | case "$xrpath " in |
| 15196 | *" $arg "*) ;; |
| 15197 | - *) xrpath="$xrpath $arg" ;; |
| 15198 | + *) func_append xrpath " $arg" ;; |
| 15199 | esac |
| 15200 | fi |
| 15201 | prev= |
| 15202 | @@ -4574,28 +5430,28 @@ func_mode_link () |
| 15203 | continue |
| 15204 | ;; |
| 15205 | weak) |
| 15206 | - weak_libs="$weak_libs $arg" |
| 15207 | + func_append weak_libs " $arg" |
| 15208 | prev= |
| 15209 | continue |
| 15210 | ;; |
| 15211 | xcclinker) |
| 15212 | - linker_flags="$linker_flags $qarg" |
| 15213 | - compiler_flags="$compiler_flags $qarg" |
| 15214 | + func_append linker_flags " $qarg" |
| 15215 | + func_append compiler_flags " $qarg" |
| 15216 | prev= |
| 15217 | func_append compile_command " $qarg" |
| 15218 | func_append finalize_command " $qarg" |
| 15219 | continue |
| 15220 | ;; |
| 15221 | xcompiler) |
| 15222 | - compiler_flags="$compiler_flags $qarg" |
| 15223 | + func_append compiler_flags " $qarg" |
| 15224 | prev= |
| 15225 | func_append compile_command " $qarg" |
| 15226 | func_append finalize_command " $qarg" |
| 15227 | continue |
| 15228 | ;; |
| 15229 | xlinker) |
| 15230 | - linker_flags="$linker_flags $qarg" |
| 15231 | - compiler_flags="$compiler_flags $wl$qarg" |
| 15232 | + func_append linker_flags " $qarg" |
| 15233 | + func_append compiler_flags " $wl$qarg" |
| 15234 | prev= |
| 15235 | func_append compile_command " $wl$qarg" |
| 15236 | func_append finalize_command " $wl$qarg" |
| 15237 | @@ -4686,15 +5542,16 @@ func_mode_link () |
| 15238 | ;; |
| 15239 | |
| 15240 | -L*) |
| 15241 | - func_stripname '-L' '' "$arg" |
| 15242 | - dir=$func_stripname_result |
| 15243 | - if test -z "$dir"; then |
| 15244 | + func_stripname "-L" '' "$arg" |
| 15245 | + if test -z "$func_stripname_result"; then |
| 15246 | if test "$#" -gt 0; then |
| 15247 | func_fatal_error "require no space between \`-L' and \`$1'" |
| 15248 | else |
| 15249 | func_fatal_error "need path for \`-L' option" |
| 15250 | fi |
| 15251 | fi |
| 15252 | + func_resolve_sysroot "$func_stripname_result" |
| 15253 | + dir=$func_resolve_sysroot_result |
| 15254 | # We need an absolute path. |
| 15255 | case $dir in |
| 15256 | [\\/]* | [A-Za-z]:[\\/]*) ;; |
| 15257 | @@ -4706,10 +5563,16 @@ func_mode_link () |
| 15258 | ;; |
| 15259 | esac |
| 15260 | case "$deplibs " in |
| 15261 | - *" -L$dir "*) ;; |
| 15262 | + *" -L$dir "* | *" $arg "*) |
| 15263 | + # Will only happen for absolute or sysroot arguments |
| 15264 | + ;; |
| 15265 | *) |
| 15266 | - deplibs="$deplibs -L$dir" |
| 15267 | - lib_search_path="$lib_search_path $dir" |
| 15268 | + # Preserve sysroot, but never include relative directories |
| 15269 | + case $dir in |
| 15270 | + [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; |
| 15271 | + *) func_append deplibs " -L$dir" ;; |
| 15272 | + esac |
| 15273 | + func_append lib_search_path " $dir" |
| 15274 | ;; |
| 15275 | esac |
| 15276 | case $host in |
| 15277 | @@ -4718,12 +5581,12 @@ func_mode_link () |
| 15278 | case :$dllsearchpath: in |
| 15279 | *":$dir:"*) ;; |
| 15280 | ::) dllsearchpath=$dir;; |
| 15281 | - *) dllsearchpath="$dllsearchpath:$dir";; |
| 15282 | + *) func_append dllsearchpath ":$dir";; |
| 15283 | esac |
| 15284 | case :$dllsearchpath: in |
| 15285 | *":$testbindir:"*) ;; |
| 15286 | ::) dllsearchpath=$testbindir;; |
| 15287 | - *) dllsearchpath="$dllsearchpath:$testbindir";; |
| 15288 | + *) func_append dllsearchpath ":$testbindir";; |
| 15289 | esac |
| 15290 | ;; |
| 15291 | esac |
| 15292 | @@ -4747,7 +5610,7 @@ func_mode_link () |
| 15293 | ;; |
| 15294 | *-*-rhapsody* | *-*-darwin1.[012]) |
| 15295 | # Rhapsody C and math libraries are in the System framework |
| 15296 | - deplibs="$deplibs System.ltframework" |
| 15297 | + func_append deplibs " System.ltframework" |
| 15298 | continue |
| 15299 | ;; |
| 15300 | *-*-sco3.2v5* | *-*-sco5v6*) |
| 15301 | @@ -4758,9 +5621,6 @@ func_mode_link () |
| 15302 | # Compiler inserts libc in the correct place for threads to work |
| 15303 | test "X$arg" = "X-lc" && continue |
| 15304 | ;; |
| 15305 | - *-*-linux*) |
| 15306 | - test "X$arg" = "X-lc" && continue |
| 15307 | - ;; |
| 15308 | esac |
| 15309 | elif test "X$arg" = "X-lc_r"; then |
| 15310 | case $host in |
| 15311 | @@ -4770,7 +5630,7 @@ func_mode_link () |
| 15312 | ;; |
| 15313 | esac |
| 15314 | fi |
| 15315 | - deplibs="$deplibs $arg" |
| 15316 | + func_append deplibs " $arg" |
| 15317 | continue |
| 15318 | ;; |
| 15319 | |
| 15320 | @@ -4782,8 +5642,8 @@ func_mode_link () |
| 15321 | # Tru64 UNIX uses -model [arg] to determine the layout of C++ |
| 15322 | # classes, name mangling, and exception handling. |
| 15323 | # Darwin uses the -arch flag to determine output architecture. |
| 15324 | - -model|-arch|-isysroot) |
| 15325 | - compiler_flags="$compiler_flags $arg" |
| 15326 | + -model|-arch|-isysroot|--sysroot) |
| 15327 | + func_append compiler_flags " $arg" |
| 15328 | func_append compile_command " $arg" |
| 15329 | func_append finalize_command " $arg" |
| 15330 | prev=xcompiler |
| 15331 | @@ -4791,12 +5651,12 @@ func_mode_link () |
| 15332 | ;; |
| 15333 | |
| 15334 | -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) |
| 15335 | - compiler_flags="$compiler_flags $arg" |
| 15336 | + func_append compiler_flags " $arg" |
| 15337 | func_append compile_command " $arg" |
| 15338 | func_append finalize_command " $arg" |
| 15339 | case "$new_inherited_linker_flags " in |
| 15340 | *" $arg "*) ;; |
| 15341 | - * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; |
| 15342 | + * ) func_append new_inherited_linker_flags " $arg" ;; |
| 15343 | esac |
| 15344 | continue |
| 15345 | ;; |
| 15346 | @@ -4863,13 +5723,17 @@ func_mode_link () |
| 15347 | # We need an absolute path. |
| 15348 | case $dir in |
| 15349 | [\\/]* | [A-Za-z]:[\\/]*) ;; |
| 15350 | + =*) |
| 15351 | + func_stripname '=' '' "$dir" |
| 15352 | + dir=$lt_sysroot$func_stripname_result |
| 15353 | + ;; |
| 15354 | *) |
| 15355 | func_fatal_error "only absolute run-paths are allowed" |
| 15356 | ;; |
| 15357 | esac |
| 15358 | case "$xrpath " in |
| 15359 | *" $dir "*) ;; |
| 15360 | - *) xrpath="$xrpath $dir" ;; |
| 15361 | + *) func_append xrpath " $dir" ;; |
| 15362 | esac |
| 15363 | continue |
| 15364 | ;; |
| 15365 | @@ -4922,8 +5786,8 @@ func_mode_link () |
| 15366 | for flag in $args; do |
| 15367 | IFS="$save_ifs" |
| 15368 | func_quote_for_eval "$flag" |
| 15369 | - arg="$arg $func_quote_for_eval_result" |
| 15370 | - compiler_flags="$compiler_flags $func_quote_for_eval_result" |
| 15371 | + func_append arg " $func_quote_for_eval_result" |
| 15372 | + func_append compiler_flags " $func_quote_for_eval_result" |
| 15373 | done |
| 15374 | IFS="$save_ifs" |
| 15375 | func_stripname ' ' '' "$arg" |
| 15376 | @@ -4938,9 +5802,9 @@ func_mode_link () |
| 15377 | for flag in $args; do |
| 15378 | IFS="$save_ifs" |
| 15379 | func_quote_for_eval "$flag" |
| 15380 | - arg="$arg $wl$func_quote_for_eval_result" |
| 15381 | - compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" |
| 15382 | - linker_flags="$linker_flags $func_quote_for_eval_result" |
| 15383 | + func_append arg " $wl$func_quote_for_eval_result" |
| 15384 | + func_append compiler_flags " $wl$func_quote_for_eval_result" |
| 15385 | + func_append linker_flags " $func_quote_for_eval_result" |
| 15386 | done |
| 15387 | IFS="$save_ifs" |
| 15388 | func_stripname ' ' '' "$arg" |
| 15389 | @@ -4968,24 +5832,27 @@ func_mode_link () |
| 15390 | arg="$func_quote_for_eval_result" |
| 15391 | ;; |
| 15392 | |
| 15393 | - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler |
| 15394 | - # -r[0-9][0-9]* specifies the processor on the SGI compiler |
| 15395 | - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler |
| 15396 | - # +DA*, +DD* enable 64-bit mode on the HP compiler |
| 15397 | - # -q* pass through compiler args for the IBM compiler |
| 15398 | - # -m*, -t[45]*, -txscale* pass through architecture-specific |
| 15399 | - # compiler args for GCC |
| 15400 | - # -F/path gives path to uninstalled frameworks, gcc on darwin |
| 15401 | - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC |
| 15402 | - # @file GCC response files |
| 15403 | - # -tp=* Portland pgcc target processor selection |
| 15404 | + # Flags to be passed through unchanged, with rationale: |
| 15405 | + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler |
| 15406 | + # -r[0-9][0-9]* specify processor for the SGI compiler |
| 15407 | + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler |
| 15408 | + # +DA*, +DD* enable 64-bit mode for the HP compiler |
| 15409 | + # -q* compiler args for the IBM compiler |
| 15410 | + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC |
| 15411 | + # -F/path path to uninstalled frameworks, gcc on darwin |
| 15412 | + # -p, -pg, --coverage, -fprofile-* profiling flags for GCC |
| 15413 | + # @file GCC response files |
| 15414 | + # -tp=* Portland pgcc target processor selection |
| 15415 | + # --sysroot=* for sysroot support |
| 15416 | + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization |
| 15417 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ |
| 15418 | - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) |
| 15419 | + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ |
| 15420 | + -O*|-flto*|-fwhopr*|-fuse-linker-plugin) |
| 15421 | func_quote_for_eval "$arg" |
| 15422 | arg="$func_quote_for_eval_result" |
| 15423 | func_append compile_command " $arg" |
| 15424 | func_append finalize_command " $arg" |
| 15425 | - compiler_flags="$compiler_flags $arg" |
| 15426 | + func_append compiler_flags " $arg" |
| 15427 | continue |
| 15428 | ;; |
| 15429 | |
| 15430 | @@ -4997,7 +5864,7 @@ func_mode_link () |
| 15431 | |
| 15432 | *.$objext) |
| 15433 | # A standard object. |
| 15434 | - objs="$objs $arg" |
| 15435 | + func_append objs " $arg" |
| 15436 | ;; |
| 15437 | |
| 15438 | *.lo) |
| 15439 | @@ -5028,7 +5895,7 @@ func_mode_link () |
| 15440 | |
| 15441 | if test "$prev" = dlfiles; then |
| 15442 | if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then |
| 15443 | - dlfiles="$dlfiles $pic_object" |
| 15444 | + func_append dlfiles " $pic_object" |
| 15445 | prev= |
| 15446 | continue |
| 15447 | else |
| 15448 | @@ -5040,7 +5907,7 @@ func_mode_link () |
| 15449 | # CHECK ME: I think I busted this. -Ossama |
| 15450 | if test "$prev" = dlprefiles; then |
| 15451 | # Preload the old-style object. |
| 15452 | - dlprefiles="$dlprefiles $pic_object" |
| 15453 | + func_append dlprefiles " $pic_object" |
| 15454 | prev= |
| 15455 | fi |
| 15456 | |
| 15457 | @@ -5085,24 +5952,25 @@ func_mode_link () |
| 15458 | |
| 15459 | *.$libext) |
| 15460 | # An archive. |
| 15461 | - deplibs="$deplibs $arg" |
| 15462 | - old_deplibs="$old_deplibs $arg" |
| 15463 | + func_append deplibs " $arg" |
| 15464 | + func_append old_deplibs " $arg" |
| 15465 | continue |
| 15466 | ;; |
| 15467 | |
| 15468 | *.la) |
| 15469 | # A libtool-controlled library. |
| 15470 | |
| 15471 | + func_resolve_sysroot "$arg" |
| 15472 | if test "$prev" = dlfiles; then |
| 15473 | # This library was specified with -dlopen. |
| 15474 | - dlfiles="$dlfiles $arg" |
| 15475 | + func_append dlfiles " $func_resolve_sysroot_result" |
| 15476 | prev= |
| 15477 | elif test "$prev" = dlprefiles; then |
| 15478 | # The library was specified with -dlpreopen. |
| 15479 | - dlprefiles="$dlprefiles $arg" |
| 15480 | + func_append dlprefiles " $func_resolve_sysroot_result" |
| 15481 | prev= |
| 15482 | else |
| 15483 | - deplibs="$deplibs $arg" |
| 15484 | + func_append deplibs " $func_resolve_sysroot_result" |
| 15485 | fi |
| 15486 | continue |
| 15487 | ;; |
| 15488 | @@ -5127,7 +5995,7 @@ func_mode_link () |
| 15489 | func_fatal_help "the \`$prevarg' option requires an argument" |
| 15490 | |
| 15491 | if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then |
| 15492 | - eval "arg=\"$export_dynamic_flag_spec\"" |
| 15493 | + eval arg=\"$export_dynamic_flag_spec\" |
| 15494 | func_append compile_command " $arg" |
| 15495 | func_append finalize_command " $arg" |
| 15496 | fi |
| 15497 | @@ -5144,11 +6012,13 @@ func_mode_link () |
| 15498 | else |
| 15499 | shlib_search_path= |
| 15500 | fi |
| 15501 | - eval "sys_lib_search_path=\"$sys_lib_search_path_spec\"" |
| 15502 | - eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"" |
| 15503 | + eval sys_lib_search_path=\"$sys_lib_search_path_spec\" |
| 15504 | + eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" |
| 15505 | |
| 15506 | func_dirname "$output" "/" "" |
| 15507 | output_objdir="$func_dirname_result$objdir" |
| 15508 | + func_to_tool_file "$output_objdir/" |
| 15509 | + tool_output_objdir=$func_to_tool_file_result |
| 15510 | # Create the object directory. |
| 15511 | func_mkdir_p "$output_objdir" |
| 15512 | |
| 15513 | @@ -5169,12 +6039,12 @@ func_mode_link () |
| 15514 | # Find all interdependent deplibs by searching for libraries |
| 15515 | # that are linked more than once (e.g. -la -lb -la) |
| 15516 | for deplib in $deplibs; do |
| 15517 | - if $opt_duplicate_deps ; then |
| 15518 | + if $opt_preserve_dup_deps ; then |
| 15519 | case "$libs " in |
| 15520 | - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
| 15521 | + *" $deplib "*) func_append specialdeplibs " $deplib" ;; |
| 15522 | esac |
| 15523 | fi |
| 15524 | - libs="$libs $deplib" |
| 15525 | + func_append libs " $deplib" |
| 15526 | done |
| 15527 | |
| 15528 | if test "$linkmode" = lib; then |
| 15529 | @@ -5187,9 +6057,9 @@ func_mode_link () |
| 15530 | if $opt_duplicate_compiler_generated_deps; then |
| 15531 | for pre_post_dep in $predeps $postdeps; do |
| 15532 | case "$pre_post_deps " in |
| 15533 | - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; |
| 15534 | + *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; |
| 15535 | esac |
| 15536 | - pre_post_deps="$pre_post_deps $pre_post_dep" |
| 15537 | + func_append pre_post_deps " $pre_post_dep" |
| 15538 | done |
| 15539 | fi |
| 15540 | pre_post_deps= |
| 15541 | @@ -5256,8 +6126,9 @@ func_mode_link () |
| 15542 | for lib in $dlprefiles; do |
| 15543 | # Ignore non-libtool-libs |
| 15544 | dependency_libs= |
| 15545 | + func_resolve_sysroot "$lib" |
| 15546 | case $lib in |
| 15547 | - *.la) func_source "$lib" ;; |
| 15548 | + *.la) func_source "$func_resolve_sysroot_result" ;; |
| 15549 | esac |
| 15550 | |
| 15551 | # Collect preopened libtool deplibs, except any this library |
| 15552 | @@ -5267,7 +6138,7 @@ func_mode_link () |
| 15553 | deplib_base=$func_basename_result |
| 15554 | case " $weak_libs " in |
| 15555 | *" $deplib_base "*) ;; |
| 15556 | - *) deplibs="$deplibs $deplib" ;; |
| 15557 | + *) func_append deplibs " $deplib" ;; |
| 15558 | esac |
| 15559 | done |
| 15560 | done |
| 15561 | @@ -5288,11 +6159,11 @@ func_mode_link () |
| 15562 | compile_deplibs="$deplib $compile_deplibs" |
| 15563 | finalize_deplibs="$deplib $finalize_deplibs" |
| 15564 | else |
| 15565 | - compiler_flags="$compiler_flags $deplib" |
| 15566 | + func_append compiler_flags " $deplib" |
| 15567 | if test "$linkmode" = lib ; then |
| 15568 | case "$new_inherited_linker_flags " in |
| 15569 | *" $deplib "*) ;; |
| 15570 | - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; |
| 15571 | + * ) func_append new_inherited_linker_flags " $deplib" ;; |
| 15572 | esac |
| 15573 | fi |
| 15574 | fi |
| 15575 | @@ -5377,7 +6248,7 @@ func_mode_link () |
| 15576 | if test "$linkmode" = lib ; then |
| 15577 | case "$new_inherited_linker_flags " in |
| 15578 | *" $deplib "*) ;; |
| 15579 | - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; |
| 15580 | + * ) func_append new_inherited_linker_flags " $deplib" ;; |
| 15581 | esac |
| 15582 | fi |
| 15583 | fi |
| 15584 | @@ -5390,7 +6261,8 @@ func_mode_link () |
| 15585 | test "$pass" = conv && continue |
| 15586 | newdependency_libs="$deplib $newdependency_libs" |
| 15587 | func_stripname '-L' '' "$deplib" |
| 15588 | - newlib_search_path="$newlib_search_path $func_stripname_result" |
| 15589 | + func_resolve_sysroot "$func_stripname_result" |
| 15590 | + func_append newlib_search_path " $func_resolve_sysroot_result" |
| 15591 | ;; |
| 15592 | prog) |
| 15593 | if test "$pass" = conv; then |
| 15594 | @@ -5404,7 +6276,8 @@ func_mode_link () |
| 15595 | finalize_deplibs="$deplib $finalize_deplibs" |
| 15596 | fi |
| 15597 | func_stripname '-L' '' "$deplib" |
| 15598 | - newlib_search_path="$newlib_search_path $func_stripname_result" |
| 15599 | + func_resolve_sysroot "$func_stripname_result" |
| 15600 | + func_append newlib_search_path " $func_resolve_sysroot_result" |
| 15601 | ;; |
| 15602 | *) |
| 15603 | func_warning "\`-L' is ignored for archives/objects" |
| 15604 | @@ -5415,17 +6288,21 @@ func_mode_link () |
| 15605 | -R*) |
| 15606 | if test "$pass" = link; then |
| 15607 | func_stripname '-R' '' "$deplib" |
| 15608 | - dir=$func_stripname_result |
| 15609 | + func_resolve_sysroot "$func_stripname_result" |
| 15610 | + dir=$func_resolve_sysroot_result |
| 15611 | # Make sure the xrpath contains only unique directories. |
| 15612 | case "$xrpath " in |
| 15613 | *" $dir "*) ;; |
| 15614 | - *) xrpath="$xrpath $dir" ;; |
| 15615 | + *) func_append xrpath " $dir" ;; |
| 15616 | esac |
| 15617 | fi |
| 15618 | deplibs="$deplib $deplibs" |
| 15619 | continue |
| 15620 | ;; |
| 15621 | - *.la) lib="$deplib" ;; |
| 15622 | + *.la) |
| 15623 | + func_resolve_sysroot "$deplib" |
| 15624 | + lib=$func_resolve_sysroot_result |
| 15625 | + ;; |
| 15626 | *.$libext) |
| 15627 | if test "$pass" = conv; then |
| 15628 | deplibs="$deplib $deplibs" |
| 15629 | @@ -5488,11 +6365,11 @@ func_mode_link () |
| 15630 | if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then |
| 15631 | # If there is no dlopen support or we're linking statically, |
| 15632 | # we need to preload. |
| 15633 | - newdlprefiles="$newdlprefiles $deplib" |
| 15634 | + func_append newdlprefiles " $deplib" |
| 15635 | compile_deplibs="$deplib $compile_deplibs" |
| 15636 | finalize_deplibs="$deplib $finalize_deplibs" |
| 15637 | else |
| 15638 | - newdlfiles="$newdlfiles $deplib" |
| 15639 | + func_append newdlfiles " $deplib" |
| 15640 | fi |
| 15641 | fi |
| 15642 | continue |
| 15643 | @@ -5538,7 +6415,7 @@ func_mode_link () |
| 15644 | for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do |
| 15645 | case " $new_inherited_linker_flags " in |
| 15646 | *" $tmp_inherited_linker_flag "*) ;; |
| 15647 | - *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; |
| 15648 | + *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; |
| 15649 | esac |
| 15650 | done |
| 15651 | fi |
| 15652 | @@ -5546,8 +6423,8 @@ func_mode_link () |
| 15653 | if test "$linkmode,$pass" = "lib,link" || |
| 15654 | test "$linkmode,$pass" = "prog,scan" || |
| 15655 | { test "$linkmode" != prog && test "$linkmode" != lib; }; then |
| 15656 | - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" |
| 15657 | - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" |
| 15658 | + test -n "$dlopen" && func_append dlfiles " $dlopen" |
| 15659 | + test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" |
| 15660 | fi |
| 15661 | |
| 15662 | if test "$pass" = conv; then |
| 15663 | @@ -5558,20 +6435,20 @@ func_mode_link () |
| 15664 | func_fatal_error "cannot find name of link library for \`$lib'" |
| 15665 | fi |
| 15666 | # It is a libtool convenience library, so add in its objects. |
| 15667 | - convenience="$convenience $ladir/$objdir/$old_library" |
| 15668 | - old_convenience="$old_convenience $ladir/$objdir/$old_library" |
| 15669 | + func_append convenience " $ladir/$objdir/$old_library" |
| 15670 | + func_append old_convenience " $ladir/$objdir/$old_library" |
| 15671 | elif test "$linkmode" != prog && test "$linkmode" != lib; then |
| 15672 | func_fatal_error "\`$lib' is not a convenience library" |
| 15673 | fi |
| 15674 | tmp_libs= |
| 15675 | for deplib in $dependency_libs; do |
| 15676 | deplibs="$deplib $deplibs" |
| 15677 | - if $opt_duplicate_deps ; then |
| 15678 | + if $opt_preserve_dup_deps ; then |
| 15679 | case "$tmp_libs " in |
| 15680 | - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
| 15681 | + *" $deplib "*) func_append specialdeplibs " $deplib" ;; |
| 15682 | esac |
| 15683 | fi |
| 15684 | - tmp_libs="$tmp_libs $deplib" |
| 15685 | + func_append tmp_libs " $deplib" |
| 15686 | done |
| 15687 | continue |
| 15688 | fi # $pass = conv |
| 15689 | @@ -5579,9 +6456,15 @@ func_mode_link () |
| 15690 | |
| 15691 | # Get the name of the library we link against. |
| 15692 | linklib= |
| 15693 | - for l in $old_library $library_names; do |
| 15694 | - linklib="$l" |
| 15695 | - done |
| 15696 | + if test -n "$old_library" && |
| 15697 | + { test "$prefer_static_libs" = yes || |
| 15698 | + test "$prefer_static_libs,$installed" = "built,no"; }; then |
| 15699 | + linklib=$old_library |
| 15700 | + else |
| 15701 | + for l in $old_library $library_names; do |
| 15702 | + linklib="$l" |
| 15703 | + done |
| 15704 | + fi |
| 15705 | if test -z "$linklib"; then |
| 15706 | func_fatal_error "cannot find name of link library for \`$lib'" |
| 15707 | fi |
| 15708 | @@ -5598,9 +6481,9 @@ func_mode_link () |
| 15709 | # statically, we need to preload. We also need to preload any |
| 15710 | # dependent libraries so libltdl's deplib preloader doesn't |
| 15711 | # bomb out in the load deplibs phase. |
| 15712 | - dlprefiles="$dlprefiles $lib $dependency_libs" |
| 15713 | + func_append dlprefiles " $lib $dependency_libs" |
| 15714 | else |
| 15715 | - newdlfiles="$newdlfiles $lib" |
| 15716 | + func_append newdlfiles " $lib" |
| 15717 | fi |
| 15718 | continue |
| 15719 | fi # $pass = dlopen |
| 15720 | @@ -5622,14 +6505,14 @@ func_mode_link () |
| 15721 | |
| 15722 | # Find the relevant object directory and library name. |
| 15723 | if test "X$installed" = Xyes; then |
| 15724 | - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then |
| 15725 | + if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then |
| 15726 | func_warning "library \`$lib' was moved." |
| 15727 | dir="$ladir" |
| 15728 | absdir="$abs_ladir" |
| 15729 | libdir="$abs_ladir" |
| 15730 | else |
| 15731 | - dir="$libdir" |
| 15732 | - absdir="$libdir" |
| 15733 | + dir="$lt_sysroot$libdir" |
| 15734 | + absdir="$lt_sysroot$libdir" |
| 15735 | fi |
| 15736 | test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes |
| 15737 | else |
| 15738 | @@ -5637,12 +6520,12 @@ func_mode_link () |
| 15739 | dir="$ladir" |
| 15740 | absdir="$abs_ladir" |
| 15741 | # Remove this search path later |
| 15742 | - notinst_path="$notinst_path $abs_ladir" |
| 15743 | + func_append notinst_path " $abs_ladir" |
| 15744 | else |
| 15745 | dir="$ladir/$objdir" |
| 15746 | absdir="$abs_ladir/$objdir" |
| 15747 | # Remove this search path later |
| 15748 | - notinst_path="$notinst_path $abs_ladir" |
| 15749 | + func_append notinst_path " $abs_ladir" |
| 15750 | fi |
| 15751 | fi # $installed = yes |
| 15752 | func_stripname 'lib' '.la' "$laname" |
| 15753 | @@ -5653,20 +6536,46 @@ func_mode_link () |
| 15754 | if test -z "$libdir" && test "$linkmode" = prog; then |
| 15755 | func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" |
| 15756 | fi |
| 15757 | - # Prefer using a static library (so that no silly _DYNAMIC symbols |
| 15758 | - # are required to link). |
| 15759 | - if test -n "$old_library"; then |
| 15760 | - newdlprefiles="$newdlprefiles $dir/$old_library" |
| 15761 | - # Keep a list of preopened convenience libraries to check |
| 15762 | - # that they are being used correctly in the link pass. |
| 15763 | - test -z "$libdir" && \ |
| 15764 | - dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" |
| 15765 | - # Otherwise, use the dlname, so that lt_dlopen finds it. |
| 15766 | - elif test -n "$dlname"; then |
| 15767 | - newdlprefiles="$newdlprefiles $dir/$dlname" |
| 15768 | - else |
| 15769 | - newdlprefiles="$newdlprefiles $dir/$linklib" |
| 15770 | - fi |
| 15771 | + case "$host" in |
| 15772 | + # special handling for platforms with PE-DLLs. |
| 15773 | + *cygwin* | *mingw* | *cegcc* ) |
| 15774 | + # Linker will automatically link against shared library if both |
| 15775 | + # static and shared are present. Therefore, ensure we extract |
| 15776 | + # symbols from the import library if a shared library is present |
| 15777 | + # (otherwise, the dlopen module name will be incorrect). We do |
| 15778 | + # this by putting the import library name into $newdlprefiles. |
| 15779 | + # We recover the dlopen module name by 'saving' the la file |
| 15780 | + # name in a special purpose variable, and (later) extracting the |
| 15781 | + # dlname from the la file. |
| 15782 | + if test -n "$dlname"; then |
| 15783 | + func_tr_sh "$dir/$linklib" |
| 15784 | + eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" |
| 15785 | + func_append newdlprefiles " $dir/$linklib" |
| 15786 | + else |
| 15787 | + func_append newdlprefiles " $dir/$old_library" |
| 15788 | + # Keep a list of preopened convenience libraries to check |
| 15789 | + # that they are being used correctly in the link pass. |
| 15790 | + test -z "$libdir" && \ |
| 15791 | + func_append dlpreconveniencelibs " $dir/$old_library" |
| 15792 | + fi |
| 15793 | + ;; |
| 15794 | + * ) |
| 15795 | + # Prefer using a static library (so that no silly _DYNAMIC symbols |
| 15796 | + # are required to link). |
| 15797 | + if test -n "$old_library"; then |
| 15798 | + func_append newdlprefiles " $dir/$old_library" |
| 15799 | + # Keep a list of preopened convenience libraries to check |
| 15800 | + # that they are being used correctly in the link pass. |
| 15801 | + test -z "$libdir" && \ |
| 15802 | + func_append dlpreconveniencelibs " $dir/$old_library" |
| 15803 | + # Otherwise, use the dlname, so that lt_dlopen finds it. |
| 15804 | + elif test -n "$dlname"; then |
| 15805 | + func_append newdlprefiles " $dir/$dlname" |
| 15806 | + else |
| 15807 | + func_append newdlprefiles " $dir/$linklib" |
| 15808 | + fi |
| 15809 | + ;; |
| 15810 | + esac |
| 15811 | fi # $pass = dlpreopen |
| 15812 | |
| 15813 | if test -z "$libdir"; then |
| 15814 | @@ -5684,7 +6593,7 @@ func_mode_link () |
| 15815 | |
| 15816 | |
| 15817 | if test "$linkmode" = prog && test "$pass" != link; then |
| 15818 | - newlib_search_path="$newlib_search_path $ladir" |
| 15819 | + func_append newlib_search_path " $ladir" |
| 15820 | deplibs="$lib $deplibs" |
| 15821 | |
| 15822 | linkalldeplibs=no |
| 15823 | @@ -5697,7 +6606,8 @@ func_mode_link () |
| 15824 | for deplib in $dependency_libs; do |
| 15825 | case $deplib in |
| 15826 | -L*) func_stripname '-L' '' "$deplib" |
| 15827 | - newlib_search_path="$newlib_search_path $func_stripname_result" |
| 15828 | + func_resolve_sysroot "$func_stripname_result" |
| 15829 | + func_append newlib_search_path " $func_resolve_sysroot_result" |
| 15830 | ;; |
| 15831 | esac |
| 15832 | # Need to link against all dependency_libs? |
| 15833 | @@ -5708,12 +6618,12 @@ func_mode_link () |
| 15834 | # or/and link against static libraries |
| 15835 | newdependency_libs="$deplib $newdependency_libs" |
| 15836 | fi |
| 15837 | - if $opt_duplicate_deps ; then |
| 15838 | + if $opt_preserve_dup_deps ; then |
| 15839 | case "$tmp_libs " in |
| 15840 | - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
| 15841 | + *" $deplib "*) func_append specialdeplibs " $deplib" ;; |
| 15842 | esac |
| 15843 | fi |
| 15844 | - tmp_libs="$tmp_libs $deplib" |
| 15845 | + func_append tmp_libs " $deplib" |
| 15846 | done # for deplib |
| 15847 | continue |
| 15848 | fi # $linkmode = prog... |
| 15849 | @@ -5728,7 +6638,7 @@ func_mode_link () |
| 15850 | # Make sure the rpath contains only unique directories. |
| 15851 | case "$temp_rpath:" in |
| 15852 | *"$absdir:"*) ;; |
| 15853 | - *) temp_rpath="$temp_rpath$absdir:" ;; |
| 15854 | + *) func_append temp_rpath "$absdir:" ;; |
| 15855 | esac |
| 15856 | fi |
| 15857 | |
| 15858 | @@ -5740,7 +6650,7 @@ func_mode_link () |
| 15859 | *) |
| 15860 | case "$compile_rpath " in |
| 15861 | *" $absdir "*) ;; |
| 15862 | - *) compile_rpath="$compile_rpath $absdir" |
| 15863 | + *) func_append compile_rpath " $absdir" ;; |
| 15864 | esac |
| 15865 | ;; |
| 15866 | esac |
| 15867 | @@ -5749,7 +6659,7 @@ func_mode_link () |
| 15868 | *) |
| 15869 | case "$finalize_rpath " in |
| 15870 | *" $libdir "*) ;; |
| 15871 | - *) finalize_rpath="$finalize_rpath $libdir" |
| 15872 | + *) func_append finalize_rpath " $libdir" ;; |
| 15873 | esac |
| 15874 | ;; |
| 15875 | esac |
| 15876 | @@ -5774,12 +6684,12 @@ func_mode_link () |
| 15877 | case $host in |
| 15878 | *cygwin* | *mingw* | *cegcc*) |
| 15879 | # No point in relinking DLLs because paths are not encoded |
| 15880 | - notinst_deplibs="$notinst_deplibs $lib" |
| 15881 | + func_append notinst_deplibs " $lib" |
| 15882 | need_relink=no |
| 15883 | ;; |
| 15884 | *) |
| 15885 | if test "$installed" = no; then |
| 15886 | - notinst_deplibs="$notinst_deplibs $lib" |
| 15887 | + func_append notinst_deplibs " $lib" |
| 15888 | need_relink=yes |
| 15889 | fi |
| 15890 | ;; |
| 15891 | @@ -5814,7 +6724,7 @@ func_mode_link () |
| 15892 | *) |
| 15893 | case "$compile_rpath " in |
| 15894 | *" $absdir "*) ;; |
| 15895 | - *) compile_rpath="$compile_rpath $absdir" |
| 15896 | + *) func_append compile_rpath " $absdir" ;; |
| 15897 | esac |
| 15898 | ;; |
| 15899 | esac |
| 15900 | @@ -5823,7 +6733,7 @@ func_mode_link () |
| 15901 | *) |
| 15902 | case "$finalize_rpath " in |
| 15903 | *" $libdir "*) ;; |
| 15904 | - *) finalize_rpath="$finalize_rpath $libdir" |
| 15905 | + *) func_append finalize_rpath " $libdir" ;; |
| 15906 | esac |
| 15907 | ;; |
| 15908 | esac |
| 15909 | @@ -5835,7 +6745,7 @@ func_mode_link () |
| 15910 | shift |
| 15911 | realname="$1" |
| 15912 | shift |
| 15913 | - eval "libname=\"$libname_spec\"" |
| 15914 | + libname=`eval "\\$ECHO \"$libname_spec\""` |
| 15915 | # use dlname if we got it. it's perfectly good, no? |
| 15916 | if test -n "$dlname"; then |
| 15917 | soname="$dlname" |
| 15918 | @@ -5848,7 +6758,7 @@ func_mode_link () |
| 15919 | versuffix="-$major" |
| 15920 | ;; |
| 15921 | esac |
| 15922 | - eval "soname=\"$soname_spec\"" |
| 15923 | + eval soname=\"$soname_spec\" |
| 15924 | else |
| 15925 | soname="$realname" |
| 15926 | fi |
| 15927 | @@ -5877,7 +6787,7 @@ func_mode_link () |
| 15928 | linklib=$newlib |
| 15929 | fi # test -n "$old_archive_from_expsyms_cmds" |
| 15930 | |
| 15931 | - if test "$linkmode" = prog || test "$mode" != relink; then |
| 15932 | + if test "$linkmode" = prog || test "$opt_mode" != relink; then |
| 15933 | add_shlibpath= |
| 15934 | add_dir= |
| 15935 | add= |
| 15936 | @@ -5933,7 +6843,7 @@ func_mode_link () |
| 15937 | if test -n "$inst_prefix_dir"; then |
| 15938 | case $libdir in |
| 15939 | [\\/]*) |
| 15940 | - add_dir="$add_dir -L$inst_prefix_dir$libdir" |
| 15941 | + func_append add_dir " -L$inst_prefix_dir$libdir" |
| 15942 | ;; |
| 15943 | esac |
| 15944 | fi |
| 15945 | @@ -5955,7 +6865,7 @@ func_mode_link () |
| 15946 | if test -n "$add_shlibpath"; then |
| 15947 | case :$compile_shlibpath: in |
| 15948 | *":$add_shlibpath:"*) ;; |
| 15949 | - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; |
| 15950 | + *) func_append compile_shlibpath "$add_shlibpath:" ;; |
| 15951 | esac |
| 15952 | fi |
| 15953 | if test "$linkmode" = prog; then |
| 15954 | @@ -5969,13 +6879,13 @@ func_mode_link () |
| 15955 | test "$hardcode_shlibpath_var" = yes; then |
| 15956 | case :$finalize_shlibpath: in |
| 15957 | *":$libdir:"*) ;; |
| 15958 | - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; |
| 15959 | + *) func_append finalize_shlibpath "$libdir:" ;; |
| 15960 | esac |
| 15961 | fi |
| 15962 | fi |
| 15963 | fi |
| 15964 | |
| 15965 | - if test "$linkmode" = prog || test "$mode" = relink; then |
| 15966 | + if test "$linkmode" = prog || test "$opt_mode" = relink; then |
| 15967 | add_shlibpath= |
| 15968 | add_dir= |
| 15969 | add= |
| 15970 | @@ -5989,7 +6899,7 @@ func_mode_link () |
| 15971 | elif test "$hardcode_shlibpath_var" = yes; then |
| 15972 | case :$finalize_shlibpath: in |
| 15973 | *":$libdir:"*) ;; |
| 15974 | - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; |
| 15975 | + *) func_append finalize_shlibpath "$libdir:" ;; |
| 15976 | esac |
| 15977 | add="-l$name" |
| 15978 | elif test "$hardcode_automatic" = yes; then |
| 15979 | @@ -6001,12 +6911,12 @@ func_mode_link () |
| 15980 | fi |
| 15981 | else |
| 15982 | # We cannot seem to hardcode it, guess we'll fake it. |
| 15983 | - add_dir="-L$libdir" |
| 15984 | + add_dir="-L$lt_sysroot$libdir" |
| 15985 | # Try looking first in the location we're being installed to. |
| 15986 | if test -n "$inst_prefix_dir"; then |
| 15987 | case $libdir in |
| 15988 | [\\/]*) |
| 15989 | - add_dir="$add_dir -L$inst_prefix_dir$libdir" |
| 15990 | + func_append add_dir " -L$inst_prefix_dir$libdir" |
| 15991 | ;; |
| 15992 | esac |
| 15993 | fi |
| 15994 | @@ -6083,27 +6993,33 @@ func_mode_link () |
| 15995 | temp_xrpath=$func_stripname_result |
| 15996 | case " $xrpath " in |
| 15997 | *" $temp_xrpath "*) ;; |
| 15998 | - *) xrpath="$xrpath $temp_xrpath";; |
| 15999 | + *) func_append xrpath " $temp_xrpath";; |
| 16000 | esac;; |
| 16001 | - *) temp_deplibs="$temp_deplibs $libdir";; |
| 16002 | + *) func_append temp_deplibs " $libdir";; |
| 16003 | esac |
| 16004 | done |
| 16005 | dependency_libs="$temp_deplibs" |
| 16006 | fi |
| 16007 | |
| 16008 | - newlib_search_path="$newlib_search_path $absdir" |
| 16009 | + func_append newlib_search_path " $absdir" |
| 16010 | # Link against this library |
| 16011 | test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" |
| 16012 | # ... and its dependency_libs |
| 16013 | tmp_libs= |
| 16014 | for deplib in $dependency_libs; do |
| 16015 | newdependency_libs="$deplib $newdependency_libs" |
| 16016 | - if $opt_duplicate_deps ; then |
| 16017 | + case $deplib in |
| 16018 | + -L*) func_stripname '-L' '' "$deplib" |
| 16019 | + func_resolve_sysroot "$func_stripname_result";; |
| 16020 | + *) func_resolve_sysroot "$deplib" ;; |
| 16021 | + esac |
| 16022 | + if $opt_preserve_dup_deps ; then |
| 16023 | case "$tmp_libs " in |
| 16024 | - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; |
| 16025 | + *" $func_resolve_sysroot_result "*) |
| 16026 | + func_append specialdeplibs " $func_resolve_sysroot_result" ;; |
| 16027 | esac |
| 16028 | fi |
| 16029 | - tmp_libs="$tmp_libs $deplib" |
| 16030 | + func_append tmp_libs " $func_resolve_sysroot_result" |
| 16031 | done |
| 16032 | |
| 16033 | if test "$link_all_deplibs" != no; then |
| 16034 | @@ -6113,8 +7029,10 @@ func_mode_link () |
| 16035 | case $deplib in |
| 16036 | -L*) path="$deplib" ;; |
| 16037 | *.la) |
| 16038 | + func_resolve_sysroot "$deplib" |
| 16039 | + deplib=$func_resolve_sysroot_result |
| 16040 | func_dirname "$deplib" "" "." |
| 16041 | - dir="$func_dirname_result" |
| 16042 | + dir=$func_dirname_result |
| 16043 | # We need an absolute path. |
| 16044 | case $dir in |
| 16045 | [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; |
| 16046 | @@ -6130,7 +7048,7 @@ func_mode_link () |
| 16047 | case $host in |
| 16048 | *-*-darwin*) |
| 16049 | depdepl= |
| 16050 | - deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` |
| 16051 | + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` |
| 16052 | if test -n "$deplibrary_names" ; then |
| 16053 | for tmp in $deplibrary_names ; do |
| 16054 | depdepl=$tmp |
| 16055 | @@ -6141,8 +7059,8 @@ func_mode_link () |
| 16056 | if test -z "$darwin_install_name"; then |
| 16057 | darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` |
| 16058 | fi |
| 16059 | - compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" |
| 16060 | - linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" |
| 16061 | + func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" |
| 16062 | + func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" |
| 16063 | path= |
| 16064 | fi |
| 16065 | fi |
| 16066 | @@ -6152,7 +7070,7 @@ func_mode_link () |
| 16067 | ;; |
| 16068 | esac |
| 16069 | else |
| 16070 | - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
| 16071 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
| 16072 | test -z "$libdir" && \ |
| 16073 | func_fatal_error "\`$deplib' is not a valid libtool archive" |
| 16074 | test "$absdir" != "$libdir" && \ |
| 16075 | @@ -6192,7 +7110,7 @@ func_mode_link () |
| 16076 | for dir in $newlib_search_path; do |
| 16077 | case "$lib_search_path " in |
| 16078 | *" $dir "*) ;; |
| 16079 | - *) lib_search_path="$lib_search_path $dir" ;; |
| 16080 | + *) func_append lib_search_path " $dir" ;; |
| 16081 | esac |
| 16082 | done |
| 16083 | newlib_search_path= |
| 16084 | @@ -6205,7 +7123,7 @@ func_mode_link () |
| 16085 | fi |
| 16086 | for var in $vars dependency_libs; do |
| 16087 | # Add libraries to $var in reverse order |
| 16088 | - eval tmp_libs=\$$var |
| 16089 | + eval tmp_libs=\"\$$var\" |
| 16090 | new_libs= |
| 16091 | for deplib in $tmp_libs; do |
| 16092 | # FIXME: Pedantically, this is the right thing to do, so |
| 16093 | @@ -6250,13 +7168,13 @@ func_mode_link () |
| 16094 | -L*) |
| 16095 | case " $tmp_libs " in |
| 16096 | *" $deplib "*) ;; |
| 16097 | - *) tmp_libs="$tmp_libs $deplib" ;; |
| 16098 | + *) func_append tmp_libs " $deplib" ;; |
| 16099 | esac |
| 16100 | ;; |
| 16101 | - *) tmp_libs="$tmp_libs $deplib" ;; |
| 16102 | + *) func_append tmp_libs " $deplib" ;; |
| 16103 | esac |
| 16104 | done |
| 16105 | - eval $var=\$tmp_libs |
| 16106 | + eval $var=\"$tmp_libs\" |
| 16107 | done # for var |
| 16108 | fi |
| 16109 | # Last step: remove runtime libs from dependency_libs |
| 16110 | @@ -6269,7 +7187,7 @@ func_mode_link () |
| 16111 | ;; |
| 16112 | esac |
| 16113 | if test -n "$i" ; then |
| 16114 | - tmp_libs="$tmp_libs $i" |
| 16115 | + func_append tmp_libs " $i" |
| 16116 | fi |
| 16117 | done |
| 16118 | dependency_libs=$tmp_libs |
| 16119 | @@ -6310,7 +7228,7 @@ func_mode_link () |
| 16120 | # Now set the variables for building old libraries. |
| 16121 | build_libtool_libs=no |
| 16122 | oldlibs="$output" |
| 16123 | - objs="$objs$old_deplibs" |
| 16124 | + func_append objs "$old_deplibs" |
| 16125 | ;; |
| 16126 | |
| 16127 | lib) |
| 16128 | @@ -6319,8 +7237,8 @@ func_mode_link () |
| 16129 | lib*) |
| 16130 | func_stripname 'lib' '.la' "$outputname" |
| 16131 | name=$func_stripname_result |
| 16132 | - eval "shared_ext=\"$shrext_cmds\"" |
| 16133 | - eval "libname=\"$libname_spec\"" |
| 16134 | + eval shared_ext=\"$shrext_cmds\" |
| 16135 | + eval libname=\"$libname_spec\" |
| 16136 | ;; |
| 16137 | *) |
| 16138 | test "$module" = no && \ |
| 16139 | @@ -6330,8 +7248,8 @@ func_mode_link () |
| 16140 | # Add the "lib" prefix for modules if required |
| 16141 | func_stripname '' '.la' "$outputname" |
| 16142 | name=$func_stripname_result |
| 16143 | - eval "shared_ext=\"$shrext_cmds\"" |
| 16144 | - eval "libname=\"$libname_spec\"" |
| 16145 | + eval shared_ext=\"$shrext_cmds\" |
| 16146 | + eval libname=\"$libname_spec\" |
| 16147 | else |
| 16148 | func_stripname '' '.la' "$outputname" |
| 16149 | libname=$func_stripname_result |
| 16150 | @@ -6346,7 +7264,7 @@ func_mode_link () |
| 16151 | echo |
| 16152 | $ECHO "*** Warning: Linking the shared library $output against the non-libtool" |
| 16153 | $ECHO "*** objects $objs is not portable!" |
| 16154 | - libobjs="$libobjs $objs" |
| 16155 | + func_append libobjs " $objs" |
| 16156 | fi |
| 16157 | fi |
| 16158 | |
| 16159 | @@ -6544,7 +7462,7 @@ func_mode_link () |
| 16160 | done |
| 16161 | |
| 16162 | # Make executables depend on our current version. |
| 16163 | - verstring="$verstring:${current}.0" |
| 16164 | + func_append verstring ":${current}.0" |
| 16165 | ;; |
| 16166 | |
| 16167 | qnx) |
| 16168 | @@ -6612,10 +7530,10 @@ func_mode_link () |
| 16169 | fi |
| 16170 | |
| 16171 | func_generate_dlsyms "$libname" "$libname" "yes" |
| 16172 | - libobjs="$libobjs $symfileobj" |
| 16173 | + func_append libobjs " $symfileobj" |
| 16174 | test "X$libobjs" = "X " && libobjs= |
| 16175 | |
| 16176 | - if test "$mode" != relink; then |
| 16177 | + if test "$opt_mode" != relink; then |
| 16178 | # Remove our outputs, but don't remove object files since they |
| 16179 | # may have been created when compiling PIC objects. |
| 16180 | removelist= |
| 16181 | @@ -6631,7 +7549,7 @@ func_mode_link () |
| 16182 | continue |
| 16183 | fi |
| 16184 | fi |
| 16185 | - removelist="$removelist $p" |
| 16186 | + func_append removelist " $p" |
| 16187 | ;; |
| 16188 | *) ;; |
| 16189 | esac |
| 16190 | @@ -6642,7 +7560,7 @@ func_mode_link () |
| 16191 | |
| 16192 | # Now set the variables for building old libraries. |
| 16193 | if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then |
| 16194 | - oldlibs="$oldlibs $output_objdir/$libname.$libext" |
| 16195 | + func_append oldlibs " $output_objdir/$libname.$libext" |
| 16196 | |
| 16197 | # Transform .lo files to .o files. |
| 16198 | oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` |
| 16199 | @@ -6659,10 +7577,11 @@ func_mode_link () |
| 16200 | # If the user specified any rpath flags, then add them. |
| 16201 | temp_xrpath= |
| 16202 | for libdir in $xrpath; do |
| 16203 | - temp_xrpath="$temp_xrpath -R$libdir" |
| 16204 | + func_replace_sysroot "$libdir" |
| 16205 | + func_append temp_xrpath " -R$func_replace_sysroot_result" |
| 16206 | case "$finalize_rpath " in |
| 16207 | *" $libdir "*) ;; |
| 16208 | - *) finalize_rpath="$finalize_rpath $libdir" ;; |
| 16209 | + *) func_append finalize_rpath " $libdir" ;; |
| 16210 | esac |
| 16211 | done |
| 16212 | if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then |
| 16213 | @@ -6676,7 +7595,7 @@ func_mode_link () |
| 16214 | for lib in $old_dlfiles; do |
| 16215 | case " $dlprefiles $dlfiles " in |
| 16216 | *" $lib "*) ;; |
| 16217 | - *) dlfiles="$dlfiles $lib" ;; |
| 16218 | + *) func_append dlfiles " $lib" ;; |
| 16219 | esac |
| 16220 | done |
| 16221 | |
| 16222 | @@ -6686,7 +7605,7 @@ func_mode_link () |
| 16223 | for lib in $old_dlprefiles; do |
| 16224 | case "$dlprefiles " in |
| 16225 | *" $lib "*) ;; |
| 16226 | - *) dlprefiles="$dlprefiles $lib" ;; |
| 16227 | + *) func_append dlprefiles " $lib" ;; |
| 16228 | esac |
| 16229 | done |
| 16230 | |
| 16231 | @@ -6698,7 +7617,7 @@ func_mode_link () |
| 16232 | ;; |
| 16233 | *-*-rhapsody* | *-*-darwin1.[012]) |
| 16234 | # Rhapsody C library is in the System framework |
| 16235 | - deplibs="$deplibs System.ltframework" |
| 16236 | + func_append deplibs " System.ltframework" |
| 16237 | ;; |
| 16238 | *-*-netbsd*) |
| 16239 | # Don't link with libc until the a.out ld.so is fixed. |
| 16240 | @@ -6715,7 +7634,7 @@ func_mode_link () |
| 16241 | *) |
| 16242 | # Add libc to deplibs on all other systems if necessary. |
| 16243 | if test "$build_libtool_need_lc" = "yes"; then |
| 16244 | - deplibs="$deplibs -lc" |
| 16245 | + func_append deplibs " -lc" |
| 16246 | fi |
| 16247 | ;; |
| 16248 | esac |
| 16249 | @@ -6764,18 +7683,18 @@ EOF |
| 16250 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
| 16251 | case " $predeps $postdeps " in |
| 16252 | *" $i "*) |
| 16253 | - newdeplibs="$newdeplibs $i" |
| 16254 | + func_append newdeplibs " $i" |
| 16255 | i="" |
| 16256 | ;; |
| 16257 | esac |
| 16258 | fi |
| 16259 | if test -n "$i" ; then |
| 16260 | - eval "libname=\"$libname_spec\"" |
| 16261 | - eval "deplib_matches=\"$library_names_spec\"" |
| 16262 | + libname=`eval "\\$ECHO \"$libname_spec\""` |
| 16263 | + deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` |
| 16264 | set dummy $deplib_matches; shift |
| 16265 | deplib_match=$1 |
| 16266 | if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then |
| 16267 | - newdeplibs="$newdeplibs $i" |
| 16268 | + func_append newdeplibs " $i" |
| 16269 | else |
| 16270 | droppeddeps=yes |
| 16271 | echo |
| 16272 | @@ -6789,7 +7708,7 @@ EOF |
| 16273 | fi |
| 16274 | ;; |
| 16275 | *) |
| 16276 | - newdeplibs="$newdeplibs $i" |
| 16277 | + func_append newdeplibs " $i" |
| 16278 | ;; |
| 16279 | esac |
| 16280 | done |
| 16281 | @@ -6807,18 +7726,18 @@ EOF |
| 16282 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
| 16283 | case " $predeps $postdeps " in |
| 16284 | *" $i "*) |
| 16285 | - newdeplibs="$newdeplibs $i" |
| 16286 | + func_append newdeplibs " $i" |
| 16287 | i="" |
| 16288 | ;; |
| 16289 | esac |
| 16290 | fi |
| 16291 | if test -n "$i" ; then |
| 16292 | - eval "libname=\"$libname_spec\"" |
| 16293 | - eval "deplib_matches=\"$library_names_spec\"" |
| 16294 | + libname=`eval "\\$ECHO \"$libname_spec\""` |
| 16295 | + deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` |
| 16296 | set dummy $deplib_matches; shift |
| 16297 | deplib_match=$1 |
| 16298 | if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then |
| 16299 | - newdeplibs="$newdeplibs $i" |
| 16300 | + func_append newdeplibs " $i" |
| 16301 | else |
| 16302 | droppeddeps=yes |
| 16303 | echo |
| 16304 | @@ -6840,7 +7759,7 @@ EOF |
| 16305 | fi |
| 16306 | ;; |
| 16307 | *) |
| 16308 | - newdeplibs="$newdeplibs $i" |
| 16309 | + func_append newdeplibs " $i" |
| 16310 | ;; |
| 16311 | esac |
| 16312 | done |
| 16313 | @@ -6857,15 +7776,27 @@ EOF |
| 16314 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
| 16315 | case " $predeps $postdeps " in |
| 16316 | *" $a_deplib "*) |
| 16317 | - newdeplibs="$newdeplibs $a_deplib" |
| 16318 | + func_append newdeplibs " $a_deplib" |
| 16319 | a_deplib="" |
| 16320 | ;; |
| 16321 | esac |
| 16322 | fi |
| 16323 | if test -n "$a_deplib" ; then |
| 16324 | - eval "libname=\"$libname_spec\"" |
| 16325 | + libname=`eval "\\$ECHO \"$libname_spec\""` |
| 16326 | + if test -n "$file_magic_glob"; then |
| 16327 | + libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` |
| 16328 | + else |
| 16329 | + libnameglob=$libname |
| 16330 | + fi |
| 16331 | + test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` |
| 16332 | for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do |
| 16333 | - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` |
| 16334 | + if test "$want_nocaseglob" = yes; then |
| 16335 | + shopt -s nocaseglob |
| 16336 | + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` |
| 16337 | + $nocaseglob |
| 16338 | + else |
| 16339 | + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` |
| 16340 | + fi |
| 16341 | for potent_lib in $potential_libs; do |
| 16342 | # Follow soft links. |
| 16343 | if ls -lLd "$potent_lib" 2>/dev/null | |
| 16344 | @@ -6885,10 +7816,10 @@ EOF |
| 16345 | *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; |
| 16346 | esac |
| 16347 | done |
| 16348 | - if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null | |
| 16349 | + if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | |
| 16350 | $SED -e 10q | |
| 16351 | $EGREP "$file_magic_regex" > /dev/null; then |
| 16352 | - newdeplibs="$newdeplibs $a_deplib" |
| 16353 | + func_append newdeplibs " $a_deplib" |
| 16354 | a_deplib="" |
| 16355 | break 2 |
| 16356 | fi |
| 16357 | @@ -6913,7 +7844,7 @@ EOF |
| 16358 | ;; |
| 16359 | *) |
| 16360 | # Add a -L argument. |
| 16361 | - newdeplibs="$newdeplibs $a_deplib" |
| 16362 | + func_append newdeplibs " $a_deplib" |
| 16363 | ;; |
| 16364 | esac |
| 16365 | done # Gone through all deplibs. |
| 16366 | @@ -6929,20 +7860,20 @@ EOF |
| 16367 | if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then |
| 16368 | case " $predeps $postdeps " in |
| 16369 | *" $a_deplib "*) |
| 16370 | - newdeplibs="$newdeplibs $a_deplib" |
| 16371 | + func_append newdeplibs " $a_deplib" |
| 16372 | a_deplib="" |
| 16373 | ;; |
| 16374 | esac |
| 16375 | fi |
| 16376 | if test -n "$a_deplib" ; then |
| 16377 | - eval "libname=\"$libname_spec\"" |
| 16378 | + libname=`eval "\\$ECHO \"$libname_spec\""` |
| 16379 | for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do |
| 16380 | potential_libs=`ls $i/$libname[.-]* 2>/dev/null` |
| 16381 | for potent_lib in $potential_libs; do |
| 16382 | potlib="$potent_lib" # see symlink-check above in file_magic test |
| 16383 | if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ |
| 16384 | $EGREP "$match_pattern_regex" > /dev/null; then |
| 16385 | - newdeplibs="$newdeplibs $a_deplib" |
| 16386 | + func_append newdeplibs " $a_deplib" |
| 16387 | a_deplib="" |
| 16388 | break 2 |
| 16389 | fi |
| 16390 | @@ -6967,7 +7898,7 @@ EOF |
| 16391 | ;; |
| 16392 | *) |
| 16393 | # Add a -L argument. |
| 16394 | - newdeplibs="$newdeplibs $a_deplib" |
| 16395 | + func_append newdeplibs " $a_deplib" |
| 16396 | ;; |
| 16397 | esac |
| 16398 | done # Gone through all deplibs. |
| 16399 | @@ -7071,7 +8002,7 @@ EOF |
| 16400 | *) |
| 16401 | case " $deplibs " in |
| 16402 | *" -L$path/$objdir "*) |
| 16403 | - new_libs="$new_libs -L$path/$objdir" ;; |
| 16404 | + func_append new_libs " -L$path/$objdir" ;; |
| 16405 | esac |
| 16406 | ;; |
| 16407 | esac |
| 16408 | @@ -7081,10 +8012,10 @@ EOF |
| 16409 | -L*) |
| 16410 | case " $new_libs " in |
| 16411 | *" $deplib "*) ;; |
| 16412 | - *) new_libs="$new_libs $deplib" ;; |
| 16413 | + *) func_append new_libs " $deplib" ;; |
| 16414 | esac |
| 16415 | ;; |
| 16416 | - *) new_libs="$new_libs $deplib" ;; |
| 16417 | + *) func_append new_libs " $deplib" ;; |
| 16418 | esac |
| 16419 | done |
| 16420 | deplibs="$new_libs" |
| 16421 | @@ -7101,10 +8032,12 @@ EOF |
| 16422 | hardcode_libdirs= |
| 16423 | dep_rpath= |
| 16424 | rpath="$finalize_rpath" |
| 16425 | - test "$mode" != relink && rpath="$compile_rpath$rpath" |
| 16426 | + test "$opt_mode" != relink && rpath="$compile_rpath$rpath" |
| 16427 | for libdir in $rpath; do |
| 16428 | if test -n "$hardcode_libdir_flag_spec"; then |
| 16429 | if test -n "$hardcode_libdir_separator"; then |
| 16430 | + func_replace_sysroot "$libdir" |
| 16431 | + libdir=$func_replace_sysroot_result |
| 16432 | if test -z "$hardcode_libdirs"; then |
| 16433 | hardcode_libdirs="$libdir" |
| 16434 | else |
| 16435 | @@ -7113,18 +8046,18 @@ EOF |
| 16436 | *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) |
| 16437 | ;; |
| 16438 | *) |
| 16439 | - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" |
| 16440 | + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" |
| 16441 | ;; |
| 16442 | esac |
| 16443 | fi |
| 16444 | else |
| 16445 | - eval "flag=\"$hardcode_libdir_flag_spec\"" |
| 16446 | - dep_rpath="$dep_rpath $flag" |
| 16447 | + eval flag=\"$hardcode_libdir_flag_spec\" |
| 16448 | + func_append dep_rpath " $flag" |
| 16449 | fi |
| 16450 | elif test -n "$runpath_var"; then |
| 16451 | case "$perm_rpath " in |
| 16452 | *" $libdir "*) ;; |
| 16453 | - *) perm_rpath="$perm_rpath $libdir" ;; |
| 16454 | + *) func_apped perm_rpath " $libdir" ;; |
| 16455 | esac |
| 16456 | fi |
| 16457 | done |
| 16458 | @@ -7133,40 +8066,38 @@ EOF |
| 16459 | test -n "$hardcode_libdirs"; then |
| 16460 | libdir="$hardcode_libdirs" |
| 16461 | if test -n "$hardcode_libdir_flag_spec_ld"; then |
| 16462 | - eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\"" |
| 16463 | + eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" |
| 16464 | else |
| 16465 | - eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" |
| 16466 | + eval dep_rpath=\"$hardcode_libdir_flag_spec\" |
| 16467 | fi |
| 16468 | fi |
| 16469 | if test -n "$runpath_var" && test -n "$perm_rpath"; then |
| 16470 | # We should set the runpath_var. |
| 16471 | rpath= |
| 16472 | for dir in $perm_rpath; do |
| 16473 | - rpath="$rpath$dir:" |
| 16474 | + func_append rpath "$dir:" |
| 16475 | done |
| 16476 | - eval $runpath_var=\$rpath\$$runpath_var |
| 16477 | - export $runpath_var |
| 16478 | + eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" |
| 16479 | fi |
| 16480 | test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" |
| 16481 | fi |
| 16482 | |
| 16483 | shlibpath="$finalize_shlibpath" |
| 16484 | - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" |
| 16485 | + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" |
| 16486 | if test -n "$shlibpath"; then |
| 16487 | - eval $shlibpath_var=\$shlibpath\$$shlibpath_var |
| 16488 | - export $shlibpath_var |
| 16489 | + eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" |
| 16490 | fi |
| 16491 | |
| 16492 | # Get the real and link names of the library. |
| 16493 | - eval "shared_ext=\"$shrext_cmds\"" |
| 16494 | - eval "library_names=\"$library_names_spec\"" |
| 16495 | + eval shared_ext=\"$shrext_cmds\" |
| 16496 | + eval library_names=\"$library_names_spec\" |
| 16497 | set dummy $library_names |
| 16498 | shift |
| 16499 | realname="$1" |
| 16500 | shift |
| 16501 | |
| 16502 | if test -n "$soname_spec"; then |
| 16503 | - eval "soname=\"$soname_spec\"" |
| 16504 | + eval soname=\"$soname_spec\" |
| 16505 | else |
| 16506 | soname="$realname" |
| 16507 | fi |
| 16508 | @@ -7178,7 +8109,7 @@ EOF |
| 16509 | linknames= |
| 16510 | for link |
| 16511 | do |
| 16512 | - linknames="$linknames $link" |
| 16513 | + func_append linknames " $link" |
| 16514 | done |
| 16515 | |
| 16516 | # Use standard objects if they are pic |
| 16517 | @@ -7189,7 +8120,7 @@ EOF |
| 16518 | if test -n "$export_symbols" && test -n "$include_expsyms"; then |
| 16519 | $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" |
| 16520 | export_symbols="$output_objdir/$libname.uexp" |
| 16521 | - delfiles="$delfiles $export_symbols" |
| 16522 | + func_append delfiles " $export_symbols" |
| 16523 | fi |
| 16524 | |
| 16525 | orig_export_symbols= |
| 16526 | @@ -7220,13 +8151,45 @@ EOF |
| 16527 | $opt_dry_run || $RM $export_symbols |
| 16528 | cmds=$export_symbols_cmds |
| 16529 | save_ifs="$IFS"; IFS='~' |
| 16530 | - for cmd in $cmds; do |
| 16531 | + for cmd1 in $cmds; do |
| 16532 | IFS="$save_ifs" |
| 16533 | - eval "cmd=\"$cmd\"" |
| 16534 | - func_len " $cmd" |
| 16535 | - len=$func_len_result |
| 16536 | - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then |
| 16537 | + # Take the normal branch if the nm_file_list_spec branch |
| 16538 | + # doesn't work or if tool conversion is not needed. |
| 16539 | + case $nm_file_list_spec~$to_tool_file_cmd in |
| 16540 | + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) |
| 16541 | + try_normal_branch=yes |
| 16542 | + eval cmd=\"$cmd1\" |
| 16543 | + func_len " $cmd" |
| 16544 | + len=$func_len_result |
| 16545 | + ;; |
| 16546 | + *) |
| 16547 | + try_normal_branch=no |
| 16548 | + ;; |
| 16549 | + esac |
| 16550 | + if test "$try_normal_branch" = yes \ |
| 16551 | + && { test "$len" -lt "$max_cmd_len" \ |
| 16552 | + || test "$max_cmd_len" -le -1; } |
| 16553 | + then |
| 16554 | + func_show_eval "$cmd" 'exit $?' |
| 16555 | + skipped_export=false |
| 16556 | + elif test -n "$nm_file_list_spec"; then |
| 16557 | + func_basename "$output" |
| 16558 | + output_la=$func_basename_result |
| 16559 | + save_libobjs=$libobjs |
| 16560 | + save_output=$output |
| 16561 | + output=${output_objdir}/${output_la}.nm |
| 16562 | + func_to_tool_file "$output" |
| 16563 | + libobjs=$nm_file_list_spec$func_to_tool_file_result |
| 16564 | + func_append delfiles " $output" |
| 16565 | + func_verbose "creating $NM input file list: $output" |
| 16566 | + for obj in $save_libobjs; do |
| 16567 | + func_to_tool_file "$obj" |
| 16568 | + $ECHO "$func_to_tool_file_result" |
| 16569 | + done > "$output" |
| 16570 | + eval cmd=\"$cmd1\" |
| 16571 | func_show_eval "$cmd" 'exit $?' |
| 16572 | + output=$save_output |
| 16573 | + libobjs=$save_libobjs |
| 16574 | skipped_export=false |
| 16575 | else |
| 16576 | # The command line is too long to execute in one step. |
| 16577 | @@ -7248,7 +8211,7 @@ EOF |
| 16578 | if test -n "$export_symbols" && test -n "$include_expsyms"; then |
| 16579 | tmp_export_symbols="$export_symbols" |
| 16580 | test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" |
| 16581 | - $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" |
| 16582 | + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' |
| 16583 | fi |
| 16584 | |
| 16585 | if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then |
| 16586 | @@ -7260,7 +8223,7 @@ EOF |
| 16587 | # global variables. join(1) would be nice here, but unfortunately |
| 16588 | # isn't a blessed tool. |
| 16589 | $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter |
| 16590 | - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" |
| 16591 | + func_append delfiles " $export_symbols $output_objdir/$libname.filter" |
| 16592 | export_symbols=$output_objdir/$libname.def |
| 16593 | $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols |
| 16594 | fi |
| 16595 | @@ -7270,7 +8233,7 @@ EOF |
| 16596 | case " $convenience " in |
| 16597 | *" $test_deplib "*) ;; |
| 16598 | *) |
| 16599 | - tmp_deplibs="$tmp_deplibs $test_deplib" |
| 16600 | + func_append tmp_deplibs " $test_deplib" |
| 16601 | ;; |
| 16602 | esac |
| 16603 | done |
| 16604 | @@ -7286,43 +8249,43 @@ EOF |
| 16605 | fi |
| 16606 | if test -n "$whole_archive_flag_spec"; then |
| 16607 | save_libobjs=$libobjs |
| 16608 | - eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" |
| 16609 | + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" |
| 16610 | test "X$libobjs" = "X " && libobjs= |
| 16611 | else |
| 16612 | gentop="$output_objdir/${outputname}x" |
| 16613 | - generated="$generated $gentop" |
| 16614 | + func_append generated " $gentop" |
| 16615 | |
| 16616 | func_extract_archives $gentop $convenience |
| 16617 | - libobjs="$libobjs $func_extract_archives_result" |
| 16618 | + func_append libobjs " $func_extract_archives_result" |
| 16619 | test "X$libobjs" = "X " && libobjs= |
| 16620 | fi |
| 16621 | fi |
| 16622 | |
| 16623 | if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then |
| 16624 | - eval "flag=\"$thread_safe_flag_spec\"" |
| 16625 | - linker_flags="$linker_flags $flag" |
| 16626 | + eval flag=\"$thread_safe_flag_spec\" |
| 16627 | + func_append linker_flags " $flag" |
| 16628 | fi |
| 16629 | |
| 16630 | # Make a backup of the uninstalled library when relinking |
| 16631 | - if test "$mode" = relink; then |
| 16632 | - $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $? |
| 16633 | + if test "$opt_mode" = relink; then |
| 16634 | + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? |
| 16635 | fi |
| 16636 | |
| 16637 | # Do each of the archive commands. |
| 16638 | if test "$module" = yes && test -n "$module_cmds" ; then |
| 16639 | if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then |
| 16640 | - eval "test_cmds=\"$module_expsym_cmds\"" |
| 16641 | + eval test_cmds=\"$module_expsym_cmds\" |
| 16642 | cmds=$module_expsym_cmds |
| 16643 | else |
| 16644 | - eval "test_cmds=\"$module_cmds\"" |
| 16645 | + eval test_cmds=\"$module_cmds\" |
| 16646 | cmds=$module_cmds |
| 16647 | fi |
| 16648 | else |
| 16649 | if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then |
| 16650 | - eval "test_cmds=\"$archive_expsym_cmds\"" |
| 16651 | + eval test_cmds=\"$archive_expsym_cmds\" |
| 16652 | cmds=$archive_expsym_cmds |
| 16653 | else |
| 16654 | - eval "test_cmds=\"$archive_cmds\"" |
| 16655 | + eval test_cmds=\"$archive_cmds\" |
| 16656 | cmds=$archive_cmds |
| 16657 | fi |
| 16658 | fi |
| 16659 | @@ -7366,10 +8329,13 @@ EOF |
| 16660 | echo 'INPUT (' > $output |
| 16661 | for obj in $save_libobjs |
| 16662 | do |
| 16663 | - $ECHO "$obj" >> $output |
| 16664 | + func_to_tool_file "$obj" |
| 16665 | + $ECHO "$func_to_tool_file_result" >> $output |
| 16666 | done |
| 16667 | echo ')' >> $output |
| 16668 | - delfiles="$delfiles $output" |
| 16669 | + func_append delfiles " $output" |
| 16670 | + func_to_tool_file "$output" |
| 16671 | + output=$func_to_tool_file_result |
| 16672 | elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then |
| 16673 | output=${output_objdir}/${output_la}.lnk |
| 16674 | func_verbose "creating linker input file list: $output" |
| 16675 | @@ -7383,15 +8349,17 @@ EOF |
| 16676 | fi |
| 16677 | for obj |
| 16678 | do |
| 16679 | - $ECHO "$obj" >> $output |
| 16680 | + func_to_tool_file "$obj" |
| 16681 | + $ECHO "$func_to_tool_file_result" >> $output |
| 16682 | done |
| 16683 | - delfiles="$delfiles $output" |
| 16684 | - output=$firstobj\"$file_list_spec$output\" |
| 16685 | + func_append delfiles " $output" |
| 16686 | + func_to_tool_file "$output" |
| 16687 | + output=$firstobj\"$file_list_spec$func_to_tool_file_result\" |
| 16688 | else |
| 16689 | if test -n "$save_libobjs"; then |
| 16690 | func_verbose "creating reloadable object files..." |
| 16691 | output=$output_objdir/$output_la-${k}.$objext |
| 16692 | - eval "test_cmds=\"$reload_cmds\"" |
| 16693 | + eval test_cmds=\"$reload_cmds\" |
| 16694 | func_len " $test_cmds" |
| 16695 | len0=$func_len_result |
| 16696 | len=$len0 |
| 16697 | @@ -7411,12 +8379,12 @@ EOF |
| 16698 | if test "$k" -eq 1 ; then |
| 16699 | # The first file doesn't have a previous command to add. |
| 16700 | reload_objs=$objlist |
| 16701 | - eval "concat_cmds=\"$reload_cmds\"" |
| 16702 | + eval concat_cmds=\"$reload_cmds\" |
| 16703 | else |
| 16704 | # All subsequent reloadable object files will link in |
| 16705 | # the last one created. |
| 16706 | reload_objs="$objlist $last_robj" |
| 16707 | - eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"" |
| 16708 | + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" |
| 16709 | fi |
| 16710 | last_robj=$output_objdir/$output_la-${k}.$objext |
| 16711 | func_arith $k + 1 |
| 16712 | @@ -7433,11 +8401,11 @@ EOF |
| 16713 | # files will link in the last one created. |
| 16714 | test -z "$concat_cmds" || concat_cmds=$concat_cmds~ |
| 16715 | reload_objs="$objlist $last_robj" |
| 16716 | - eval "concat_cmds=\"\${concat_cmds}$reload_cmds\"" |
| 16717 | + eval concat_cmds=\"\${concat_cmds}$reload_cmds\" |
| 16718 | if test -n "$last_robj"; then |
| 16719 | - eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"" |
| 16720 | + eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" |
| 16721 | fi |
| 16722 | - delfiles="$delfiles $output" |
| 16723 | + func_append delfiles " $output" |
| 16724 | |
| 16725 | else |
| 16726 | output= |
| 16727 | @@ -7450,9 +8418,9 @@ EOF |
| 16728 | libobjs=$output |
| 16729 | # Append the command to create the export file. |
| 16730 | test -z "$concat_cmds" || concat_cmds=$concat_cmds~ |
| 16731 | - eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\"" |
| 16732 | + eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" |
| 16733 | if test -n "$last_robj"; then |
| 16734 | - eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\"" |
| 16735 | + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" |
| 16736 | fi |
| 16737 | fi |
| 16738 | |
| 16739 | @@ -7471,7 +8439,7 @@ EOF |
| 16740 | lt_exit=$? |
| 16741 | |
| 16742 | # Restore the uninstalled library and exit |
| 16743 | - if test "$mode" = relink; then |
| 16744 | + if test "$opt_mode" = relink; then |
| 16745 | ( cd "$output_objdir" && \ |
| 16746 | $RM "${realname}T" && \ |
| 16747 | $MV "${realname}U" "$realname" ) |
| 16748 | @@ -7492,7 +8460,7 @@ EOF |
| 16749 | if test -n "$export_symbols" && test -n "$include_expsyms"; then |
| 16750 | tmp_export_symbols="$export_symbols" |
| 16751 | test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" |
| 16752 | - $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols" |
| 16753 | + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' |
| 16754 | fi |
| 16755 | |
| 16756 | if test -n "$orig_export_symbols"; then |
| 16757 | @@ -7504,7 +8472,7 @@ EOF |
| 16758 | # global variables. join(1) would be nice here, but unfortunately |
| 16759 | # isn't a blessed tool. |
| 16760 | $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter |
| 16761 | - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" |
| 16762 | + func_append delfiles " $export_symbols $output_objdir/$libname.filter" |
| 16763 | export_symbols=$output_objdir/$libname.def |
| 16764 | $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols |
| 16765 | fi |
| 16766 | @@ -7515,7 +8483,7 @@ EOF |
| 16767 | output=$save_output |
| 16768 | |
| 16769 | if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then |
| 16770 | - eval "libobjs=\"\$libobjs $whole_archive_flag_spec\"" |
| 16771 | + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" |
| 16772 | test "X$libobjs" = "X " && libobjs= |
| 16773 | fi |
| 16774 | # Expand the library linking commands again to reset the |
| 16775 | @@ -7539,23 +8507,23 @@ EOF |
| 16776 | |
| 16777 | if test -n "$delfiles"; then |
| 16778 | # Append the command to remove temporary files to $cmds. |
| 16779 | - eval "cmds=\"\$cmds~\$RM $delfiles\"" |
| 16780 | + eval cmds=\"\$cmds~\$RM $delfiles\" |
| 16781 | fi |
| 16782 | |
| 16783 | # Add any objects from preloaded convenience libraries |
| 16784 | if test -n "$dlprefiles"; then |
| 16785 | gentop="$output_objdir/${outputname}x" |
| 16786 | - generated="$generated $gentop" |
| 16787 | + func_append generated " $gentop" |
| 16788 | |
| 16789 | func_extract_archives $gentop $dlprefiles |
| 16790 | - libobjs="$libobjs $func_extract_archives_result" |
| 16791 | + func_append libobjs " $func_extract_archives_result" |
| 16792 | test "X$libobjs" = "X " && libobjs= |
| 16793 | fi |
| 16794 | |
| 16795 | save_ifs="$IFS"; IFS='~' |
| 16796 | for cmd in $cmds; do |
| 16797 | IFS="$save_ifs" |
| 16798 | - eval "cmd=\"$cmd\"" |
| 16799 | + eval cmd=\"$cmd\" |
| 16800 | $opt_silent || { |
| 16801 | func_quote_for_expand "$cmd" |
| 16802 | eval "func_echo $func_quote_for_expand_result" |
| 16803 | @@ -7564,7 +8532,7 @@ EOF |
| 16804 | lt_exit=$? |
| 16805 | |
| 16806 | # Restore the uninstalled library and exit |
| 16807 | - if test "$mode" = relink; then |
| 16808 | + if test "$opt_mode" = relink; then |
| 16809 | ( cd "$output_objdir" && \ |
| 16810 | $RM "${realname}T" && \ |
| 16811 | $MV "${realname}U" "$realname" ) |
| 16812 | @@ -7576,8 +8544,8 @@ EOF |
| 16813 | IFS="$save_ifs" |
| 16814 | |
| 16815 | # Restore the uninstalled library and exit |
| 16816 | - if test "$mode" = relink; then |
| 16817 | - $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $? |
| 16818 | + if test "$opt_mode" = relink; then |
| 16819 | + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? |
| 16820 | |
| 16821 | if test -n "$convenience"; then |
| 16822 | if test -z "$whole_archive_flag_spec"; then |
| 16823 | @@ -7656,17 +8624,20 @@ EOF |
| 16824 | |
| 16825 | if test -n "$convenience"; then |
| 16826 | if test -n "$whole_archive_flag_spec"; then |
| 16827 | - eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\"" |
| 16828 | + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" |
| 16829 | reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` |
| 16830 | else |
| 16831 | gentop="$output_objdir/${obj}x" |
| 16832 | - generated="$generated $gentop" |
| 16833 | + func_append generated " $gentop" |
| 16834 | |
| 16835 | func_extract_archives $gentop $convenience |
| 16836 | reload_conv_objs="$reload_objs $func_extract_archives_result" |
| 16837 | fi |
| 16838 | fi |
| 16839 | |
| 16840 | + # If we're not building shared, we need to use non_pic_objs |
| 16841 | + test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" |
| 16842 | + |
| 16843 | # Create the old-style object. |
| 16844 | reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test |
| 16845 | |
| 16846 | @@ -7690,7 +8661,7 @@ EOF |
| 16847 | # Create an invalid libtool object if no PIC, so that we don't |
| 16848 | # accidentally link it into a program. |
| 16849 | # $show "echo timestamp > $libobj" |
| 16850 | - # $opt_dry_run || echo timestamp > $libobj || exit $? |
| 16851 | + # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? |
| 16852 | exit $EXIT_SUCCESS |
| 16853 | fi |
| 16854 | |
| 16855 | @@ -7740,8 +8711,8 @@ EOF |
| 16856 | if test "$tagname" = CXX ; then |
| 16857 | case ${MACOSX_DEPLOYMENT_TARGET-10.0} in |
| 16858 | 10.[0123]) |
| 16859 | - compile_command="$compile_command ${wl}-bind_at_load" |
| 16860 | - finalize_command="$finalize_command ${wl}-bind_at_load" |
| 16861 | + func_append compile_command " ${wl}-bind_at_load" |
| 16862 | + func_append finalize_command " ${wl}-bind_at_load" |
| 16863 | ;; |
| 16864 | esac |
| 16865 | fi |
| 16866 | @@ -7761,7 +8732,7 @@ EOF |
| 16867 | *) |
| 16868 | case " $compile_deplibs " in |
| 16869 | *" -L$path/$objdir "*) |
| 16870 | - new_libs="$new_libs -L$path/$objdir" ;; |
| 16871 | + func_append new_libs " -L$path/$objdir" ;; |
| 16872 | esac |
| 16873 | ;; |
| 16874 | esac |
| 16875 | @@ -7771,17 +8742,17 @@ EOF |
| 16876 | -L*) |
| 16877 | case " $new_libs " in |
| 16878 | *" $deplib "*) ;; |
| 16879 | - *) new_libs="$new_libs $deplib" ;; |
| 16880 | + *) func_append new_libs " $deplib" ;; |
| 16881 | esac |
| 16882 | ;; |
| 16883 | - *) new_libs="$new_libs $deplib" ;; |
| 16884 | + *) func_append new_libs " $deplib" ;; |
| 16885 | esac |
| 16886 | done |
| 16887 | compile_deplibs="$new_libs" |
| 16888 | |
| 16889 | |
| 16890 | - compile_command="$compile_command $compile_deplibs" |
| 16891 | - finalize_command="$finalize_command $finalize_deplibs" |
| 16892 | + func_append compile_command " $compile_deplibs" |
| 16893 | + func_append finalize_command " $finalize_deplibs" |
| 16894 | |
| 16895 | if test -n "$rpath$xrpath"; then |
| 16896 | # If the user specified any rpath flags, then add them. |
| 16897 | @@ -7789,7 +8760,7 @@ EOF |
| 16898 | # This is the magic to use -rpath. |
| 16899 | case "$finalize_rpath " in |
| 16900 | *" $libdir "*) ;; |
| 16901 | - *) finalize_rpath="$finalize_rpath $libdir" ;; |
| 16902 | + *) func_append finalize_rpath " $libdir" ;; |
| 16903 | esac |
| 16904 | done |
| 16905 | fi |
| 16906 | @@ -7808,18 +8779,18 @@ EOF |
| 16907 | *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) |
| 16908 | ;; |
| 16909 | *) |
| 16910 | - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" |
| 16911 | + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" |
| 16912 | ;; |
| 16913 | esac |
| 16914 | fi |
| 16915 | else |
| 16916 | - eval "flag=\"$hardcode_libdir_flag_spec\"" |
| 16917 | - rpath="$rpath $flag" |
| 16918 | + eval flag=\"$hardcode_libdir_flag_spec\" |
| 16919 | + func_append rpath " $flag" |
| 16920 | fi |
| 16921 | elif test -n "$runpath_var"; then |
| 16922 | case "$perm_rpath " in |
| 16923 | *" $libdir "*) ;; |
| 16924 | - *) perm_rpath="$perm_rpath $libdir" ;; |
| 16925 | + *) func_append perm_rpath " $libdir" ;; |
| 16926 | esac |
| 16927 | fi |
| 16928 | case $host in |
| 16929 | @@ -7828,12 +8799,12 @@ EOF |
| 16930 | case :$dllsearchpath: in |
| 16931 | *":$libdir:"*) ;; |
| 16932 | ::) dllsearchpath=$libdir;; |
| 16933 | - *) dllsearchpath="$dllsearchpath:$libdir";; |
| 16934 | + *) func_append dllsearchpath ":$libdir";; |
| 16935 | esac |
| 16936 | case :$dllsearchpath: in |
| 16937 | *":$testbindir:"*) ;; |
| 16938 | ::) dllsearchpath=$testbindir;; |
| 16939 | - *) dllsearchpath="$dllsearchpath:$testbindir";; |
| 16940 | + *) func_append dllsearchpath ":$testbindir";; |
| 16941 | esac |
| 16942 | ;; |
| 16943 | esac |
| 16944 | @@ -7842,7 +8813,7 @@ EOF |
| 16945 | if test -n "$hardcode_libdir_separator" && |
| 16946 | test -n "$hardcode_libdirs"; then |
| 16947 | libdir="$hardcode_libdirs" |
| 16948 | - eval "rpath=\" $hardcode_libdir_flag_spec\"" |
| 16949 | + eval rpath=\" $hardcode_libdir_flag_spec\" |
| 16950 | fi |
| 16951 | compile_rpath="$rpath" |
| 16952 | |
| 16953 | @@ -7859,18 +8830,18 @@ EOF |
| 16954 | *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) |
| 16955 | ;; |
| 16956 | *) |
| 16957 | - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" |
| 16958 | + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" |
| 16959 | ;; |
| 16960 | esac |
| 16961 | fi |
| 16962 | else |
| 16963 | - eval "flag=\"$hardcode_libdir_flag_spec\"" |
| 16964 | - rpath="$rpath $flag" |
| 16965 | + eval flag=\"$hardcode_libdir_flag_spec\" |
| 16966 | + func_append rpath " $flag" |
| 16967 | fi |
| 16968 | elif test -n "$runpath_var"; then |
| 16969 | case "$finalize_perm_rpath " in |
| 16970 | *" $libdir "*) ;; |
| 16971 | - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; |
| 16972 | + *) func_append finalize_perm_rpath " $libdir" ;; |
| 16973 | esac |
| 16974 | fi |
| 16975 | done |
| 16976 | @@ -7878,7 +8849,7 @@ EOF |
| 16977 | if test -n "$hardcode_libdir_separator" && |
| 16978 | test -n "$hardcode_libdirs"; then |
| 16979 | libdir="$hardcode_libdirs" |
| 16980 | - eval "rpath=\" $hardcode_libdir_flag_spec\"" |
| 16981 | + eval rpath=\" $hardcode_libdir_flag_spec\" |
| 16982 | fi |
| 16983 | finalize_rpath="$rpath" |
| 16984 | |
| 16985 | @@ -7921,6 +8892,12 @@ EOF |
| 16986 | exit_status=0 |
| 16987 | func_show_eval "$link_command" 'exit_status=$?' |
| 16988 | |
| 16989 | + if test -n "$postlink_cmds"; then |
| 16990 | + func_to_tool_file "$output" |
| 16991 | + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` |
| 16992 | + func_execute_cmds "$postlink_cmds" 'exit $?' |
| 16993 | + fi |
| 16994 | + |
| 16995 | # Delete the generated files. |
| 16996 | if test -f "$output_objdir/${outputname}S.${objext}"; then |
| 16997 | func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' |
| 16998 | @@ -7943,7 +8920,7 @@ EOF |
| 16999 | # We should set the runpath_var. |
| 17000 | rpath= |
| 17001 | for dir in $perm_rpath; do |
| 17002 | - rpath="$rpath$dir:" |
| 17003 | + func_append rpath "$dir:" |
| 17004 | done |
| 17005 | compile_var="$runpath_var=\"$rpath\$$runpath_var\" " |
| 17006 | fi |
| 17007 | @@ -7951,7 +8928,7 @@ EOF |
| 17008 | # We should set the runpath_var. |
| 17009 | rpath= |
| 17010 | for dir in $finalize_perm_rpath; do |
| 17011 | - rpath="$rpath$dir:" |
| 17012 | + func_append rpath "$dir:" |
| 17013 | done |
| 17014 | finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " |
| 17015 | fi |
| 17016 | @@ -7966,6 +8943,13 @@ EOF |
| 17017 | $opt_dry_run || $RM $output |
| 17018 | # Link the executable and exit |
| 17019 | func_show_eval "$link_command" 'exit $?' |
| 17020 | + |
| 17021 | + if test -n "$postlink_cmds"; then |
| 17022 | + func_to_tool_file "$output" |
| 17023 | + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` |
| 17024 | + func_execute_cmds "$postlink_cmds" 'exit $?' |
| 17025 | + fi |
| 17026 | + |
| 17027 | exit $EXIT_SUCCESS |
| 17028 | fi |
| 17029 | |
| 17030 | @@ -7999,6 +8983,12 @@ EOF |
| 17031 | |
| 17032 | func_show_eval "$link_command" 'exit $?' |
| 17033 | |
| 17034 | + if test -n "$postlink_cmds"; then |
| 17035 | + func_to_tool_file "$output_objdir/$outputname" |
| 17036 | + 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'` |
| 17037 | + func_execute_cmds "$postlink_cmds" 'exit $?' |
| 17038 | + fi |
| 17039 | + |
| 17040 | # Now create the wrapper script. |
| 17041 | func_verbose "creating $output" |
| 17042 | |
| 17043 | @@ -8096,7 +9086,7 @@ EOF |
| 17044 | else |
| 17045 | oldobjs="$old_deplibs $non_pic_objects" |
| 17046 | if test "$preload" = yes && test -f "$symfileobj"; then |
| 17047 | - oldobjs="$oldobjs $symfileobj" |
| 17048 | + func_append oldobjs " $symfileobj" |
| 17049 | fi |
| 17050 | fi |
| 17051 | addlibs="$old_convenience" |
| 17052 | @@ -8104,10 +9094,10 @@ EOF |
| 17053 | |
| 17054 | if test -n "$addlibs"; then |
| 17055 | gentop="$output_objdir/${outputname}x" |
| 17056 | - generated="$generated $gentop" |
| 17057 | + func_append generated " $gentop" |
| 17058 | |
| 17059 | func_extract_archives $gentop $addlibs |
| 17060 | - oldobjs="$oldobjs $func_extract_archives_result" |
| 17061 | + func_append oldobjs " $func_extract_archives_result" |
| 17062 | fi |
| 17063 | |
| 17064 | # Do each command in the archive commands. |
| 17065 | @@ -8118,10 +9108,10 @@ EOF |
| 17066 | # Add any objects from preloaded convenience libraries |
| 17067 | if test -n "$dlprefiles"; then |
| 17068 | gentop="$output_objdir/${outputname}x" |
| 17069 | - generated="$generated $gentop" |
| 17070 | + func_append generated " $gentop" |
| 17071 | |
| 17072 | func_extract_archives $gentop $dlprefiles |
| 17073 | - oldobjs="$oldobjs $func_extract_archives_result" |
| 17074 | + func_append oldobjs " $func_extract_archives_result" |
| 17075 | fi |
| 17076 | |
| 17077 | # POSIX demands no paths to be encoded in archives. We have |
| 17078 | @@ -8139,7 +9129,7 @@ EOF |
| 17079 | else |
| 17080 | echo "copying selected object files to avoid basename conflicts..." |
| 17081 | gentop="$output_objdir/${outputname}x" |
| 17082 | - generated="$generated $gentop" |
| 17083 | + func_append generated " $gentop" |
| 17084 | func_mkdir_p "$gentop" |
| 17085 | save_oldobjs=$oldobjs |
| 17086 | oldobjs= |
| 17087 | @@ -8163,18 +9153,28 @@ EOF |
| 17088 | esac |
| 17089 | done |
| 17090 | func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" |
| 17091 | - oldobjs="$oldobjs $gentop/$newobj" |
| 17092 | + func_append oldobjs " $gentop/$newobj" |
| 17093 | ;; |
| 17094 | - *) oldobjs="$oldobjs $obj" ;; |
| 17095 | + *) func_append oldobjs " $obj" ;; |
| 17096 | esac |
| 17097 | done |
| 17098 | fi |
| 17099 | - eval "cmds=\"$old_archive_cmds\"" |
| 17100 | + eval cmds=\"$old_archive_cmds\" |
| 17101 | |
| 17102 | func_len " $cmds" |
| 17103 | len=$func_len_result |
| 17104 | if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then |
| 17105 | cmds=$old_archive_cmds |
| 17106 | + elif test -n "$archiver_list_spec"; then |
| 17107 | + func_verbose "using command file archive linking..." |
| 17108 | + for obj in $oldobjs |
| 17109 | + do |
| 17110 | + func_to_tool_file "$obj" |
| 17111 | + $ECHO "$func_to_tool_file_result" |
| 17112 | + done > $output_objdir/$libname.libcmd |
| 17113 | + func_to_tool_file "$output_objdir/$libname.libcmd" |
| 17114 | + oldobjs=" $archiver_list_spec$func_to_tool_file_result" |
| 17115 | + cmds=$old_archive_cmds |
| 17116 | else |
| 17117 | # the command line is too long to link in one step, link in parts |
| 17118 | func_verbose "using piecewise archive linking..." |
| 17119 | @@ -8189,7 +9189,7 @@ EOF |
| 17120 | do |
| 17121 | last_oldobj=$obj |
| 17122 | done |
| 17123 | - eval "test_cmds=\"$old_archive_cmds\"" |
| 17124 | + eval test_cmds=\"$old_archive_cmds\" |
| 17125 | func_len " $test_cmds" |
| 17126 | len0=$func_len_result |
| 17127 | len=$len0 |
| 17128 | @@ -8208,7 +9208,7 @@ EOF |
| 17129 | RANLIB=$save_RANLIB |
| 17130 | fi |
| 17131 | test -z "$concat_cmds" || concat_cmds=$concat_cmds~ |
| 17132 | - eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\"" |
| 17133 | + eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" |
| 17134 | objlist= |
| 17135 | len=$len0 |
| 17136 | fi |
| 17137 | @@ -8216,9 +9216,9 @@ EOF |
| 17138 | RANLIB=$save_RANLIB |
| 17139 | oldobjs=$objlist |
| 17140 | if test "X$oldobjs" = "X" ; then |
| 17141 | - eval "cmds=\"\$concat_cmds\"" |
| 17142 | + eval cmds=\"\$concat_cmds\" |
| 17143 | else |
| 17144 | - eval "cmds=\"\$concat_cmds~\$old_archive_cmds\"" |
| 17145 | + eval cmds=\"\$concat_cmds~\$old_archive_cmds\" |
| 17146 | fi |
| 17147 | fi |
| 17148 | fi |
| 17149 | @@ -8268,12 +9268,23 @@ EOF |
| 17150 | *.la) |
| 17151 | func_basename "$deplib" |
| 17152 | name="$func_basename_result" |
| 17153 | - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
| 17154 | + func_resolve_sysroot "$deplib" |
| 17155 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` |
| 17156 | test -z "$libdir" && \ |
| 17157 | func_fatal_error "\`$deplib' is not a valid libtool archive" |
| 17158 | - newdependency_libs="$newdependency_libs $libdir/$name" |
| 17159 | + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" |
| 17160 | + ;; |
| 17161 | + -L*) |
| 17162 | + func_stripname -L '' "$deplib" |
| 17163 | + func_replace_sysroot "$func_stripname_result" |
| 17164 | + func_append newdependency_libs " -L$func_replace_sysroot_result" |
| 17165 | ;; |
| 17166 | - *) newdependency_libs="$newdependency_libs $deplib" ;; |
| 17167 | + -R*) |
| 17168 | + func_stripname -R '' "$deplib" |
| 17169 | + func_replace_sysroot "$func_stripname_result" |
| 17170 | + func_append newdependency_libs " -R$func_replace_sysroot_result" |
| 17171 | + ;; |
| 17172 | + *) func_append newdependency_libs " $deplib" ;; |
| 17173 | esac |
| 17174 | done |
| 17175 | dependency_libs="$newdependency_libs" |
| 17176 | @@ -8284,12 +9295,14 @@ EOF |
| 17177 | *.la) |
| 17178 | func_basename "$lib" |
| 17179 | name="$func_basename_result" |
| 17180 | - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` |
| 17181 | + func_resolve_sysroot "$lib" |
| 17182 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` |
| 17183 | + |
| 17184 | test -z "$libdir" && \ |
| 17185 | func_fatal_error "\`$lib' is not a valid libtool archive" |
| 17186 | - newdlfiles="$newdlfiles $libdir/$name" |
| 17187 | + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" |
| 17188 | ;; |
| 17189 | - *) newdlfiles="$newdlfiles $lib" ;; |
| 17190 | + *) func_append newdlfiles " $lib" ;; |
| 17191 | esac |
| 17192 | done |
| 17193 | dlfiles="$newdlfiles" |
| 17194 | @@ -8303,10 +9316,11 @@ EOF |
| 17195 | # the library: |
| 17196 | func_basename "$lib" |
| 17197 | name="$func_basename_result" |
| 17198 | - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` |
| 17199 | + func_resolve_sysroot "$lib" |
| 17200 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` |
| 17201 | test -z "$libdir" && \ |
| 17202 | func_fatal_error "\`$lib' is not a valid libtool archive" |
| 17203 | - newdlprefiles="$newdlprefiles $libdir/$name" |
| 17204 | + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" |
| 17205 | ;; |
| 17206 | esac |
| 17207 | done |
| 17208 | @@ -8318,7 +9332,7 @@ EOF |
| 17209 | [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; |
| 17210 | *) abs=`pwd`"/$lib" ;; |
| 17211 | esac |
| 17212 | - newdlfiles="$newdlfiles $abs" |
| 17213 | + func_append newdlfiles " $abs" |
| 17214 | done |
| 17215 | dlfiles="$newdlfiles" |
| 17216 | newdlprefiles= |
| 17217 | @@ -8327,7 +9341,7 @@ EOF |
| 17218 | [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; |
| 17219 | *) abs=`pwd`"/$lib" ;; |
| 17220 | esac |
| 17221 | - newdlprefiles="$newdlprefiles $abs" |
| 17222 | + func_append newdlprefiles " $abs" |
| 17223 | done |
| 17224 | dlprefiles="$newdlprefiles" |
| 17225 | fi |
| 17226 | @@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\"" |
| 17227 | exit $EXIT_SUCCESS |
| 17228 | } |
| 17229 | |
| 17230 | -{ test "$mode" = link || test "$mode" = relink; } && |
| 17231 | +{ test "$opt_mode" = link || test "$opt_mode" = relink; } && |
| 17232 | func_mode_link ${1+"$@"} |
| 17233 | |
| 17234 | |
| 17235 | @@ -8432,9 +9446,9 @@ func_mode_uninstall () |
| 17236 | for arg |
| 17237 | do |
| 17238 | case $arg in |
| 17239 | - -f) RM="$RM $arg"; rmforce=yes ;; |
| 17240 | - -*) RM="$RM $arg" ;; |
| 17241 | - *) files="$files $arg" ;; |
| 17242 | + -f) func_append RM " $arg"; rmforce=yes ;; |
| 17243 | + -*) func_append RM " $arg" ;; |
| 17244 | + *) func_append files " $arg" ;; |
| 17245 | esac |
| 17246 | done |
| 17247 | |
| 17248 | @@ -8443,24 +9457,23 @@ func_mode_uninstall () |
| 17249 | |
| 17250 | rmdirs= |
| 17251 | |
| 17252 | - origobjdir="$objdir" |
| 17253 | for file in $files; do |
| 17254 | func_dirname "$file" "" "." |
| 17255 | dir="$func_dirname_result" |
| 17256 | if test "X$dir" = X.; then |
| 17257 | - objdir="$origobjdir" |
| 17258 | + odir="$objdir" |
| 17259 | else |
| 17260 | - objdir="$dir/$origobjdir" |
| 17261 | + odir="$dir/$objdir" |
| 17262 | fi |
| 17263 | func_basename "$file" |
| 17264 | name="$func_basename_result" |
| 17265 | - test "$mode" = uninstall && objdir="$dir" |
| 17266 | + test "$opt_mode" = uninstall && odir="$dir" |
| 17267 | |
| 17268 | - # Remember objdir for removal later, being careful to avoid duplicates |
| 17269 | - if test "$mode" = clean; then |
| 17270 | + # Remember odir for removal later, being careful to avoid duplicates |
| 17271 | + if test "$opt_mode" = clean; then |
| 17272 | case " $rmdirs " in |
| 17273 | - *" $objdir "*) ;; |
| 17274 | - *) rmdirs="$rmdirs $objdir" ;; |
| 17275 | + *" $odir "*) ;; |
| 17276 | + *) func_append rmdirs " $odir" ;; |
| 17277 | esac |
| 17278 | fi |
| 17279 | |
| 17280 | @@ -8486,18 +9499,17 @@ func_mode_uninstall () |
| 17281 | |
| 17282 | # Delete the libtool libraries and symlinks. |
| 17283 | for n in $library_names; do |
| 17284 | - rmfiles="$rmfiles $objdir/$n" |
| 17285 | + func_append rmfiles " $odir/$n" |
| 17286 | done |
| 17287 | - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" |
| 17288 | + test -n "$old_library" && func_append rmfiles " $odir/$old_library" |
| 17289 | |
| 17290 | - case "$mode" in |
| 17291 | + case "$opt_mode" in |
| 17292 | clean) |
| 17293 | - case " $library_names " in |
| 17294 | - # " " in the beginning catches empty $dlname |
| 17295 | + case " $library_names " in |
| 17296 | *" $dlname "*) ;; |
| 17297 | - *) rmfiles="$rmfiles $objdir/$dlname" ;; |
| 17298 | + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; |
| 17299 | esac |
| 17300 | - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" |
| 17301 | + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" |
| 17302 | ;; |
| 17303 | uninstall) |
| 17304 | if test -n "$library_names"; then |
| 17305 | @@ -8525,19 +9537,19 @@ func_mode_uninstall () |
| 17306 | # Add PIC object to the list of files to remove. |
| 17307 | if test -n "$pic_object" && |
| 17308 | test "$pic_object" != none; then |
| 17309 | - rmfiles="$rmfiles $dir/$pic_object" |
| 17310 | + func_append rmfiles " $dir/$pic_object" |
| 17311 | fi |
| 17312 | |
| 17313 | # Add non-PIC object to the list of files to remove. |
| 17314 | if test -n "$non_pic_object" && |
| 17315 | test "$non_pic_object" != none; then |
| 17316 | - rmfiles="$rmfiles $dir/$non_pic_object" |
| 17317 | + func_append rmfiles " $dir/$non_pic_object" |
| 17318 | fi |
| 17319 | fi |
| 17320 | ;; |
| 17321 | |
| 17322 | *) |
| 17323 | - if test "$mode" = clean ; then |
| 17324 | + if test "$opt_mode" = clean ; then |
| 17325 | noexename=$name |
| 17326 | case $file in |
| 17327 | *.exe) |
| 17328 | @@ -8547,7 +9559,7 @@ func_mode_uninstall () |
| 17329 | noexename=$func_stripname_result |
| 17330 | # $file with .exe has already been added to rmfiles, |
| 17331 | # add $file without .exe |
| 17332 | - rmfiles="$rmfiles $file" |
| 17333 | + func_append rmfiles " $file" |
| 17334 | ;; |
| 17335 | esac |
| 17336 | # Do a test to see if this is a libtool program. |
| 17337 | @@ -8556,7 +9568,7 @@ func_mode_uninstall () |
| 17338 | func_ltwrapper_scriptname "$file" |
| 17339 | relink_command= |
| 17340 | func_source $func_ltwrapper_scriptname_result |
| 17341 | - rmfiles="$rmfiles $func_ltwrapper_scriptname_result" |
| 17342 | + func_append rmfiles " $func_ltwrapper_scriptname_result" |
| 17343 | else |
| 17344 | relink_command= |
| 17345 | func_source $dir/$noexename |
| 17346 | @@ -8564,12 +9576,12 @@ func_mode_uninstall () |
| 17347 | |
| 17348 | # note $name still contains .exe if it was in $file originally |
| 17349 | # as does the version of $file that was added into $rmfiles |
| 17350 | - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" |
| 17351 | + func_append rmfiles " $odir/$name $odir/${name}S.${objext}" |
| 17352 | if test "$fast_install" = yes && test -n "$relink_command"; then |
| 17353 | - rmfiles="$rmfiles $objdir/lt-$name" |
| 17354 | + func_append rmfiles " $odir/lt-$name" |
| 17355 | fi |
| 17356 | if test "X$noexename" != "X$name" ; then |
| 17357 | - rmfiles="$rmfiles $objdir/lt-${noexename}.c" |
| 17358 | + func_append rmfiles " $odir/lt-${noexename}.c" |
| 17359 | fi |
| 17360 | fi |
| 17361 | fi |
| 17362 | @@ -8577,7 +9589,6 @@ func_mode_uninstall () |
| 17363 | esac |
| 17364 | func_show_eval "$RM $rmfiles" 'exit_status=1' |
| 17365 | done |
| 17366 | - objdir="$origobjdir" |
| 17367 | |
| 17368 | # Try to remove the ${objdir}s in the directories where we deleted files |
| 17369 | for dir in $rmdirs; do |
| 17370 | @@ -8589,16 +9600,16 @@ func_mode_uninstall () |
| 17371 | exit $exit_status |
| 17372 | } |
| 17373 | |
| 17374 | -{ test "$mode" = uninstall || test "$mode" = clean; } && |
| 17375 | +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && |
| 17376 | func_mode_uninstall ${1+"$@"} |
| 17377 | |
| 17378 | -test -z "$mode" && { |
| 17379 | +test -z "$opt_mode" && { |
| 17380 | help="$generic_help" |
| 17381 | func_fatal_help "you must specify a MODE" |
| 17382 | } |
| 17383 | |
| 17384 | test -z "$exec_cmd" && \ |
| 17385 | - func_fatal_help "invalid operation mode \`$mode'" |
| 17386 | + func_fatal_help "invalid operation mode \`$opt_mode'" |
| 17387 | |
| 17388 | if test -n "$exec_cmd"; then |
| 17389 | eval exec "$exec_cmd" |
| 17390 | diff --git a/ltoptions.m4 b/ltoptions.m4 |
| 17391 | index 5ef12ce..17cfd51 100644 |
| 17392 | --- a/ltoptions.m4 |
| 17393 | +++ b/ltoptions.m4 |
| 17394 | @@ -8,7 +8,7 @@ |
| 17395 | # unlimited permission to copy and/or distribute it, with or without |
| 17396 | # modifications, as long as this notice is preserved. |
| 17397 | |
| 17398 | -# serial 6 ltoptions.m4 |
| 17399 | +# serial 7 ltoptions.m4 |
| 17400 | |
| 17401 | # This is to help aclocal find these macros, as it can't see m4_define. |
| 17402 | AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) |
| 17403 | diff --git a/ltversion.m4 b/ltversion.m4 |
| 17404 | index bf87f77..9c7b5d4 100644 |
| 17405 | --- a/ltversion.m4 |
| 17406 | +++ b/ltversion.m4 |
| 17407 | @@ -7,17 +7,17 @@ |
| 17408 | # unlimited permission to copy and/or distribute it, with or without |
| 17409 | # modifications, as long as this notice is preserved. |
| 17410 | |
| 17411 | -# Generated from ltversion.in. |
| 17412 | +# @configure_input@ |
| 17413 | |
| 17414 | -# serial 3134 ltversion.m4 |
| 17415 | +# serial 3293 ltversion.m4 |
| 17416 | # This file is part of GNU Libtool |
| 17417 | |
| 17418 | -m4_define([LT_PACKAGE_VERSION], [2.2.7a]) |
| 17419 | -m4_define([LT_PACKAGE_REVISION], [1.3134]) |
| 17420 | +m4_define([LT_PACKAGE_VERSION], [2.4]) |
| 17421 | +m4_define([LT_PACKAGE_REVISION], [1.3293]) |
| 17422 | |
| 17423 | AC_DEFUN([LTVERSION_VERSION], |
| 17424 | -[macro_version='2.2.7a' |
| 17425 | -macro_revision='1.3134' |
| 17426 | +[macro_version='2.4' |
| 17427 | +macro_revision='1.3293' |
| 17428 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) |
| 17429 | _LT_DECL(, macro_revision, 0) |
| 17430 | ]) |
| 17431 | diff --git a/lt~obsolete.m4 b/lt~obsolete.m4 |
| 17432 | index bf92b5e..c573da9 100644 |
| 17433 | --- a/lt~obsolete.m4 |
| 17434 | +++ b/lt~obsolete.m4 |
| 17435 | @@ -7,7 +7,7 @@ |
| 17436 | # unlimited permission to copy and/or distribute it, with or without |
| 17437 | # modifications, as long as this notice is preserved. |
| 17438 | |
| 17439 | -# serial 4 lt~obsolete.m4 |
| 17440 | +# serial 5 lt~obsolete.m4 |
| 17441 | |
| 17442 | # These exist entirely to fool aclocal when bootstrapping libtool. |
| 17443 | # |
| 17444 | diff --git a/opcodes/configure b/opcodes/configure |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 17445 | index eedb184..d3076e1 100755 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 17446 | --- a/opcodes/configure |
| 17447 | +++ b/opcodes/configure |
| 17448 | @@ -648,6 +648,9 @@ OTOOL |
| 17449 | LIPO |
| 17450 | NMEDIT |
| 17451 | DSYMUTIL |
| 17452 | +MANIFEST_TOOL |
| 17453 | +ac_ct_AR |
| 17454 | +DLLTOOL |
| 17455 | OBJDUMP |
| 17456 | LN_S |
| 17457 | NM |
| 17458 | @@ -760,6 +763,7 @@ enable_static |
| 17459 | with_pic |
| 17460 | enable_fast_install |
| 17461 | with_gnu_ld |
| 17462 | +with_libtool_sysroot |
| 17463 | enable_libtool_lock |
| 17464 | enable_targets |
| 17465 | enable_werror |
| 17466 | @@ -1420,6 +1424,8 @@ Optional Packages: |
| 17467 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 17468 | both] |
| 17469 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 17470 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 17471 | + (or the compiler's sysroot if not specified). |
| 17472 | |
| 17473 | Some influential environment variables: |
| 17474 | CC C compiler command |
| 17475 | @@ -5110,8 +5116,8 @@ esac |
| 17476 | |
| 17477 | |
| 17478 | |
| 17479 | -macro_version='2.2.7a' |
| 17480 | -macro_revision='1.3134' |
| 17481 | +macro_version='2.4' |
| 17482 | +macro_revision='1.3293' |
| 17483 | |
| 17484 | |
| 17485 | |
| 17486 | @@ -5151,7 +5157,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 17487 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 17488 | $as_echo_n "checking how to print strings... " >&6; } |
| 17489 | # Test print first, because it will be a builtin if present. |
| 17490 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 17491 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 17492 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 17493 | ECHO='print -r --' |
| 17494 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 17495 | @@ -5837,8 +5843,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 17496 | # Try some XSI features |
| 17497 | xsi_shell=no |
| 17498 | ( _lt_dummy="a/b/c" |
| 17499 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 17500 | - = c,a/b,, \ |
| 17501 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 17502 | + = c,a/b,b/c, \ |
| 17503 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 17504 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 17505 | && xsi_shell=yes |
| 17506 | @@ -5887,6 +5893,80 @@ esac |
| 17507 | |
| 17508 | |
| 17509 | |
| 17510 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 17511 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 17512 | +if test "${lt_cv_to_host_file_cmd+set}" = set; then : |
| 17513 | + $as_echo_n "(cached) " >&6 |
| 17514 | +else |
| 17515 | + case $host in |
| 17516 | + *-*-mingw* ) |
| 17517 | + case $build in |
| 17518 | + *-*-mingw* ) # actually msys |
| 17519 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 17520 | + ;; |
| 17521 | + *-*-cygwin* ) |
| 17522 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 17523 | + ;; |
| 17524 | + * ) # otherwise, assume *nix |
| 17525 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 17526 | + ;; |
| 17527 | + esac |
| 17528 | + ;; |
| 17529 | + *-*-cygwin* ) |
| 17530 | + case $build in |
| 17531 | + *-*-mingw* ) # actually msys |
| 17532 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 17533 | + ;; |
| 17534 | + *-*-cygwin* ) |
| 17535 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 17536 | + ;; |
| 17537 | + * ) # otherwise, assume *nix |
| 17538 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 17539 | + ;; |
| 17540 | + esac |
| 17541 | + ;; |
| 17542 | + * ) # unhandled hosts (and "normal" native builds) |
| 17543 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 17544 | + ;; |
| 17545 | +esac |
| 17546 | + |
| 17547 | +fi |
| 17548 | + |
| 17549 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 17550 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 17551 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 17552 | + |
| 17553 | + |
| 17554 | + |
| 17555 | + |
| 17556 | + |
| 17557 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 17558 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 17559 | +if test "${lt_cv_to_tool_file_cmd+set}" = set; then : |
| 17560 | + $as_echo_n "(cached) " >&6 |
| 17561 | +else |
| 17562 | + #assume ordinary cross tools, or native build. |
| 17563 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 17564 | +case $host in |
| 17565 | + *-*-mingw* ) |
| 17566 | + case $build in |
| 17567 | + *-*-mingw* ) # actually msys |
| 17568 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 17569 | + ;; |
| 17570 | + esac |
| 17571 | + ;; |
| 17572 | +esac |
| 17573 | + |
| 17574 | +fi |
| 17575 | + |
| 17576 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 17577 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 17578 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 17579 | + |
| 17580 | + |
| 17581 | + |
| 17582 | + |
| 17583 | + |
| 17584 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 17585 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 17586 | if test "${lt_cv_ld_reload_flag+set}" = set; then : |
| 17587 | @@ -5903,6 +5983,11 @@ case $reload_flag in |
| 17588 | esac |
| 17589 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 17590 | case $host_os in |
| 17591 | + cygwin* | mingw* | pw32* | cegcc*) |
| 17592 | + if test "$GCC" != yes; then |
| 17593 | + reload_cmds=false |
| 17594 | + fi |
| 17595 | + ;; |
| 17596 | darwin*) |
| 17597 | if test "$GCC" = yes; then |
| 17598 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 17599 | @@ -6071,7 +6156,8 @@ mingw* | pw32*) |
| 17600 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 17601 | lt_cv_file_magic_cmd='func_win32_libid' |
| 17602 | else |
| 17603 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 17604 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 17605 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 17606 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 17607 | fi |
| 17608 | ;; |
| 17609 | @@ -6225,6 +6311,21 @@ esac |
| 17610 | fi |
| 17611 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 17612 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 17613 | + |
| 17614 | +file_magic_glob= |
| 17615 | +want_nocaseglob=no |
| 17616 | +if test "$build" = "$host"; then |
| 17617 | + case $host_os in |
| 17618 | + mingw* | pw32*) |
| 17619 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 17620 | + want_nocaseglob=yes |
| 17621 | + else |
| 17622 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 17623 | + fi |
| 17624 | + ;; |
| 17625 | + esac |
| 17626 | +fi |
| 17627 | + |
| 17628 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 17629 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 17630 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 17631 | @@ -6240,9 +6341,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 17632 | |
| 17633 | |
| 17634 | |
| 17635 | + |
| 17636 | + |
| 17637 | + |
| 17638 | + |
| 17639 | + |
| 17640 | + |
| 17641 | + |
| 17642 | + |
| 17643 | + |
| 17644 | + |
| 17645 | if test -n "$ac_tool_prefix"; then |
| 17646 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 17647 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 17648 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 17649 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 17650 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 17651 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 17652 | +if test "${ac_cv_prog_DLLTOOL+set}" = set; then : |
| 17653 | + $as_echo_n "(cached) " >&6 |
| 17654 | +else |
| 17655 | + if test -n "$DLLTOOL"; then |
| 17656 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 17657 | +else |
| 17658 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 17659 | +for as_dir in $PATH |
| 17660 | +do |
| 17661 | + IFS=$as_save_IFS |
| 17662 | + test -z "$as_dir" && as_dir=. |
| 17663 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 17664 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 17665 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 17666 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 17667 | + break 2 |
| 17668 | + fi |
| 17669 | +done |
| 17670 | + done |
| 17671 | +IFS=$as_save_IFS |
| 17672 | + |
| 17673 | +fi |
| 17674 | +fi |
| 17675 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 17676 | +if test -n "$DLLTOOL"; then |
| 17677 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 17678 | +$as_echo "$DLLTOOL" >&6; } |
| 17679 | +else |
| 17680 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 17681 | +$as_echo "no" >&6; } |
| 17682 | +fi |
| 17683 | + |
| 17684 | + |
| 17685 | +fi |
| 17686 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 17687 | + ac_ct_DLLTOOL=$DLLTOOL |
| 17688 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 17689 | +set dummy dlltool; ac_word=$2 |
| 17690 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 17691 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 17692 | +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : |
| 17693 | + $as_echo_n "(cached) " >&6 |
| 17694 | +else |
| 17695 | + if test -n "$ac_ct_DLLTOOL"; then |
| 17696 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 17697 | +else |
| 17698 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 17699 | +for as_dir in $PATH |
| 17700 | +do |
| 17701 | + IFS=$as_save_IFS |
| 17702 | + test -z "$as_dir" && as_dir=. |
| 17703 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 17704 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 17705 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 17706 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 17707 | + break 2 |
| 17708 | + fi |
| 17709 | +done |
| 17710 | + done |
| 17711 | +IFS=$as_save_IFS |
| 17712 | + |
| 17713 | +fi |
| 17714 | +fi |
| 17715 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 17716 | +if test -n "$ac_ct_DLLTOOL"; then |
| 17717 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 17718 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 17719 | +else |
| 17720 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 17721 | +$as_echo "no" >&6; } |
| 17722 | +fi |
| 17723 | + |
| 17724 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 17725 | + DLLTOOL="false" |
| 17726 | + else |
| 17727 | + case $cross_compiling:$ac_tool_warned in |
| 17728 | +yes:) |
| 17729 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 17730 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 17731 | +ac_tool_warned=yes ;; |
| 17732 | +esac |
| 17733 | + DLLTOOL=$ac_ct_DLLTOOL |
| 17734 | + fi |
| 17735 | +else |
| 17736 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 17737 | +fi |
| 17738 | + |
| 17739 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 17740 | + |
| 17741 | + |
| 17742 | + |
| 17743 | + |
| 17744 | + |
| 17745 | + |
| 17746 | + |
| 17747 | + |
| 17748 | + |
| 17749 | + |
| 17750 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 17751 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 17752 | +if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : |
| 17753 | + $as_echo_n "(cached) " >&6 |
| 17754 | +else |
| 17755 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 17756 | + |
| 17757 | +case $host_os in |
| 17758 | +cygwin* | mingw* | pw32* | cegcc*) |
| 17759 | + # two different shell functions defined in ltmain.sh |
| 17760 | + # decide which to use based on capabilities of $DLLTOOL |
| 17761 | + case `$DLLTOOL --help 2>&1` in |
| 17762 | + *--identify-strict*) |
| 17763 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 17764 | + ;; |
| 17765 | + *) |
| 17766 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 17767 | + ;; |
| 17768 | + esac |
| 17769 | + ;; |
| 17770 | +*) |
| 17771 | + # fallback: assume linklib IS sharedlib |
| 17772 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 17773 | + ;; |
| 17774 | +esac |
| 17775 | + |
| 17776 | +fi |
| 17777 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 17778 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 17779 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 17780 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 17781 | + |
| 17782 | + |
| 17783 | + |
| 17784 | + |
| 17785 | + |
| 17786 | + |
| 17787 | + |
| 17788 | +if test -n "$ac_tool_prefix"; then |
| 17789 | + for ac_prog in ar |
| 17790 | + do |
| 17791 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 17792 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 17793 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 17794 | $as_echo_n "checking for $ac_word... " >&6; } |
| 17795 | if test "${ac_cv_prog_AR+set}" = set; then : |
| 17796 | @@ -6258,7 +6512,7 @@ do |
| 17797 | test -z "$as_dir" && as_dir=. |
| 17798 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 17799 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 17800 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 17801 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 17802 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 17803 | break 2 |
| 17804 | fi |
| 17805 | @@ -6278,11 +6532,15 @@ $as_echo "no" >&6; } |
| 17806 | fi |
| 17807 | |
| 17808 | |
| 17809 | + test -n "$AR" && break |
| 17810 | + done |
| 17811 | fi |
| 17812 | -if test -z "$ac_cv_prog_AR"; then |
| 17813 | +if test -z "$AR"; then |
| 17814 | ac_ct_AR=$AR |
| 17815 | - # Extract the first word of "ar", so it can be a program name with args. |
| 17816 | -set dummy ar; ac_word=$2 |
| 17817 | + for ac_prog in ar |
| 17818 | +do |
| 17819 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 17820 | +set dummy $ac_prog; ac_word=$2 |
| 17821 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 17822 | $as_echo_n "checking for $ac_word... " >&6; } |
| 17823 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
| 17824 | @@ -6298,7 +6556,7 @@ do |
| 17825 | test -z "$as_dir" && as_dir=. |
| 17826 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 17827 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 17828 | - ac_cv_prog_ac_ct_AR="ar" |
| 17829 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 17830 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 17831 | break 2 |
| 17832 | fi |
| 17833 | @@ -6317,6 +6575,10 @@ else |
| 17834 | $as_echo "no" >&6; } |
| 17835 | fi |
| 17836 | |
| 17837 | + |
| 17838 | + test -n "$ac_ct_AR" && break |
| 17839 | +done |
| 17840 | + |
| 17841 | if test "x$ac_ct_AR" = x; then |
| 17842 | AR="false" |
| 17843 | else |
| 17844 | @@ -6328,16 +6590,72 @@ ac_tool_warned=yes ;; |
| 17845 | esac |
| 17846 | AR=$ac_ct_AR |
| 17847 | fi |
| 17848 | -else |
| 17849 | - AR="$ac_cv_prog_AR" |
| 17850 | fi |
| 17851 | |
| 17852 | -test -z "$AR" && AR=ar |
| 17853 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 17854 | +: ${AR=ar} |
| 17855 | +: ${AR_FLAGS=cru} |
| 17856 | + |
| 17857 | + |
| 17858 | + |
| 17859 | + |
| 17860 | + |
| 17861 | + |
| 17862 | + |
| 17863 | + |
| 17864 | + |
| 17865 | + |
| 17866 | + |
| 17867 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 17868 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 17869 | +if test "${lt_cv_ar_at_file+set}" = set; then : |
| 17870 | + $as_echo_n "(cached) " >&6 |
| 17871 | +else |
| 17872 | + lt_cv_ar_at_file=no |
| 17873 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 17874 | +/* end confdefs.h. */ |
| 17875 | + |
| 17876 | +int |
| 17877 | +main () |
| 17878 | +{ |
| 17879 | |
| 17880 | + ; |
| 17881 | + return 0; |
| 17882 | +} |
| 17883 | +_ACEOF |
| 17884 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 17885 | + echo conftest.$ac_objext > conftest.lst |
| 17886 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 17887 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 17888 | + (eval $lt_ar_try) 2>&5 |
| 17889 | + ac_status=$? |
| 17890 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 17891 | + test $ac_status = 0; } |
| 17892 | + if test "$ac_status" -eq 0; then |
| 17893 | + # Ensure the archiver fails upon bogus file names. |
| 17894 | + rm -f conftest.$ac_objext libconftest.a |
| 17895 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 17896 | + (eval $lt_ar_try) 2>&5 |
| 17897 | + ac_status=$? |
| 17898 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 17899 | + test $ac_status = 0; } |
| 17900 | + if test "$ac_status" -ne 0; then |
| 17901 | + lt_cv_ar_at_file=@ |
| 17902 | + fi |
| 17903 | + fi |
| 17904 | + rm -f conftest.* libconftest.a |
| 17905 | |
| 17906 | +fi |
| 17907 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 17908 | |
| 17909 | +fi |
| 17910 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 17911 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 17912 | |
| 17913 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 17914 | + archiver_list_spec= |
| 17915 | +else |
| 17916 | + archiver_list_spec=$lt_cv_ar_at_file |
| 17917 | +fi |
| 17918 | |
| 17919 | |
| 17920 | |
| 17921 | @@ -6679,8 +6997,8 @@ esac |
| 17922 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 17923 | |
| 17924 | # Transform an extracted symbol line into symbol name and symbol address |
| 17925 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 17926 | -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'" |
| 17927 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 17928 | +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'" |
| 17929 | |
| 17930 | # Handle CRLF in mingw tool chain |
| 17931 | opt_cr= |
| 17932 | @@ -6716,6 +7034,7 @@ for ac_symprfx in "" "_"; do |
| 17933 | else |
| 17934 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 17935 | fi |
| 17936 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 17937 | |
| 17938 | # Check to see that the pipe works correctly. |
| 17939 | pipe_works=no |
| 17940 | @@ -6757,6 +7076,18 @@ _LT_EOF |
| 17941 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 17942 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 17943 | cat <<_LT_EOF > conftest.$ac_ext |
| 17944 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 17945 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 17946 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 17947 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 17948 | +# define LT_DLSYM_CONST |
| 17949 | +#elif defined(__osf__) |
| 17950 | +/* This system does not cope well with relocations in const data. */ |
| 17951 | +# define LT_DLSYM_CONST |
| 17952 | +#else |
| 17953 | +# define LT_DLSYM_CONST const |
| 17954 | +#endif |
| 17955 | + |
| 17956 | #ifdef __cplusplus |
| 17957 | extern "C" { |
| 17958 | #endif |
| 17959 | @@ -6768,7 +7099,7 @@ _LT_EOF |
| 17960 | cat <<_LT_EOF >> conftest.$ac_ext |
| 17961 | |
| 17962 | /* The mapping between symbol names and symbols. */ |
| 17963 | -const struct { |
| 17964 | +LT_DLSYM_CONST struct { |
| 17965 | const char *name; |
| 17966 | void *address; |
| 17967 | } |
| 17968 | @@ -6794,8 +7125,8 @@ static const void *lt_preloaded_setup() { |
| 17969 | _LT_EOF |
| 17970 | # Now try linking the two files. |
| 17971 | mv conftest.$ac_objext conftstm.$ac_objext |
| 17972 | - lt_save_LIBS="$LIBS" |
| 17973 | - lt_save_CFLAGS="$CFLAGS" |
| 17974 | + lt_globsym_save_LIBS=$LIBS |
| 17975 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 17976 | LIBS="conftstm.$ac_objext" |
| 17977 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 17978 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 17979 | @@ -6805,8 +7136,8 @@ _LT_EOF |
| 17980 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 17981 | pipe_works=yes |
| 17982 | fi |
| 17983 | - LIBS="$lt_save_LIBS" |
| 17984 | - CFLAGS="$lt_save_CFLAGS" |
| 17985 | + LIBS=$lt_globsym_save_LIBS |
| 17986 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 17987 | else |
| 17988 | echo "cannot find nm_test_func in $nlist" >&5 |
| 17989 | fi |
| 17990 | @@ -6843,6 +7174,16 @@ else |
| 17991 | $as_echo "ok" >&6; } |
| 17992 | fi |
| 17993 | |
| 17994 | +# Response file support. |
| 17995 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 17996 | + nm_file_list_spec='@' |
| 17997 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 17998 | + nm_file_list_spec='@' |
| 17999 | +fi |
| 18000 | + |
| 18001 | + |
| 18002 | + |
| 18003 | + |
| 18004 | |
| 18005 | |
| 18006 | |
| 18007 | @@ -6864,6 +7205,45 @@ fi |
| 18008 | |
| 18009 | |
| 18010 | |
| 18011 | + |
| 18012 | + |
| 18013 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 18014 | +$as_echo_n "checking for sysroot... " >&6; } |
| 18015 | + |
| 18016 | +# Check whether --with-libtool-sysroot was given. |
| 18017 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 18018 | + withval=$with_libtool_sysroot; |
| 18019 | +else |
| 18020 | + with_libtool_sysroot=no |
| 18021 | +fi |
| 18022 | + |
| 18023 | + |
| 18024 | +lt_sysroot= |
| 18025 | +case ${with_libtool_sysroot} in #( |
| 18026 | + yes) |
| 18027 | + if test "$GCC" = yes; then |
| 18028 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 18029 | + fi |
| 18030 | + ;; #( |
| 18031 | + /*) |
| 18032 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 18033 | + ;; #( |
| 18034 | + no|'') |
| 18035 | + ;; #( |
| 18036 | + *) |
| 18037 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 18038 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 18039 | + as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 |
| 18040 | + ;; |
| 18041 | +esac |
| 18042 | + |
| 18043 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 18044 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 18045 | + |
| 18046 | + |
| 18047 | + |
| 18048 | + |
| 18049 | + |
| 18050 | # Check whether --enable-libtool-lock was given. |
| 18051 | if test "${enable_libtool_lock+set}" = set; then : |
| 18052 | enableval=$enable_libtool_lock; |
| 18053 | @@ -7070,6 +7450,123 @@ esac |
| 18054 | |
| 18055 | need_locks="$enable_libtool_lock" |
| 18056 | |
| 18057 | +if test -n "$ac_tool_prefix"; then |
| 18058 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 18059 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 18060 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 18061 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 18062 | +if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : |
| 18063 | + $as_echo_n "(cached) " >&6 |
| 18064 | +else |
| 18065 | + if test -n "$MANIFEST_TOOL"; then |
| 18066 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 18067 | +else |
| 18068 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 18069 | +for as_dir in $PATH |
| 18070 | +do |
| 18071 | + IFS=$as_save_IFS |
| 18072 | + test -z "$as_dir" && as_dir=. |
| 18073 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 18074 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 18075 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 18076 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 18077 | + break 2 |
| 18078 | + fi |
| 18079 | +done |
| 18080 | + done |
| 18081 | +IFS=$as_save_IFS |
| 18082 | + |
| 18083 | +fi |
| 18084 | +fi |
| 18085 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 18086 | +if test -n "$MANIFEST_TOOL"; then |
| 18087 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 18088 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 18089 | +else |
| 18090 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 18091 | +$as_echo "no" >&6; } |
| 18092 | +fi |
| 18093 | + |
| 18094 | + |
| 18095 | +fi |
| 18096 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 18097 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 18098 | + # Extract the first word of "mt", so it can be a program name with args. |
| 18099 | +set dummy mt; ac_word=$2 |
| 18100 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 18101 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 18102 | +if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : |
| 18103 | + $as_echo_n "(cached) " >&6 |
| 18104 | +else |
| 18105 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 18106 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 18107 | +else |
| 18108 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 18109 | +for as_dir in $PATH |
| 18110 | +do |
| 18111 | + IFS=$as_save_IFS |
| 18112 | + test -z "$as_dir" && as_dir=. |
| 18113 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 18114 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 18115 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 18116 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 18117 | + break 2 |
| 18118 | + fi |
| 18119 | +done |
| 18120 | + done |
| 18121 | +IFS=$as_save_IFS |
| 18122 | + |
| 18123 | +fi |
| 18124 | +fi |
| 18125 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 18126 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 18127 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 18128 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 18129 | +else |
| 18130 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 18131 | +$as_echo "no" >&6; } |
| 18132 | +fi |
| 18133 | + |
| 18134 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 18135 | + MANIFEST_TOOL=":" |
| 18136 | + else |
| 18137 | + case $cross_compiling:$ac_tool_warned in |
| 18138 | +yes:) |
| 18139 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 18140 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 18141 | +ac_tool_warned=yes ;; |
| 18142 | +esac |
| 18143 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 18144 | + fi |
| 18145 | +else |
| 18146 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 18147 | +fi |
| 18148 | + |
| 18149 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 18150 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 18151 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 18152 | +if test "${lt_cv_path_mainfest_tool+set}" = set; then : |
| 18153 | + $as_echo_n "(cached) " >&6 |
| 18154 | +else |
| 18155 | + lt_cv_path_mainfest_tool=no |
| 18156 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 18157 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 18158 | + cat conftest.err >&5 |
| 18159 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 18160 | + lt_cv_path_mainfest_tool=yes |
| 18161 | + fi |
| 18162 | + rm -f conftest* |
| 18163 | +fi |
| 18164 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 18165 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 18166 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 18167 | + MANIFEST_TOOL=: |
| 18168 | +fi |
| 18169 | + |
| 18170 | + |
| 18171 | + |
| 18172 | + |
| 18173 | + |
| 18174 | |
| 18175 | case $host_os in |
| 18176 | rhapsody* | darwin*) |
| 18177 | @@ -7633,6 +8130,8 @@ _LT_EOF |
| 18178 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 18179 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 18180 | $AR cru libconftest.a conftest.o 2>&5 |
| 18181 | + echo "$RANLIB libconftest.a" >&5 |
| 18182 | + $RANLIB libconftest.a 2>&5 |
| 18183 | cat > conftest.c << _LT_EOF |
| 18184 | int main() { return 0;} |
| 18185 | _LT_EOF |
| 18186 | @@ -7798,7 +8297,8 @@ fi |
| 18187 | LIBTOOL_DEPS="$ltmain" |
| 18188 | |
| 18189 | # Always use our own libtool. |
| 18190 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
| 18191 | +LIBTOOL='$(SHELL) $(top_builddir)' |
| 18192 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" |
| 18193 | |
| 18194 | |
| 18195 | |
| 18196 | @@ -7887,7 +8387,7 @@ aix3*) |
| 18197 | esac |
| 18198 | |
| 18199 | # Global variables: |
| 18200 | -ofile=libtool |
| 18201 | +ofile=${host_alias}-libtool |
| 18202 | can_build_shared=yes |
| 18203 | |
| 18204 | # All known linkers require a `.a' archive for static linking (except MSVC, |
| 18205 | @@ -8185,8 +8685,6 @@ fi |
| 18206 | lt_prog_compiler_pic= |
| 18207 | lt_prog_compiler_static= |
| 18208 | |
| 18209 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 18210 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 18211 | |
| 18212 | if test "$GCC" = yes; then |
| 18213 | lt_prog_compiler_wl='-Wl,' |
| 18214 | @@ -8352,6 +8850,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 18215 | lt_prog_compiler_pic='--shared' |
| 18216 | lt_prog_compiler_static='--static' |
| 18217 | ;; |
| 18218 | + nagfor*) |
| 18219 | + # NAG Fortran compiler |
| 18220 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 18221 | + lt_prog_compiler_pic='-PIC' |
| 18222 | + lt_prog_compiler_static='-Bstatic' |
| 18223 | + ;; |
| 18224 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 18225 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 18226 | # which looks to be a dead project) |
| 18227 | @@ -8414,7 +8918,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 18228 | lt_prog_compiler_pic='-KPIC' |
| 18229 | lt_prog_compiler_static='-Bstatic' |
| 18230 | case $cc_basename in |
| 18231 | - f77* | f90* | f95*) |
| 18232 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 18233 | lt_prog_compiler_wl='-Qoption ld ';; |
| 18234 | *) |
| 18235 | lt_prog_compiler_wl='-Wl,';; |
| 18236 | @@ -8471,13 +8975,17 @@ case $host_os in |
| 18237 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 18238 | ;; |
| 18239 | esac |
| 18240 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 18241 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 18242 | - |
| 18243 | - |
| 18244 | - |
| 18245 | - |
| 18246 | |
| 18247 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 18248 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 18249 | +if test "${lt_cv_prog_compiler_pic+set}" = set; then : |
| 18250 | + $as_echo_n "(cached) " >&6 |
| 18251 | +else |
| 18252 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 18253 | +fi |
| 18254 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 18255 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 18256 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 18257 | |
| 18258 | # |
| 18259 | # Check to make sure the PIC flag actually works. |
| 18260 | @@ -8538,6 +9046,11 @@ fi |
| 18261 | |
| 18262 | |
| 18263 | |
| 18264 | + |
| 18265 | + |
| 18266 | + |
| 18267 | + |
| 18268 | + |
| 18269 | # |
| 18270 | # Check to make sure the static flag actually works. |
| 18271 | # |
| 18272 | @@ -8888,7 +9401,8 @@ _LT_EOF |
| 18273 | allow_undefined_flag=unsupported |
| 18274 | always_export_symbols=no |
| 18275 | enable_shared_with_static_runtimes=yes |
| 18276 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 18277 | + 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' |
| 18278 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 18279 | |
| 18280 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 18281 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18282 | @@ -8987,12 +9501,12 @@ _LT_EOF |
| 18283 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 18284 | hardcode_libdir_flag_spec= |
| 18285 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 18286 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 18287 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 18288 | if test "x$supports_anon_versioning" = xyes; then |
| 18289 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 18290 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 18291 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 18292 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 18293 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 18294 | fi |
| 18295 | ;; |
| 18296 | esac |
| 18297 | @@ -9006,8 +9520,8 @@ _LT_EOF |
| 18298 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 18299 | wlarc= |
| 18300 | else |
| 18301 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 18302 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 18303 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 18304 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 18305 | fi |
| 18306 | ;; |
| 18307 | |
| 18308 | @@ -9025,8 +9539,8 @@ _LT_EOF |
| 18309 | |
| 18310 | _LT_EOF |
| 18311 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 18312 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 18313 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 18314 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 18315 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 18316 | else |
| 18317 | ld_shlibs=no |
| 18318 | fi |
| 18319 | @@ -9072,8 +9586,8 @@ _LT_EOF |
| 18320 | |
| 18321 | *) |
| 18322 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 18323 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 18324 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 18325 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 18326 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 18327 | else |
| 18328 | ld_shlibs=no |
| 18329 | fi |
| 18330 | @@ -9203,7 +9717,13 @@ _LT_EOF |
| 18331 | allow_undefined_flag='-berok' |
| 18332 | # Determine the default libpath from the value encoded in an |
| 18333 | # empty executable. |
| 18334 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 18335 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 18336 | + aix_libpath=$lt_cv_aix_libpath |
| 18337 | +else |
| 18338 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 18339 | + $as_echo_n "(cached) " >&6 |
| 18340 | +else |
| 18341 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 18342 | /* end confdefs.h. */ |
| 18343 | |
| 18344 | int |
| 18345 | @@ -9216,22 +9736,29 @@ main () |
| 18346 | _ACEOF |
| 18347 | if ac_fn_c_try_link "$LINENO"; then : |
| 18348 | |
| 18349 | -lt_aix_libpath_sed=' |
| 18350 | - /Import File Strings/,/^$/ { |
| 18351 | - /^0/ { |
| 18352 | - s/^0 *\(.*\)$/\1/ |
| 18353 | - p |
| 18354 | - } |
| 18355 | - }' |
| 18356 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18357 | -# Check for a 64-bit object if we didn't find anything. |
| 18358 | -if test -z "$aix_libpath"; then |
| 18359 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18360 | -fi |
| 18361 | + lt_aix_libpath_sed=' |
| 18362 | + /Import File Strings/,/^$/ { |
| 18363 | + /^0/ { |
| 18364 | + s/^0 *\([^ ]*\) *$/\1/ |
| 18365 | + p |
| 18366 | + } |
| 18367 | + }' |
| 18368 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18369 | + # Check for a 64-bit object if we didn't find anything. |
| 18370 | + if test -z "$lt_cv_aix_libpath_"; then |
| 18371 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18372 | + fi |
| 18373 | fi |
| 18374 | rm -f core conftest.err conftest.$ac_objext \ |
| 18375 | conftest$ac_exeext conftest.$ac_ext |
| 18376 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18377 | + if test -z "$lt_cv_aix_libpath_"; then |
| 18378 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 18379 | + fi |
| 18380 | + |
| 18381 | +fi |
| 18382 | + |
| 18383 | + aix_libpath=$lt_cv_aix_libpath_ |
| 18384 | +fi |
| 18385 | |
| 18386 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 18387 | 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" |
| 18388 | @@ -9243,7 +9770,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18389 | else |
| 18390 | # Determine the default libpath from the value encoded in an |
| 18391 | # empty executable. |
| 18392 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 18393 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 18394 | + aix_libpath=$lt_cv_aix_libpath |
| 18395 | +else |
| 18396 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 18397 | + $as_echo_n "(cached) " >&6 |
| 18398 | +else |
| 18399 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 18400 | /* end confdefs.h. */ |
| 18401 | |
| 18402 | int |
| 18403 | @@ -9256,22 +9789,29 @@ main () |
| 18404 | _ACEOF |
| 18405 | if ac_fn_c_try_link "$LINENO"; then : |
| 18406 | |
| 18407 | -lt_aix_libpath_sed=' |
| 18408 | - /Import File Strings/,/^$/ { |
| 18409 | - /^0/ { |
| 18410 | - s/^0 *\(.*\)$/\1/ |
| 18411 | - p |
| 18412 | - } |
| 18413 | - }' |
| 18414 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18415 | -# Check for a 64-bit object if we didn't find anything. |
| 18416 | -if test -z "$aix_libpath"; then |
| 18417 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18418 | -fi |
| 18419 | + lt_aix_libpath_sed=' |
| 18420 | + /Import File Strings/,/^$/ { |
| 18421 | + /^0/ { |
| 18422 | + s/^0 *\([^ ]*\) *$/\1/ |
| 18423 | + p |
| 18424 | + } |
| 18425 | + }' |
| 18426 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18427 | + # Check for a 64-bit object if we didn't find anything. |
| 18428 | + if test -z "$lt_cv_aix_libpath_"; then |
| 18429 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 18430 | + fi |
| 18431 | fi |
| 18432 | rm -f core conftest.err conftest.$ac_objext \ |
| 18433 | conftest$ac_exeext conftest.$ac_ext |
| 18434 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18435 | + if test -z "$lt_cv_aix_libpath_"; then |
| 18436 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 18437 | + fi |
| 18438 | + |
| 18439 | +fi |
| 18440 | + |
| 18441 | + aix_libpath=$lt_cv_aix_libpath_ |
| 18442 | +fi |
| 18443 | |
| 18444 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 18445 | # Warning - without using the other run time loading flags, |
| 18446 | @@ -9316,20 +9856,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18447 | # Microsoft Visual C++. |
| 18448 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 18449 | # no search path for DLLs. |
| 18450 | - hardcode_libdir_flag_spec=' ' |
| 18451 | - allow_undefined_flag=unsupported |
| 18452 | - # Tell ltmain to make .lib files, not .a files. |
| 18453 | - libext=lib |
| 18454 | - # Tell ltmain to make .dll files, not .so files. |
| 18455 | - shrext_cmds=".dll" |
| 18456 | - # FIXME: Setting linknames here is a bad hack. |
| 18457 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 18458 | - # The linker will automatically build a .lib file if we build a DLL. |
| 18459 | - old_archive_from_new_cmds='true' |
| 18460 | - # FIXME: Should let the user specify the lib program. |
| 18461 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 18462 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 18463 | - enable_shared_with_static_runtimes=yes |
| 18464 | + case $cc_basename in |
| 18465 | + cl*) |
| 18466 | + # Native MSVC |
| 18467 | + hardcode_libdir_flag_spec=' ' |
| 18468 | + allow_undefined_flag=unsupported |
| 18469 | + always_export_symbols=yes |
| 18470 | + file_list_spec='@' |
| 18471 | + # Tell ltmain to make .lib files, not .a files. |
| 18472 | + libext=lib |
| 18473 | + # Tell ltmain to make .dll files, not .so files. |
| 18474 | + shrext_cmds=".dll" |
| 18475 | + # FIXME: Setting linknames here is a bad hack. |
| 18476 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 18477 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 18478 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 18479 | + else |
| 18480 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 18481 | + fi~ |
| 18482 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 18483 | + linknames=' |
| 18484 | + # The linker will not automatically build a static lib if we build a DLL. |
| 18485 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 18486 | + enable_shared_with_static_runtimes=yes |
| 18487 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 18488 | + # Don't use ranlib |
| 18489 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 18490 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 18491 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 18492 | + case $lt_outputfile in |
| 18493 | + *.exe|*.EXE) ;; |
| 18494 | + *) |
| 18495 | + lt_outputfile="$lt_outputfile.exe" |
| 18496 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 18497 | + ;; |
| 18498 | + esac~ |
| 18499 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 18500 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 18501 | + $RM "$lt_outputfile.manifest"; |
| 18502 | + fi' |
| 18503 | + ;; |
| 18504 | + *) |
| 18505 | + # Assume MSVC wrapper |
| 18506 | + hardcode_libdir_flag_spec=' ' |
| 18507 | + allow_undefined_flag=unsupported |
| 18508 | + # Tell ltmain to make .lib files, not .a files. |
| 18509 | + libext=lib |
| 18510 | + # Tell ltmain to make .dll files, not .so files. |
| 18511 | + shrext_cmds=".dll" |
| 18512 | + # FIXME: Setting linknames here is a bad hack. |
| 18513 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 18514 | + # The linker will automatically build a .lib file if we build a DLL. |
| 18515 | + old_archive_from_new_cmds='true' |
| 18516 | + # FIXME: Should let the user specify the lib program. |
| 18517 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 18518 | + enable_shared_with_static_runtimes=yes |
| 18519 | + ;; |
| 18520 | + esac |
| 18521 | ;; |
| 18522 | |
| 18523 | darwin* | rhapsody*) |
| 18524 | @@ -9390,7 +9973,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18525 | |
| 18526 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 18527 | freebsd* | dragonfly*) |
| 18528 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 18529 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 18530 | hardcode_libdir_flag_spec='-R$libdir' |
| 18531 | hardcode_direct=yes |
| 18532 | hardcode_shlibpath_var=no |
| 18533 | @@ -9398,7 +9981,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18534 | |
| 18535 | hpux9*) |
| 18536 | if test "$GCC" = yes; then |
| 18537 | - 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' |
| 18538 | + 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' |
| 18539 | else |
| 18540 | 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' |
| 18541 | fi |
| 18542 | @@ -9414,7 +9997,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18543 | |
| 18544 | hpux10*) |
| 18545 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 18546 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 18547 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 18548 | else |
| 18549 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 18550 | fi |
| 18551 | @@ -9438,10 +10021,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 18552 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 18553 | ;; |
| 18554 | ia64*) |
| 18555 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 18556 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 18557 | ;; |
| 18558 | *) |
| 18559 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 18560 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 18561 | ;; |
| 18562 | esac |
| 18563 | else |
| 18564 | @@ -9520,23 +10103,36 @@ fi |
| 18565 | |
| 18566 | irix5* | irix6* | nonstopux*) |
| 18567 | if test "$GCC" = yes; then |
| 18568 | - 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' |
| 18569 | + 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' |
| 18570 | # Try to use the -exported_symbol ld option, if it does not |
| 18571 | # work, assume that -exports_file does not work either and |
| 18572 | # implicitly export all symbols. |
| 18573 | - save_LDFLAGS="$LDFLAGS" |
| 18574 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 18575 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 18576 | + # This should be the same for all languages, so no per-tag cache variable. |
| 18577 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 18578 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 18579 | +if test "${lt_cv_irix_exported_symbol+set}" = set; then : |
| 18580 | + $as_echo_n "(cached) " >&6 |
| 18581 | +else |
| 18582 | + save_LDFLAGS="$LDFLAGS" |
| 18583 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 18584 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 18585 | /* end confdefs.h. */ |
| 18586 | -int foo(void) {} |
| 18587 | +int foo (void) { return 0; } |
| 18588 | _ACEOF |
| 18589 | if ac_fn_c_try_link "$LINENO"; then : |
| 18590 | - 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' |
| 18591 | - |
| 18592 | + lt_cv_irix_exported_symbol=yes |
| 18593 | +else |
| 18594 | + lt_cv_irix_exported_symbol=no |
| 18595 | fi |
| 18596 | rm -f core conftest.err conftest.$ac_objext \ |
| 18597 | conftest$ac_exeext conftest.$ac_ext |
| 18598 | - LDFLAGS="$save_LDFLAGS" |
| 18599 | + LDFLAGS="$save_LDFLAGS" |
| 18600 | +fi |
| 18601 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 18602 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 18603 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 18604 | + 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' |
| 18605 | + fi |
| 18606 | else |
| 18607 | 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' |
| 18608 | 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' |
| 18609 | @@ -9621,7 +10217,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 18610 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 18611 | if test "$GCC" = yes; then |
| 18612 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 18613 | - 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' |
| 18614 | + 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' |
| 18615 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 18616 | else |
| 18617 | allow_undefined_flag=' -expect_unresolved \*' |
| 18618 | @@ -9640,9 +10236,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 18619 | no_undefined_flag=' -z defs' |
| 18620 | if test "$GCC" = yes; then |
| 18621 | wlarc='${wl}' |
| 18622 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 18623 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 18624 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 18625 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 18626 | + $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' |
| 18627 | else |
| 18628 | case `$CC -V 2>&1` in |
| 18629 | *"Compilers 5.0"*) |
| 18630 | @@ -10218,8 +10814,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 18631 | need_version=no |
| 18632 | need_lib_prefix=no |
| 18633 | |
| 18634 | - case $GCC,$host_os in |
| 18635 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 18636 | + case $GCC,$cc_basename in |
| 18637 | + yes,*) |
| 18638 | + # gcc |
| 18639 | library_names_spec='$libname.dll.a' |
| 18640 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 18641 | postinstall_cmds='base_file=`basename \${file}`~ |
| 18642 | @@ -10252,13 +10849,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 18643 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 18644 | ;; |
| 18645 | esac |
| 18646 | + dynamic_linker='Win32 ld.exe' |
| 18647 | + ;; |
| 18648 | + |
| 18649 | + *,cl*) |
| 18650 | + # Native MSVC |
| 18651 | + libname_spec='$name' |
| 18652 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 18653 | + library_names_spec='${libname}.dll.lib' |
| 18654 | + |
| 18655 | + case $build_os in |
| 18656 | + mingw*) |
| 18657 | + sys_lib_search_path_spec= |
| 18658 | + lt_save_ifs=$IFS |
| 18659 | + IFS=';' |
| 18660 | + for lt_path in $LIB |
| 18661 | + do |
| 18662 | + IFS=$lt_save_ifs |
| 18663 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 18664 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 18665 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 18666 | + done |
| 18667 | + IFS=$lt_save_ifs |
| 18668 | + # Convert to MSYS style. |
| 18669 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 18670 | + ;; |
| 18671 | + cygwin*) |
| 18672 | + # Convert to unix form, then to dos form, then back to unix form |
| 18673 | + # but this time dos style (no spaces!) so that the unix form looks |
| 18674 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 18675 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 18676 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 18677 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 18678 | + ;; |
| 18679 | + *) |
| 18680 | + sys_lib_search_path_spec="$LIB" |
| 18681 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 18682 | + # It is most probably a Windows format PATH. |
| 18683 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 18684 | + else |
| 18685 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 18686 | + fi |
| 18687 | + # FIXME: find the short name or the path components, as spaces are |
| 18688 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 18689 | + ;; |
| 18690 | + esac |
| 18691 | + |
| 18692 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 18693 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 18694 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 18695 | + dldir=$destdir/`dirname \$dlpath`~ |
| 18696 | + test -d \$dldir || mkdir -p \$dldir~ |
| 18697 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 18698 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 18699 | + dlpath=$dir/\$dldll~ |
| 18700 | + $RM \$dlpath' |
| 18701 | + shlibpath_overrides_runpath=yes |
| 18702 | + dynamic_linker='Win32 link.exe' |
| 18703 | ;; |
| 18704 | |
| 18705 | *) |
| 18706 | + # Assume MSVC wrapper |
| 18707 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 18708 | + dynamic_linker='Win32 ld.exe' |
| 18709 | ;; |
| 18710 | esac |
| 18711 | - dynamic_linker='Win32 ld.exe' |
| 18712 | # FIXME: first we should search . and the directory the executable is in |
| 18713 | shlibpath_var=PATH |
| 18714 | ;; |
| 18715 | @@ -10350,7 +11005,7 @@ haiku*) |
| 18716 | soname_spec='${libname}${release}${shared_ext}$major' |
| 18717 | shlibpath_var=LIBRARY_PATH |
| 18718 | shlibpath_overrides_runpath=yes |
| 18719 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' |
| 18720 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
| 18721 | hardcode_into_libs=yes |
| 18722 | ;; |
| 18723 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18724 | @@ -11146,7 +11801,7 @@ else |
| 18725 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 18726 | lt_status=$lt_dlunknown |
| 18727 | cat > conftest.$ac_ext <<_LT_EOF |
| 18728 | -#line 11149 "configure" |
| 18729 | +#line $LINENO "configure" |
| 18730 | #include "confdefs.h" |
| 18731 | |
| 18732 | #if HAVE_DLFCN_H |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18733 | @@ -11190,10 +11845,10 @@ else |
| 18734 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 18735 | correspondingly for the symbols needed. */ |
| 18736 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 18737 | -void fnord () __attribute__((visibility("default"))); |
| 18738 | +int fnord () __attribute__((visibility("default"))); |
| 18739 | #endif |
| 18740 | |
| 18741 | -void fnord () { int i=42; } |
| 18742 | +int fnord () { return 42; } |
| 18743 | int main () |
| 18744 | { |
| 18745 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18746 | @@ -11252,7 +11907,7 @@ else |
| 18747 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 18748 | lt_status=$lt_dlunknown |
| 18749 | cat > conftest.$ac_ext <<_LT_EOF |
| 18750 | -#line 11255 "configure" |
| 18751 | +#line $LINENO "configure" |
| 18752 | #include "confdefs.h" |
| 18753 | |
| 18754 | #if HAVE_DLFCN_H |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18755 | @@ -11296,10 +11951,10 @@ else |
| 18756 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 18757 | correspondingly for the symbols needed. */ |
| 18758 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 18759 | -void fnord () __attribute__((visibility("default"))); |
| 18760 | +int fnord () __attribute__((visibility("default"))); |
| 18761 | #endif |
| 18762 | |
| 18763 | -void fnord () { int i=42; } |
| 18764 | +int fnord () { return 42; } |
| 18765 | int main () |
| 18766 | { |
| 18767 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18768 | @@ -12462,7 +13117,7 @@ if test "$enable_shared" = "yes"; then |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18769 | # since libbfd may not pull in the entirety of libiberty. |
| 18770 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` |
| 18771 | if test -n "$x"; then |
| 18772 | - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" |
| 18773 | + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" |
| 18774 | fi |
| 18775 | |
| 18776 | case "${host}" in |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18777 | @@ -13436,13 +14091,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18778 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 18779 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 18780 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 18781 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 18782 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 18783 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 18784 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 18785 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 18786 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 18787 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 18788 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 18789 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 18790 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 18791 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 18792 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 18793 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 18794 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 18795 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 18796 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 18797 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18798 | @@ -13457,14 +14119,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18799 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 18800 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 18801 | 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"`' |
| 18802 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 18803 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 18804 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 18805 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 18806 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 18807 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 18808 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 18809 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 18810 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 18811 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 18812 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 18813 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 18814 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 18815 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 18816 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18817 | @@ -13497,12 +14162,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18818 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 18819 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 18820 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 18821 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 18822 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 18823 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 18824 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 18825 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 18826 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 18827 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 18828 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 18829 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 18830 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18831 | @@ -13557,8 +14222,13 @@ reload_flag \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18832 | OBJDUMP \ |
| 18833 | deplibs_check_method \ |
| 18834 | file_magic_cmd \ |
| 18835 | +file_magic_glob \ |
| 18836 | +want_nocaseglob \ |
| 18837 | +DLLTOOL \ |
| 18838 | +sharedlib_from_linklib_cmd \ |
| 18839 | AR \ |
| 18840 | AR_FLAGS \ |
| 18841 | +archiver_list_spec \ |
| 18842 | STRIP \ |
| 18843 | RANLIB \ |
| 18844 | CC \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18845 | @@ -13568,12 +14238,14 @@ lt_cv_sys_global_symbol_pipe \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18846 | lt_cv_sys_global_symbol_to_cdecl \ |
| 18847 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 18848 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 18849 | +nm_file_list_spec \ |
| 18850 | lt_prog_compiler_no_builtin_flag \ |
| 18851 | -lt_prog_compiler_wl \ |
| 18852 | lt_prog_compiler_pic \ |
| 18853 | +lt_prog_compiler_wl \ |
| 18854 | lt_prog_compiler_static \ |
| 18855 | lt_cv_prog_compiler_c_o \ |
| 18856 | need_locks \ |
| 18857 | +MANIFEST_TOOL \ |
| 18858 | DSYMUTIL \ |
| 18859 | NMEDIT \ |
| 18860 | LIPO \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18861 | @@ -13589,7 +14261,6 @@ no_undefined_flag \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18862 | hardcode_libdir_flag_spec \ |
| 18863 | hardcode_libdir_flag_spec_ld \ |
| 18864 | hardcode_libdir_separator \ |
| 18865 | -fix_srcfile_path \ |
| 18866 | exclude_expsyms \ |
| 18867 | include_expsyms \ |
| 18868 | file_list_spec \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18869 | @@ -13625,6 +14296,7 @@ module_cmds \ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18870 | module_expsym_cmds \ |
| 18871 | export_symbols_cmds \ |
| 18872 | prelink_cmds \ |
| 18873 | +postlink_cmds \ |
| 18874 | postinstall_cmds \ |
| 18875 | postuninstall_cmds \ |
| 18876 | finish_cmds \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18877 | @@ -14381,7 +15053,8 @@ $as_echo X"$file" | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18878 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 18879 | # |
| 18880 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 18881 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 18882 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 18883 | +# Inc. |
| 18884 | # Written by Gordon Matzigkeit, 1996 |
| 18885 | # |
| 18886 | # This file is part of GNU Libtool. |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18887 | @@ -14484,19 +15157,42 @@ SP2NL=$lt_lt_SP2NL |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18888 | # turn newlines into spaces. |
| 18889 | NL2SP=$lt_lt_NL2SP |
| 18890 | |
| 18891 | +# convert \$build file names to \$host format. |
| 18892 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 18893 | + |
| 18894 | +# convert \$build files to toolchain format. |
| 18895 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 18896 | + |
| 18897 | # An object symbol dumper. |
| 18898 | OBJDUMP=$lt_OBJDUMP |
| 18899 | |
| 18900 | # Method to check whether dependent libraries are shared objects. |
| 18901 | deplibs_check_method=$lt_deplibs_check_method |
| 18902 | |
| 18903 | -# Command to use when deplibs_check_method == "file_magic". |
| 18904 | +# Command to use when deplibs_check_method = "file_magic". |
| 18905 | file_magic_cmd=$lt_file_magic_cmd |
| 18906 | |
| 18907 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 18908 | +file_magic_glob=$lt_file_magic_glob |
| 18909 | + |
| 18910 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 18911 | +want_nocaseglob=$lt_want_nocaseglob |
| 18912 | + |
| 18913 | +# DLL creation program. |
| 18914 | +DLLTOOL=$lt_DLLTOOL |
| 18915 | + |
| 18916 | +# Command to associate shared and link libraries. |
| 18917 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 18918 | + |
| 18919 | # The archiver. |
| 18920 | AR=$lt_AR |
| 18921 | + |
| 18922 | +# Flags to create an archive. |
| 18923 | AR_FLAGS=$lt_AR_FLAGS |
| 18924 | |
| 18925 | +# How to feed a file listing to the archiver. |
| 18926 | +archiver_list_spec=$lt_archiver_list_spec |
| 18927 | + |
| 18928 | # A symbol stripping program. |
| 18929 | STRIP=$lt_STRIP |
| 18930 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18931 | @@ -14526,6 +15222,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18932 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 18933 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 18934 | |
| 18935 | +# Specify filename containing input files for \$NM. |
| 18936 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 18937 | + |
| 18938 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 18939 | +lt_sysroot=$lt_sysroot |
| 18940 | + |
| 18941 | # The name of the directory that contains temporary libtool files. |
| 18942 | objdir=$objdir |
| 18943 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18944 | @@ -14535,6 +15237,9 @@ MAGIC_CMD=$MAGIC_CMD |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18945 | # Must we lock files when doing compilation? |
| 18946 | need_locks=$lt_need_locks |
| 18947 | |
| 18948 | +# Manifest tool. |
| 18949 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 18950 | + |
| 18951 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 18952 | DSYMUTIL=$lt_DSYMUTIL |
| 18953 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18954 | @@ -14649,12 +15354,12 @@ with_gcc=$GCC |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18955 | # Compiler flag to turn off builtin functions. |
| 18956 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 18957 | |
| 18958 | -# How to pass a linker flag through the compiler. |
| 18959 | -wl=$lt_lt_prog_compiler_wl |
| 18960 | - |
| 18961 | # Additional compiler flags for building library objects. |
| 18962 | pic_flag=$lt_lt_prog_compiler_pic |
| 18963 | |
| 18964 | +# How to pass a linker flag through the compiler. |
| 18965 | +wl=$lt_lt_prog_compiler_wl |
| 18966 | + |
| 18967 | # Compiler flag to prevent dynamic linking. |
| 18968 | link_static_flag=$lt_lt_prog_compiler_static |
| 18969 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18970 | @@ -14741,9 +15446,6 @@ inherit_rpath=$inherit_rpath |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18971 | # Whether libtool must link a program against all its dependency libraries. |
| 18972 | link_all_deplibs=$link_all_deplibs |
| 18973 | |
| 18974 | -# Fix the shell variable \$srcfile for the compiler. |
| 18975 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 18976 | - |
| 18977 | # Set to "yes" if exported symbols are required. |
| 18978 | always_export_symbols=$always_export_symbols |
| 18979 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18980 | @@ -14759,6 +15461,9 @@ include_expsyms=$lt_include_expsyms |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18981 | # Commands necessary for linking programs (against libraries) with templates. |
| 18982 | prelink_cmds=$lt_prelink_cmds |
| 18983 | |
| 18984 | +# Commands necessary for finishing linking programs. |
| 18985 | +postlink_cmds=$lt_postlink_cmds |
| 18986 | + |
| 18987 | # Specify filename containing input files. |
| 18988 | file_list_spec=$lt_file_list_spec |
| 18989 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18990 | @@ -14791,210 +15496,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18991 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 18992 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 18993 | # is reportedly fixed, but why not run on old versions too? |
| 18994 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 18995 | - || (rm -f "$cfgfile"; exit 1) |
| 18996 | - |
| 18997 | - case $xsi_shell in |
| 18998 | - yes) |
| 18999 | - cat << \_LT_EOF >> "$cfgfile" |
| 19000 | - |
| 19001 | -# func_dirname file append nondir_replacement |
| 19002 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 19003 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 19004 | -func_dirname () |
| 19005 | -{ |
| 19006 | - case ${1} in |
| 19007 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 19008 | - * ) func_dirname_result="${3}" ;; |
| 19009 | - esac |
| 19010 | -} |
| 19011 | - |
| 19012 | -# func_basename file |
| 19013 | -func_basename () |
| 19014 | -{ |
| 19015 | - func_basename_result="${1##*/}" |
| 19016 | -} |
| 19017 | - |
| 19018 | -# func_dirname_and_basename file append nondir_replacement |
| 19019 | -# perform func_basename and func_dirname in a single function |
| 19020 | -# call: |
| 19021 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 19022 | -# add APPEND to the result, otherwise set result |
| 19023 | -# to NONDIR_REPLACEMENT. |
| 19024 | -# value returned in "$func_dirname_result" |
| 19025 | -# basename: Compute filename of FILE. |
| 19026 | -# value retuned in "$func_basename_result" |
| 19027 | -# Implementation must be kept synchronized with func_dirname |
| 19028 | -# and func_basename. For efficiency, we do not delegate to |
| 19029 | -# those functions but instead duplicate the functionality here. |
| 19030 | -func_dirname_and_basename () |
| 19031 | -{ |
| 19032 | - case ${1} in |
| 19033 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 19034 | - * ) func_dirname_result="${3}" ;; |
| 19035 | - esac |
| 19036 | - func_basename_result="${1##*/}" |
| 19037 | -} |
| 19038 | - |
| 19039 | -# func_stripname prefix suffix name |
| 19040 | -# strip PREFIX and SUFFIX off of NAME. |
| 19041 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 19042 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 19043 | -# dot (in which case that matches only a dot). |
| 19044 | -func_stripname () |
| 19045 | -{ |
| 19046 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 19047 | - # positional parameters, so assign one to ordinary parameter first. |
| 19048 | - func_stripname_result=${3} |
| 19049 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 19050 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 19051 | -} |
| 19052 | - |
| 19053 | -# func_opt_split |
| 19054 | -func_opt_split () |
| 19055 | -{ |
| 19056 | - func_opt_split_opt=${1%%=*} |
| 19057 | - func_opt_split_arg=${1#*=} |
| 19058 | -} |
| 19059 | - |
| 19060 | -# func_lo2o object |
| 19061 | -func_lo2o () |
| 19062 | -{ |
| 19063 | - case ${1} in |
| 19064 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 19065 | - *) func_lo2o_result=${1} ;; |
| 19066 | - esac |
| 19067 | -} |
| 19068 | - |
| 19069 | -# func_xform libobj-or-source |
| 19070 | -func_xform () |
| 19071 | -{ |
| 19072 | - func_xform_result=${1%.*}.lo |
| 19073 | -} |
| 19074 | - |
| 19075 | -# func_arith arithmetic-term... |
| 19076 | -func_arith () |
| 19077 | -{ |
| 19078 | - func_arith_result=$(( $* )) |
| 19079 | -} |
| 19080 | - |
| 19081 | -# func_len string |
| 19082 | -# STRING may not start with a hyphen. |
| 19083 | -func_len () |
| 19084 | -{ |
| 19085 | - func_len_result=${#1} |
| 19086 | -} |
| 19087 | - |
| 19088 | -_LT_EOF |
| 19089 | - ;; |
| 19090 | - *) # Bourne compatible functions. |
| 19091 | - cat << \_LT_EOF >> "$cfgfile" |
| 19092 | - |
| 19093 | -# func_dirname file append nondir_replacement |
| 19094 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 19095 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 19096 | -func_dirname () |
| 19097 | -{ |
| 19098 | - # Extract subdirectory from the argument. |
| 19099 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 19100 | - if test "X$func_dirname_result" = "X${1}"; then |
| 19101 | - func_dirname_result="${3}" |
| 19102 | - else |
| 19103 | - func_dirname_result="$func_dirname_result${2}" |
| 19104 | - fi |
| 19105 | -} |
| 19106 | - |
| 19107 | -# func_basename file |
| 19108 | -func_basename () |
| 19109 | -{ |
| 19110 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 19111 | -} |
| 19112 | - |
| 19113 | - |
| 19114 | -# func_stripname prefix suffix name |
| 19115 | -# strip PREFIX and SUFFIX off of NAME. |
| 19116 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 19117 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 19118 | -# dot (in which case that matches only a dot). |
| 19119 | -# func_strip_suffix prefix name |
| 19120 | -func_stripname () |
| 19121 | -{ |
| 19122 | - case ${2} in |
| 19123 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 19124 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 19125 | - esac |
| 19126 | -} |
| 19127 | - |
| 19128 | -# sed scripts: |
| 19129 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 19130 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 19131 | - |
| 19132 | -# func_opt_split |
| 19133 | -func_opt_split () |
| 19134 | -{ |
| 19135 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 19136 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 19137 | -} |
| 19138 | - |
| 19139 | -# func_lo2o object |
| 19140 | -func_lo2o () |
| 19141 | -{ |
| 19142 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 19143 | -} |
| 19144 | - |
| 19145 | -# func_xform libobj-or-source |
| 19146 | -func_xform () |
| 19147 | -{ |
| 19148 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 19149 | -} |
| 19150 | - |
| 19151 | -# func_arith arithmetic-term... |
| 19152 | -func_arith () |
| 19153 | -{ |
| 19154 | - func_arith_result=`expr "$@"` |
| 19155 | -} |
| 19156 | - |
| 19157 | -# func_len string |
| 19158 | -# STRING may not start with a hyphen. |
| 19159 | -func_len () |
| 19160 | -{ |
| 19161 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 19162 | -} |
| 19163 | - |
| 19164 | -_LT_EOF |
| 19165 | -esac |
| 19166 | - |
| 19167 | -case $lt_shell_append in |
| 19168 | - yes) |
| 19169 | - cat << \_LT_EOF >> "$cfgfile" |
| 19170 | - |
| 19171 | -# func_append var value |
| 19172 | -# Append VALUE to the end of shell variable VAR. |
| 19173 | -func_append () |
| 19174 | -{ |
| 19175 | - eval "$1+=\$2" |
| 19176 | -} |
| 19177 | -_LT_EOF |
| 19178 | - ;; |
| 19179 | - *) |
| 19180 | - cat << \_LT_EOF >> "$cfgfile" |
| 19181 | - |
| 19182 | -# func_append var value |
| 19183 | -# Append VALUE to the end of shell variable VAR. |
| 19184 | -func_append () |
| 19185 | -{ |
| 19186 | - eval "$1=\$$1\$2" |
| 19187 | -} |
| 19188 | - |
| 19189 | -_LT_EOF |
| 19190 | - ;; |
| 19191 | - esac |
| 19192 | - |
| 19193 | - |
| 19194 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 19195 | - || (rm -f "$cfgfile"; exit 1) |
| 19196 | - |
| 19197 | - mv -f "$cfgfile" "$ofile" || |
| 19198 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 19199 | + || (rm -f "$cfgfile"; exit 1) |
| 19200 | + |
| 19201 | + if test x"$xsi_shell" = xyes; then |
| 19202 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 19203 | +func_dirname ()\ |
| 19204 | +{\ |
| 19205 | +\ case ${1} in\ |
| 19206 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 19207 | +\ * ) func_dirname_result="${3}" ;;\ |
| 19208 | +\ esac\ |
| 19209 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19210 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19211 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19212 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19213 | + |
| 19214 | + |
| 19215 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 19216 | +func_basename ()\ |
| 19217 | +{\ |
| 19218 | +\ func_basename_result="${1##*/}"\ |
| 19219 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19220 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19221 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19222 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19223 | + |
| 19224 | + |
| 19225 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 19226 | +func_dirname_and_basename ()\ |
| 19227 | +{\ |
| 19228 | +\ case ${1} in\ |
| 19229 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 19230 | +\ * ) func_dirname_result="${3}" ;;\ |
| 19231 | +\ esac\ |
| 19232 | +\ func_basename_result="${1##*/}"\ |
| 19233 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19234 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19235 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19236 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19237 | + |
| 19238 | + |
| 19239 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 19240 | +func_stripname ()\ |
| 19241 | +{\ |
| 19242 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 19243 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 19244 | +\ func_stripname_result=${3}\ |
| 19245 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 19246 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 19247 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19248 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19249 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19250 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19251 | + |
| 19252 | + |
| 19253 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 19254 | +func_split_long_opt ()\ |
| 19255 | +{\ |
| 19256 | +\ func_split_long_opt_name=${1%%=*}\ |
| 19257 | +\ func_split_long_opt_arg=${1#*=}\ |
| 19258 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19259 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19260 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19261 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19262 | + |
| 19263 | + |
| 19264 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 19265 | +func_split_short_opt ()\ |
| 19266 | +{\ |
| 19267 | +\ func_split_short_opt_arg=${1#??}\ |
| 19268 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 19269 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19270 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19271 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19272 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19273 | + |
| 19274 | + |
| 19275 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 19276 | +func_lo2o ()\ |
| 19277 | +{\ |
| 19278 | +\ case ${1} in\ |
| 19279 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 19280 | +\ *) func_lo2o_result=${1} ;;\ |
| 19281 | +\ esac\ |
| 19282 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19283 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19284 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19285 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19286 | + |
| 19287 | + |
| 19288 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 19289 | +func_xform ()\ |
| 19290 | +{\ |
| 19291 | + func_xform_result=${1%.*}.lo\ |
| 19292 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19293 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19294 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19295 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19296 | + |
| 19297 | + |
| 19298 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 19299 | +func_arith ()\ |
| 19300 | +{\ |
| 19301 | + func_arith_result=$(( $* ))\ |
| 19302 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19303 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19304 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19305 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19306 | + |
| 19307 | + |
| 19308 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 19309 | +func_len ()\ |
| 19310 | +{\ |
| 19311 | + func_len_result=${#1}\ |
| 19312 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19313 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19314 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19315 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19316 | + |
| 19317 | +fi |
| 19318 | + |
| 19319 | +if test x"$lt_shell_append" = xyes; then |
| 19320 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 19321 | +func_append ()\ |
| 19322 | +{\ |
| 19323 | + eval "${1}+=\\${2}"\ |
| 19324 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19325 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19326 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19327 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19328 | + |
| 19329 | + |
| 19330 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 19331 | +func_append_quoted ()\ |
| 19332 | +{\ |
| 19333 | +\ func_quote_for_eval "${2}"\ |
| 19334 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 19335 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 19336 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19337 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19338 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 19339 | + |
| 19340 | + |
| 19341 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 19342 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 19343 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19344 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19345 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 19346 | +else |
| 19347 | + # Save a `func_append' function call even when '+=' is not available |
| 19348 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 19349 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 19350 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 19351 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 19352 | +fi |
| 19353 | + |
| 19354 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 19355 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 19356 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 19357 | +fi |
| 19358 | + |
| 19359 | + |
| 19360 | + mv -f "$cfgfile" "$ofile" || |
| 19361 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 19362 | chmod +x "$ofile" |
| 19363 | |
| 19364 | diff --git a/opcodes/configure.ac b/opcodes/configure.ac |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 19365 | index 07e3162..c0c75d4 100644 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 19366 | --- a/opcodes/configure.ac |
| 19367 | +++ b/opcodes/configure.ac |
| 19368 | @@ -167,7 +167,7 @@ changequote(,)dnl |
| 19369 | x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'` |
| 19370 | changequote([,])dnl |
| 19371 | if test -n "$x"; then |
| 19372 | - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" |
| 19373 | + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a" |
| 19374 | fi |
| 19375 | |
| 19376 | case "${host}" in |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 19377 | diff --git a/zlib/configure b/zlib/configure |
| 19378 | index 8378857..7584940 100755 |
| 19379 | --- a/zlib/configure |
| 19380 | +++ b/zlib/configure |
| 19381 | @@ -614,8 +614,11 @@ OTOOL |
| 19382 | LIPO |
| 19383 | NMEDIT |
| 19384 | DSYMUTIL |
| 19385 | +MANIFEST_TOOL |
| 19386 | RANLIB |
| 19387 | +ac_ct_AR |
| 19388 | AR |
| 19389 | +DLLTOOL |
| 19390 | OBJDUMP |
| 19391 | LN_S |
| 19392 | NM |
| 19393 | @@ -736,6 +739,7 @@ enable_static |
| 19394 | with_pic |
| 19395 | enable_fast_install |
| 19396 | with_gnu_ld |
| 19397 | +with_libtool_sysroot |
| 19398 | enable_libtool_lock |
| 19399 | enable_host_shared |
| 19400 | ' |
| 19401 | @@ -1384,6 +1388,8 @@ Optional Packages: |
| 19402 | --with-pic try to use only PIC/non-PIC objects [default=use |
| 19403 | both] |
| 19404 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
| 19405 | + --with-libtool-sysroot=DIR Search for dependent libraries within DIR |
| 19406 | + (or the compiler's sysroot if not specified). |
| 19407 | |
| 19408 | Some influential environment variables: |
| 19409 | CC C compiler command |
| 19410 | @@ -3907,8 +3913,8 @@ esac |
| 19411 | |
| 19412 | |
| 19413 | |
| 19414 | -macro_version='2.2.7a' |
| 19415 | -macro_revision='1.3134' |
| 19416 | +macro_version='2.4' |
| 19417 | +macro_revision='1.3293' |
| 19418 | |
| 19419 | |
| 19420 | |
| 19421 | @@ -3948,7 +3954,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
| 19422 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
| 19423 | $as_echo_n "checking how to print strings... " >&6; } |
| 19424 | # Test print first, because it will be a builtin if present. |
| 19425 | -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
| 19426 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
| 19427 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 19428 | ECHO='print -r --' |
| 19429 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
| 19430 | @@ -4764,8 +4770,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; |
| 19431 | # Try some XSI features |
| 19432 | xsi_shell=no |
| 19433 | ( _lt_dummy="a/b/c" |
| 19434 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
| 19435 | - = c,a/b,, \ |
| 19436 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
| 19437 | + = c,a/b,b/c, \ |
| 19438 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
| 19439 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
| 19440 | && xsi_shell=yes |
| 19441 | @@ -4814,6 +4820,80 @@ esac |
| 19442 | |
| 19443 | |
| 19444 | |
| 19445 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
| 19446 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
| 19447 | +if test "${lt_cv_to_host_file_cmd+set}" = set; then : |
| 19448 | + $as_echo_n "(cached) " >&6 |
| 19449 | +else |
| 19450 | + case $host in |
| 19451 | + *-*-mingw* ) |
| 19452 | + case $build in |
| 19453 | + *-*-mingw* ) # actually msys |
| 19454 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
| 19455 | + ;; |
| 19456 | + *-*-cygwin* ) |
| 19457 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
| 19458 | + ;; |
| 19459 | + * ) # otherwise, assume *nix |
| 19460 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
| 19461 | + ;; |
| 19462 | + esac |
| 19463 | + ;; |
| 19464 | + *-*-cygwin* ) |
| 19465 | + case $build in |
| 19466 | + *-*-mingw* ) # actually msys |
| 19467 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
| 19468 | + ;; |
| 19469 | + *-*-cygwin* ) |
| 19470 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 19471 | + ;; |
| 19472 | + * ) # otherwise, assume *nix |
| 19473 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
| 19474 | + ;; |
| 19475 | + esac |
| 19476 | + ;; |
| 19477 | + * ) # unhandled hosts (and "normal" native builds) |
| 19478 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
| 19479 | + ;; |
| 19480 | +esac |
| 19481 | + |
| 19482 | +fi |
| 19483 | + |
| 19484 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 19485 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
| 19486 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
| 19487 | + |
| 19488 | + |
| 19489 | + |
| 19490 | + |
| 19491 | + |
| 19492 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
| 19493 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
| 19494 | +if test "${lt_cv_to_tool_file_cmd+set}" = set; then : |
| 19495 | + $as_echo_n "(cached) " >&6 |
| 19496 | +else |
| 19497 | + #assume ordinary cross tools, or native build. |
| 19498 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
| 19499 | +case $host in |
| 19500 | + *-*-mingw* ) |
| 19501 | + case $build in |
| 19502 | + *-*-mingw* ) # actually msys |
| 19503 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
| 19504 | + ;; |
| 19505 | + esac |
| 19506 | + ;; |
| 19507 | +esac |
| 19508 | + |
| 19509 | +fi |
| 19510 | + |
| 19511 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 19512 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
| 19513 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
| 19514 | + |
| 19515 | + |
| 19516 | + |
| 19517 | + |
| 19518 | + |
| 19519 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
| 19520 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 19521 | if test "${lt_cv_ld_reload_flag+set}" = set; then : |
| 19522 | @@ -4830,6 +4910,11 @@ case $reload_flag in |
| 19523 | esac |
| 19524 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
| 19525 | case $host_os in |
| 19526 | + cygwin* | mingw* | pw32* | cegcc*) |
| 19527 | + if test "$GCC" != yes; then |
| 19528 | + reload_cmds=false |
| 19529 | + fi |
| 19530 | + ;; |
| 19531 | darwin*) |
| 19532 | if test "$GCC" = yes; then |
| 19533 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
| 19534 | @@ -4998,7 +5083,8 @@ mingw* | pw32*) |
| 19535 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
| 19536 | lt_cv_file_magic_cmd='func_win32_libid' |
| 19537 | else |
| 19538 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
| 19539 | + # Keep this pattern in sync with the one in func_win32_libid. |
| 19540 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
| 19541 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
| 19542 | fi |
| 19543 | ;; |
| 19544 | @@ -5152,6 +5238,21 @@ esac |
| 19545 | fi |
| 19546 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
| 19547 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 19548 | + |
| 19549 | +file_magic_glob= |
| 19550 | +want_nocaseglob=no |
| 19551 | +if test "$build" = "$host"; then |
| 19552 | + case $host_os in |
| 19553 | + mingw* | pw32*) |
| 19554 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
| 19555 | + want_nocaseglob=yes |
| 19556 | + else |
| 19557 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
| 19558 | + fi |
| 19559 | + ;; |
| 19560 | + esac |
| 19561 | +fi |
| 19562 | + |
| 19563 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 19564 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 19565 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 19566 | @@ -5167,9 +5268,163 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 19567 | |
| 19568 | |
| 19569 | |
| 19570 | + |
| 19571 | + |
| 19572 | + |
| 19573 | + |
| 19574 | + |
| 19575 | + |
| 19576 | + |
| 19577 | + |
| 19578 | + |
| 19579 | + |
| 19580 | if test -n "$ac_tool_prefix"; then |
| 19581 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 19582 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 19583 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
| 19584 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
| 19585 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 19586 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 19587 | +if test "${ac_cv_prog_DLLTOOL+set}" = set; then : |
| 19588 | + $as_echo_n "(cached) " >&6 |
| 19589 | +else |
| 19590 | + if test -n "$DLLTOOL"; then |
| 19591 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
| 19592 | +else |
| 19593 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 19594 | +for as_dir in $PATH |
| 19595 | +do |
| 19596 | + IFS=$as_save_IFS |
| 19597 | + test -z "$as_dir" && as_dir=. |
| 19598 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 19599 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 19600 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
| 19601 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 19602 | + break 2 |
| 19603 | + fi |
| 19604 | +done |
| 19605 | + done |
| 19606 | +IFS=$as_save_IFS |
| 19607 | + |
| 19608 | +fi |
| 19609 | +fi |
| 19610 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
| 19611 | +if test -n "$DLLTOOL"; then |
| 19612 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
| 19613 | +$as_echo "$DLLTOOL" >&6; } |
| 19614 | +else |
| 19615 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 19616 | +$as_echo "no" >&6; } |
| 19617 | +fi |
| 19618 | + |
| 19619 | + |
| 19620 | +fi |
| 19621 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
| 19622 | + ac_ct_DLLTOOL=$DLLTOOL |
| 19623 | + # Extract the first word of "dlltool", so it can be a program name with args. |
| 19624 | +set dummy dlltool; ac_word=$2 |
| 19625 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 19626 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 19627 | +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : |
| 19628 | + $as_echo_n "(cached) " >&6 |
| 19629 | +else |
| 19630 | + if test -n "$ac_ct_DLLTOOL"; then |
| 19631 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
| 19632 | +else |
| 19633 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 19634 | +for as_dir in $PATH |
| 19635 | +do |
| 19636 | + IFS=$as_save_IFS |
| 19637 | + test -z "$as_dir" && as_dir=. |
| 19638 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 19639 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 19640 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
| 19641 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 19642 | + break 2 |
| 19643 | + fi |
| 19644 | +done |
| 19645 | + done |
| 19646 | +IFS=$as_save_IFS |
| 19647 | + |
| 19648 | +fi |
| 19649 | +fi |
| 19650 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
| 19651 | +if test -n "$ac_ct_DLLTOOL"; then |
| 19652 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
| 19653 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
| 19654 | +else |
| 19655 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 19656 | +$as_echo "no" >&6; } |
| 19657 | +fi |
| 19658 | + |
| 19659 | + if test "x$ac_ct_DLLTOOL" = x; then |
| 19660 | + DLLTOOL="false" |
| 19661 | + else |
| 19662 | + case $cross_compiling:$ac_tool_warned in |
| 19663 | +yes:) |
| 19664 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 19665 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 19666 | +ac_tool_warned=yes ;; |
| 19667 | +esac |
| 19668 | + DLLTOOL=$ac_ct_DLLTOOL |
| 19669 | + fi |
| 19670 | +else |
| 19671 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
| 19672 | +fi |
| 19673 | + |
| 19674 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
| 19675 | + |
| 19676 | + |
| 19677 | + |
| 19678 | + |
| 19679 | + |
| 19680 | + |
| 19681 | + |
| 19682 | + |
| 19683 | + |
| 19684 | + |
| 19685 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
| 19686 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
| 19687 | +if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : |
| 19688 | + $as_echo_n "(cached) " >&6 |
| 19689 | +else |
| 19690 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
| 19691 | + |
| 19692 | +case $host_os in |
| 19693 | +cygwin* | mingw* | pw32* | cegcc*) |
| 19694 | + # two different shell functions defined in ltmain.sh |
| 19695 | + # decide which to use based on capabilities of $DLLTOOL |
| 19696 | + case `$DLLTOOL --help 2>&1` in |
| 19697 | + *--identify-strict*) |
| 19698 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
| 19699 | + ;; |
| 19700 | + *) |
| 19701 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
| 19702 | + ;; |
| 19703 | + esac |
| 19704 | + ;; |
| 19705 | +*) |
| 19706 | + # fallback: assume linklib IS sharedlib |
| 19707 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
| 19708 | + ;; |
| 19709 | +esac |
| 19710 | + |
| 19711 | +fi |
| 19712 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
| 19713 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
| 19714 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
| 19715 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
| 19716 | + |
| 19717 | + |
| 19718 | + |
| 19719 | + |
| 19720 | + |
| 19721 | + |
| 19722 | + |
| 19723 | + |
| 19724 | +if test -n "$ac_tool_prefix"; then |
| 19725 | + for ac_prog in ar |
| 19726 | + do |
| 19727 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 19728 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 19729 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 19730 | $as_echo_n "checking for $ac_word... " >&6; } |
| 19731 | if test "${ac_cv_prog_AR+set}" = set; then : |
| 19732 | @@ -5185,7 +5440,7 @@ do |
| 19733 | test -z "$as_dir" && as_dir=. |
| 19734 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 19735 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 19736 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 19737 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
| 19738 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 19739 | break 2 |
| 19740 | fi |
| 19741 | @@ -5205,11 +5460,15 @@ $as_echo "no" >&6; } |
| 19742 | fi |
| 19743 | |
| 19744 | |
| 19745 | + test -n "$AR" && break |
| 19746 | + done |
| 19747 | fi |
| 19748 | -if test -z "$ac_cv_prog_AR"; then |
| 19749 | +if test -z "$AR"; then |
| 19750 | ac_ct_AR=$AR |
| 19751 | - # Extract the first word of "ar", so it can be a program name with args. |
| 19752 | -set dummy ar; ac_word=$2 |
| 19753 | + for ac_prog in ar |
| 19754 | +do |
| 19755 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 19756 | +set dummy $ac_prog; ac_word=$2 |
| 19757 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 19758 | $as_echo_n "checking for $ac_word... " >&6; } |
| 19759 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
| 19760 | @@ -5225,7 +5484,7 @@ do |
| 19761 | test -z "$as_dir" && as_dir=. |
| 19762 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 19763 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 19764 | - ac_cv_prog_ac_ct_AR="ar" |
| 19765 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
| 19766 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 19767 | break 2 |
| 19768 | fi |
| 19769 | @@ -5244,6 +5503,10 @@ else |
| 19770 | $as_echo "no" >&6; } |
| 19771 | fi |
| 19772 | |
| 19773 | + |
| 19774 | + test -n "$ac_ct_AR" && break |
| 19775 | +done |
| 19776 | + |
| 19777 | if test "x$ac_ct_AR" = x; then |
| 19778 | AR="false" |
| 19779 | else |
| 19780 | @@ -5255,16 +5518,72 @@ ac_tool_warned=yes ;; |
| 19781 | esac |
| 19782 | AR=$ac_ct_AR |
| 19783 | fi |
| 19784 | -else |
| 19785 | - AR="$ac_cv_prog_AR" |
| 19786 | fi |
| 19787 | |
| 19788 | -test -z "$AR" && AR=ar |
| 19789 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
| 19790 | +: ${AR=ar} |
| 19791 | +: ${AR_FLAGS=cru} |
| 19792 | + |
| 19793 | + |
| 19794 | + |
| 19795 | + |
| 19796 | + |
| 19797 | + |
| 19798 | + |
| 19799 | + |
| 19800 | + |
| 19801 | + |
| 19802 | + |
| 19803 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
| 19804 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
| 19805 | +if test "${lt_cv_ar_at_file+set}" = set; then : |
| 19806 | + $as_echo_n "(cached) " >&6 |
| 19807 | +else |
| 19808 | + lt_cv_ar_at_file=no |
| 19809 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 19810 | +/* end confdefs.h. */ |
| 19811 | + |
| 19812 | +int |
| 19813 | +main () |
| 19814 | +{ |
| 19815 | |
| 19816 | + ; |
| 19817 | + return 0; |
| 19818 | +} |
| 19819 | +_ACEOF |
| 19820 | +if ac_fn_c_try_compile "$LINENO"; then : |
| 19821 | + echo conftest.$ac_objext > conftest.lst |
| 19822 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
| 19823 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 19824 | + (eval $lt_ar_try) 2>&5 |
| 19825 | + ac_status=$? |
| 19826 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 19827 | + test $ac_status = 0; } |
| 19828 | + if test "$ac_status" -eq 0; then |
| 19829 | + # Ensure the archiver fails upon bogus file names. |
| 19830 | + rm -f conftest.$ac_objext libconftest.a |
| 19831 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
| 19832 | + (eval $lt_ar_try) 2>&5 |
| 19833 | + ac_status=$? |
| 19834 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| 19835 | + test $ac_status = 0; } |
| 19836 | + if test "$ac_status" -ne 0; then |
| 19837 | + lt_cv_ar_at_file=@ |
| 19838 | + fi |
| 19839 | + fi |
| 19840 | + rm -f conftest.* libconftest.a |
| 19841 | |
| 19842 | +fi |
| 19843 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 19844 | |
| 19845 | +fi |
| 19846 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
| 19847 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
| 19848 | |
| 19849 | +if test "x$lt_cv_ar_at_file" = xno; then |
| 19850 | + archiver_list_spec= |
| 19851 | +else |
| 19852 | + archiver_list_spec=$lt_cv_ar_at_file |
| 19853 | +fi |
| 19854 | |
| 19855 | |
| 19856 | |
| 19857 | @@ -5606,8 +5925,8 @@ esac |
| 19858 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
| 19859 | |
| 19860 | # Transform an extracted symbol line into symbol name and symbol address |
| 19861 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 19862 | -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'" |
| 19863 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
| 19864 | +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'" |
| 19865 | |
| 19866 | # Handle CRLF in mingw tool chain |
| 19867 | opt_cr= |
| 19868 | @@ -5643,6 +5962,7 @@ for ac_symprfx in "" "_"; do |
| 19869 | else |
| 19870 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
| 19871 | fi |
| 19872 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
| 19873 | |
| 19874 | # Check to see that the pipe works correctly. |
| 19875 | pipe_works=no |
| 19876 | @@ -5684,6 +6004,18 @@ _LT_EOF |
| 19877 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
| 19878 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
| 19879 | cat <<_LT_EOF > conftest.$ac_ext |
| 19880 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
| 19881 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
| 19882 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
| 19883 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
| 19884 | +# define LT_DLSYM_CONST |
| 19885 | +#elif defined(__osf__) |
| 19886 | +/* This system does not cope well with relocations in const data. */ |
| 19887 | +# define LT_DLSYM_CONST |
| 19888 | +#else |
| 19889 | +# define LT_DLSYM_CONST const |
| 19890 | +#endif |
| 19891 | + |
| 19892 | #ifdef __cplusplus |
| 19893 | extern "C" { |
| 19894 | #endif |
| 19895 | @@ -5695,7 +6027,7 @@ _LT_EOF |
| 19896 | cat <<_LT_EOF >> conftest.$ac_ext |
| 19897 | |
| 19898 | /* The mapping between symbol names and symbols. */ |
| 19899 | -const struct { |
| 19900 | +LT_DLSYM_CONST struct { |
| 19901 | const char *name; |
| 19902 | void *address; |
| 19903 | } |
| 19904 | @@ -5721,8 +6053,8 @@ static const void *lt_preloaded_setup() { |
| 19905 | _LT_EOF |
| 19906 | # Now try linking the two files. |
| 19907 | mv conftest.$ac_objext conftstm.$ac_objext |
| 19908 | - lt_save_LIBS="$LIBS" |
| 19909 | - lt_save_CFLAGS="$CFLAGS" |
| 19910 | + lt_globsym_save_LIBS=$LIBS |
| 19911 | + lt_globsym_save_CFLAGS=$CFLAGS |
| 19912 | LIBS="conftstm.$ac_objext" |
| 19913 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
| 19914 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
| 19915 | @@ -5732,8 +6064,8 @@ _LT_EOF |
| 19916 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
| 19917 | pipe_works=yes |
| 19918 | fi |
| 19919 | - LIBS="$lt_save_LIBS" |
| 19920 | - CFLAGS="$lt_save_CFLAGS" |
| 19921 | + LIBS=$lt_globsym_save_LIBS |
| 19922 | + CFLAGS=$lt_globsym_save_CFLAGS |
| 19923 | else |
| 19924 | echo "cannot find nm_test_func in $nlist" >&5 |
| 19925 | fi |
| 19926 | @@ -5770,6 +6102,19 @@ else |
| 19927 | $as_echo "ok" >&6; } |
| 19928 | fi |
| 19929 | |
| 19930 | +# Response file support. |
| 19931 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
| 19932 | + nm_file_list_spec='@' |
| 19933 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
| 19934 | + nm_file_list_spec='@' |
| 19935 | +fi |
| 19936 | + |
| 19937 | + |
| 19938 | + |
| 19939 | + |
| 19940 | + |
| 19941 | + |
| 19942 | + |
| 19943 | |
| 19944 | |
| 19945 | |
| 19946 | @@ -5790,6 +6135,41 @@ fi |
| 19947 | |
| 19948 | |
| 19949 | |
| 19950 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
| 19951 | +$as_echo_n "checking for sysroot... " >&6; } |
| 19952 | + |
| 19953 | +# Check whether --with-libtool-sysroot was given. |
| 19954 | +if test "${with_libtool_sysroot+set}" = set; then : |
| 19955 | + withval=$with_libtool_sysroot; |
| 19956 | +else |
| 19957 | + with_libtool_sysroot=no |
| 19958 | +fi |
| 19959 | + |
| 19960 | + |
| 19961 | +lt_sysroot= |
| 19962 | +case ${with_libtool_sysroot} in #( |
| 19963 | + yes) |
| 19964 | + if test "$GCC" = yes; then |
| 19965 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
| 19966 | + fi |
| 19967 | + ;; #( |
| 19968 | + /*) |
| 19969 | + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` |
| 19970 | + ;; #( |
| 19971 | + no|'') |
| 19972 | + ;; #( |
| 19973 | + *) |
| 19974 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 |
| 19975 | +$as_echo "${with_libtool_sysroot}" >&6; } |
| 19976 | + as_fn_error "The sysroot must be an absolute path." "$LINENO" 5 |
| 19977 | + ;; |
| 19978 | +esac |
| 19979 | + |
| 19980 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
| 19981 | +$as_echo "${lt_sysroot:-no}" >&6; } |
| 19982 | + |
| 19983 | + |
| 19984 | + |
| 19985 | |
| 19986 | |
| 19987 | # Check whether --enable-libtool-lock was given. |
| 19988 | @@ -6001,6 +6381,123 @@ esac |
| 19989 | |
| 19990 | need_locks="$enable_libtool_lock" |
| 19991 | |
| 19992 | +if test -n "$ac_tool_prefix"; then |
| 19993 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
| 19994 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
| 19995 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 19996 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 19997 | +if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : |
| 19998 | + $as_echo_n "(cached) " >&6 |
| 19999 | +else |
| 20000 | + if test -n "$MANIFEST_TOOL"; then |
| 20001 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
| 20002 | +else |
| 20003 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 20004 | +for as_dir in $PATH |
| 20005 | +do |
| 20006 | + IFS=$as_save_IFS |
| 20007 | + test -z "$as_dir" && as_dir=. |
| 20008 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 20009 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 20010 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
| 20011 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 20012 | + break 2 |
| 20013 | + fi |
| 20014 | +done |
| 20015 | + done |
| 20016 | +IFS=$as_save_IFS |
| 20017 | + |
| 20018 | +fi |
| 20019 | +fi |
| 20020 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
| 20021 | +if test -n "$MANIFEST_TOOL"; then |
| 20022 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
| 20023 | +$as_echo "$MANIFEST_TOOL" >&6; } |
| 20024 | +else |
| 20025 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 20026 | +$as_echo "no" >&6; } |
| 20027 | +fi |
| 20028 | + |
| 20029 | + |
| 20030 | +fi |
| 20031 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
| 20032 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
| 20033 | + # Extract the first word of "mt", so it can be a program name with args. |
| 20034 | +set dummy mt; ac_word=$2 |
| 20035 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 20036 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 20037 | +if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : |
| 20038 | + $as_echo_n "(cached) " >&6 |
| 20039 | +else |
| 20040 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 20041 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
| 20042 | +else |
| 20043 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 20044 | +for as_dir in $PATH |
| 20045 | +do |
| 20046 | + IFS=$as_save_IFS |
| 20047 | + test -z "$as_dir" && as_dir=. |
| 20048 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 20049 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 20050 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
| 20051 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 20052 | + break 2 |
| 20053 | + fi |
| 20054 | +done |
| 20055 | + done |
| 20056 | +IFS=$as_save_IFS |
| 20057 | + |
| 20058 | +fi |
| 20059 | +fi |
| 20060 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
| 20061 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
| 20062 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
| 20063 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
| 20064 | +else |
| 20065 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| 20066 | +$as_echo "no" >&6; } |
| 20067 | +fi |
| 20068 | + |
| 20069 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
| 20070 | + MANIFEST_TOOL=":" |
| 20071 | + else |
| 20072 | + case $cross_compiling:$ac_tool_warned in |
| 20073 | +yes:) |
| 20074 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 20075 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 20076 | +ac_tool_warned=yes ;; |
| 20077 | +esac |
| 20078 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
| 20079 | + fi |
| 20080 | +else |
| 20081 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
| 20082 | +fi |
| 20083 | + |
| 20084 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
| 20085 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
| 20086 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
| 20087 | +if test "${lt_cv_path_mainfest_tool+set}" = set; then : |
| 20088 | + $as_echo_n "(cached) " >&6 |
| 20089 | +else |
| 20090 | + lt_cv_path_mainfest_tool=no |
| 20091 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
| 20092 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
| 20093 | + cat conftest.err >&5 |
| 20094 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
| 20095 | + lt_cv_path_mainfest_tool=yes |
| 20096 | + fi |
| 20097 | + rm -f conftest* |
| 20098 | +fi |
| 20099 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
| 20100 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
| 20101 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
| 20102 | + MANIFEST_TOOL=: |
| 20103 | +fi |
| 20104 | + |
| 20105 | + |
| 20106 | + |
| 20107 | + |
| 20108 | + |
| 20109 | |
| 20110 | case $host_os in |
| 20111 | rhapsody* | darwin*) |
| 20112 | @@ -6567,6 +7064,8 @@ _LT_EOF |
| 20113 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
| 20114 | echo "$AR cru libconftest.a conftest.o" >&5 |
| 20115 | $AR cru libconftest.a conftest.o 2>&5 |
| 20116 | + echo "$RANLIB libconftest.a" >&5 |
| 20117 | + $RANLIB libconftest.a 2>&5 |
| 20118 | cat > conftest.c << _LT_EOF |
| 20119 | int main() { return 0;} |
| 20120 | _LT_EOF |
| 20121 | @@ -7030,7 +7529,8 @@ fi |
| 20122 | LIBTOOL_DEPS="$ltmain" |
| 20123 | |
| 20124 | # Always use our own libtool. |
| 20125 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
| 20126 | +LIBTOOL='$(SHELL) $(top_builddir)' |
| 20127 | +LIBTOOL="$LIBTOOL/${host_alias}-libtool" |
| 20128 | |
| 20129 | |
| 20130 | |
| 20131 | @@ -7119,7 +7619,7 @@ aix3*) |
| 20132 | esac |
| 20133 | |
| 20134 | # Global variables: |
| 20135 | -ofile=libtool |
| 20136 | +ofile=${host_alias}-libtool |
| 20137 | can_build_shared=yes |
| 20138 | |
| 20139 | # All known linkers require a `.a' archive for static linking (except MSVC, |
| 20140 | @@ -7417,8 +7917,6 @@ fi |
| 20141 | lt_prog_compiler_pic= |
| 20142 | lt_prog_compiler_static= |
| 20143 | |
| 20144 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 20145 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 20146 | |
| 20147 | if test "$GCC" = yes; then |
| 20148 | lt_prog_compiler_wl='-Wl,' |
| 20149 | @@ -7584,6 +8082,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 20150 | lt_prog_compiler_pic='--shared' |
| 20151 | lt_prog_compiler_static='--static' |
| 20152 | ;; |
| 20153 | + nagfor*) |
| 20154 | + # NAG Fortran compiler |
| 20155 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
| 20156 | + lt_prog_compiler_pic='-PIC' |
| 20157 | + lt_prog_compiler_static='-Bstatic' |
| 20158 | + ;; |
| 20159 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
| 20160 | # Portland Group compilers (*not* the Pentium gcc compiler, |
| 20161 | # which looks to be a dead project) |
| 20162 | @@ -7646,7 +8150,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 20163 | lt_prog_compiler_pic='-KPIC' |
| 20164 | lt_prog_compiler_static='-Bstatic' |
| 20165 | case $cc_basename in |
| 20166 | - f77* | f90* | f95*) |
| 20167 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
| 20168 | lt_prog_compiler_wl='-Qoption ld ';; |
| 20169 | *) |
| 20170 | lt_prog_compiler_wl='-Wl,';; |
| 20171 | @@ -7703,13 +8207,17 @@ case $host_os in |
| 20172 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
| 20173 | ;; |
| 20174 | esac |
| 20175 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
| 20176 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
| 20177 | - |
| 20178 | - |
| 20179 | - |
| 20180 | - |
| 20181 | |
| 20182 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
| 20183 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 20184 | +if test "${lt_cv_prog_compiler_pic+set}" = set; then : |
| 20185 | + $as_echo_n "(cached) " >&6 |
| 20186 | +else |
| 20187 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
| 20188 | +fi |
| 20189 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
| 20190 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
| 20191 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
| 20192 | |
| 20193 | # |
| 20194 | # Check to make sure the PIC flag actually works. |
| 20195 | @@ -7770,6 +8278,11 @@ fi |
| 20196 | |
| 20197 | |
| 20198 | |
| 20199 | + |
| 20200 | + |
| 20201 | + |
| 20202 | + |
| 20203 | + |
| 20204 | # |
| 20205 | # Check to make sure the static flag actually works. |
| 20206 | # |
| 20207 | @@ -8120,7 +8633,8 @@ _LT_EOF |
| 20208 | allow_undefined_flag=unsupported |
| 20209 | always_export_symbols=no |
| 20210 | enable_shared_with_static_runtimes=yes |
| 20211 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 20212 | + 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' |
| 20213 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
| 20214 | |
| 20215 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
| 20216 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
| 20217 | @@ -8219,12 +8733,12 @@ _LT_EOF |
| 20218 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
| 20219 | hardcode_libdir_flag_spec= |
| 20220 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
| 20221 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
| 20222 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
| 20223 | if test "x$supports_anon_versioning" = xyes; then |
| 20224 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
| 20225 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
| 20226 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
| 20227 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 20228 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
| 20229 | fi |
| 20230 | ;; |
| 20231 | esac |
| 20232 | @@ -8238,8 +8752,8 @@ _LT_EOF |
| 20233 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 20234 | wlarc= |
| 20235 | else |
| 20236 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 20237 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 20238 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 20239 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 20240 | fi |
| 20241 | ;; |
| 20242 | |
| 20243 | @@ -8257,8 +8771,8 @@ _LT_EOF |
| 20244 | |
| 20245 | _LT_EOF |
| 20246 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 20247 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 20248 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 20249 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 20250 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 20251 | else |
| 20252 | ld_shlibs=no |
| 20253 | fi |
| 20254 | @@ -8304,8 +8818,8 @@ _LT_EOF |
| 20255 | |
| 20256 | *) |
| 20257 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
| 20258 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 20259 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 20260 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
| 20261 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
| 20262 | else |
| 20263 | ld_shlibs=no |
| 20264 | fi |
| 20265 | @@ -8435,7 +8949,13 @@ _LT_EOF |
| 20266 | allow_undefined_flag='-berok' |
| 20267 | # Determine the default libpath from the value encoded in an |
| 20268 | # empty executable. |
| 20269 | - if test x$gcc_no_link = xyes; then |
| 20270 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 20271 | + aix_libpath=$lt_cv_aix_libpath |
| 20272 | +else |
| 20273 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 20274 | + $as_echo_n "(cached) " >&6 |
| 20275 | +else |
| 20276 | + if test x$gcc_no_link = xyes; then |
| 20277 | as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 |
| 20278 | fi |
| 20279 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 20280 | @@ -8451,22 +8971,29 @@ main () |
| 20281 | _ACEOF |
| 20282 | if ac_fn_c_try_link "$LINENO"; then : |
| 20283 | |
| 20284 | -lt_aix_libpath_sed=' |
| 20285 | - /Import File Strings/,/^$/ { |
| 20286 | - /^0/ { |
| 20287 | - s/^0 *\(.*\)$/\1/ |
| 20288 | - p |
| 20289 | - } |
| 20290 | - }' |
| 20291 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 20292 | -# Check for a 64-bit object if we didn't find anything. |
| 20293 | -if test -z "$aix_libpath"; then |
| 20294 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 20295 | -fi |
| 20296 | + lt_aix_libpath_sed=' |
| 20297 | + /Import File Strings/,/^$/ { |
| 20298 | + /^0/ { |
| 20299 | + s/^0 *\([^ ]*\) *$/\1/ |
| 20300 | + p |
| 20301 | + } |
| 20302 | + }' |
| 20303 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 20304 | + # Check for a 64-bit object if we didn't find anything. |
| 20305 | + if test -z "$lt_cv_aix_libpath_"; then |
| 20306 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 20307 | + fi |
| 20308 | fi |
| 20309 | rm -f core conftest.err conftest.$ac_objext \ |
| 20310 | conftest$ac_exeext conftest.$ac_ext |
| 20311 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 20312 | + if test -z "$lt_cv_aix_libpath_"; then |
| 20313 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 20314 | + fi |
| 20315 | + |
| 20316 | +fi |
| 20317 | + |
| 20318 | + aix_libpath=$lt_cv_aix_libpath_ |
| 20319 | +fi |
| 20320 | |
| 20321 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 20322 | 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" |
| 20323 | @@ -8478,7 +9005,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 20324 | else |
| 20325 | # Determine the default libpath from the value encoded in an |
| 20326 | # empty executable. |
| 20327 | - if test x$gcc_no_link = xyes; then |
| 20328 | + if test "${lt_cv_aix_libpath+set}" = set; then |
| 20329 | + aix_libpath=$lt_cv_aix_libpath |
| 20330 | +else |
| 20331 | + if test "${lt_cv_aix_libpath_+set}" = set; then : |
| 20332 | + $as_echo_n "(cached) " >&6 |
| 20333 | +else |
| 20334 | + if test x$gcc_no_link = xyes; then |
| 20335 | as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 |
| 20336 | fi |
| 20337 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 20338 | @@ -8494,22 +9027,29 @@ main () |
| 20339 | _ACEOF |
| 20340 | if ac_fn_c_try_link "$LINENO"; then : |
| 20341 | |
| 20342 | -lt_aix_libpath_sed=' |
| 20343 | - /Import File Strings/,/^$/ { |
| 20344 | - /^0/ { |
| 20345 | - s/^0 *\(.*\)$/\1/ |
| 20346 | - p |
| 20347 | - } |
| 20348 | - }' |
| 20349 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 20350 | -# Check for a 64-bit object if we didn't find anything. |
| 20351 | -if test -z "$aix_libpath"; then |
| 20352 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 20353 | -fi |
| 20354 | + lt_aix_libpath_sed=' |
| 20355 | + /Import File Strings/,/^$/ { |
| 20356 | + /^0/ { |
| 20357 | + s/^0 *\([^ ]*\) *$/\1/ |
| 20358 | + p |
| 20359 | + } |
| 20360 | + }' |
| 20361 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 20362 | + # Check for a 64-bit object if we didn't find anything. |
| 20363 | + if test -z "$lt_cv_aix_libpath_"; then |
| 20364 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 20365 | + fi |
| 20366 | fi |
| 20367 | rm -f core conftest.err conftest.$ac_objext \ |
| 20368 | conftest$ac_exeext conftest.$ac_ext |
| 20369 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 20370 | + if test -z "$lt_cv_aix_libpath_"; then |
| 20371 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
| 20372 | + fi |
| 20373 | + |
| 20374 | +fi |
| 20375 | + |
| 20376 | + aix_libpath=$lt_cv_aix_libpath_ |
| 20377 | +fi |
| 20378 | |
| 20379 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
| 20380 | # Warning - without using the other run time loading flags, |
| 20381 | @@ -8554,20 +9094,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 20382 | # Microsoft Visual C++. |
| 20383 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
| 20384 | # no search path for DLLs. |
| 20385 | - hardcode_libdir_flag_spec=' ' |
| 20386 | - allow_undefined_flag=unsupported |
| 20387 | - # Tell ltmain to make .lib files, not .a files. |
| 20388 | - libext=lib |
| 20389 | - # Tell ltmain to make .dll files, not .so files. |
| 20390 | - shrext_cmds=".dll" |
| 20391 | - # FIXME: Setting linknames here is a bad hack. |
| 20392 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 20393 | - # The linker will automatically build a .lib file if we build a DLL. |
| 20394 | - old_archive_from_new_cmds='true' |
| 20395 | - # FIXME: Should let the user specify the lib program. |
| 20396 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 20397 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
| 20398 | - enable_shared_with_static_runtimes=yes |
| 20399 | + case $cc_basename in |
| 20400 | + cl*) |
| 20401 | + # Native MSVC |
| 20402 | + hardcode_libdir_flag_spec=' ' |
| 20403 | + allow_undefined_flag=unsupported |
| 20404 | + always_export_symbols=yes |
| 20405 | + file_list_spec='@' |
| 20406 | + # Tell ltmain to make .lib files, not .a files. |
| 20407 | + libext=lib |
| 20408 | + # Tell ltmain to make .dll files, not .so files. |
| 20409 | + shrext_cmds=".dll" |
| 20410 | + # FIXME: Setting linknames here is a bad hack. |
| 20411 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
| 20412 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
| 20413 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
| 20414 | + else |
| 20415 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
| 20416 | + fi~ |
| 20417 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
| 20418 | + linknames=' |
| 20419 | + # The linker will not automatically build a static lib if we build a DLL. |
| 20420 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
| 20421 | + enable_shared_with_static_runtimes=yes |
| 20422 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
| 20423 | + # Don't use ranlib |
| 20424 | + old_postinstall_cmds='chmod 644 $oldlib' |
| 20425 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
| 20426 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
| 20427 | + case $lt_outputfile in |
| 20428 | + *.exe|*.EXE) ;; |
| 20429 | + *) |
| 20430 | + lt_outputfile="$lt_outputfile.exe" |
| 20431 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
| 20432 | + ;; |
| 20433 | + esac~ |
| 20434 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
| 20435 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
| 20436 | + $RM "$lt_outputfile.manifest"; |
| 20437 | + fi' |
| 20438 | + ;; |
| 20439 | + *) |
| 20440 | + # Assume MSVC wrapper |
| 20441 | + hardcode_libdir_flag_spec=' ' |
| 20442 | + allow_undefined_flag=unsupported |
| 20443 | + # Tell ltmain to make .lib files, not .a files. |
| 20444 | + libext=lib |
| 20445 | + # Tell ltmain to make .dll files, not .so files. |
| 20446 | + shrext_cmds=".dll" |
| 20447 | + # FIXME: Setting linknames here is a bad hack. |
| 20448 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
| 20449 | + # The linker will automatically build a .lib file if we build a DLL. |
| 20450 | + old_archive_from_new_cmds='true' |
| 20451 | + # FIXME: Should let the user specify the lib program. |
| 20452 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
| 20453 | + enable_shared_with_static_runtimes=yes |
| 20454 | + ;; |
| 20455 | + esac |
| 20456 | ;; |
| 20457 | |
| 20458 | darwin* | rhapsody*) |
| 20459 | @@ -8628,7 +9211,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 20460 | |
| 20461 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
| 20462 | freebsd* | dragonfly*) |
| 20463 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
| 20464 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
| 20465 | hardcode_libdir_flag_spec='-R$libdir' |
| 20466 | hardcode_direct=yes |
| 20467 | hardcode_shlibpath_var=no |
| 20468 | @@ -8636,7 +9219,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 20469 | |
| 20470 | hpux9*) |
| 20471 | if test "$GCC" = yes; then |
| 20472 | - 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' |
| 20473 | + 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' |
| 20474 | else |
| 20475 | 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' |
| 20476 | fi |
| 20477 | @@ -8652,7 +9235,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 20478 | |
| 20479 | hpux10*) |
| 20480 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
| 20481 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 20482 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 20483 | else |
| 20484 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
| 20485 | fi |
| 20486 | @@ -8676,10 +9259,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 20487 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 20488 | ;; |
| 20489 | ia64*) |
| 20490 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 20491 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
| 20492 | ;; |
| 20493 | *) |
| 20494 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 20495 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
| 20496 | ;; |
| 20497 | esac |
| 20498 | else |
| 20499 | @@ -8758,26 +9341,39 @@ fi |
| 20500 | |
| 20501 | irix5* | irix6* | nonstopux*) |
| 20502 | if test "$GCC" = yes; then |
| 20503 | - 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' |
| 20504 | + 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' |
| 20505 | # Try to use the -exported_symbol ld option, if it does not |
| 20506 | # work, assume that -exports_file does not work either and |
| 20507 | # implicitly export all symbols. |
| 20508 | - save_LDFLAGS="$LDFLAGS" |
| 20509 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 20510 | - if test x$gcc_no_link = xyes; then |
| 20511 | + # This should be the same for all languages, so no per-tag cache variable. |
| 20512 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
| 20513 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
| 20514 | +if test "${lt_cv_irix_exported_symbol+set}" = set; then : |
| 20515 | + $as_echo_n "(cached) " >&6 |
| 20516 | +else |
| 20517 | + save_LDFLAGS="$LDFLAGS" |
| 20518 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
| 20519 | + if test x$gcc_no_link = xyes; then |
| 20520 | as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 |
| 20521 | fi |
| 20522 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 20523 | /* end confdefs.h. */ |
| 20524 | -int foo(void) {} |
| 20525 | +int foo (void) { return 0; } |
| 20526 | _ACEOF |
| 20527 | if ac_fn_c_try_link "$LINENO"; then : |
| 20528 | - 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' |
| 20529 | - |
| 20530 | + lt_cv_irix_exported_symbol=yes |
| 20531 | +else |
| 20532 | + lt_cv_irix_exported_symbol=no |
| 20533 | fi |
| 20534 | rm -f core conftest.err conftest.$ac_objext \ |
| 20535 | conftest$ac_exeext conftest.$ac_ext |
| 20536 | - LDFLAGS="$save_LDFLAGS" |
| 20537 | + LDFLAGS="$save_LDFLAGS" |
| 20538 | +fi |
| 20539 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
| 20540 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
| 20541 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
| 20542 | + 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' |
| 20543 | + fi |
| 20544 | else |
| 20545 | 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' |
| 20546 | 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' |
| 20547 | @@ -8862,7 +9458,7 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 20548 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
| 20549 | if test "$GCC" = yes; then |
| 20550 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
| 20551 | - 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' |
| 20552 | + 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' |
| 20553 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
| 20554 | else |
| 20555 | allow_undefined_flag=' -expect_unresolved \*' |
| 20556 | @@ -8881,9 +9477,9 @@ rm -f core conftest.err conftest.$ac_objext \ |
| 20557 | no_undefined_flag=' -z defs' |
| 20558 | if test "$GCC" = yes; then |
| 20559 | wlarc='${wl}' |
| 20560 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 20561 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
| 20562 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
| 20563 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
| 20564 | + $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' |
| 20565 | else |
| 20566 | case `$CC -V 2>&1` in |
| 20567 | *"Compilers 5.0"*) |
| 20568 | @@ -9459,8 +10055,9 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 20569 | need_version=no |
| 20570 | need_lib_prefix=no |
| 20571 | |
| 20572 | - case $GCC,$host_os in |
| 20573 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
| 20574 | + case $GCC,$cc_basename in |
| 20575 | + yes,*) |
| 20576 | + # gcc |
| 20577 | library_names_spec='$libname.dll.a' |
| 20578 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 20579 | postinstall_cmds='base_file=`basename \${file}`~ |
| 20580 | @@ -9493,13 +10090,71 @@ cygwin* | mingw* | pw32* | cegcc*) |
| 20581 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 20582 | ;; |
| 20583 | esac |
| 20584 | + dynamic_linker='Win32 ld.exe' |
| 20585 | + ;; |
| 20586 | + |
| 20587 | + *,cl*) |
| 20588 | + # Native MSVC |
| 20589 | + libname_spec='$name' |
| 20590 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
| 20591 | + library_names_spec='${libname}.dll.lib' |
| 20592 | + |
| 20593 | + case $build_os in |
| 20594 | + mingw*) |
| 20595 | + sys_lib_search_path_spec= |
| 20596 | + lt_save_ifs=$IFS |
| 20597 | + IFS=';' |
| 20598 | + for lt_path in $LIB |
| 20599 | + do |
| 20600 | + IFS=$lt_save_ifs |
| 20601 | + # Let DOS variable expansion print the short 8.3 style file name. |
| 20602 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
| 20603 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
| 20604 | + done |
| 20605 | + IFS=$lt_save_ifs |
| 20606 | + # Convert to MSYS style. |
| 20607 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
| 20608 | + ;; |
| 20609 | + cygwin*) |
| 20610 | + # Convert to unix form, then to dos form, then back to unix form |
| 20611 | + # but this time dos style (no spaces!) so that the unix form looks |
| 20612 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
| 20613 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
| 20614 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
| 20615 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 20616 | + ;; |
| 20617 | + *) |
| 20618 | + sys_lib_search_path_spec="$LIB" |
| 20619 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
| 20620 | + # It is most probably a Windows format PATH. |
| 20621 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
| 20622 | + else |
| 20623 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
| 20624 | + fi |
| 20625 | + # FIXME: find the short name or the path components, as spaces are |
| 20626 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
| 20627 | + ;; |
| 20628 | + esac |
| 20629 | + |
| 20630 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
| 20631 | + postinstall_cmds='base_file=`basename \${file}`~ |
| 20632 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
| 20633 | + dldir=$destdir/`dirname \$dlpath`~ |
| 20634 | + test -d \$dldir || mkdir -p \$dldir~ |
| 20635 | + $install_prog $dir/$dlname \$dldir/$dlname' |
| 20636 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
| 20637 | + dlpath=$dir/\$dldll~ |
| 20638 | + $RM \$dlpath' |
| 20639 | + shlibpath_overrides_runpath=yes |
| 20640 | + dynamic_linker='Win32 link.exe' |
| 20641 | ;; |
| 20642 | |
| 20643 | *) |
| 20644 | + # Assume MSVC wrapper |
| 20645 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
| 20646 | + dynamic_linker='Win32 ld.exe' |
| 20647 | ;; |
| 20648 | esac |
| 20649 | - dynamic_linker='Win32 ld.exe' |
| 20650 | # FIXME: first we should search . and the directory the executable is in |
| 20651 | shlibpath_var=PATH |
| 20652 | ;; |
| 20653 | @@ -9591,7 +10246,7 @@ haiku*) |
| 20654 | soname_spec='${libname}${release}${shared_ext}$major' |
| 20655 | shlibpath_var=LIBRARY_PATH |
| 20656 | shlibpath_overrides_runpath=yes |
| 20657 | - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' |
| 20658 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
| 20659 | hardcode_into_libs=yes |
| 20660 | ;; |
| 20661 | |
| 20662 | @@ -10405,7 +11060,7 @@ else |
| 20663 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 20664 | lt_status=$lt_dlunknown |
| 20665 | cat > conftest.$ac_ext <<_LT_EOF |
| 20666 | -#line 10408 "configure" |
| 20667 | +#line $LINENO "configure" |
| 20668 | #include "confdefs.h" |
| 20669 | |
| 20670 | #if HAVE_DLFCN_H |
| 20671 | @@ -10449,10 +11104,10 @@ else |
| 20672 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 20673 | correspondingly for the symbols needed. */ |
| 20674 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 20675 | -void fnord () __attribute__((visibility("default"))); |
| 20676 | +int fnord () __attribute__((visibility("default"))); |
| 20677 | #endif |
| 20678 | |
| 20679 | -void fnord () { int i=42; } |
| 20680 | +int fnord () { return 42; } |
| 20681 | int main () |
| 20682 | { |
| 20683 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 20684 | @@ -10511,7 +11166,7 @@ else |
| 20685 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 20686 | lt_status=$lt_dlunknown |
| 20687 | cat > conftest.$ac_ext <<_LT_EOF |
| 20688 | -#line 10514 "configure" |
| 20689 | +#line $LINENO "configure" |
| 20690 | #include "confdefs.h" |
| 20691 | |
| 20692 | #if HAVE_DLFCN_H |
| 20693 | @@ -10555,10 +11210,10 @@ else |
| 20694 | /* When -fvisbility=hidden is used, assume the code has been annotated |
| 20695 | correspondingly for the symbols needed. */ |
| 20696 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
| 20697 | -void fnord () __attribute__((visibility("default"))); |
| 20698 | +int fnord () __attribute__((visibility("default"))); |
| 20699 | #endif |
| 20700 | |
| 20701 | -void fnord () { int i=42; } |
| 20702 | +int fnord () { return 42; } |
| 20703 | int main () |
| 20704 | { |
| 20705 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
| 20706 | @@ -11990,13 +12645,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
| 20707 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
| 20708 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
| 20709 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
| 20710 | +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 20711 | +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
| 20712 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
| 20713 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
| 20714 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
| 20715 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
| 20716 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
| 20717 | +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
| 20718 | +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
| 20719 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
| 20720 | +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
| 20721 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
| 20722 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
| 20723 | +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
| 20724 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
| 20725 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
| 20726 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
| 20727 | @@ -12011,14 +12673,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de |
| 20728 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
| 20729 | lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' |
| 20730 | 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"`' |
| 20731 | +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 20732 | +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
| 20733 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
| 20734 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
| 20735 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
| 20736 | -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 20737 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
| 20738 | +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
| 20739 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
| 20740 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
| 20741 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
| 20742 | +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
| 20743 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
| 20744 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
| 20745 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
| 20746 | @@ -12051,12 +12716,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q |
| 20747 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
| 20748 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
| 20749 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
| 20750 | -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' |
| 20751 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
| 20752 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
| 20753 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
| 20754 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
| 20755 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
| 20756 | +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
| 20757 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
| 20758 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
| 20759 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
| 20760 | @@ -12111,8 +12776,13 @@ reload_flag \ |
| 20761 | OBJDUMP \ |
| 20762 | deplibs_check_method \ |
| 20763 | file_magic_cmd \ |
| 20764 | +file_magic_glob \ |
| 20765 | +want_nocaseglob \ |
| 20766 | +DLLTOOL \ |
| 20767 | +sharedlib_from_linklib_cmd \ |
| 20768 | AR \ |
| 20769 | AR_FLAGS \ |
| 20770 | +archiver_list_spec \ |
| 20771 | STRIP \ |
| 20772 | RANLIB \ |
| 20773 | CC \ |
| 20774 | @@ -12122,12 +12792,14 @@ lt_cv_sys_global_symbol_pipe \ |
| 20775 | lt_cv_sys_global_symbol_to_cdecl \ |
| 20776 | lt_cv_sys_global_symbol_to_c_name_address \ |
| 20777 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
| 20778 | +nm_file_list_spec \ |
| 20779 | lt_prog_compiler_no_builtin_flag \ |
| 20780 | -lt_prog_compiler_wl \ |
| 20781 | lt_prog_compiler_pic \ |
| 20782 | +lt_prog_compiler_wl \ |
| 20783 | lt_prog_compiler_static \ |
| 20784 | lt_cv_prog_compiler_c_o \ |
| 20785 | need_locks \ |
| 20786 | +MANIFEST_TOOL \ |
| 20787 | DSYMUTIL \ |
| 20788 | NMEDIT \ |
| 20789 | LIPO \ |
| 20790 | @@ -12143,7 +12815,6 @@ no_undefined_flag \ |
| 20791 | hardcode_libdir_flag_spec \ |
| 20792 | hardcode_libdir_flag_spec_ld \ |
| 20793 | hardcode_libdir_separator \ |
| 20794 | -fix_srcfile_path \ |
| 20795 | exclude_expsyms \ |
| 20796 | include_expsyms \ |
| 20797 | file_list_spec \ |
| 20798 | @@ -12179,6 +12850,7 @@ module_cmds \ |
| 20799 | module_expsym_cmds \ |
| 20800 | export_symbols_cmds \ |
| 20801 | prelink_cmds \ |
| 20802 | +postlink_cmds \ |
| 20803 | postinstall_cmds \ |
| 20804 | postuninstall_cmds \ |
| 20805 | finish_cmds \ |
| 20806 | @@ -12768,7 +13440,8 @@ $as_echo X"$file" | |
| 20807 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 20808 | # |
| 20809 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
| 20810 | -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
| 20811 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
| 20812 | +# Inc. |
| 20813 | # Written by Gordon Matzigkeit, 1996 |
| 20814 | # |
| 20815 | # This file is part of GNU Libtool. |
| 20816 | @@ -12871,19 +13544,42 @@ SP2NL=$lt_lt_SP2NL |
| 20817 | # turn newlines into spaces. |
| 20818 | NL2SP=$lt_lt_NL2SP |
| 20819 | |
| 20820 | +# convert \$build file names to \$host format. |
| 20821 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
| 20822 | + |
| 20823 | +# convert \$build files to toolchain format. |
| 20824 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
| 20825 | + |
| 20826 | # An object symbol dumper. |
| 20827 | OBJDUMP=$lt_OBJDUMP |
| 20828 | |
| 20829 | # Method to check whether dependent libraries are shared objects. |
| 20830 | deplibs_check_method=$lt_deplibs_check_method |
| 20831 | |
| 20832 | -# Command to use when deplibs_check_method == "file_magic". |
| 20833 | +# Command to use when deplibs_check_method = "file_magic". |
| 20834 | file_magic_cmd=$lt_file_magic_cmd |
| 20835 | |
| 20836 | +# How to find potential files when deplibs_check_method = "file_magic". |
| 20837 | +file_magic_glob=$lt_file_magic_glob |
| 20838 | + |
| 20839 | +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". |
| 20840 | +want_nocaseglob=$lt_want_nocaseglob |
| 20841 | + |
| 20842 | +# DLL creation program. |
| 20843 | +DLLTOOL=$lt_DLLTOOL |
| 20844 | + |
| 20845 | +# Command to associate shared and link libraries. |
| 20846 | +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd |
| 20847 | + |
| 20848 | # The archiver. |
| 20849 | AR=$lt_AR |
| 20850 | + |
| 20851 | +# Flags to create an archive. |
| 20852 | AR_FLAGS=$lt_AR_FLAGS |
| 20853 | |
| 20854 | +# How to feed a file listing to the archiver. |
| 20855 | +archiver_list_spec=$lt_archiver_list_spec |
| 20856 | + |
| 20857 | # A symbol stripping program. |
| 20858 | STRIP=$lt_STRIP |
| 20859 | |
| 20860 | @@ -12913,6 +13609,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address |
| 20861 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
| 20862 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
| 20863 | |
| 20864 | +# Specify filename containing input files for \$NM. |
| 20865 | +nm_file_list_spec=$lt_nm_file_list_spec |
| 20866 | + |
| 20867 | +# The root where to search for dependent libraries,and in which our libraries should be installed. |
| 20868 | +lt_sysroot=$lt_sysroot |
| 20869 | + |
| 20870 | # The name of the directory that contains temporary libtool files. |
| 20871 | objdir=$objdir |
| 20872 | |
| 20873 | @@ -12922,6 +13624,9 @@ MAGIC_CMD=$MAGIC_CMD |
| 20874 | # Must we lock files when doing compilation? |
| 20875 | need_locks=$lt_need_locks |
| 20876 | |
| 20877 | +# Manifest tool. |
| 20878 | +MANIFEST_TOOL=$lt_MANIFEST_TOOL |
| 20879 | + |
| 20880 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
| 20881 | DSYMUTIL=$lt_DSYMUTIL |
| 20882 | |
| 20883 | @@ -13036,12 +13741,12 @@ with_gcc=$GCC |
| 20884 | # Compiler flag to turn off builtin functions. |
| 20885 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
| 20886 | |
| 20887 | -# How to pass a linker flag through the compiler. |
| 20888 | -wl=$lt_lt_prog_compiler_wl |
| 20889 | - |
| 20890 | # Additional compiler flags for building library objects. |
| 20891 | pic_flag=$lt_lt_prog_compiler_pic |
| 20892 | |
| 20893 | +# How to pass a linker flag through the compiler. |
| 20894 | +wl=$lt_lt_prog_compiler_wl |
| 20895 | + |
| 20896 | # Compiler flag to prevent dynamic linking. |
| 20897 | link_static_flag=$lt_lt_prog_compiler_static |
| 20898 | |
| 20899 | @@ -13128,9 +13833,6 @@ inherit_rpath=$inherit_rpath |
| 20900 | # Whether libtool must link a program against all its dependency libraries. |
| 20901 | link_all_deplibs=$link_all_deplibs |
| 20902 | |
| 20903 | -# Fix the shell variable \$srcfile for the compiler. |
| 20904 | -fix_srcfile_path=$lt_fix_srcfile_path |
| 20905 | - |
| 20906 | # Set to "yes" if exported symbols are required. |
| 20907 | always_export_symbols=$always_export_symbols |
| 20908 | |
| 20909 | @@ -13146,6 +13848,9 @@ include_expsyms=$lt_include_expsyms |
| 20910 | # Commands necessary for linking programs (against libraries) with templates. |
| 20911 | prelink_cmds=$lt_prelink_cmds |
| 20912 | |
| 20913 | +# Commands necessary for finishing linking programs. |
| 20914 | +postlink_cmds=$lt_postlink_cmds |
| 20915 | + |
| 20916 | # Specify filename containing input files. |
| 20917 | file_list_spec=$lt_file_list_spec |
| 20918 | |
| 20919 | @@ -13178,210 +13883,169 @@ ltmain="$ac_aux_dir/ltmain.sh" |
| 20920 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
| 20921 | # text mode, it properly converts lines to CR/LF. This bash problem |
| 20922 | # is reportedly fixed, but why not run on old versions too? |
| 20923 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
| 20924 | - || (rm -f "$cfgfile"; exit 1) |
| 20925 | - |
| 20926 | - case $xsi_shell in |
| 20927 | - yes) |
| 20928 | - cat << \_LT_EOF >> "$cfgfile" |
| 20929 | - |
| 20930 | -# func_dirname file append nondir_replacement |
| 20931 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 20932 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 20933 | -func_dirname () |
| 20934 | -{ |
| 20935 | - case ${1} in |
| 20936 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 20937 | - * ) func_dirname_result="${3}" ;; |
| 20938 | - esac |
| 20939 | -} |
| 20940 | - |
| 20941 | -# func_basename file |
| 20942 | -func_basename () |
| 20943 | -{ |
| 20944 | - func_basename_result="${1##*/}" |
| 20945 | -} |
| 20946 | - |
| 20947 | -# func_dirname_and_basename file append nondir_replacement |
| 20948 | -# perform func_basename and func_dirname in a single function |
| 20949 | -# call: |
| 20950 | -# dirname: Compute the dirname of FILE. If nonempty, |
| 20951 | -# add APPEND to the result, otherwise set result |
| 20952 | -# to NONDIR_REPLACEMENT. |
| 20953 | -# value returned in "$func_dirname_result" |
| 20954 | -# basename: Compute filename of FILE. |
| 20955 | -# value retuned in "$func_basename_result" |
| 20956 | -# Implementation must be kept synchronized with func_dirname |
| 20957 | -# and func_basename. For efficiency, we do not delegate to |
| 20958 | -# those functions but instead duplicate the functionality here. |
| 20959 | -func_dirname_and_basename () |
| 20960 | -{ |
| 20961 | - case ${1} in |
| 20962 | - */*) func_dirname_result="${1%/*}${2}" ;; |
| 20963 | - * ) func_dirname_result="${3}" ;; |
| 20964 | - esac |
| 20965 | - func_basename_result="${1##*/}" |
| 20966 | -} |
| 20967 | - |
| 20968 | -# func_stripname prefix suffix name |
| 20969 | -# strip PREFIX and SUFFIX off of NAME. |
| 20970 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 20971 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 20972 | -# dot (in which case that matches only a dot). |
| 20973 | -func_stripname () |
| 20974 | -{ |
| 20975 | - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are |
| 20976 | - # positional parameters, so assign one to ordinary parameter first. |
| 20977 | - func_stripname_result=${3} |
| 20978 | - func_stripname_result=${func_stripname_result#"${1}"} |
| 20979 | - func_stripname_result=${func_stripname_result%"${2}"} |
| 20980 | -} |
| 20981 | - |
| 20982 | -# func_opt_split |
| 20983 | -func_opt_split () |
| 20984 | -{ |
| 20985 | - func_opt_split_opt=${1%%=*} |
| 20986 | - func_opt_split_arg=${1#*=} |
| 20987 | -} |
| 20988 | - |
| 20989 | -# func_lo2o object |
| 20990 | -func_lo2o () |
| 20991 | -{ |
| 20992 | - case ${1} in |
| 20993 | - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; |
| 20994 | - *) func_lo2o_result=${1} ;; |
| 20995 | - esac |
| 20996 | -} |
| 20997 | - |
| 20998 | -# func_xform libobj-or-source |
| 20999 | -func_xform () |
| 21000 | -{ |
| 21001 | - func_xform_result=${1%.*}.lo |
| 21002 | -} |
| 21003 | - |
| 21004 | -# func_arith arithmetic-term... |
| 21005 | -func_arith () |
| 21006 | -{ |
| 21007 | - func_arith_result=$(( $* )) |
| 21008 | -} |
| 21009 | - |
| 21010 | -# func_len string |
| 21011 | -# STRING may not start with a hyphen. |
| 21012 | -func_len () |
| 21013 | -{ |
| 21014 | - func_len_result=${#1} |
| 21015 | -} |
| 21016 | - |
| 21017 | -_LT_EOF |
| 21018 | - ;; |
| 21019 | - *) # Bourne compatible functions. |
| 21020 | - cat << \_LT_EOF >> "$cfgfile" |
| 21021 | - |
| 21022 | -# func_dirname file append nondir_replacement |
| 21023 | -# Compute the dirname of FILE. If nonempty, add APPEND to the result, |
| 21024 | -# otherwise set result to NONDIR_REPLACEMENT. |
| 21025 | -func_dirname () |
| 21026 | -{ |
| 21027 | - # Extract subdirectory from the argument. |
| 21028 | - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
| 21029 | - if test "X$func_dirname_result" = "X${1}"; then |
| 21030 | - func_dirname_result="${3}" |
| 21031 | - else |
| 21032 | - func_dirname_result="$func_dirname_result${2}" |
| 21033 | - fi |
| 21034 | -} |
| 21035 | - |
| 21036 | -# func_basename file |
| 21037 | -func_basename () |
| 21038 | -{ |
| 21039 | - func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
| 21040 | -} |
| 21041 | - |
| 21042 | - |
| 21043 | -# func_stripname prefix suffix name |
| 21044 | -# strip PREFIX and SUFFIX off of NAME. |
| 21045 | -# PREFIX and SUFFIX must not contain globbing or regex special |
| 21046 | -# characters, hashes, percent signs, but SUFFIX may contain a leading |
| 21047 | -# dot (in which case that matches only a dot). |
| 21048 | -# func_strip_suffix prefix name |
| 21049 | -func_stripname () |
| 21050 | -{ |
| 21051 | - case ${2} in |
| 21052 | - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
| 21053 | - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
| 21054 | - esac |
| 21055 | -} |
| 21056 | - |
| 21057 | -# sed scripts: |
| 21058 | -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' |
| 21059 | -my_sed_long_arg='1s/^-[^=]*=//' |
| 21060 | - |
| 21061 | -# func_opt_split |
| 21062 | -func_opt_split () |
| 21063 | -{ |
| 21064 | - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
| 21065 | - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
| 21066 | -} |
| 21067 | - |
| 21068 | -# func_lo2o object |
| 21069 | -func_lo2o () |
| 21070 | -{ |
| 21071 | - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
| 21072 | -} |
| 21073 | - |
| 21074 | -# func_xform libobj-or-source |
| 21075 | -func_xform () |
| 21076 | -{ |
| 21077 | - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` |
| 21078 | -} |
| 21079 | - |
| 21080 | -# func_arith arithmetic-term... |
| 21081 | -func_arith () |
| 21082 | -{ |
| 21083 | - func_arith_result=`expr "$@"` |
| 21084 | -} |
| 21085 | - |
| 21086 | -# func_len string |
| 21087 | -# STRING may not start with a hyphen. |
| 21088 | -func_len () |
| 21089 | -{ |
| 21090 | - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` |
| 21091 | -} |
| 21092 | - |
| 21093 | -_LT_EOF |
| 21094 | -esac |
| 21095 | - |
| 21096 | -case $lt_shell_append in |
| 21097 | - yes) |
| 21098 | - cat << \_LT_EOF >> "$cfgfile" |
| 21099 | - |
| 21100 | -# func_append var value |
| 21101 | -# Append VALUE to the end of shell variable VAR. |
| 21102 | -func_append () |
| 21103 | -{ |
| 21104 | - eval "$1+=\$2" |
| 21105 | -} |
| 21106 | -_LT_EOF |
| 21107 | - ;; |
| 21108 | - *) |
| 21109 | - cat << \_LT_EOF >> "$cfgfile" |
| 21110 | - |
| 21111 | -# func_append var value |
| 21112 | -# Append VALUE to the end of shell variable VAR. |
| 21113 | -func_append () |
| 21114 | -{ |
| 21115 | - eval "$1=\$$1\$2" |
| 21116 | -} |
| 21117 | - |
| 21118 | -_LT_EOF |
| 21119 | - ;; |
| 21120 | - esac |
| 21121 | - |
| 21122 | - |
| 21123 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
| 21124 | - || (rm -f "$cfgfile"; exit 1) |
| 21125 | - |
| 21126 | - mv -f "$cfgfile" "$ofile" || |
| 21127 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
| 21128 | + || (rm -f "$cfgfile"; exit 1) |
| 21129 | + |
| 21130 | + if test x"$xsi_shell" = xyes; then |
| 21131 | + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
| 21132 | +func_dirname ()\ |
| 21133 | +{\ |
| 21134 | +\ case ${1} in\ |
| 21135 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 21136 | +\ * ) func_dirname_result="${3}" ;;\ |
| 21137 | +\ esac\ |
| 21138 | +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21139 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21140 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21141 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21142 | + |
| 21143 | + |
| 21144 | + sed -e '/^func_basename ()$/,/^} # func_basename /c\ |
| 21145 | +func_basename ()\ |
| 21146 | +{\ |
| 21147 | +\ func_basename_result="${1##*/}"\ |
| 21148 | +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21149 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21150 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21151 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21152 | + |
| 21153 | + |
| 21154 | + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ |
| 21155 | +func_dirname_and_basename ()\ |
| 21156 | +{\ |
| 21157 | +\ case ${1} in\ |
| 21158 | +\ */*) func_dirname_result="${1%/*}${2}" ;;\ |
| 21159 | +\ * ) func_dirname_result="${3}" ;;\ |
| 21160 | +\ esac\ |
| 21161 | +\ func_basename_result="${1##*/}"\ |
| 21162 | +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21163 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21164 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21165 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21166 | + |
| 21167 | + |
| 21168 | + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ |
| 21169 | +func_stripname ()\ |
| 21170 | +{\ |
| 21171 | +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ |
| 21172 | +\ # positional parameters, so assign one to ordinary parameter first.\ |
| 21173 | +\ func_stripname_result=${3}\ |
| 21174 | +\ func_stripname_result=${func_stripname_result#"${1}"}\ |
| 21175 | +\ func_stripname_result=${func_stripname_result%"${2}"}\ |
| 21176 | +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21177 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21178 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21179 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21180 | + |
| 21181 | + |
| 21182 | + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ |
| 21183 | +func_split_long_opt ()\ |
| 21184 | +{\ |
| 21185 | +\ func_split_long_opt_name=${1%%=*}\ |
| 21186 | +\ func_split_long_opt_arg=${1#*=}\ |
| 21187 | +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21188 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21189 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21190 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21191 | + |
| 21192 | + |
| 21193 | + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ |
| 21194 | +func_split_short_opt ()\ |
| 21195 | +{\ |
| 21196 | +\ func_split_short_opt_arg=${1#??}\ |
| 21197 | +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ |
| 21198 | +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21199 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21200 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21201 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21202 | + |
| 21203 | + |
| 21204 | + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ |
| 21205 | +func_lo2o ()\ |
| 21206 | +{\ |
| 21207 | +\ case ${1} in\ |
| 21208 | +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ |
| 21209 | +\ *) func_lo2o_result=${1} ;;\ |
| 21210 | +\ esac\ |
| 21211 | +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21212 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21213 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21214 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21215 | + |
| 21216 | + |
| 21217 | + sed -e '/^func_xform ()$/,/^} # func_xform /c\ |
| 21218 | +func_xform ()\ |
| 21219 | +{\ |
| 21220 | + func_xform_result=${1%.*}.lo\ |
| 21221 | +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21222 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21223 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21224 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21225 | + |
| 21226 | + |
| 21227 | + sed -e '/^func_arith ()$/,/^} # func_arith /c\ |
| 21228 | +func_arith ()\ |
| 21229 | +{\ |
| 21230 | + func_arith_result=$(( $* ))\ |
| 21231 | +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21232 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21233 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21234 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21235 | + |
| 21236 | + |
| 21237 | + sed -e '/^func_len ()$/,/^} # func_len /c\ |
| 21238 | +func_len ()\ |
| 21239 | +{\ |
| 21240 | + func_len_result=${#1}\ |
| 21241 | +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21242 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21243 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21244 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21245 | + |
| 21246 | +fi |
| 21247 | + |
| 21248 | +if test x"$lt_shell_append" = xyes; then |
| 21249 | + sed -e '/^func_append ()$/,/^} # func_append /c\ |
| 21250 | +func_append ()\ |
| 21251 | +{\ |
| 21252 | + eval "${1}+=\\${2}"\ |
| 21253 | +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21254 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21255 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21256 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21257 | + |
| 21258 | + |
| 21259 | + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ |
| 21260 | +func_append_quoted ()\ |
| 21261 | +{\ |
| 21262 | +\ func_quote_for_eval "${2}"\ |
| 21263 | +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ |
| 21264 | +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ |
| 21265 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21266 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21267 | +test 0 -eq $? || _lt_function_replace_fail=: |
| 21268 | + |
| 21269 | + |
| 21270 | + # Save a `func_append' function call where possible by direct use of '+=' |
| 21271 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ |
| 21272 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21273 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21274 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 21275 | +else |
| 21276 | + # Save a `func_append' function call even when '+=' is not available |
| 21277 | + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ |
| 21278 | + && mv -f "$cfgfile.tmp" "$cfgfile" \ |
| 21279 | + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
| 21280 | + test 0 -eq $? || _lt_function_replace_fail=: |
| 21281 | +fi |
| 21282 | + |
| 21283 | +if test x"$_lt_function_replace_fail" = x":"; then |
| 21284 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 |
| 21285 | +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} |
| 21286 | +fi |
| 21287 | + |
| 21288 | + |
| 21289 | + mv -f "$cfgfile" "$ofile" || |
| 21290 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
| 21291 | chmod +x "$ofile" |
| 21292 | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 21293 | -- |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 21294 | 2.7.1 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 21295 | |