diff options
Diffstat (limited to 'm4')
-rw-r--r-- | m4/libtool.m4 | 27 | ||||
-rw-r--r-- | m4/ltdl.m4 | 2 |
2 files changed, 5 insertions, 24 deletions
diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 1e7ea47c0..39ba996cb 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 | |||
@@ -2485,18 +2485,6 @@ linux* | k*bsd*-gnu) | |||
2485 | dynamic_linker='GNU/Linux ld.so' | 2485 | dynamic_linker='GNU/Linux ld.so' |
2486 | ;; | 2486 | ;; |
2487 | 2487 | ||
2488 | netbsdelf*-gnu) | ||
2489 | version_type=linux | ||
2490 | need_lib_prefix=no | ||
2491 | need_version=no | ||
2492 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
2493 | soname_spec='${libname}${release}${shared_ext}$major' | ||
2494 | shlibpath_var=LD_LIBRARY_PATH | ||
2495 | shlibpath_overrides_runpath=no | ||
2496 | hardcode_into_libs=yes | ||
2497 | dynamic_linker='NetBSD ld.elf_so' | ||
2498 | ;; | ||
2499 | |||
2500 | netbsd*) | 2488 | netbsd*) |
2501 | version_type=sunos | 2489 | version_type=sunos |
2502 | need_lib_prefix=no | 2490 | need_lib_prefix=no |
@@ -3088,7 +3076,7 @@ linux* | k*bsd*-gnu) | |||
3088 | lt_cv_deplibs_check_method=pass_all | 3076 | lt_cv_deplibs_check_method=pass_all |
3089 | ;; | 3077 | ;; |
3090 | 3078 | ||
3091 | netbsd* | netbsdelf*-gnu) | 3079 | netbsd*) |
3092 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then | 3080 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
3093 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' | 3081 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' |
3094 | else | 3082 | else |
@@ -3769,7 +3757,7 @@ m4_if([$1], [CXX], [ | |||
3769 | ;; | 3757 | ;; |
3770 | esac | 3758 | esac |
3771 | ;; | 3759 | ;; |
3772 | netbsd* | netbsdelf*-gnu) | 3760 | netbsd*) |
3773 | ;; | 3761 | ;; |
3774 | *qnx* | *nto*) | 3762 | *qnx* | *nto*) |
3775 | # QNX uses GNU C++, but need to define -shared option too, otherwise | 3763 | # QNX uses GNU C++, but need to define -shared option too, otherwise |
@@ -4194,9 +4182,6 @@ m4_if([$1], [CXX], [ | |||
4194 | cygwin* | mingw* | cegcc*) | 4182 | cygwin* | mingw* | cegcc*) |
4195 | _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' | 4183 | _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' |
4196 | ;; | 4184 | ;; |
4197 | linux* | k*bsd*-gnu) | ||
4198 | _LT_TAGVAR(link_all_deplibs, $1)=no | ||
4199 | ;; | ||
4200 | *) | 4185 | *) |
4201 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 4186 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
4202 | ;; | 4187 | ;; |
@@ -4261,9 +4246,6 @@ dnl Note also adjust exclude_expsyms for C++ above. | |||
4261 | openbsd*) | 4246 | openbsd*) |
4262 | with_gnu_ld=no | 4247 | with_gnu_ld=no |
4263 | ;; | 4248 | ;; |
4264 | linux* | k*bsd*-gnu) | ||
4265 | _LT_TAGVAR(link_all_deplibs, $1)=no | ||
4266 | ;; | ||
4267 | esac | 4249 | esac |
4268 | 4250 | ||
4269 | _LT_TAGVAR(ld_shlibs, $1)=yes | 4251 | _LT_TAGVAR(ld_shlibs, $1)=yes |
@@ -4446,7 +4428,7 @@ _LT_EOF | |||
4446 | fi | 4428 | fi |
4447 | ;; | 4429 | ;; |
4448 | 4430 | ||
4449 | netbsd* | netbsdelf*-gnu) | 4431 | netbsd*) |
4450 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | 4432 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
4451 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 4433 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
4452 | wlarc= | 4434 | wlarc= |
@@ -4621,7 +4603,6 @@ _LT_EOF | |||
4621 | if test "$aix_use_runtimelinking" = yes; then | 4603 | if test "$aix_use_runtimelinking" = yes; then |
4622 | shared_flag="$shared_flag "'${wl}-G' | 4604 | shared_flag="$shared_flag "'${wl}-G' |
4623 | fi | 4605 | fi |
4624 | _LT_TAGVAR(link_all_deplibs, $1)=no | ||
4625 | else | 4606 | else |
4626 | # not using gcc | 4607 | # not using gcc |
4627 | if test "$host_cpu" = ia64; then | 4608 | if test "$host_cpu" = ia64; then |
@@ -4860,7 +4841,7 @@ _LT_EOF | |||
4860 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 4841 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
4861 | ;; | 4842 | ;; |
4862 | 4843 | ||
4863 | netbsd* | netbsdelf*-gnu) | 4844 | netbsd*) |
4864 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | 4845 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
4865 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | 4846 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
4866 | else | 4847 | else |
diff --git a/m4/ltdl.m4 b/m4/ltdl.m4 index 46535e2e1..f6be54a94 100644 --- a/m4/ltdl.m4 +++ b/m4/ltdl.m4 | |||
@@ -487,7 +487,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen], | |||
487 | # at 6.2 and later dlopen does load deplibs. | 487 | # at 6.2 and later dlopen does load deplibs. |
488 | lt_cv_sys_dlopen_deplibs=yes | 488 | lt_cv_sys_dlopen_deplibs=yes |
489 | ;; | 489 | ;; |
490 | netbsd* | netbsdelf*-gnu) | 490 | netbsd*) |
491 | lt_cv_sys_dlopen_deplibs=yes | 491 | lt_cv_sys_dlopen_deplibs=yes |
492 | ;; | 492 | ;; |
493 | openbsd*) | 493 | openbsd*) |