| Index: m4/libtool.m4
|
| ===================================================================
|
| --- m4/libtool.m4 (revision 166547)
|
| +++ m4/libtool.m4 (working copy)
|
| @@ -2669,10 +2669,14 @@
|
| # before this can be enabled.
|
| hardcode_into_libs=yes
|
|
|
| + # Add ABI-specific directories to the system library path.
|
| + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
|
| +
|
| # Append ld.so.conf contents to the search path
|
| if test -f /etc/ld.so.conf; then
|
| lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
|
| - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
| + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
|
| +
|
| fi
|
|
|
| # We used to test for /lib/ld.so.1 and disable shared libraries on
|
| @@ -2684,18 +2688,6 @@
|
| dynamic_linker='GNU/Linux ld.so'
|
| ;;
|
|
|
| -netbsdelf*-gnu)
|
| - version_type=linux
|
| - need_lib_prefix=no
|
| - need_version=no
|
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
| - soname_spec='${libname}${release}${shared_ext}$major'
|
| - shlibpath_var=LD_LIBRARY_PATH
|
| - shlibpath_overrides_runpath=no
|
| - hardcode_into_libs=yes
|
| - dynamic_linker='NetBSD ld.elf_so'
|
| - ;;
|
| -
|
| netbsd*)
|
| version_type=sunos
|
| need_lib_prefix=no
|
| @@ -3301,7 +3293,7 @@
|
| lt_cv_deplibs_check_method=pass_all
|
| ;;
|
|
|
| -netbsd* | netbsdelf*-gnu)
|
| +netbsd*)
|
| if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
|
| lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
|
| else
|
| @@ -4113,7 +4105,7 @@
|
| ;;
|
| esac
|
| ;;
|
| - netbsd* | netbsdelf*-gnu)
|
| + netbsd*)
|
| ;;
|
| *qnx* | *nto*)
|
| # QNX uses GNU C++, but need to define -shared option too, otherwise
|
| @@ -4590,9 +4582,6 @@
|
| ;;
|
| esac
|
| ;;
|
| - linux* | k*bsd*-gnu | gnu*)
|
| - _LT_TAGVAR(link_all_deplibs, $1)=no
|
| - ;;
|
| *)
|
| _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
|
| ;;
|
| @@ -4655,9 +4644,6 @@
|
| openbsd*)
|
| with_gnu_ld=no
|
| ;;
|
| - linux* | k*bsd*-gnu | gnu*)
|
| - _LT_TAGVAR(link_all_deplibs, $1)=no
|
| - ;;
|
| esac
|
|
|
| _LT_TAGVAR(ld_shlibs, $1)=yes
|
| @@ -4879,7 +4865,7 @@
|
| fi
|
| ;;
|
|
|
| - netbsd* | netbsdelf*-gnu)
|
| + netbsd*)
|
| if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
| _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
|
| wlarc=
|
| @@ -5056,7 +5042,6 @@
|
| if test "$aix_use_runtimelinking" = yes; then
|
| shared_flag="$shared_flag "'${wl}-G'
|
| fi
|
| - _LT_TAGVAR(link_all_deplibs, $1)=no
|
| else
|
| # not using gcc
|
| if test "$host_cpu" = ia64; then
|
| @@ -5361,7 +5346,7 @@
|
| _LT_TAGVAR(link_all_deplibs, $1)=yes
|
| ;;
|
|
|
| - netbsd* | netbsdelf*-gnu)
|
| + netbsd*)
|
| if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
|
| _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
|
| else
|
|
|