diff options
Diffstat (limited to 'libltdl/aclocal.m4')
-rw-r--r-- | libltdl/aclocal.m4 | 72 |
1 files changed, 18 insertions, 54 deletions
diff --git a/libltdl/aclocal.m4 b/libltdl/aclocal.m4 index 8e09194b..4f3077ba 100644 --- a/libltdl/aclocal.m4 +++ b/libltdl/aclocal.m4 | |||
@@ -13,7 +13,7 @@ | |||
13 | 13 | ||
14 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- | 14 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
15 | 15 | ||
16 | # serial 48 Debian 1.5.22-2 AC_PROG_LIBTOOL | 16 | # serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL |
17 | 17 | ||
18 | 18 | ||
19 | # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) | 19 | # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) |
@@ -1397,18 +1397,6 @@ freebsd1*) | |||
1397 | dynamic_linker=no | 1397 | dynamic_linker=no |
1398 | ;; | 1398 | ;; |
1399 | 1399 | ||
1400 | kfreebsd*-gnu) | ||
1401 | version_type=linux | ||
1402 | need_lib_prefix=no | ||
1403 | need_version=no | ||
1404 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
1405 | soname_spec='${libname}${release}${shared_ext}$major' | ||
1406 | shlibpath_var=LD_LIBRARY_PATH | ||
1407 | shlibpath_overrides_runpath=no | ||
1408 | hardcode_into_libs=yes | ||
1409 | dynamic_linker='GNU ld.so' | ||
1410 | ;; | ||
1411 | |||
1412 | freebsd* | dragonfly*) | 1400 | freebsd* | dragonfly*) |
1413 | # DragonFly does not have aout. When/if they implement a new | 1401 | # DragonFly does not have aout. When/if they implement a new |
1414 | # versioning mechanism, adjust this. | 1402 | # versioning mechanism, adjust this. |
@@ -1564,7 +1552,7 @@ linux*oldld* | linux*aout* | linux*coff*) | |||
1564 | ;; | 1552 | ;; |
1565 | 1553 | ||
1566 | # This must be Linux ELF. | 1554 | # This must be Linux ELF. |
1567 | linux*) | 1555 | linux* | k*bsd*-gnu) |
1568 | version_type=linux | 1556 | version_type=linux |
1569 | need_lib_prefix=no | 1557 | need_lib_prefix=no |
1570 | need_version=no | 1558 | need_version=no |
@@ -1605,18 +1593,6 @@ netbsdelf*-gnu) | |||
1605 | dynamic_linker='NetBSD ld.elf_so' | 1593 | dynamic_linker='NetBSD ld.elf_so' |
1606 | ;; | 1594 | ;; |
1607 | 1595 | ||
1608 | knetbsd*-gnu) | ||
1609 | version_type=linux | ||
1610 | need_lib_prefix=no | ||
1611 | need_version=no | ||
1612 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
1613 | soname_spec='${libname}${release}${shared_ext}$major' | ||
1614 | shlibpath_var=LD_LIBRARY_PATH | ||
1615 | shlibpath_overrides_runpath=no | ||
1616 | hardcode_into_libs=yes | ||
1617 | dynamic_linker='GNU ld.so' | ||
1618 | ;; | ||
1619 | |||
1620 | netbsd*) | 1596 | netbsd*) |
1621 | version_type=sunos | 1597 | version_type=sunos |
1622 | need_lib_prefix=no | 1598 | need_lib_prefix=no |
@@ -2322,7 +2298,7 @@ darwin* | rhapsody*) | |||
2322 | lt_cv_deplibs_check_method=pass_all | 2298 | lt_cv_deplibs_check_method=pass_all |
2323 | ;; | 2299 | ;; |
2324 | 2300 | ||
2325 | freebsd* | kfreebsd*-gnu | dragonfly*) | 2301 | freebsd* | dragonfly*) |
2326 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | 2302 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |
2327 | case $host_cpu in | 2303 | case $host_cpu in |
2328 | i*86 ) | 2304 | i*86 ) |
@@ -2376,11 +2352,11 @@ irix5* | irix6* | nonstopux*) | |||
2376 | ;; | 2352 | ;; |
2377 | 2353 | ||
2378 | # This must be Linux ELF. | 2354 | # This must be Linux ELF. |
2379 | linux*) | 2355 | linux* | k*bsd*-gnu) |
2380 | lt_cv_deplibs_check_method=pass_all | 2356 | lt_cv_deplibs_check_method=pass_all |
2381 | ;; | 2357 | ;; |
2382 | 2358 | ||
2383 | netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | 2359 | netbsd* | netbsdelf*-gnu) |
2384 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | 2360 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |
2385 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' | 2361 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' |
2386 | else | 2362 | else |
@@ -3128,7 +3104,7 @@ case $host_os in | |||
3128 | freebsd-elf*) | 3104 | freebsd-elf*) |
3129 | _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no | 3105 | _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no |
3130 | ;; | 3106 | ;; |
3131 | freebsd* | kfreebsd*-gnu | dragonfly*) | 3107 | freebsd* | dragonfly*) |
3132 | # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF | 3108 | # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF |
3133 | # conventions | 3109 | # conventions |
3134 | _LT_AC_TAGVAR(ld_shlibs, $1)=yes | 3110 | _LT_AC_TAGVAR(ld_shlibs, $1)=yes |
@@ -3287,7 +3263,7 @@ case $host_os in | |||
3287 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 3263 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3288 | _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: | 3264 | _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: |
3289 | ;; | 3265 | ;; |
3290 | linux*) | 3266 | linux* | k*bsd*-gnu) |
3291 | case $cc_basename in | 3267 | case $cc_basename in |
3292 | KCC*) | 3268 | KCC*) |
3293 | # Kuck and Associates, Inc. (KAI) C++ Compiler | 3269 | # Kuck and Associates, Inc. (KAI) C++ Compiler |
@@ -3389,7 +3365,7 @@ case $host_os in | |||
3389 | ;; | 3365 | ;; |
3390 | esac | 3366 | esac |
3391 | ;; | 3367 | ;; |
3392 | netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | 3368 | netbsd* | netbsdelf*-gnu) |
3393 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | 3369 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
3394 | _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' | 3370 | _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' |
3395 | wlarc= | 3371 | wlarc= |
@@ -4654,7 +4630,7 @@ hpux*) # Its linker distinguishes data from code symbols | |||
4654 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 4630 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
4655 | lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" | 4631 | lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" |
4656 | ;; | 4632 | ;; |
4657 | linux*) | 4633 | linux* | k*bsd*-gnu) |
4658 | if test "$host_cpu" = ia64; then | 4634 | if test "$host_cpu" = ia64; then |
4659 | symcode='[[ABCDGIRSTW]]' | 4635 | symcode='[[ABCDGIRSTW]]' |
4660 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 4636 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
@@ -4927,7 +4903,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) | |||
4927 | ;; | 4903 | ;; |
4928 | esac | 4904 | esac |
4929 | ;; | 4905 | ;; |
4930 | freebsd* | kfreebsd*-gnu | dragonfly*) | 4906 | freebsd* | dragonfly*) |
4931 | # FreeBSD uses GNU C++ | 4907 | # FreeBSD uses GNU C++ |
4932 | ;; | 4908 | ;; |
4933 | hpux9* | hpux10* | hpux11*) | 4909 | hpux9* | hpux10* | hpux11*) |
@@ -4970,7 +4946,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) | |||
4970 | ;; | 4946 | ;; |
4971 | esac | 4947 | esac |
4972 | ;; | 4948 | ;; |
4973 | linux*) | 4949 | linux* | k*bsd*-gnu) |
4974 | case $cc_basename in | 4950 | case $cc_basename in |
4975 | KCC*) | 4951 | KCC*) |
4976 | # KAI C++ Compiler | 4952 | # KAI C++ Compiler |
@@ -5013,7 +4989,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) | |||
5013 | ;; | 4989 | ;; |
5014 | esac | 4990 | esac |
5015 | ;; | 4991 | ;; |
5016 | netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | 4992 | netbsd* | netbsdelf*-gnu) |
5017 | ;; | 4993 | ;; |
5018 | osf3* | osf4* | osf5*) | 4994 | osf3* | osf4* | osf5*) |
5019 | case $cc_basename in | 4995 | case $cc_basename in |
@@ -5224,7 +5200,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) | |||
5224 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 5200 | _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
5225 | ;; | 5201 | ;; |
5226 | 5202 | ||
5227 | linux*) | 5203 | linux* | k*bsd*-gnu) |
5228 | case $cc_basename in | 5204 | case $cc_basename in |
5229 | icc* | ecc*) | 5205 | icc* | ecc*) |
5230 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 5206 | _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
@@ -5365,10 +5341,7 @@ ifelse([$1],[CXX],[ | |||
5365 | cygwin* | mingw*) | 5341 | cygwin* | mingw*) |
5366 | _LT_AC_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' | 5342 | _LT_AC_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' |
5367 | ;; | 5343 | ;; |
5368 | kfreebsd*-gnu) | 5344 | linux* | k*bsd*-gnu) |
5369 | _LT_AC_TAGVAR(link_all_deplibs, $1)=no | ||
5370 | ;; | ||
5371 | linux*) | ||
5372 | _LT_AC_TAGVAR(link_all_deplibs, $1)=no | 5345 | _LT_AC_TAGVAR(link_all_deplibs, $1)=no |
5373 | ;; | 5346 | ;; |
5374 | *) | 5347 | *) |
@@ -5541,7 +5514,7 @@ EOF | |||
5541 | _LT_AC_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' | 5514 | _LT_AC_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' |
5542 | ;; | 5515 | ;; |
5543 | 5516 | ||
5544 | linux*) | 5517 | linux* | k*bsd*-gnu) |
5545 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | 5518 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
5546 | tmp_addflag= | 5519 | tmp_addflag= |
5547 | case $cc_basename,$host_cpu in | 5520 | case $cc_basename,$host_cpu in |
@@ -5573,7 +5546,7 @@ EOF | |||
5573 | fi | 5546 | fi |
5574 | ;; | 5547 | ;; |
5575 | 5548 | ||
5576 | netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | 5549 | netbsd* | netbsdelf*-gnu) |
5577 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | 5550 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
5578 | _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 5551 | _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
5579 | wlarc= | 5552 | wlarc= |
@@ -5909,15 +5882,6 @@ _LT_EOF | |||
5909 | _LT_AC_TAGVAR(hardcode_direct, $1)=yes | 5882 | _LT_AC_TAGVAR(hardcode_direct, $1)=yes |
5910 | _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no | 5883 | _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no |
5911 | ;; | 5884 | ;; |
5912 | |||
5913 | # GNU/kFreeBSD uses gcc -shared to do shared libraries. | ||
5914 | kfreebsd*-gnu) | ||
5915 | _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
5916 | _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | ||
5917 | _LT_AC_TAGVAR(hardcode_direct, $1)=yes | ||
5918 | _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no | ||
5919 | _LT_AC_TAGVAR(link_all_deplibs, $1)=no | ||
5920 | ;; | ||
5921 | 5885 | ||
5922 | hpux9*) | 5886 | hpux9*) |
5923 | if test "$GCC" = yes; then | 5887 | if test "$GCC" = yes; then |
@@ -6014,7 +5978,7 @@ _LT_EOF | |||
6014 | _LT_AC_TAGVAR(link_all_deplibs, $1)=yes | 5978 | _LT_AC_TAGVAR(link_all_deplibs, $1)=yes |
6015 | ;; | 5979 | ;; |
6016 | 5980 | ||
6017 | netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | 5981 | netbsd* | netbsdelf*-gnu) |
6018 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | 5982 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
6019 | _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | 5983 | _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
6020 | else | 5984 | else |
@@ -6539,7 +6503,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen], | |||
6539 | # If you are looking for one http://www.opendarwin.org/projects/dlcompat | 6503 | # If you are looking for one http://www.opendarwin.org/projects/dlcompat |
6540 | libltdl_cv_sys_dlopen_deplibs=yes | 6504 | libltdl_cv_sys_dlopen_deplibs=yes |
6541 | ;; | 6505 | ;; |
6542 | gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) | 6506 | gnu* | linux* | k*bsd*-gnu) |
6543 | # GNU and its variants, using gnu ld.so (Glibc) | 6507 | # GNU and its variants, using gnu ld.so (Glibc) |
6544 | libltdl_cv_sys_dlopen_deplibs=yes | 6508 | libltdl_cv_sys_dlopen_deplibs=yes |
6545 | ;; | 6509 | ;; |