diff options
author | Christian Grothoff <christian@grothoff.org> | 2006-03-25 17:41:49 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2006-03-25 17:41:49 +0000 |
commit | 890516b21d815b74b489bc0250a87aeabd43ca65 (patch) | |
tree | e2c78f7e4af26d620a54b457d52cee2464acc21a | |
parent | 47fa0355dbe3795a934e7f8789e36fa501083d5f (diff) | |
download | gnunet-gtk-890516b21d815b74b489bc0250a87aeabd43ca65.tar.gz gnunet-gtk-890516b21d815b74b489bc0250a87aeabd43ca65.zip |
.desktop support
-rw-r--r-- | AUTHORS | 4 | ||||
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | gnunet-gtk.desktop.in | 27 | ||||
-rw-r--r-- | libltdl/aclocal.m4 | 72 | ||||
-rwxr-xr-x | libltdl/configure | 216 | ||||
-rw-r--r-- | libltdl/ltmain.sh | 2 | ||||
-rw-r--r-- | ltmain.sh | 2 |
9 files changed, 102 insertions, 229 deletions
@@ -2,11 +2,11 @@ Primary developer: | |||
2 | Christian Grothoff <christian@grothoff.org> | 2 | Christian Grothoff <christian@grothoff.org> |
3 | 3 | ||
4 | Code contributions also came from: | 4 | Code contributions also came from: |
5 | Igor Wronsky <iwronsky@users.sourceforge.net>' | 5 | Igor Wronsky <iwronsky@users.sourceforge.net> |
6 | Nils Durner <durner@gnunet.org> | 6 | Nils Durner <durner@gnunet.org> |
7 | Milan <nalimilan@club-internet.fr> | 7 | Milan <nalimilan@club-internet.fr> |
8 | 8 | ||
9 | Images from: | 9 | Images and other content from: |
10 | Jimmac's site | 10 | Jimmac's site |
11 | Christian Muellner <chris@flop.de> | 11 | Christian Muellner <chris@flop.de> |
12 | Nicklas Larsson <whybill@gmail.com> | 12 | Nicklas Larsson <whybill@gmail.com> |
@@ -1,3 +1,6 @@ | |||
1 | Sat Mar 25 10:14:44 PST 2006 | ||
2 | Adding .desktop support. | ||
3 | |||
1 | Sat Jan 7 02:38:37 PST 2006 | 4 | Sat Jan 7 02:38:37 PST 2006 |
2 | Adding Swedish translation. | 5 | Adding Swedish translation. |
3 | 6 | ||
diff --git a/Makefile.am b/Makefile.am index 622507db..29e2acec 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -2,6 +2,10 @@ | |||
2 | 2 | ||
3 | SUBDIRS = doc po src | 3 | SUBDIRS = doc po src |
4 | 4 | ||
5 | desktopdir = $(datadir)/applications | ||
6 | desktop_in_files = gnunet-gtk.desktop.in | ||
7 | desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) | ||
8 | |||
5 | EXTRA_DIST = \ | 9 | EXTRA_DIST = \ |
6 | bootstrap \ | 10 | bootstrap \ |
7 | gnunet-gtk.glade | 11 | gnunet-gtk.glade |
diff --git a/configure.ac b/configure.ac index 727b42a8..f18a8c0d 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -262,5 +262,6 @@ src/plugins/fs/Makefile | |||
262 | src/plugins/stats/Makefile | 262 | src/plugins/stats/Makefile |
263 | po/Makefile.in | 263 | po/Makefile.in |
264 | po/Makefile | 264 | po/Makefile |
265 | gnunet-gtk.desktop | ||
265 | ]) | 266 | ]) |
266 | 267 | ||
diff --git a/gnunet-gtk.desktop.in b/gnunet-gtk.desktop.in new file mode 100644 index 00000000..30b55b3b --- /dev/null +++ b/gnunet-gtk.desktop.in | |||
@@ -0,0 +1,27 @@ | |||
1 | [Desktop Entry] | ||
2 | Encoding=UTF-8 | ||
3 | Version=1.0 | ||
4 | Name=gnunet-gtk | ||
5 | GenericName=GNUnet Client | ||
6 | Comment=Share files security over GNUnet P2P | ||
7 | |||
8 | #Name[sv_SE]= | ||
9 | #GenericName[sv_SE]= | ||
10 | #Comment[sv_SE]= | ||
11 | |||
12 | #Name[fi_FI]= | ||
13 | #GenericName[fi_FI]= | ||
14 | #Comment[fi_FI]= | ||
15 | |||
16 | Name[de]=gnunet-gtk | ||
17 | GenericName[de]=GNUnet | ||
18 | Comment[de]=Sicherer Datentausch mit GNUnet P2P | ||
19 | |||
20 | Exec=gnunet-gtk | ||
21 | Icon=gnunet_logo.png | ||
22 | Terminal=false | ||
23 | Type=Application | ||
24 | Categories=Application;Network; | ||
25 | StartupNotify=true | ||
26 | #StartupWMClass=gnunet-gtk | ||
27 | |||
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 | ;; |
diff --git a/libltdl/configure b/libltdl/configure index 5bce4b0d..2ed5401f 100755 --- a/libltdl/configure +++ b/libltdl/configure | |||
@@ -3714,7 +3714,7 @@ darwin* | rhapsody*) | |||
3714 | lt_cv_deplibs_check_method=pass_all | 3714 | lt_cv_deplibs_check_method=pass_all |
3715 | ;; | 3715 | ;; |
3716 | 3716 | ||
3717 | freebsd* | kfreebsd*-gnu | dragonfly*) | 3717 | freebsd* | dragonfly*) |
3718 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | 3718 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |
3719 | case $host_cpu in | 3719 | case $host_cpu in |
3720 | i*86 ) | 3720 | i*86 ) |
@@ -3768,11 +3768,11 @@ irix5* | irix6* | nonstopux*) | |||
3768 | ;; | 3768 | ;; |
3769 | 3769 | ||
3770 | # This must be Linux ELF. | 3770 | # This must be Linux ELF. |
3771 | linux*) | 3771 | linux* | k*bsd*-gnu) |
3772 | lt_cv_deplibs_check_method=pass_all | 3772 | lt_cv_deplibs_check_method=pass_all |
3773 | ;; | 3773 | ;; |
3774 | 3774 | ||
3775 | netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | 3775 | netbsd* | netbsdelf*-gnu) |
3776 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | 3776 | if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |
3777 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' | 3777 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' |
3778 | else | 3778 | else |
@@ -6024,7 +6024,7 @@ hpux*) # Its linker distinguishes data from code symbols | |||
6024 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 6024 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
6025 | 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'" | 6025 | 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'" |
6026 | ;; | 6026 | ;; |
6027 | linux*) | 6027 | linux* | k*bsd*-gnu) |
6028 | if test "$host_cpu" = ia64; then | 6028 | if test "$host_cpu" = ia64; then |
6029 | symcode='[ABCDGIRSTW]' | 6029 | symcode='[ABCDGIRSTW]' |
6030 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 6030 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
@@ -6944,7 +6944,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 | |||
6944 | lt_prog_compiler_static='-Bstatic' | 6944 | lt_prog_compiler_static='-Bstatic' |
6945 | ;; | 6945 | ;; |
6946 | 6946 | ||
6947 | linux*) | 6947 | linux* | k*bsd*-gnu) |
6948 | case $cc_basename in | 6948 | case $cc_basename in |
6949 | icc* | ecc*) | 6949 | icc* | ecc*) |
6950 | lt_prog_compiler_wl='-Wl,' | 6950 | lt_prog_compiler_wl='-Wl,' |
@@ -7383,7 +7383,7 @@ EOF | |||
7383 | archive_expsym_cmds='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' | 7383 | archive_expsym_cmds='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' |
7384 | ;; | 7384 | ;; |
7385 | 7385 | ||
7386 | linux*) | 7386 | linux* | k*bsd*-gnu) |
7387 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | 7387 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
7388 | tmp_addflag= | 7388 | tmp_addflag= |
7389 | case $cc_basename,$host_cpu in | 7389 | case $cc_basename,$host_cpu in |
@@ -7415,7 +7415,7 @@ EOF | |||
7415 | fi | 7415 | fi |
7416 | ;; | 7416 | ;; |
7417 | 7417 | ||
7418 | netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | 7418 | netbsd* | netbsdelf*-gnu) |
7419 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | 7419 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
7420 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 7420 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
7421 | wlarc= | 7421 | wlarc= |
@@ -7852,15 +7852,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
7852 | hardcode_shlibpath_var=no | 7852 | hardcode_shlibpath_var=no |
7853 | ;; | 7853 | ;; |
7854 | 7854 | ||
7855 | # GNU/kFreeBSD uses gcc -shared to do shared libraries. | ||
7856 | kfreebsd*-gnu) | ||
7857 | archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
7858 | hardcode_libdir_flag_spec='-R$libdir' | ||
7859 | hardcode_direct=yes | ||
7860 | hardcode_shlibpath_var=no | ||
7861 | link_all_deplibs=no | ||
7862 | ;; | ||
7863 | |||
7864 | hpux9*) | 7855 | hpux9*) |
7865 | if test "$GCC" = yes; then | 7856 | if test "$GCC" = yes; then |
7866 | archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | 7857 | archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
@@ -7956,7 +7947,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
7956 | link_all_deplibs=yes | 7947 | link_all_deplibs=yes |
7957 | ;; | 7948 | ;; |
7958 | 7949 | ||
7959 | netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | 7950 | netbsd* | netbsdelf*-gnu) |
7960 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | 7951 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
7961 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | 7952 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
7962 | else | 7953 | else |
@@ -8446,18 +8437,6 @@ freebsd1*) | |||
8446 | dynamic_linker=no | 8437 | dynamic_linker=no |
8447 | ;; | 8438 | ;; |
8448 | 8439 | ||
8449 | kfreebsd*-gnu) | ||
8450 | version_type=linux | ||
8451 | need_lib_prefix=no | ||
8452 | need_version=no | ||
8453 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
8454 | soname_spec='${libname}${release}${shared_ext}$major' | ||
8455 | shlibpath_var=LD_LIBRARY_PATH | ||
8456 | shlibpath_overrides_runpath=no | ||
8457 | hardcode_into_libs=yes | ||
8458 | dynamic_linker='GNU ld.so' | ||
8459 | ;; | ||
8460 | |||
8461 | freebsd* | dragonfly*) | 8440 | freebsd* | dragonfly*) |
8462 | # DragonFly does not have aout. When/if they implement a new | 8441 | # DragonFly does not have aout. When/if they implement a new |
8463 | # versioning mechanism, adjust this. | 8442 | # versioning mechanism, adjust this. |
@@ -8613,7 +8592,7 @@ linux*oldld* | linux*aout* | linux*coff*) | |||
8613 | ;; | 8592 | ;; |
8614 | 8593 | ||
8615 | # This must be Linux ELF. | 8594 | # This must be Linux ELF. |
8616 | linux*) | 8595 | linux* | k*bsd*-gnu) |
8617 | version_type=linux | 8596 | version_type=linux |
8618 | need_lib_prefix=no | 8597 | need_lib_prefix=no |
8619 | need_version=no | 8598 | need_version=no |
@@ -8654,18 +8633,6 @@ netbsdelf*-gnu) | |||
8654 | dynamic_linker='NetBSD ld.elf_so' | 8633 | dynamic_linker='NetBSD ld.elf_so' |
8655 | ;; | 8634 | ;; |
8656 | 8635 | ||
8657 | knetbsd*-gnu) | ||
8658 | version_type=linux | ||
8659 | need_lib_prefix=no | ||
8660 | need_version=no | ||
8661 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
8662 | soname_spec='${libname}${release}${shared_ext}$major' | ||
8663 | shlibpath_var=LD_LIBRARY_PATH | ||
8664 | shlibpath_overrides_runpath=no | ||
8665 | hardcode_into_libs=yes | ||
8666 | dynamic_linker='GNU ld.so' | ||
8667 | ;; | ||
8668 | |||
8669 | netbsd*) | 8636 | netbsd*) |
8670 | version_type=sunos | 8637 | version_type=sunos |
8671 | need_lib_prefix=no | 8638 | need_lib_prefix=no |
@@ -9512,7 +9479,7 @@ else | |||
9512 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 9479 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
9513 | lt_status=$lt_dlunknown | 9480 | lt_status=$lt_dlunknown |
9514 | cat > conftest.$ac_ext <<EOF | 9481 | cat > conftest.$ac_ext <<EOF |
9515 | #line 9515 "configure" | 9482 | #line 9482 "configure" |
9516 | #include "confdefs.h" | 9483 | #include "confdefs.h" |
9517 | 9484 | ||
9518 | #if HAVE_DLFCN_H | 9485 | #if HAVE_DLFCN_H |
@@ -9612,7 +9579,7 @@ else | |||
9612 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 9579 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
9613 | lt_status=$lt_dlunknown | 9580 | lt_status=$lt_dlunknown |
9614 | cat > conftest.$ac_ext <<EOF | 9581 | cat > conftest.$ac_ext <<EOF |
9615 | #line 9615 "configure" | 9582 | #line 9582 "configure" |
9616 | #include "confdefs.h" | 9583 | #include "confdefs.h" |
9617 | 9584 | ||
9618 | #if HAVE_DLFCN_H | 9585 | #if HAVE_DLFCN_H |
@@ -10927,7 +10894,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
10927 | freebsd-elf*) | 10894 | freebsd-elf*) |
10928 | archive_cmds_need_lc_CXX=no | 10895 | archive_cmds_need_lc_CXX=no |
10929 | ;; | 10896 | ;; |
10930 | freebsd* | kfreebsd*-gnu | dragonfly*) | 10897 | freebsd* | dragonfly*) |
10931 | # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF | 10898 | # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF |
10932 | # conventions | 10899 | # conventions |
10933 | ld_shlibs_CXX=yes | 10900 | ld_shlibs_CXX=yes |
@@ -11086,7 +11053,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
11086 | hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' | 11053 | hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' |
11087 | hardcode_libdir_separator_CXX=: | 11054 | hardcode_libdir_separator_CXX=: |
11088 | ;; | 11055 | ;; |
11089 | linux*) | 11056 | linux* | k*bsd*-gnu) |
11090 | case $cc_basename in | 11057 | case $cc_basename in |
11091 | KCC*) | 11058 | KCC*) |
11092 | # Kuck and Associates, Inc. (KAI) C++ Compiler | 11059 | # Kuck and Associates, Inc. (KAI) C++ Compiler |
@@ -11188,7 +11155,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
11188 | ;; | 11155 | ;; |
11189 | esac | 11156 | esac |
11190 | ;; | 11157 | ;; |
11191 | netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | 11158 | netbsd* | netbsdelf*-gnu) |
11192 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | 11159 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
11193 | archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' | 11160 | archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' |
11194 | wlarc= | 11161 | wlarc= |
@@ -11755,7 +11722,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 | |||
11755 | ;; | 11722 | ;; |
11756 | esac | 11723 | esac |
11757 | ;; | 11724 | ;; |
11758 | freebsd* | kfreebsd*-gnu | dragonfly*) | 11725 | freebsd* | dragonfly*) |
11759 | # FreeBSD uses GNU C++ | 11726 | # FreeBSD uses GNU C++ |
11760 | ;; | 11727 | ;; |
11761 | hpux9* | hpux10* | hpux11*) | 11728 | hpux9* | hpux10* | hpux11*) |
@@ -11798,7 +11765,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 | |||
11798 | ;; | 11765 | ;; |
11799 | esac | 11766 | esac |
11800 | ;; | 11767 | ;; |
11801 | linux*) | 11768 | linux* | k*bsd*-gnu) |
11802 | case $cc_basename in | 11769 | case $cc_basename in |
11803 | KCC*) | 11770 | KCC*) |
11804 | # KAI C++ Compiler | 11771 | # KAI C++ Compiler |
@@ -11841,7 +11808,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 | |||
11841 | ;; | 11808 | ;; |
11842 | esac | 11809 | esac |
11843 | ;; | 11810 | ;; |
11844 | netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | 11811 | netbsd* | netbsdelf*-gnu) |
11845 | ;; | 11812 | ;; |
11846 | osf3* | osf4* | osf5*) | 11813 | osf3* | osf4* | osf5*) |
11847 | case $cc_basename in | 11814 | case $cc_basename in |
@@ -11950,11 +11917,11 @@ else | |||
11950 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 11917 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
11951 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 11918 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
11952 | -e 's:$: $lt_compiler_flag:'` | 11919 | -e 's:$: $lt_compiler_flag:'` |
11953 | (eval echo "\"\$as_me:11953: $lt_compile\"" >&5) | 11920 | (eval echo "\"\$as_me:11920: $lt_compile\"" >&5) |
11954 | (eval "$lt_compile" 2>conftest.err) | 11921 | (eval "$lt_compile" 2>conftest.err) |
11955 | ac_status=$? | 11922 | ac_status=$? |
11956 | cat conftest.err >&5 | 11923 | cat conftest.err >&5 |
11957 | echo "$as_me:11957: \$? = $ac_status" >&5 | 11924 | echo "$as_me:11924: \$? = $ac_status" >&5 |
11958 | if (exit $ac_status) && test -s "$ac_outfile"; then | 11925 | if (exit $ac_status) && test -s "$ac_outfile"; then |
11959 | # The compiler can only warn and ignore the option if not recognized | 11926 | # The compiler can only warn and ignore the option if not recognized |
11960 | # So say no if there are warnings other than the usual output. | 11927 | # So say no if there are warnings other than the usual output. |
@@ -12054,11 +12021,11 @@ else | |||
12054 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 12021 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
12055 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 12022 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
12056 | -e 's:$: $lt_compiler_flag:'` | 12023 | -e 's:$: $lt_compiler_flag:'` |
12057 | (eval echo "\"\$as_me:12057: $lt_compile\"" >&5) | 12024 | (eval echo "\"\$as_me:12024: $lt_compile\"" >&5) |
12058 | (eval "$lt_compile" 2>out/conftest.err) | 12025 | (eval "$lt_compile" 2>out/conftest.err) |
12059 | ac_status=$? | 12026 | ac_status=$? |
12060 | cat out/conftest.err >&5 | 12027 | cat out/conftest.err >&5 |
12061 | echo "$as_me:12061: \$? = $ac_status" >&5 | 12028 | echo "$as_me:12028: \$? = $ac_status" >&5 |
12062 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 12029 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
12063 | then | 12030 | then |
12064 | # The compiler can only warn and ignore the option if not recognized | 12031 | # The compiler can only warn and ignore the option if not recognized |
@@ -12126,10 +12093,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar | |||
12126 | cygwin* | mingw*) | 12093 | cygwin* | mingw*) |
12127 | export_symbols_cmds_CXX='$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' | 12094 | export_symbols_cmds_CXX='$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' |
12128 | ;; | 12095 | ;; |
12129 | kfreebsd*-gnu) | 12096 | linux* | k*bsd*-gnu) |
12130 | link_all_deplibs_CXX=no | ||
12131 | ;; | ||
12132 | linux*) | ||
12133 | link_all_deplibs_CXX=no | 12097 | link_all_deplibs_CXX=no |
12134 | ;; | 12098 | ;; |
12135 | *) | 12099 | *) |
@@ -12411,18 +12375,6 @@ freebsd1*) | |||
12411 | dynamic_linker=no | 12375 | dynamic_linker=no |
12412 | ;; | 12376 | ;; |
12413 | 12377 | ||
12414 | kfreebsd*-gnu) | ||
12415 | version_type=linux | ||
12416 | need_lib_prefix=no | ||
12417 | need_version=no | ||
12418 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
12419 | soname_spec='${libname}${release}${shared_ext}$major' | ||
12420 | shlibpath_var=LD_LIBRARY_PATH | ||
12421 | shlibpath_overrides_runpath=no | ||
12422 | hardcode_into_libs=yes | ||
12423 | dynamic_linker='GNU ld.so' | ||
12424 | ;; | ||
12425 | |||
12426 | freebsd* | dragonfly*) | 12378 | freebsd* | dragonfly*) |
12427 | # DragonFly does not have aout. When/if they implement a new | 12379 | # DragonFly does not have aout. When/if they implement a new |
12428 | # versioning mechanism, adjust this. | 12380 | # versioning mechanism, adjust this. |
@@ -12578,7 +12530,7 @@ linux*oldld* | linux*aout* | linux*coff*) | |||
12578 | ;; | 12530 | ;; |
12579 | 12531 | ||
12580 | # This must be Linux ELF. | 12532 | # This must be Linux ELF. |
12581 | linux*) | 12533 | linux* | k*bsd*-gnu) |
12582 | version_type=linux | 12534 | version_type=linux |
12583 | need_lib_prefix=no | 12535 | need_lib_prefix=no |
12584 | need_version=no | 12536 | need_version=no |
@@ -12619,18 +12571,6 @@ netbsdelf*-gnu) | |||
12619 | dynamic_linker='NetBSD ld.elf_so' | 12571 | dynamic_linker='NetBSD ld.elf_so' |
12620 | ;; | 12572 | ;; |
12621 | 12573 | ||
12622 | knetbsd*-gnu) | ||
12623 | version_type=linux | ||
12624 | need_lib_prefix=no | ||
12625 | need_version=no | ||
12626 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
12627 | soname_spec='${libname}${release}${shared_ext}$major' | ||
12628 | shlibpath_var=LD_LIBRARY_PATH | ||
12629 | shlibpath_overrides_runpath=no | ||
12630 | hardcode_into_libs=yes | ||
12631 | dynamic_linker='GNU ld.so' | ||
12632 | ;; | ||
12633 | |||
12634 | netbsd*) | 12574 | netbsd*) |
12635 | version_type=sunos | 12575 | version_type=sunos |
12636 | need_lib_prefix=no | 12576 | need_lib_prefix=no |
@@ -13536,7 +13476,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 | |||
13536 | lt_prog_compiler_static_F77='-Bstatic' | 13476 | lt_prog_compiler_static_F77='-Bstatic' |
13537 | ;; | 13477 | ;; |
13538 | 13478 | ||
13539 | linux*) | 13479 | linux* | k*bsd*-gnu) |
13540 | case $cc_basename in | 13480 | case $cc_basename in |
13541 | icc* | ecc*) | 13481 | icc* | ecc*) |
13542 | lt_prog_compiler_wl_F77='-Wl,' | 13482 | lt_prog_compiler_wl_F77='-Wl,' |
@@ -13642,11 +13582,11 @@ else | |||
13642 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 13582 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
13643 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 13583 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
13644 | -e 's:$: $lt_compiler_flag:'` | 13584 | -e 's:$: $lt_compiler_flag:'` |
13645 | (eval echo "\"\$as_me:13645: $lt_compile\"" >&5) | 13585 | (eval echo "\"\$as_me:13585: $lt_compile\"" >&5) |
13646 | (eval "$lt_compile" 2>conftest.err) | 13586 | (eval "$lt_compile" 2>conftest.err) |
13647 | ac_status=$? | 13587 | ac_status=$? |
13648 | cat conftest.err >&5 | 13588 | cat conftest.err >&5 |
13649 | echo "$as_me:13649: \$? = $ac_status" >&5 | 13589 | echo "$as_me:13589: \$? = $ac_status" >&5 |
13650 | if (exit $ac_status) && test -s "$ac_outfile"; then | 13590 | if (exit $ac_status) && test -s "$ac_outfile"; then |
13651 | # The compiler can only warn and ignore the option if not recognized | 13591 | # The compiler can only warn and ignore the option if not recognized |
13652 | # So say no if there are warnings other than the usual output. | 13592 | # So say no if there are warnings other than the usual output. |
@@ -13746,11 +13686,11 @@ else | |||
13746 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 13686 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
13747 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 13687 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
13748 | -e 's:$: $lt_compiler_flag:'` | 13688 | -e 's:$: $lt_compiler_flag:'` |
13749 | (eval echo "\"\$as_me:13749: $lt_compile\"" >&5) | 13689 | (eval echo "\"\$as_me:13689: $lt_compile\"" >&5) |
13750 | (eval "$lt_compile" 2>out/conftest.err) | 13690 | (eval "$lt_compile" 2>out/conftest.err) |
13751 | ac_status=$? | 13691 | ac_status=$? |
13752 | cat out/conftest.err >&5 | 13692 | cat out/conftest.err >&5 |
13753 | echo "$as_me:13753: \$? = $ac_status" >&5 | 13693 | echo "$as_me:13693: \$? = $ac_status" >&5 |
13754 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 13694 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
13755 | then | 13695 | then |
13756 | # The compiler can only warn and ignore the option if not recognized | 13696 | # The compiler can only warn and ignore the option if not recognized |
@@ -13975,7 +13915,7 @@ EOF | |||
13975 | archive_expsym_cmds_F77='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' | 13915 | archive_expsym_cmds_F77='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' |
13976 | ;; | 13916 | ;; |
13977 | 13917 | ||
13978 | linux*) | 13918 | linux* | k*bsd*-gnu) |
13979 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | 13919 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
13980 | tmp_addflag= | 13920 | tmp_addflag= |
13981 | case $cc_basename,$host_cpu in | 13921 | case $cc_basename,$host_cpu in |
@@ -14007,7 +13947,7 @@ EOF | |||
14007 | fi | 13947 | fi |
14008 | ;; | 13948 | ;; |
14009 | 13949 | ||
14010 | netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | 13950 | netbsd* | netbsdelf*-gnu) |
14011 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | 13951 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
14012 | archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 13952 | archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
14013 | wlarc= | 13953 | wlarc= |
@@ -14424,15 +14364,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
14424 | hardcode_shlibpath_var_F77=no | 14364 | hardcode_shlibpath_var_F77=no |
14425 | ;; | 14365 | ;; |
14426 | 14366 | ||
14427 | # GNU/kFreeBSD uses gcc -shared to do shared libraries. | ||
14428 | kfreebsd*-gnu) | ||
14429 | archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
14430 | hardcode_libdir_flag_spec_F77='-R$libdir' | ||
14431 | hardcode_direct_F77=yes | ||
14432 | hardcode_shlibpath_var_F77=no | ||
14433 | link_all_deplibs_F77=no | ||
14434 | ;; | ||
14435 | |||
14436 | hpux9*) | 14367 | hpux9*) |
14437 | if test "$GCC" = yes; then | 14368 | if test "$GCC" = yes; then |
14438 | archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | 14369 | archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
@@ -14528,7 +14459,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
14528 | link_all_deplibs_F77=yes | 14459 | link_all_deplibs_F77=yes |
14529 | ;; | 14460 | ;; |
14530 | 14461 | ||
14531 | netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | 14462 | netbsd* | netbsdelf*-gnu) |
14532 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | 14463 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
14533 | archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | 14464 | archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
14534 | else | 14465 | else |
@@ -15018,18 +14949,6 @@ freebsd1*) | |||
15018 | dynamic_linker=no | 14949 | dynamic_linker=no |
15019 | ;; | 14950 | ;; |
15020 | 14951 | ||
15021 | kfreebsd*-gnu) | ||
15022 | version_type=linux | ||
15023 | need_lib_prefix=no | ||
15024 | need_version=no | ||
15025 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
15026 | soname_spec='${libname}${release}${shared_ext}$major' | ||
15027 | shlibpath_var=LD_LIBRARY_PATH | ||
15028 | shlibpath_overrides_runpath=no | ||
15029 | hardcode_into_libs=yes | ||
15030 | dynamic_linker='GNU ld.so' | ||
15031 | ;; | ||
15032 | |||
15033 | freebsd* | dragonfly*) | 14952 | freebsd* | dragonfly*) |
15034 | # DragonFly does not have aout. When/if they implement a new | 14953 | # DragonFly does not have aout. When/if they implement a new |
15035 | # versioning mechanism, adjust this. | 14954 | # versioning mechanism, adjust this. |
@@ -15185,7 +15104,7 @@ linux*oldld* | linux*aout* | linux*coff*) | |||
15185 | ;; | 15104 | ;; |
15186 | 15105 | ||
15187 | # This must be Linux ELF. | 15106 | # This must be Linux ELF. |
15188 | linux*) | 15107 | linux* | k*bsd*-gnu) |
15189 | version_type=linux | 15108 | version_type=linux |
15190 | need_lib_prefix=no | 15109 | need_lib_prefix=no |
15191 | need_version=no | 15110 | need_version=no |
@@ -15226,18 +15145,6 @@ netbsdelf*-gnu) | |||
15226 | dynamic_linker='NetBSD ld.elf_so' | 15145 | dynamic_linker='NetBSD ld.elf_so' |
15227 | ;; | 15146 | ;; |
15228 | 15147 | ||
15229 | knetbsd*-gnu) | ||
15230 | version_type=linux | ||
15231 | need_lib_prefix=no | ||
15232 | need_version=no | ||
15233 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
15234 | soname_spec='${libname}${release}${shared_ext}$major' | ||
15235 | shlibpath_var=LD_LIBRARY_PATH | ||
15236 | shlibpath_overrides_runpath=no | ||
15237 | hardcode_into_libs=yes | ||
15238 | dynamic_linker='GNU ld.so' | ||
15239 | ;; | ||
15240 | |||
15241 | netbsd*) | 15148 | netbsd*) |
15242 | version_type=sunos | 15149 | version_type=sunos |
15243 | need_lib_prefix=no | 15150 | need_lib_prefix=no |
@@ -15969,11 +15876,11 @@ else | |||
15969 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 15876 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
15970 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 15877 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
15971 | -e 's:$: $lt_compiler_flag:'` | 15878 | -e 's:$: $lt_compiler_flag:'` |
15972 | (eval echo "\"\$as_me:15972: $lt_compile\"" >&5) | 15879 | (eval echo "\"\$as_me:15879: $lt_compile\"" >&5) |
15973 | (eval "$lt_compile" 2>conftest.err) | 15880 | (eval "$lt_compile" 2>conftest.err) |
15974 | ac_status=$? | 15881 | ac_status=$? |
15975 | cat conftest.err >&5 | 15882 | cat conftest.err >&5 |
15976 | echo "$as_me:15976: \$? = $ac_status" >&5 | 15883 | echo "$as_me:15883: \$? = $ac_status" >&5 |
15977 | if (exit $ac_status) && test -s "$ac_outfile"; then | 15884 | if (exit $ac_status) && test -s "$ac_outfile"; then |
15978 | # The compiler can only warn and ignore the option if not recognized | 15885 | # The compiler can only warn and ignore the option if not recognized |
15979 | # So say no if there are warnings other than the usual output. | 15886 | # So say no if there are warnings other than the usual output. |
@@ -16131,7 +16038,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 | |||
16131 | lt_prog_compiler_static_GCJ='-Bstatic' | 16038 | lt_prog_compiler_static_GCJ='-Bstatic' |
16132 | ;; | 16039 | ;; |
16133 | 16040 | ||
16134 | linux*) | 16041 | linux* | k*bsd*-gnu) |
16135 | case $cc_basename in | 16042 | case $cc_basename in |
16136 | icc* | ecc*) | 16043 | icc* | ecc*) |
16137 | lt_prog_compiler_wl_GCJ='-Wl,' | 16044 | lt_prog_compiler_wl_GCJ='-Wl,' |
@@ -16237,11 +16144,11 @@ else | |||
16237 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 16144 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
16238 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 16145 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
16239 | -e 's:$: $lt_compiler_flag:'` | 16146 | -e 's:$: $lt_compiler_flag:'` |
16240 | (eval echo "\"\$as_me:16240: $lt_compile\"" >&5) | 16147 | (eval echo "\"\$as_me:16147: $lt_compile\"" >&5) |
16241 | (eval "$lt_compile" 2>conftest.err) | 16148 | (eval "$lt_compile" 2>conftest.err) |
16242 | ac_status=$? | 16149 | ac_status=$? |
16243 | cat conftest.err >&5 | 16150 | cat conftest.err >&5 |
16244 | echo "$as_me:16244: \$? = $ac_status" >&5 | 16151 | echo "$as_me:16151: \$? = $ac_status" >&5 |
16245 | if (exit $ac_status) && test -s "$ac_outfile"; then | 16152 | if (exit $ac_status) && test -s "$ac_outfile"; then |
16246 | # The compiler can only warn and ignore the option if not recognized | 16153 | # The compiler can only warn and ignore the option if not recognized |
16247 | # So say no if there are warnings other than the usual output. | 16154 | # So say no if there are warnings other than the usual output. |
@@ -16341,11 +16248,11 @@ else | |||
16341 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 16248 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
16342 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 16249 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
16343 | -e 's:$: $lt_compiler_flag:'` | 16250 | -e 's:$: $lt_compiler_flag:'` |
16344 | (eval echo "\"\$as_me:16344: $lt_compile\"" >&5) | 16251 | (eval echo "\"\$as_me:16251: $lt_compile\"" >&5) |
16345 | (eval "$lt_compile" 2>out/conftest.err) | 16252 | (eval "$lt_compile" 2>out/conftest.err) |
16346 | ac_status=$? | 16253 | ac_status=$? |
16347 | cat out/conftest.err >&5 | 16254 | cat out/conftest.err >&5 |
16348 | echo "$as_me:16348: \$? = $ac_status" >&5 | 16255 | echo "$as_me:16255: \$? = $ac_status" >&5 |
16349 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 16256 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
16350 | then | 16257 | then |
16351 | # The compiler can only warn and ignore the option if not recognized | 16258 | # The compiler can only warn and ignore the option if not recognized |
@@ -16570,7 +16477,7 @@ EOF | |||
16570 | archive_expsym_cmds_GCJ='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' | 16477 | archive_expsym_cmds_GCJ='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' |
16571 | ;; | 16478 | ;; |
16572 | 16479 | ||
16573 | linux*) | 16480 | linux* | k*bsd*-gnu) |
16574 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | 16481 | if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
16575 | tmp_addflag= | 16482 | tmp_addflag= |
16576 | case $cc_basename,$host_cpu in | 16483 | case $cc_basename,$host_cpu in |
@@ -16602,7 +16509,7 @@ EOF | |||
16602 | fi | 16509 | fi |
16603 | ;; | 16510 | ;; |
16604 | 16511 | ||
16605 | netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | 16512 | netbsd* | netbsdelf*-gnu) |
16606 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | 16513 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
16607 | archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 16514 | archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
16608 | wlarc= | 16515 | wlarc= |
@@ -17039,15 +16946,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
17039 | hardcode_shlibpath_var_GCJ=no | 16946 | hardcode_shlibpath_var_GCJ=no |
17040 | ;; | 16947 | ;; |
17041 | 16948 | ||
17042 | # GNU/kFreeBSD uses gcc -shared to do shared libraries. | ||
17043 | kfreebsd*-gnu) | ||
17044 | archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | ||
17045 | hardcode_libdir_flag_spec_GCJ='-R$libdir' | ||
17046 | hardcode_direct_GCJ=yes | ||
17047 | hardcode_shlibpath_var_GCJ=no | ||
17048 | link_all_deplibs_GCJ=no | ||
17049 | ;; | ||
17050 | |||
17051 | hpux9*) | 16949 | hpux9*) |
17052 | if test "$GCC" = yes; then | 16950 | if test "$GCC" = yes; then |
17053 | archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | 16951 | archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
@@ -17143,7 +17041,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |||
17143 | link_all_deplibs_GCJ=yes | 17041 | link_all_deplibs_GCJ=yes |
17144 | ;; | 17042 | ;; |
17145 | 17043 | ||
17146 | netbsd* | netbsdelf*-gnu | knetbsd*-gnu) | 17044 | netbsd* | netbsdelf*-gnu) |
17147 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | 17045 | if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
17148 | archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | 17046 | archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
17149 | else | 17047 | else |
@@ -17633,18 +17531,6 @@ freebsd1*) | |||
17633 | dynamic_linker=no | 17531 | dynamic_linker=no |
17634 | ;; | 17532 | ;; |
17635 | 17533 | ||
17636 | kfreebsd*-gnu) | ||
17637 | version_type=linux | ||
17638 | need_lib_prefix=no | ||
17639 | need_version=no | ||
17640 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
17641 | soname_spec='${libname}${release}${shared_ext}$major' | ||
17642 | shlibpath_var=LD_LIBRARY_PATH | ||
17643 | shlibpath_overrides_runpath=no | ||
17644 | hardcode_into_libs=yes | ||
17645 | dynamic_linker='GNU ld.so' | ||
17646 | ;; | ||
17647 | |||
17648 | freebsd* | dragonfly*) | 17534 | freebsd* | dragonfly*) |
17649 | # DragonFly does not have aout. When/if they implement a new | 17535 | # DragonFly does not have aout. When/if they implement a new |
17650 | # versioning mechanism, adjust this. | 17536 | # versioning mechanism, adjust this. |
@@ -17800,7 +17686,7 @@ linux*oldld* | linux*aout* | linux*coff*) | |||
17800 | ;; | 17686 | ;; |
17801 | 17687 | ||
17802 | # This must be Linux ELF. | 17688 | # This must be Linux ELF. |
17803 | linux*) | 17689 | linux* | k*bsd*-gnu) |
17804 | version_type=linux | 17690 | version_type=linux |
17805 | need_lib_prefix=no | 17691 | need_lib_prefix=no |
17806 | need_version=no | 17692 | need_version=no |
@@ -17841,18 +17727,6 @@ netbsdelf*-gnu) | |||
17841 | dynamic_linker='NetBSD ld.elf_so' | 17727 | dynamic_linker='NetBSD ld.elf_so' |
17842 | ;; | 17728 | ;; |
17843 | 17729 | ||
17844 | knetbsd*-gnu) | ||
17845 | version_type=linux | ||
17846 | need_lib_prefix=no | ||
17847 | need_version=no | ||
17848 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
17849 | soname_spec='${libname}${release}${shared_ext}$major' | ||
17850 | shlibpath_var=LD_LIBRARY_PATH | ||
17851 | shlibpath_overrides_runpath=no | ||
17852 | hardcode_into_libs=yes | ||
17853 | dynamic_linker='GNU ld.so' | ||
17854 | ;; | ||
17855 | |||
17856 | netbsd*) | 17730 | netbsd*) |
17857 | version_type=sunos | 17731 | version_type=sunos |
17858 | need_lib_prefix=no | 17732 | need_lib_prefix=no |
@@ -20231,7 +20105,7 @@ else | |||
20231 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 20105 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
20232 | lt_status=$lt_dlunknown | 20106 | lt_status=$lt_dlunknown |
20233 | cat > conftest.$ac_ext <<EOF | 20107 | cat > conftest.$ac_ext <<EOF |
20234 | #line 20234 "configure" | 20108 | #line 20108 "configure" |
20235 | #include "confdefs.h" | 20109 | #include "confdefs.h" |
20236 | 20110 | ||
20237 | #if HAVE_DLFCN_H | 20111 | #if HAVE_DLFCN_H |
@@ -20354,7 +20228,7 @@ else | |||
20354 | # If you are looking for one http://www.opendarwin.org/projects/dlcompat | 20228 | # If you are looking for one http://www.opendarwin.org/projects/dlcompat |
20355 | libltdl_cv_sys_dlopen_deplibs=yes | 20229 | libltdl_cv_sys_dlopen_deplibs=yes |
20356 | ;; | 20230 | ;; |
20357 | gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) | 20231 | gnu* | linux* | k*bsd*-gnu) |
20358 | # GNU and its variants, using gnu ld.so (Glibc) | 20232 | # GNU and its variants, using gnu ld.so (Glibc) |
20359 | libltdl_cv_sys_dlopen_deplibs=yes | 20233 | libltdl_cv_sys_dlopen_deplibs=yes |
20360 | ;; | 20234 | ;; |
diff --git a/libltdl/ltmain.sh b/libltdl/ltmain.sh index 8fc56db8..c715b594 100644 --- a/libltdl/ltmain.sh +++ b/libltdl/ltmain.sh | |||
@@ -43,7 +43,7 @@ EXIT_FAILURE=1 | |||
43 | 43 | ||
44 | PROGRAM=ltmain.sh | 44 | PROGRAM=ltmain.sh |
45 | PACKAGE=libtool | 45 | PACKAGE=libtool |
46 | VERSION="1.5.22 Debian 1.5.22-2" | 46 | VERSION="1.5.22 Debian 1.5.22-4" |
47 | TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" | 47 | TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" |
48 | 48 | ||
49 | # See if we are running on zsh, and set the options which allow our | 49 | # See if we are running on zsh, and set the options which allow our |
@@ -43,7 +43,7 @@ EXIT_FAILURE=1 | |||
43 | 43 | ||
44 | PROGRAM=ltmain.sh | 44 | PROGRAM=ltmain.sh |
45 | PACKAGE=libtool | 45 | PACKAGE=libtool |
46 | VERSION="1.5.22 Debian 1.5.22-2" | 46 | VERSION="1.5.22 Debian 1.5.22-4" |
47 | TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" | 47 | TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" |
48 | 48 | ||
49 | # See if we are running on zsh, and set the options which allow our | 49 | # See if we are running on zsh, and set the options which allow our |