diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-07-12 11:47:22 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-07-12 11:47:22 +0000 |
commit | 89ef8d3391791ec7eb21f5d7ba1d35132e559ecb (patch) | |
tree | 5a23769cf5dc9a75b6c8ab29926b76c40cd59f41 /m4/libtool.m4 | |
parent | 72291fa29300f06bf324bfe72ae4b88ec7df1990 (diff) | |
download | gnunet-gtk-89ef8d3391791ec7eb21f5d7ba1d35132e559ecb.tar.gz gnunet-gtk-89ef8d3391791ec7eb21f5d7ba1d35132e559ecb.zip |
fixing 1453
Diffstat (limited to 'm4/libtool.m4')
-rw-r--r-- | m4/libtool.m4 | 40 |
1 files changed, 30 insertions, 10 deletions
diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 39ba996c..a3fee536 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 | |||
@@ -2445,7 +2445,7 @@ linux*oldld* | linux*aout* | linux*coff*) | |||
2445 | ;; | 2445 | ;; |
2446 | 2446 | ||
2447 | # This must be Linux ELF. | 2447 | # This must be Linux ELF. |
2448 | linux* | k*bsd*-gnu) | 2448 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2449 | version_type=linux | 2449 | version_type=linux |
2450 | need_lib_prefix=no | 2450 | need_lib_prefix=no |
2451 | need_version=no | 2451 | need_version=no |
@@ -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 |
@@ -3072,11 +3084,11 @@ irix5* | irix6* | nonstopux*) | |||
3072 | ;; | 3084 | ;; |
3073 | 3085 | ||
3074 | # This must be Linux ELF. | 3086 | # This must be Linux ELF. |
3075 | linux* | k*bsd*-gnu) | 3087 | linux* | k*bsd*-gnu | kopensolaris*-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 |
@@ -3693,7 +3705,7 @@ m4_if([$1], [CXX], [ | |||
3693 | ;; | 3705 | ;; |
3694 | esac | 3706 | esac |
3695 | ;; | 3707 | ;; |
3696 | linux* | k*bsd*-gnu) | 3708 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3697 | case $cc_basename in | 3709 | case $cc_basename in |
3698 | KCC*) | 3710 | KCC*) |
3699 | # KAI C++ Compiler | 3711 | # KAI C++ Compiler |
@@ -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 |
@@ -3977,7 +3989,7 @@ m4_if([$1], [CXX], [ | |||
3977 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' | 3989 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
3978 | ;; | 3990 | ;; |
3979 | 3991 | ||
3980 | linux* | k*bsd*-gnu) | 3992 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3981 | case $cc_basename in | 3993 | case $cc_basename in |
3982 | # old Intel for x86_64 which still supported -KPIC. | 3994 | # old Intel for x86_64 which still supported -KPIC. |
3983 | ecc*) | 3995 | ecc*) |
@@ -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 |
@@ -4267,6 +4285,7 @@ dnl Note also adjust exclude_expsyms for C++ above. | |||
4267 | fi | 4285 | fi |
4268 | supports_anon_versioning=no | 4286 | supports_anon_versioning=no |
4269 | case `$LD -v 2>&1` in | 4287 | case `$LD -v 2>&1` in |
4288 | *GNU\ gold*) supports_anon_versioning=yes ;; | ||
4270 | *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 | 4289 | *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 |
4271 | *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... | 4290 | *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
4272 | *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... | 4291 | *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... |
@@ -4358,7 +4377,7 @@ _LT_EOF | |||
4358 | _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' | 4377 | _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
4359 | ;; | 4378 | ;; |
4360 | 4379 | ||
4361 | gnu* | linux* | tpf* | k*bsd*-gnu) | 4380 | gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) |
4362 | tmp_diet=no | 4381 | tmp_diet=no |
4363 | if test "$host_os" = linux-dietlibc; then | 4382 | if test "$host_os" = linux-dietlibc; then |
4364 | case $cc_basename in | 4383 | case $cc_basename in |
@@ -4428,7 +4447,7 @@ _LT_EOF | |||
4428 | fi | 4447 | fi |
4429 | ;; | 4448 | ;; |
4430 | 4449 | ||
4431 | netbsd*) | 4450 | netbsd* | netbsdelf*-gnu) |
4432 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | 4451 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
4433 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 4452 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
4434 | wlarc= | 4453 | wlarc= |
@@ -4603,6 +4622,7 @@ _LT_EOF | |||
4603 | if test "$aix_use_runtimelinking" = yes; then | 4622 | if test "$aix_use_runtimelinking" = yes; then |
4604 | shared_flag="$shared_flag "'${wl}-G' | 4623 | shared_flag="$shared_flag "'${wl}-G' |
4605 | fi | 4624 | fi |
4625 | _LT_TAGVAR(link_all_deplibs, $1)=no | ||
4606 | else | 4626 | else |
4607 | # not using gcc | 4627 | # not using gcc |
4608 | if test "$host_cpu" = ia64; then | 4628 | if test "$host_cpu" = ia64; then |
@@ -4841,7 +4861,7 @@ _LT_EOF | |||
4841 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 4861 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
4842 | ;; | 4862 | ;; |
4843 | 4863 | ||
4844 | netbsd*) | 4864 | netbsd* | netbsdelf*-gnu) |
4845 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | 4865 | 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 | 4866 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
4847 | else | 4867 | else |
@@ -5841,7 +5861,7 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
5841 | _LT_TAGVAR(inherit_rpath, $1)=yes | 5861 | _LT_TAGVAR(inherit_rpath, $1)=yes |
5842 | ;; | 5862 | ;; |
5843 | 5863 | ||
5844 | linux* | k*bsd*-gnu) | 5864 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
5845 | case $cc_basename in | 5865 | case $cc_basename in |
5846 | KCC*) | 5866 | KCC*) |
5847 | # Kuck and Associates, Inc. (KAI) C++ Compiler | 5867 | # Kuck and Associates, Inc. (KAI) C++ Compiler |