kopia lustrzana https://github.com/Hamlib/Hamlib
upgrade to libtool-1.5-3
git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1565 7ae35d74-ebe9-4afe-98af-79ac388436b8Hamlib-1.2.0
Stéphane Fillod, F8CFE
rodzic
5e08f2812d
commit
c2a63956f8
|
|
@ -23,7 +23,7 @@
|
|||
## the same distribution terms that you use for the rest of that program.
|
||||
|
||||
# serial 47 AC_PROG_LIBTOOL
|
||||
# Debian $Rev: 47 $
|
||||
# Debian $Rev: 100 $
|
||||
|
||||
|
||||
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
|
||||
|
|
@ -1449,6 +1449,9 @@ linux*)
|
|||
# before this can be enabled.
|
||||
hardcode_into_libs=yes
|
||||
|
||||
# /usr/X11R6/lib and /usr/local/lib are common enough...
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/local/lib"
|
||||
|
||||
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
||||
# powerpc, because MkLinux only supported shared libraries with the
|
||||
# GNU dynamic linker. Since this was broken with cross compilers,
|
||||
|
|
@ -1458,6 +1461,18 @@ linux*)
|
|||
dynamic_linker='GNU/Linux ld.so'
|
||||
;;
|
||||
|
||||
knetbsd*-gnu)
|
||||
version_type=linux
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
||||
soname_spec='${libname}${release}${shared_ext}$major'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
shlibpath_overrides_runpath=no
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker='GNU ld.so'
|
||||
;;
|
||||
|
||||
netbsd*)
|
||||
version_type=sunos
|
||||
need_lib_prefix=no
|
||||
|
|
@ -1496,7 +1511,7 @@ nto-qnx*)
|
|||
openbsd*)
|
||||
version_type=sunos
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
need_version=yes
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
|
|
@ -2113,17 +2128,6 @@ cygwin* | mingw* | pw32*)
|
|||
;;
|
||||
|
||||
darwin* | rhapsody*)
|
||||
# this will be overwritten by pass_all, but leave it in just in case
|
||||
lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
|
||||
lt_cv_file_magic_cmd='/usr/bin/file -L'
|
||||
case "$host_os" in
|
||||
rhapsody* | darwin1.[[012]])
|
||||
lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
|
||||
;;
|
||||
*) # Darwin 1.3 on
|
||||
lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
|
||||
;;
|
||||
esac
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
|
|
@ -2166,36 +2170,18 @@ hpux10.20* | hpux11*)
|
|||
;;
|
||||
|
||||
irix5* | irix6* | nonstopux*)
|
||||
case $host_os in
|
||||
irix5* | nonstopux*)
|
||||
# this will be overridden with pass_all, but let us keep it just in case
|
||||
lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
|
||||
;;
|
||||
*)
|
||||
case $LD in
|
||||
*-32|*"-32 ") libmagic=32-bit;;
|
||||
*-n32|*"-n32 ") libmagic=N32;;
|
||||
*-64|*"-64 ") libmagic=64-bit;;
|
||||
*) libmagic=never-match;;
|
||||
esac
|
||||
# this will be overridden with pass_all, but let us keep it just in case
|
||||
lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
|
||||
;;
|
||||
case $LD in
|
||||
*-32|*"-32 ") libmagic=32-bit;;
|
||||
*-n32|*"-n32 ") libmagic=N32;;
|
||||
*-64|*"-64 ") libmagic=64-bit;;
|
||||
*) libmagic=never-match;;
|
||||
esac
|
||||
lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
# This must be Linux ELF.
|
||||
linux*)
|
||||
case $host_cpu in
|
||||
alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh*)
|
||||
lt_cv_deplibs_check_method=pass_all ;;
|
||||
*)
|
||||
# glibc up to 2.1.1 does not perform some relocations on ARM
|
||||
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
|
||||
esac
|
||||
lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
netbsd*)
|
||||
|
|
@ -2227,9 +2213,6 @@ openbsd*)
|
|||
;;
|
||||
|
||||
osf3* | osf4* | osf5*)
|
||||
# this will be overridden with pass_all, but let us keep it just in case
|
||||
lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
|
||||
lt_cv_file_magic_test_file=/shlib/libc.so
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
|
|
@ -2239,7 +2222,6 @@ sco3.2v5*)
|
|||
|
||||
solaris*)
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
lt_cv_file_magic_test_file=/lib/libc.so
|
||||
;;
|
||||
|
||||
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
|
||||
|
|
@ -2505,7 +2487,7 @@ if test "$GCC" = no; then
|
|||
fi
|
||||
if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
|
||||
AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
|
||||
if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then :
|
||||
if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then :
|
||||
else
|
||||
AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
|
||||
_LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
|
||||
|
|
@ -3856,7 +3838,8 @@ if test -f "$ltmain"; then
|
|||
# Now quote all the things that may contain metacharacters while being
|
||||
# careful not to overquote the AC_SUBSTed values. We take copies of the
|
||||
# variables and quote the copies for generation of the libtool script.
|
||||
for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
|
||||
for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
|
||||
SED SHELL STRIP \
|
||||
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
|
||||
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
|
||||
deplibs_check_method reload_flag reload_cmds need_locks \
|
||||
|
|
@ -4037,7 +4020,7 @@ LN_S=$lt_LN_S
|
|||
NM=$lt_NM
|
||||
|
||||
# A symbol stripping program
|
||||
STRIP="$STRIP"
|
||||
STRIP=$lt_STRIP
|
||||
|
||||
# Used to examine libraries when file_magic_cmd begins "file"
|
||||
MAGIC_CMD=$MAGIC_CMD
|
||||
|
|
@ -4312,7 +4295,10 @@ else
|
|||
# If there is no Makefile yet, we rely on a make rule to execute
|
||||
# `config.status --recheck' to rerun these tests and create the
|
||||
# libtool script then.
|
||||
test -f Makefile && make "$ltmain"
|
||||
ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
|
||||
if test -f "$ltmain_in"; then
|
||||
test -f Makefile && make "$ltmain"
|
||||
fi
|
||||
fi
|
||||
])# AC_LIBTOOL_CONFIG
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
## the same distribution terms that you use for the rest of that program.
|
||||
|
||||
# serial 6 AC_LIB_LTDL
|
||||
# Debian $Rev: 42 $
|
||||
# Debian $Rev: 82 $
|
||||
|
||||
# AC_WITH_LTDL
|
||||
# ------------
|
||||
|
|
@ -143,10 +143,8 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
|
|||
# If you are looking for one http://www.opendarwin.org/projects/dlcompat
|
||||
libltdl_cv_sys_dlopen_deplibs=yes
|
||||
;;
|
||||
kfreebsd*-gnu)
|
||||
libltdl_cv_sys_dlopen_deplibs=yes
|
||||
;;
|
||||
gnu*)
|
||||
gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
|
||||
# GNU and its variants, using gnu ld.so (Glibc)
|
||||
libltdl_cv_sys_dlopen_deplibs=yes
|
||||
;;
|
||||
hpux10*|hpux11*)
|
||||
|
|
@ -162,9 +160,6 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
|
|||
# at 6.2 and later dlopen does load deplibs.
|
||||
libltdl_cv_sys_dlopen_deplibs=yes
|
||||
;;
|
||||
linux*)
|
||||
libltdl_cv_sys_dlopen_deplibs=yes
|
||||
;;
|
||||
netbsd*)
|
||||
libltdl_cv_sys_dlopen_deplibs=yes
|
||||
;;
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue