diff options
author | Christian Grothoff <christian@grothoff.org> | 2009-08-21 08:41:21 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2009-08-21 08:41:21 +0000 |
commit | 9a10e9c06a3b08c8ab73edb7d2093a6d452ecc05 (patch) | |
tree | d9ee186c9f61fdc90f128cf39ed113112b21e8ec /m4 | |
parent | ab1934147f74c835b525864b770795f858e37b89 (diff) | |
download | gnunet-9a10e9c06a3b08c8ab73edb7d2093a6d452ecc05.tar.gz gnunet-9a10e9c06a3b08c8ab73edb7d2093a6d452ecc05.zip |
fixes
Diffstat (limited to 'm4')
-rw-r--r-- | m4/libtool.m4 | 27 | ||||
-rw-r--r-- | m4/ltdl.m4 | 2 |
2 files changed, 24 insertions, 5 deletions
diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 39ba996cb..1e7ea47c0 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 | |||
@@ -2485,6 +2485,18 @@ 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 | |||
2488 | netbsd*) | 2500 | netbsd*) |
2489 | version_type=sunos | 2501 | version_type=sunos |
2490 | need_lib_prefix=no | 2502 | need_lib_prefix=no |
@@ -3076,7 +3088,7 @@ linux* | k*bsd*-gnu) | |||
3076 | lt_cv_deplibs_check_method=pass_all | 3088 | lt_cv_deplibs_check_method=pass_all |
3077 | ;; | 3089 | ;; |
3078 | 3090 | ||
3079 | netbsd*) | 3091 | netbsd* | netbsdelf*-gnu) |
3080 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then | 3092 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
3081 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' | 3093 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' |
3082 | else | 3094 | else |
@@ -3757,7 +3769,7 @@ m4_if([$1], [CXX], [ | |||
3757 | ;; | 3769 | ;; |
3758 | esac | 3770 | esac |
3759 | ;; | 3771 | ;; |
3760 | netbsd*) | 3772 | netbsd* | netbsdelf*-gnu) |
3761 | ;; | 3773 | ;; |
3762 | *qnx* | *nto*) | 3774 | *qnx* | *nto*) |
3763 | # QNX uses GNU C++, but need to define -shared option too, otherwise | 3775 | # QNX uses GNU C++, but need to define -shared option too, otherwise |
@@ -4182,6 +4194,9 @@ m4_if([$1], [CXX], [ | |||
4182 | cygwin* | mingw* | cegcc*) | 4194 | cygwin* | mingw* | cegcc*) |
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' | 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' |
4184 | ;; | 4196 | ;; |
4197 | linux* | k*bsd*-gnu) | ||
4198 | _LT_TAGVAR(link_all_deplibs, $1)=no | ||
4199 | ;; | ||
4185 | *) | 4200 | *) |
4186 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 4201 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
4187 | ;; | 4202 | ;; |
@@ -4246,6 +4261,9 @@ dnl Note also adjust exclude_expsyms for C++ above. | |||
4246 | openbsd*) | 4261 | openbsd*) |
4247 | with_gnu_ld=no | 4262 | with_gnu_ld=no |
4248 | ;; | 4263 | ;; |
4264 | linux* | k*bsd*-gnu) | ||
4265 | _LT_TAGVAR(link_all_deplibs, $1)=no | ||
4266 | ;; | ||
4249 | esac | 4267 | esac |
4250 | 4268 | ||
4251 | _LT_TAGVAR(ld_shlibs, $1)=yes | 4269 | _LT_TAGVAR(ld_shlibs, $1)=yes |
@@ -4428,7 +4446,7 @@ _LT_EOF | |||
4428 | fi | 4446 | fi |
4429 | ;; | 4447 | ;; |
4430 | 4448 | ||
4431 | netbsd*) | 4449 | netbsd* | netbsdelf*-gnu) |
4432 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | 4450 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
4433 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 4451 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
4434 | wlarc= | 4452 | wlarc= |
@@ -4603,6 +4621,7 @@ _LT_EOF | |||
4603 | if test "$aix_use_runtimelinking" = yes; then | 4621 | if test "$aix_use_runtimelinking" = yes; then |
4604 | shared_flag="$shared_flag "'${wl}-G' | 4622 | shared_flag="$shared_flag "'${wl}-G' |
4605 | fi | 4623 | fi |
4624 | _LT_TAGVAR(link_all_deplibs, $1)=no | ||
4606 | else | 4625 | else |
4607 | # not using gcc | 4626 | # not using gcc |
4608 | if test "$host_cpu" = ia64; then | 4627 | if test "$host_cpu" = ia64; then |
@@ -4841,7 +4860,7 @@ _LT_EOF | |||
4841 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 4860 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
4842 | ;; | 4861 | ;; |
4843 | 4862 | ||
4844 | netbsd*) | 4863 | netbsd* | netbsdelf*-gnu) |
4845 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | 4864 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
4846 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | 4865 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
4847 | else | 4866 | else |
diff --git a/m4/ltdl.m4 b/m4/ltdl.m4 index f6be54a94..46535e2e1 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*) | 490 | netbsd* | netbsdelf*-gnu) |
491 | lt_cv_sys_dlopen_deplibs=yes | 491 | lt_cv_sys_dlopen_deplibs=yes |
492 | ;; | 492 | ;; |
493 | openbsd*) | 493 | openbsd*) |