Jasper Huijsmans
parent
6934556e1b
commit
ba3e48bad4
|
|
@ -1,4 +1,4 @@
|
|||
# Makefile.in generated by automake 1.7.6 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.7.5 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
|
||||
|
|
@ -535,7 +535,7 @@ installcheck-am:
|
|||
|
||||
maintainer-clean: maintainer-clean-recursive
|
||||
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
|
||||
-rm -rf $(top_srcdir)/autom4te.cache
|
||||
-rm -rf autom4te.cache
|
||||
maintainer-clean-am: distclean-am maintainer-clean-generic
|
||||
|
||||
mostlyclean: mostlyclean-recursive
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# generated automatically by aclocal 1.7.6 -*- Autoconf -*-
|
||||
# generated automatically by aclocal 1.7.5 -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
|
||||
# Free Software Foundation, Inc.
|
||||
|
|
@ -189,7 +189,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
|
|||
# Call AM_AUTOMAKE_VERSION so it can be traced.
|
||||
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
|
||||
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
||||
[AM_AUTOMAKE_VERSION([1.7.6])])
|
||||
[AM_AUTOMAKE_VERSION([1.7.5])])
|
||||
|
||||
# Helper functions for option handling. -*- Autoconf -*-
|
||||
|
||||
|
|
@ -571,32 +571,18 @@ AC_CACHE_CHECK([dependency style of $depcc],
|
|||
# using a relative directory.
|
||||
cp "$am_depcomp" conftest.dir
|
||||
cd conftest.dir
|
||||
# We will build objects and dependencies in a subdirectory because
|
||||
# it helps to detect inapplicable dependency modes. For instance
|
||||
# both Tru64's cc and ICC support -MD to output dependencies as a
|
||||
# side effect of compilation, but ICC will put the dependencies in
|
||||
# the current directory while Tru64 will put them in the object
|
||||
# directory.
|
||||
mkdir sub
|
||||
|
||||
am_cv_$1_dependencies_compiler_type=none
|
||||
if test "$am_compiler_list" = ""; then
|
||||
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
|
||||
fi
|
||||
for depmode in $am_compiler_list; do
|
||||
# Setup a source with many dependencies, because some compilers
|
||||
# like to wrap large dependency lists on column 80 (with \), and
|
||||
# we should not choose a depcomp mode which is confused by this.
|
||||
#
|
||||
# We need to recreate these files for each test, as the compiler may
|
||||
# overwrite some of them when testing with obscure command lines.
|
||||
# This happens at least with the AIX C compiler.
|
||||
: > sub/conftest.c
|
||||
for i in 1 2 3 4 5 6; do
|
||||
echo '#include "conftst'$i'.h"' >> sub/conftest.c
|
||||
: > sub/conftst$i.h
|
||||
done
|
||||
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
|
||||
echo '#include "conftest.h"' > conftest.c
|
||||
echo 'int i;' > conftest.h
|
||||
echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
|
||||
|
||||
case $depmode in
|
||||
nosideeffect)
|
||||
|
|
@ -614,12 +600,11 @@ AC_CACHE_CHECK([dependency style of $depcc],
|
|||
# mode. It turns out that the SunPro C++ compiler does not properly
|
||||
# handle `-M -o', and we need to detect this.
|
||||
if depmode=$depmode \
|
||||
source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
|
||||
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
|
||||
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
|
||||
source=conftest.c object=conftest.o \
|
||||
depfile=conftest.Po tmpdepfile=conftest.TPo \
|
||||
$SHELL ./depcomp $depcc -c -o conftest.o conftest.c \
|
||||
>/dev/null 2>conftest.err &&
|
||||
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
|
||||
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
|
||||
grep conftest.h conftest.Po > /dev/null 2>&1 &&
|
||||
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
|
||||
# icc doesn't choke on unknown options, it will just issue warnings
|
||||
# (even with -Werror). So we grep stderr for any message
|
||||
|
|
@ -901,7 +886,6 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
|
|||
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
|
||||
|
||||
# serial 47 AC_PROG_LIBTOOL
|
||||
# Debian $Rev: 47 $
|
||||
|
||||
|
||||
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
|
||||
|
|
@ -1379,7 +1363,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
|
|||
x86_64-*linux*)
|
||||
LD="${LD-ld} -m elf_i386"
|
||||
;;
|
||||
ppc64-*linux*|powerpc64-*linux*)
|
||||
ppc64-*linux*)
|
||||
LD="${LD-ld} -m elf32ppclinux"
|
||||
;;
|
||||
s390x-*linux*)
|
||||
|
|
@ -1443,8 +1427,7 @@ need_locks="$enable_libtool_lock"
|
|||
# ----------------------------------------------------------------
|
||||
# Check whether the given compiler option works
|
||||
AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
|
||||
[AC_REQUIRE([LT_AC_PROG_SED])
|
||||
AC_CACHE_CHECK([$1], [$2],
|
||||
[AC_CACHE_CHECK([$1], [$2],
|
||||
[$2=no
|
||||
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
|
||||
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
|
||||
|
|
@ -1549,12 +1532,6 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
|
|||
lt_cv_sys_max_cmd_len=8192;
|
||||
;;
|
||||
|
||||
amigaos*)
|
||||
# On AmigaOS with pdksh, this test takes hours, literally.
|
||||
# So we just punt and use a minimum line length of 8192.
|
||||
lt_cv_sys_max_cmd_len=8192;
|
||||
;;
|
||||
|
||||
*)
|
||||
# If test is not a shell built-in, we'll probably end up computing a
|
||||
# maximum length that is only half of the actual maximum length, but
|
||||
|
|
@ -1837,11 +1814,8 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
|
|||
fi
|
||||
fi
|
||||
chmod u+w .
|
||||
$rm conftest*
|
||||
# SGI C++ compiler will create directory out/ii_files/ for
|
||||
# template instantiation
|
||||
test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
|
||||
$rm out/* && rmdir out
|
||||
$rm conftest* out/*
|
||||
rmdir out
|
||||
cd ..
|
||||
rmdir conftest
|
||||
$rm conftest*
|
||||
|
|
@ -2059,7 +2033,7 @@ aix4* | aix5*)
|
|||
amigaos*)
|
||||
library_names_spec='$libname.ixlibrary $libname.a'
|
||||
# Create ${libname}_ixlibrary.a entries in /sys/libs.
|
||||
finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
|
||||
finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
|
||||
;;
|
||||
|
||||
beos*)
|
||||
|
|
@ -2106,7 +2080,7 @@ cygwin* | mingw* | pw32*)
|
|||
cygwin*)
|
||||
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
|
||||
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
|
||||
sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
|
||||
sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
|
||||
;;
|
||||
mingw*)
|
||||
# MinGW DLLs use traditional 'lib' prefix
|
||||
|
|
@ -2145,16 +2119,17 @@ darwin* | rhapsody*)
|
|||
version_type=darwin
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
# FIXME: Relying on posixy $() will cause problems for
|
||||
# cross-compilation, but unfortunately the echo tests do not
|
||||
# yet detect zsh echo's removal of \ escapes.
|
||||
library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
|
||||
soname_spec='${libname}${release}${major}$shared_ext'
|
||||
shlibpath_overrides_runpath=yes
|
||||
shlibpath_var=DYLD_LIBRARY_PATH
|
||||
shrext='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
|
||||
if test "$GCC" = yes; then
|
||||
if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
|
||||
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
|
||||
else
|
||||
sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
|
||||
fi
|
||||
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
|
||||
;;
|
||||
|
|
@ -2172,18 +2147,6 @@ freebsd1*)
|
|||
dynamic_linker=no
|
||||
;;
|
||||
|
||||
kfreebsd*-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'
|
||||
;;
|
||||
|
||||
freebsd*)
|
||||
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
|
||||
version_type=freebsd-$objformat
|
||||
|
|
@ -2361,7 +2324,7 @@ newsos6)
|
|||
shlibpath_overrides_runpath=yes
|
||||
;;
|
||||
|
||||
nto-qnx*)
|
||||
nto-qnx)
|
||||
version_type=linux
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
|
|
@ -2830,7 +2793,7 @@ fi
|
|||
|
||||
# AC_PROG_LD
|
||||
# ----------
|
||||
# find the pathname to the GNU or non-GNU linker
|
||||
# find the path to the GNU or non-GNU linker
|
||||
AC_DEFUN([AC_PROG_LD],
|
||||
[AC_ARG_WITH([gnu-ld],
|
||||
[AC_HELP_STRING([--with-gnu-ld],
|
||||
|
|
@ -2856,7 +2819,7 @@ if test "$GCC" = yes; then
|
|||
# Accept absolute paths.
|
||||
[[\\/]]* | ?:[[\\/]]*)
|
||||
re_direlt='/[[^/]][[^/]]*/\.\./'
|
||||
# Canonicalize the pathname of ld
|
||||
# Canonicalize the path of ld
|
||||
ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
|
||||
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
|
||||
ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
|
||||
|
|
@ -2919,7 +2882,7 @@ AC_DEFUN([AC_PROG_LD_GNU],
|
|||
[AC_REQUIRE([AC_PROG_EGREP])dnl
|
||||
AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
|
||||
[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
|
||||
case `$LD -v 2>&1 </dev/null` in
|
||||
case `"$LD" -v 2>&1 </dev/null` in
|
||||
*GNU* | *'with BFD'*)
|
||||
lt_cv_prog_gnu_ld=yes
|
||||
;;
|
||||
|
|
@ -3005,7 +2968,7 @@ darwin* | rhapsody*)
|
|||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
freebsd* | kfreebsd*-gnu)
|
||||
freebsd*)
|
||||
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
|
||||
case $host_cpu in
|
||||
i*86 )
|
||||
|
|
@ -3067,7 +3030,7 @@ irix5* | irix6* | nonstopux*)
|
|||
# This must be Linux ELF.
|
||||
linux*)
|
||||
case $host_cpu in
|
||||
alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh*)
|
||||
alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*)
|
||||
lt_cv_deplibs_check_method=pass_all ;;
|
||||
*)
|
||||
# glibc up to 2.1.1 does not perform some relocations on ARM
|
||||
|
|
@ -3090,7 +3053,7 @@ newos6*)
|
|||
lt_cv_file_magic_test_file=/usr/lib/libnls.so
|
||||
;;
|
||||
|
||||
nto-qnx*)
|
||||
nto-qnx)
|
||||
lt_cv_deplibs_check_method=unknown
|
||||
;;
|
||||
|
||||
|
|
@ -3157,7 +3120,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
|
|||
|
||||
# AC_PROG_NM
|
||||
# ----------
|
||||
# find the pathname to a BSD-compatible name lister
|
||||
# find the path to a BSD-compatible name lister
|
||||
AC_DEFUN([AC_PROG_NM],
|
||||
[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
|
||||
[if test -n "$NM"; then
|
||||
|
|
@ -3295,7 +3258,7 @@ AC_DEFUN([AC_LIBTOOL_CXX],
|
|||
AC_DEFUN([_LT_AC_LANG_CXX],
|
||||
[AC_REQUIRE([AC_PROG_CXX])
|
||||
AC_REQUIRE([AC_PROG_CXXCPP])
|
||||
_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
|
||||
_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,CXX" | sed 's/^,//'`])
|
||||
])# _LT_AC_LANG_CXX
|
||||
|
||||
|
||||
|
|
@ -3311,7 +3274,7 @@ AC_DEFUN([AC_LIBTOOL_F77],
|
|||
# ---------------
|
||||
AC_DEFUN([_LT_AC_LANG_F77],
|
||||
[AC_REQUIRE([AC_PROG_F77])
|
||||
_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
|
||||
_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,F77" | sed 's/^,//'`])
|
||||
])# _LT_AC_LANG_F77
|
||||
|
||||
|
||||
|
|
@ -3332,7 +3295,7 @@ AC_DEFUN([_LT_AC_LANG_GCJ],
|
|||
[ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
|
||||
[ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
|
||||
[AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
|
||||
_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
|
||||
_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,GCJ" | sed 's/^,//'`])
|
||||
])# _LT_AC_LANG_GCJ
|
||||
|
||||
|
||||
|
|
@ -3341,7 +3304,7 @@ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
|
|||
# enable support for Windows resource files
|
||||
AC_DEFUN([AC_LIBTOOL_RC],
|
||||
[AC_REQUIRE([LT_AC_PROG_RC])
|
||||
_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
|
||||
_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,RC" | sed 's/^,//'`])
|
||||
])# AC_LIBTOOL_RC
|
||||
|
||||
|
||||
|
|
@ -3406,9 +3369,9 @@ AC_LIBTOOL_PROG_COMPILER_PIC($1)
|
|||
AC_LIBTOOL_PROG_CC_C_O($1)
|
||||
AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
|
||||
AC_LIBTOOL_PROG_LD_SHLIBS($1)
|
||||
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
|
||||
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
|
||||
AC_LIBTOOL_SYS_LIB_STRIP
|
||||
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
|
||||
AC_LIBTOOL_DLOPEN_SELF($1)
|
||||
|
||||
# Report which librarie types wil actually be built
|
||||
|
|
@ -3435,40 +3398,31 @@ aix4*)
|
|||
fi
|
||||
;;
|
||||
darwin* | rhapsody*)
|
||||
if test "$GCC" = yes; then
|
||||
if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
|
||||
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
|
||||
case "$host_os" in
|
||||
rhapsody* | darwin1.[[012]])
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
|
||||
;;
|
||||
*) # Darwin 1.3 on
|
||||
if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
else
|
||||
case ${MACOSX_DEPLOYMENT_TARGET} in
|
||||
10.[[012]])
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
;;
|
||||
10.*)
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
;;
|
||||
esac
|
||||
# FIXME: Relying on posixy $() will cause problems for
|
||||
# cross-compilation, but unfortunately the echo tests do not
|
||||
# yet detect zsh echo's removal of \ escapes. Also zsh mangles
|
||||
# `"' quotes if we put them in here... so don't!
|
||||
output_verbose_link_cmd='echo'
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
|
||||
_LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
|
||||
_LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
|
||||
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
_LT_AC_TAGVAR(hardcode_direct, $1)=no
|
||||
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
|
||||
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
|
||||
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
|
||||
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
|
||||
else
|
||||
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
|
@ -3605,7 +3559,7 @@ if test "$GXX" = yes; then
|
|||
# linker, instead of GNU ld. If possible, this setting should
|
||||
# overridden to take advantage of the native linker features on
|
||||
# the platform it is being used on.
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
||||
fi
|
||||
|
||||
# Commands to make compiler produce verbose output that lists
|
||||
|
|
@ -3772,25 +3726,14 @@ case $host_os in
|
|||
;;
|
||||
|
||||
darwin* | rhapsody*)
|
||||
if test "$GXX" = yes; then
|
||||
if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
|
||||
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
|
||||
case "$host_os" in
|
||||
rhapsody* | darwin1.[[012]])
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
|
||||
;;
|
||||
*) # Darwin 1.3 on
|
||||
if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
else
|
||||
case ${MACOSX_DEPLOYMENT_TARGET} in
|
||||
10.[[012]])
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
;;
|
||||
10.*)
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
;;
|
||||
esac
|
||||
lt_int_apple_cc_single_mod=no
|
||||
|
|
@ -3803,7 +3746,7 @@ case $host_os in
|
|||
else
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
fi
|
||||
_LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
|
||||
_LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
|
||||
|
||||
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
|
||||
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
|
||||
|
|
@ -3811,14 +3754,12 @@ case $host_os in
|
|||
else
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
fi
|
||||
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
_LT_AC_TAGVAR(hardcode_direct, $1)=no
|
||||
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
|
||||
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
|
||||
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
|
||||
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
|
||||
else
|
||||
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||
fi
|
||||
;;
|
||||
|
||||
|
|
@ -3846,7 +3787,7 @@ case $host_os in
|
|||
freebsd-elf*)
|
||||
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
|
||||
;;
|
||||
freebsd* | kfreebsd*-gnu)
|
||||
freebsd*)
|
||||
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
|
||||
# conventions
|
||||
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
|
||||
|
|
@ -4356,9 +4297,9 @@ AC_LIBTOOL_PROG_COMPILER_PIC($1)
|
|||
AC_LIBTOOL_PROG_CC_C_O($1)
|
||||
AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
|
||||
AC_LIBTOOL_PROG_LD_SHLIBS($1)
|
||||
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
|
||||
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
|
||||
AC_LIBTOOL_SYS_LIB_STRIP
|
||||
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
|
||||
AC_LIBTOOL_DLOPEN_SELF($1)
|
||||
|
||||
AC_LIBTOOL_CONFIG($1)
|
||||
|
|
@ -4600,10 +4541,9 @@ AC_LIBTOOL_PROG_COMPILER_PIC($1)
|
|||
AC_LIBTOOL_PROG_CC_C_O($1)
|
||||
AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
|
||||
AC_LIBTOOL_PROG_LD_SHLIBS($1)
|
||||
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
|
||||
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
|
||||
AC_LIBTOOL_SYS_LIB_STRIP
|
||||
|
||||
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
|
||||
|
||||
AC_LIBTOOL_CONFIG($1)
|
||||
|
||||
|
|
@ -4651,9 +4591,9 @@ AC_LIBTOOL_PROG_COMPILER_PIC($1)
|
|||
AC_LIBTOOL_PROG_CC_C_O($1)
|
||||
AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
|
||||
AC_LIBTOOL_PROG_LD_SHLIBS($1)
|
||||
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
|
||||
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
|
||||
AC_LIBTOOL_SYS_LIB_STRIP
|
||||
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
|
||||
AC_LIBTOOL_DLOPEN_SELF($1)
|
||||
|
||||
AC_LIBTOOL_CONFIG($1)
|
||||
|
|
@ -4903,7 +4843,7 @@ LN_S=$lt_LN_S
|
|||
NM=$lt_NM
|
||||
|
||||
# A symbol stripping program
|
||||
STRIP="$STRIP"
|
||||
STRIP=$STRIP
|
||||
|
||||
# Used to examine libraries when file_magic_cmd begins "file"
|
||||
MAGIC_CMD=$MAGIC_CMD
|
||||
|
|
@ -5251,7 +5191,7 @@ osf*)
|
|||
symcode='[[BCDEGQRST]]'
|
||||
;;
|
||||
solaris* | sysv5*)
|
||||
symcode='[[BDRT]]'
|
||||
symcode='[[BDT]]'
|
||||
;;
|
||||
sysv4)
|
||||
symcode='[[DFNSTU]]'
|
||||
|
|
@ -5269,7 +5209,7 @@ esac
|
|||
# If we're using GNU nm, then use its standard symbol codes.
|
||||
case `$NM -V 2>&1` in
|
||||
*GNU* | *'with BFD'*)
|
||||
symcode='[[ABCDGIRSTW]]' ;;
|
||||
symcode='[[ABCDGISTW]]' ;;
|
||||
esac
|
||||
|
||||
# Try without a prefix undercore, then with it.
|
||||
|
|
@ -5484,7 +5424,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|||
;;
|
||||
esac
|
||||
;;
|
||||
freebsd* | kfreebsd*-gnu)
|
||||
freebsd*)
|
||||
# FreeBSD uses GNU C++
|
||||
;;
|
||||
hpux9* | hpux10* | hpux11*)
|
||||
|
|
@ -5760,12 +5700,12 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|||
|
||||
linux*)
|
||||
case $CC in
|
||||
icc* | ecc*)
|
||||
icc|ecc)
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
|
||||
;;
|
||||
ccc*)
|
||||
ccc)
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
||||
# All Alpha code is PIC.
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
|
||||
|
|
@ -6038,31 +5978,6 @@ EOF
|
|||
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
|
||||
;;
|
||||
|
||||
linux*)
|
||||
if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
|
||||
tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
|
||||
supports_anon_versioning=no
|
||||
case `$LD -v 2>/dev/null` in
|
||||
*\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
|
||||
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
|
||||
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
|
||||
*\ 2.11.*) ;; # other 2.11 versions
|
||||
*) supports_anon_versioning=yes ;;
|
||||
esac
|
||||
if test $supports_anon_versioning = yes; then
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
|
||||
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
|
||||
$echo "local: *; };" >> $output_objdir/$libname.ver~
|
||||
$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
|
||||
else
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
|
||||
fi
|
||||
else
|
||||
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||
fi
|
||||
;;
|
||||
|
||||
*)
|
||||
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
||||
|
|
@ -6251,27 +6166,20 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
|||
;;
|
||||
|
||||
darwin* | rhapsody*)
|
||||
if test "$GXX" = yes ; then
|
||||
if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
|
||||
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
|
||||
case "$host_os" in
|
||||
rhapsody* | darwin1.[[012]])
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
|
||||
;;
|
||||
*) # Darwin 1.3 on
|
||||
if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
else
|
||||
case ${MACOSX_DEPLOYMENT_TARGET} in
|
||||
10.[[012]])
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
;;
|
||||
10.*)
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
|
||||
;;
|
||||
esac
|
||||
# FIXME: Relying on posixy $() will cause problems for
|
||||
# cross-compilation, but unfortunately the echo tests do not
|
||||
# yet detect zsh echo's removal of \ escapes. Also zsh mangles
|
||||
# `"' quotes if we put them in here... so don't!
|
||||
lt_int_apple_cc_single_mod=no
|
||||
output_verbose_link_cmd='echo'
|
||||
if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
|
||||
|
|
@ -6282,21 +6190,19 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
|||
else
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
fi
|
||||
_LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
|
||||
_LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
|
||||
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
|
||||
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
else
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
fi
|
||||
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
_LT_AC_TAGVAR(hardcode_direct, $1)=no
|
||||
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
|
||||
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
|
||||
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
|
||||
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
|
||||
else
|
||||
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||
fi
|
||||
;;
|
||||
|
||||
|
|
@ -6330,7 +6236,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
|
|||
;;
|
||||
|
||||
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
|
||||
freebsd* | kfreebsd*-gnu)
|
||||
freebsd*)
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
|
||||
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
|
||||
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2003-01-10'
|
||||
timestamp='2003-05-09'
|
||||
|
||||
# This file is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
|
|
@ -235,72 +235,51 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|||
*:OpenBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
*:MicroBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
alpha:OSF1:*:*)
|
||||
if test $UNAME_RELEASE = "V4.0"; then
|
||||
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
|
||||
fi
|
||||
# According to Compaq, /usr/sbin/psrinfo has been available on
|
||||
# OSF/1 and Tru64 systems produced since 1995. I hope that
|
||||
# covers most systems running today. This code pipes the CPU
|
||||
# types through head -n 1, so we only detect the type of CPU 0.
|
||||
ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
|
||||
case "$ALPHA_CPU_TYPE" in
|
||||
"EV4 (21064)")
|
||||
UNAME_MACHINE="alpha" ;;
|
||||
"EV4.5 (21064)")
|
||||
UNAME_MACHINE="alpha" ;;
|
||||
"LCA4 (21066/21068)")
|
||||
UNAME_MACHINE="alpha" ;;
|
||||
"EV5 (21164)")
|
||||
UNAME_MACHINE="alphaev5" ;;
|
||||
"EV5.6 (21164A)")
|
||||
UNAME_MACHINE="alphaev56" ;;
|
||||
"EV5.6 (21164PC)")
|
||||
UNAME_MACHINE="alphapca56" ;;
|
||||
"EV5.7 (21164PC)")
|
||||
UNAME_MACHINE="alphapca57" ;;
|
||||
"EV6 (21264)")
|
||||
UNAME_MACHINE="alphaev6" ;;
|
||||
"EV6.7 (21264A)")
|
||||
UNAME_MACHINE="alphaev67" ;;
|
||||
"EV6.8CB (21264C)")
|
||||
UNAME_MACHINE="alphaev68" ;;
|
||||
"EV6.8AL (21264B)")
|
||||
UNAME_MACHINE="alphaev68" ;;
|
||||
"EV6.8CX (21264D)")
|
||||
UNAME_MACHINE="alphaev68" ;;
|
||||
"EV6.9A (21264/EV69A)")
|
||||
UNAME_MACHINE="alphaev69" ;;
|
||||
"EV7 (21364)")
|
||||
UNAME_MACHINE="alphaev7" ;;
|
||||
"EV7.9 (21364A)")
|
||||
UNAME_MACHINE="alphaev79" ;;
|
||||
esac
|
||||
# A Vn.n version is a released version.
|
||||
# A Tn.n version is a released field test version.
|
||||
# A Xn.n version is an unreleased experimental baselevel.
|
||||
# 1.2 uses "1.2" for uname -r.
|
||||
eval $set_cc_for_build
|
||||
cat <<EOF >$dummy.s
|
||||
.data
|
||||
\$Lformat:
|
||||
.byte 37,100,45,37,120,10,0 # "%d-%x\n"
|
||||
|
||||
.text
|
||||
.globl main
|
||||
.align 4
|
||||
.ent main
|
||||
main:
|
||||
.frame \$30,16,\$26,0
|
||||
ldgp \$29,0(\$27)
|
||||
.prologue 1
|
||||
.long 0x47e03d80 # implver \$0
|
||||
lda \$2,-1
|
||||
.long 0x47e20c21 # amask \$2,\$1
|
||||
lda \$16,\$Lformat
|
||||
mov \$0,\$17
|
||||
not \$1,\$18
|
||||
jsr \$26,printf
|
||||
ldgp \$29,0(\$26)
|
||||
mov 0,\$16
|
||||
jsr \$26,exit
|
||||
.end main
|
||||
EOF
|
||||
$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
|
||||
if test "$?" = 0 ; then
|
||||
case `$dummy` in
|
||||
0-0)
|
||||
UNAME_MACHINE="alpha"
|
||||
;;
|
||||
1-0)
|
||||
UNAME_MACHINE="alphaev5"
|
||||
;;
|
||||
1-1)
|
||||
UNAME_MACHINE="alphaev56"
|
||||
;;
|
||||
1-101)
|
||||
UNAME_MACHINE="alphapca56"
|
||||
;;
|
||||
2-303)
|
||||
UNAME_MACHINE="alphaev6"
|
||||
;;
|
||||
2-307)
|
||||
UNAME_MACHINE="alphaev67"
|
||||
;;
|
||||
2-1307)
|
||||
UNAME_MACHINE="alphaev68"
|
||||
;;
|
||||
3-1307)
|
||||
UNAME_MACHINE="alphaev7"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
|
||||
exit 0 ;;
|
||||
Alpha\ *:Windows_NT*:*)
|
||||
|
|
@ -765,7 +744,7 @@ EOF
|
|||
*:BSD/OS:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
*:FreeBSD:*:*)
|
||||
*:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
|
||||
# Determine whether the default compiler uses glibc.
|
||||
eval $set_cc_for_build
|
||||
sed 's/^ //' << EOF >$dummy.c
|
||||
|
|
@ -1054,7 +1033,7 @@ EOF
|
|||
exit 0 ;;
|
||||
M68*:*:R3V[567]*:*)
|
||||
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
|
||||
3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
|
||||
3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
|
||||
OS_REL=''
|
||||
test -r /etc/.relid \
|
||||
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2003-01-03'
|
||||
timestamp='2003-05-09'
|
||||
|
||||
# This file is (in principle) common to ALL GNU software.
|
||||
# The presence of a machine in this file suggests that SOME GNU software
|
||||
|
|
@ -257,7 +257,7 @@ case $basic_machine in
|
|||
| pdp10 | pdp11 | pj | pjl \
|
||||
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
||||
| pyramid \
|
||||
| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
|
||||
| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
|
||||
| sh64 | sh64le \
|
||||
| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
|
||||
| strongarm \
|
||||
|
|
@ -296,7 +296,7 @@ case $basic_machine in
|
|||
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
|
||||
| avr-* \
|
||||
| bs2000-* \
|
||||
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
|
||||
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
|
||||
| clipper-* | cydra-* \
|
||||
| d10v-* | d30v-* | dlx-* \
|
||||
| elxsi-* \
|
||||
|
|
@ -329,11 +329,13 @@ case $basic_machine in
|
|||
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
||||
| pyramid-* \
|
||||
| romp-* | rs6000-* \
|
||||
| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
|
||||
| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
|
||||
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
||||
| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
|
||||
| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
|
||||
| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
|
||||
| tahoe-* | thumb-* \
|
||||
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
|
||||
| tron-* \
|
||||
| v850-* | v850e-* | vax-* \
|
||||
| we32k-* \
|
||||
| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
|
||||
|
|
@ -371,6 +373,9 @@ case $basic_machine in
|
|||
basic_machine=a29k-none
|
||||
os=-bsd
|
||||
;;
|
||||
amd64)
|
||||
basic_machine=x86_64-pc
|
||||
;;
|
||||
amdahl)
|
||||
basic_machine=580-amdahl
|
||||
os=-sysv
|
||||
|
|
@ -925,6 +930,14 @@ case $basic_machine in
|
|||
basic_machine=tic54x-unknown
|
||||
os=-coff
|
||||
;;
|
||||
tic55x | c55x*)
|
||||
basic_machine=tic55x-unknown
|
||||
os=-coff
|
||||
;;
|
||||
tic6x | c6x*)
|
||||
basic_machine=tic6x-unknown
|
||||
os=-coff
|
||||
;;
|
||||
tx39)
|
||||
basic_machine=mipstx39-unknown
|
||||
;;
|
||||
|
|
@ -1027,7 +1040,7 @@ case $basic_machine in
|
|||
we32k)
|
||||
basic_machine=we32k-att
|
||||
;;
|
||||
sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
|
||||
sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
|
||||
basic_machine=sh-unknown
|
||||
;;
|
||||
sh64)
|
||||
|
|
@ -1118,7 +1131,7 @@ case $os in
|
|||
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
|
||||
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
||||
| -powermax* | -dnix* | -microbsd*)
|
||||
| -powermax* | -dnix*)
|
||||
# Remember, each alternative MUST END IN *, to match a version number.
|
||||
;;
|
||||
-qnx*)
|
||||
|
|
@ -1227,6 +1240,12 @@ case $os in
|
|||
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
|
||||
os=-mint
|
||||
;;
|
||||
-aros*)
|
||||
os=-aros
|
||||
;;
|
||||
-kaos*)
|
||||
os=-kaos
|
||||
;;
|
||||
-none)
|
||||
;;
|
||||
*)
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ AC_CHECK_LIB(kstat, kstat_open, SOLLIBS="-lkstat -lsocket", SOLLIBS="")
|
|||
AC_SUBST(SOLLIBS)
|
||||
|
||||
dnl Check for i18n support
|
||||
BM_I18N([xfce4-netload], [de lt ca pl])
|
||||
BM_I18N([xfce4-netload], [de lt ca pl uk])
|
||||
|
||||
dnl configure the panel plugin
|
||||
XFCE_PANEL_PLUGIN([XFCE4_PANEL], [3.99.2])
|
||||
|
|
|
|||
22
depcomp
22
depcomp
|
|
@ -207,9 +207,11 @@ aix)
|
|||
;;
|
||||
|
||||
icc)
|
||||
# Intel's C compiler understands `-MD -MF file'. However on
|
||||
# Must come before tru64.
|
||||
|
||||
# Intel's C compiler understands `-MD -MF file'. However
|
||||
# icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
|
||||
# ICC 7.0 will fill foo.d with something like
|
||||
# will fill foo.d with something like
|
||||
# foo.o: sub/foo.c
|
||||
# foo.o: sub/foo.h
|
||||
# which is wrong. We want:
|
||||
|
|
@ -217,12 +219,6 @@ icc)
|
|||
# sub/foo.o: sub/foo.h
|
||||
# sub/foo.c:
|
||||
# sub/foo.h:
|
||||
# ICC 7.1 will output
|
||||
# foo.o: sub/foo.c sub/foo.h
|
||||
# and will wrap long lines using \ :
|
||||
# foo.o: sub/foo.c ... \
|
||||
# sub/foo.h ... \
|
||||
# ...
|
||||
|
||||
"$@" -MD -MF "$tmpdepfile"
|
||||
stat=$?
|
||||
|
|
@ -232,15 +228,11 @@ icc)
|
|||
exit $stat
|
||||
fi
|
||||
rm -f "$depfile"
|
||||
# Each line is of the form `foo.o: dependent.h',
|
||||
# or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
|
||||
# Each line is of the form `foo.o: dependent.h'.
|
||||
# Do two passes, one to just change these to
|
||||
# `$object: dependent.h' and one to simply `dependent.h:'.
|
||||
sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
|
||||
# Some versions of the HPUX 10.20 sed can't process this invocation
|
||||
# correctly. Breaking it into two sed invocations is a workaround.
|
||||
sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
|
||||
sed -e 's/$/ :/' >> "$depfile"
|
||||
sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
|
||||
sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
|
||||
rm -f "$tmpdepfile"
|
||||
;;
|
||||
|
||||
|
|
|
|||
|
|
@ -239,8 +239,8 @@ else
|
|||
|
||||
# Make a couple of temp file names in the proper directory.
|
||||
|
||||
dsttmp=$dstdir/_inst.$$_
|
||||
rmtmp=$dstdir/_rm.$$_
|
||||
dsttmp=$dstdir/#inst.$$#
|
||||
rmtmp=$dstdir/#rm.$$#
|
||||
|
||||
# Trap to clean up temp files at exit.
|
||||
|
||||
|
|
|
|||
65
ltmain.sh
65
ltmain.sh
|
|
@ -55,8 +55,8 @@ modename="$progname"
|
|||
# Constants.
|
||||
PROGRAM=ltmain.sh
|
||||
PACKAGE=libtool
|
||||
VERSION=1.5.0a
|
||||
TIMESTAMP=" (1.1220.2.25 2003/08/01 19:08:35) Debian$Rev: 49 $"
|
||||
VERSION=1.5
|
||||
TIMESTAMP=" (1.1220 2003/04/05 19:32:58)"
|
||||
|
||||
default_mode=
|
||||
help="Try \`$progname --help' for more information."
|
||||
|
|
@ -70,8 +70,8 @@ rm="rm -f"
|
|||
Xsed="${SED}"' -e 1s/^X//'
|
||||
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
|
||||
# test EBCDIC or ASCII
|
||||
case `echo A|tr A '\301'` in
|
||||
A) # EBCDIC based system
|
||||
case `echo A|od -x` in
|
||||
*[Cc]1*) # EBCDIC based system
|
||||
SP2NL="tr '\100' '\n'"
|
||||
NL2SP="tr '\r\n' '\100\100'"
|
||||
;;
|
||||
|
|
@ -94,8 +94,7 @@ if test "${LANG+set}" = set; then
|
|||
fi
|
||||
|
||||
# Make sure IFS has a sensible default
|
||||
: ${IFS="
|
||||
"}
|
||||
: ${IFS=" "}
|
||||
|
||||
if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
|
||||
$echo "$modename: not configured to build any kind of library" 1>&2
|
||||
|
|
@ -1814,18 +1813,12 @@ EOF
|
|||
fi
|
||||
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
|
||||
for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
|
||||
for search_ext in .la $shrext .so .a; do
|
||||
# Search the libtool library
|
||||
lib="$searchdir/lib${name}${search_ext}"
|
||||
lib="$searchdir/lib${name}.la"
|
||||
if test -f "$lib"; then
|
||||
if test "$search_ext" = ".la"; then
|
||||
found=yes
|
||||
else
|
||||
found=no
|
||||
break
|
||||
fi
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
if test "$found" != yes; then
|
||||
# deplib doesn't seem to be a libtool library
|
||||
|
|
@ -2359,7 +2352,7 @@ EOF
|
|||
if test -n "$inst_prefix_dir"; then
|
||||
case "$libdir" in
|
||||
[\\/]*)
|
||||
add_dir="$add_dir -L$inst_prefix_dir$libdir"
|
||||
add_dir="-L$inst_prefix_dir$libdir $add_dir"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
|
@ -2431,7 +2424,7 @@ EOF
|
|||
if test -n "$inst_prefix_dir"; then
|
||||
case "$libdir" in
|
||||
[\\/]*)
|
||||
add_dir="$add_dir -L$inst_prefix_dir$libdir"
|
||||
add_dir="-L$inst_prefix_dir$libdir $add_dir"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
|
@ -2575,11 +2568,7 @@ EOF
|
|||
if test -f "$path/$depdepl" ; then
|
||||
depdepl="$path/$depdepl"
|
||||
fi
|
||||
# do not add paths which are already there
|
||||
case " $newlib_search_path " in
|
||||
*" $path "*) ;;
|
||||
*) newlib_search_path="$newlib_search_path $path";;
|
||||
esac
|
||||
newlib_search_path="$newlib_search_path $path"
|
||||
path=""
|
||||
fi
|
||||
;;
|
||||
|
|
@ -3794,7 +3783,18 @@ EOF
|
|||
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
|
||||
eval cmds=\"$archive_expsym_cmds\"
|
||||
else
|
||||
save_deplibs="$deplibs"
|
||||
for conv in $convenience; do
|
||||
tmp_deplibs=
|
||||
for test_deplib in $deplibs; do
|
||||
if test "$test_deplib" != "$conv"; then
|
||||
tmp_deplibs="$tmp_deplibs $test_deplib"
|
||||
fi
|
||||
done
|
||||
deplibs="$tmp_deplibs"
|
||||
done
|
||||
eval cmds=\"$archive_cmds\"
|
||||
deplibs="$save_deplibs"
|
||||
fi
|
||||
|
||||
# Append the command to remove the reloadable object files
|
||||
|
|
@ -5062,9 +5062,7 @@ fi\
|
|||
# Quote the link command for shipping.
|
||||
relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
|
||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
||||
if test "$hardcode_automatic" = yes ; then
|
||||
relink_command=
|
||||
fi
|
||||
|
||||
# Only create the output if not a dry run.
|
||||
if test -z "$run"; then
|
||||
for installed in no yes; do
|
||||
|
|
@ -5112,25 +5110,6 @@ fi\
|
|||
newdlprefiles="$newdlprefiles $libdir/$name"
|
||||
done
|
||||
dlprefiles="$newdlprefiles"
|
||||
else
|
||||
newdlfiles=
|
||||
for lib in $dlfiles; do
|
||||
case $lib in
|
||||
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
|
||||
*) abs=`pwd`"/$lib" ;;
|
||||
esac
|
||||
newdlfiles="$newdlfiles $abs"
|
||||
done
|
||||
dlfiles="$newdlfiles"
|
||||
newdlprefiles=
|
||||
for lib in $dlprefiles; do
|
||||
case $lib in
|
||||
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
|
||||
*) abs=`pwd`"/$lib" ;;
|
||||
esac
|
||||
newdlprefiles="$newdlprefiles $abs"
|
||||
done
|
||||
dlprefiles="$newdlprefiles"
|
||||
fi
|
||||
$rm $output
|
||||
# place dlname in correct position for cygwin
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Makefile.in generated by automake 1.7.6 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.7.5 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
|
||||
|
|
|
|||
|
|
@ -0,0 +1,102 @@
|
|||
# Uktainian translation of xfce4-netload-plugin.
|
||||
# Copyright (C) Free Software Foundation
|
||||
# This file is distributed under the same license as the xfce4-netload-plugin package.
|
||||
# Maxim Dziumanenko <mvd@mylinux.com.ua>, 2003.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: xfce4-netload-plugin\n"
|
||||
"POT-Creation-Date: 2003-09-13 13:57+0200\n"
|
||||
"PO-Revision-Date: 2003-10-21 12:13+0200\n"
|
||||
"Last-Translator: Maxim Dziumanenko <mvd@mylinux.com.ua>\n"
|
||||
"Language-Team: Ukrainian <uk@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#: panel-plugin/netload.c:64
|
||||
msgid "Xfce4-Netload-Plugin"
|
||||
msgstr "Модуль контролю мережі для Xfce4"
|
||||
|
||||
#: panel-plugin/netload.c:67
|
||||
msgid "Unknown error."
|
||||
msgstr "Невідома помилка."
|
||||
|
||||
#: panel-plugin/netload.c:68
|
||||
msgid "Linux proc device '/proc/net/dev' not found."
|
||||
msgstr "Не знайдено Linux пристрій '/proc/net/dev'."
|
||||
|
||||
#: panel-plugin/netload.c:69
|
||||
msgid "Interface was not found."
|
||||
msgstr "Інтерфейс не існує."
|
||||
|
||||
#: panel-plugin/netload.c:223
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Average of last %d measures:\n"
|
||||
"Incoming: %s kByte/s\n"
|
||||
"Outgoing: %s kByte/s\n"
|
||||
"Total: %s kByte/s"
|
||||
msgstr ""
|
||||
"Середнє значення за останні %d періоди:\n"
|
||||
"Трафік на вході: %s кілобайт/с\n"
|
||||
"Трафік на виході: %s кілобайт/с\n"
|
||||
"Загальний трафік: %s кілобайт/с"
|
||||
|
||||
#: panel-plugin/netload.c:521
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s: Error in initalizing:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
"%s: Помилка ініціалізації:\n"
|
||||
"%s"
|
||||
|
||||
#: panel-plugin/netload.c:842
|
||||
msgid "Select color"
|
||||
msgstr "Вибір кольору"
|
||||
|
||||
#: panel-plugin/netload.c:895
|
||||
msgid "Bar color (incoming):"
|
||||
msgstr "Колір (на вхід):"
|
||||
|
||||
#: panel-plugin/netload.c:896
|
||||
msgid "Bar color (outgoing):"
|
||||
msgstr "Колір (на вихід):"
|
||||
|
||||
#: panel-plugin/netload.c:899
|
||||
msgid "Maximum (incoming):"
|
||||
msgstr "Максимум (на вхід):"
|
||||
|
||||
#: panel-plugin/netload.c:900
|
||||
msgid "Maximum (outgoing):"
|
||||
msgstr "Максимум (на вихід):"
|
||||
|
||||
#: panel-plugin/netload.c:924
|
||||
msgid "Text to display:"
|
||||
msgstr "Відображуваний текст:"
|
||||
|
||||
#: panel-plugin/netload.c:955
|
||||
msgid "Network device:"
|
||||
msgstr "Мережевий пристрій:"
|
||||
|
||||
#: panel-plugin/netload.c:981
|
||||
msgid "Update interval:"
|
||||
msgstr "Інтервал оновлення:"
|
||||
|
||||
#: panel-plugin/netload.c:992
|
||||
msgid "s"
|
||||
msgstr "с"
|
||||
|
||||
#: panel-plugin/netload.c:1005
|
||||
msgid "Automatic maximum"
|
||||
msgstr "Автоматичний максимум"
|
||||
|
||||
#: panel-plugin/netload.c:1037
|
||||
msgid "kByte/s"
|
||||
msgstr "кілобайт/с"
|
||||
|
||||
#: panel-plugin/netload.c:1125
|
||||
msgid "Netload"
|
||||
msgstr "Контроль мережі"
|
||||
Loading…
Reference in New Issue